From 789918dffbfb8acc6a4e57471dc60344ce9f5649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=B0=8F=E8=92=99?= <moe@myhloli.com>
Date: Fri, 1 Mar 2024 11:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=9B=AE=E5=BD=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spark/s3_tools.py => app/common/s3.py | 4 ++--
 {test => pipeline}/__init__.py        | 0
 test/test_commons.py                  | 3 +--
 test/test_para/__init__.py            | 0
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename spark/s3_tools.py => app/common/s3.py (95%)
 rename {test => pipeline}/__init__.py (100%)
 delete mode 100644 test/test_para/__init__.py

diff --git a/spark/s3_tools.py b/app/common/s3.py
similarity index 95%
rename from spark/s3_tools.py
rename to app/common/s3.py
index 4eebb671..329ee75c 100644
--- a/spark/s3_tools.py
+++ b/app/common/s3.py
@@ -2,10 +2,10 @@
 import boto3
 from botocore.client import Config
 
-from spark import s3_buckets, s3_clusters, get_cluster_name, s3_users
+from app.common import s3_buckets, s3_clusters, get_cluster_name, s3_users
 import re
 import random
-from typing import Dict, Iterator, List, Tuple, Union
+from typing import List, Union
 
 __re_s3_path = re.compile("^s3a?://([^/]+)(?:/(.*))?$")
 def get_s3_config(path: Union[str, List[str]], outside=False):
diff --git a/test/__init__.py b/pipeline/__init__.py
similarity index 100%
rename from test/__init__.py
rename to pipeline/__init__.py
diff --git a/test/test_commons.py b/test/test_commons.py
index 823f3bfa..4af5ef9e 100644
--- a/test/test_commons.py
+++ b/test/test_commons.py
@@ -1,10 +1,9 @@
 import io
 import json
 import os
-import unittest
 from libs.commons import fitz
 
-from spark.s3_tools import get_s3_config, get_s3_client
+from app.common.s3 import get_s3_config, get_s3_client
 from libs.commons import join_path, json_dump_path, read_file, parse_bucket_key
 from loguru import logger
 
diff --git a/test/test_para/__init__.py b/test/test_para/__init__.py
deleted file mode 100644
index e69de29b..00000000