From 7d266a38be5a55057fc034ddb2b9694282b3da97 Mon Sep 17 00:00:00 2001 From: keonly Date: Tue, 28 Nov 2023 05:50:52 +0000 Subject: [PATCH] Formatted with black --- API/candidate.py | 8 ++++---- API/elected.py | 5 +++-- scrap/utils/data_io.py | 6 ++++-- scrap/utils/runner.py | 6 ++++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/API/candidate.py b/API/candidate.py index 0134c67..c00afda 100644 --- a/API/candidate.py +++ b/API/candidate.py @@ -79,8 +79,6 @@ def fetch_all_data( ) parser.add_argument("--output-path", help="API 요청 결과 저장 경로", default="output") - - args = vars(parser.parse_args()) print(args) sgIds = args.get("sgIds").split(",") @@ -90,7 +88,9 @@ def fetch_all_data( drop_columns = [] print(drop_columns) - data_list = fetch_all_data(sgIds, args.get("sgTypecodes"), drop_columns=drop_columns) + data_list = fetch_all_data( + sgIds, args.get("sgTypecodes"), drop_columns=drop_columns + ) for sgTypecode in args.get("sgTypecodes").split(","): if sgTypecode not in SG_TYPECODE: @@ -100,4 +100,4 @@ def fetch_all_data( save_to_mongo(data_list, sgTypecode, CANDIDATE_TYPECODE_TYPE[sgTypecode]) if args.get("output_store"): - save_to_excel(data_list, sgTypecode, is_elected=False) \ No newline at end of file + save_to_excel(data_list, sgTypecode, is_elected=False) diff --git a/API/elected.py b/API/elected.py index a695290..5e13669 100644 --- a/API/elected.py +++ b/API/elected.py @@ -80,7 +80,6 @@ def fetch_all_data( ) parser.add_argument("--output-path", help="API 요청 결과 저장 경로", default="output") - args = vars(parser.parse_args()) sgIds = args.get("sgIds").split(",") if args.get("drop_columns"): @@ -88,7 +87,9 @@ def fetch_all_data( else: drop_columns = [] - data_list = fetch_all_data(sgIds, args.get("sgTypecodes"), drop_columns=drop_columns) + data_list = fetch_all_data( + sgIds, args.get("sgTypecodes"), drop_columns=drop_columns + ) for sgTypecode in args.get("sgTypecodes").split(","): if sgTypecode not in SG_TYPECODE: diff --git a/scrap/utils/data_io.py b/scrap/utils/data_io.py index 0bc6aae..44f928b 100644 --- a/scrap/utils/data_io.py +++ b/scrap/utils/data_io.py @@ -41,7 +41,9 @@ def export_results_to_txt( f.write(f"| {cid} | {councilors}\n") -def import_results_from_json(input_path: str, council_type: str) -> Dict[str, ScrapResult]: +def import_results_from_json( + input_path: str, council_type: str +) -> Dict[str, ScrapResult]: with open(input_path, "r", encoding="utf-8") as f: results = json.load(f) @@ -54,4 +56,4 @@ def import_results_from_json(input_path: str, council_type: str) -> Dict[str, Sc for k, v in results.items() } - return results \ No newline at end of file + return results diff --git a/scrap/utils/runner.py b/scrap/utils/runner.py index 741dbb9..cfee3da 100644 --- a/scrap/utils/runner.py +++ b/scrap/utils/runner.py @@ -254,11 +254,13 @@ def main(args: Dict[str, str]) -> None: where = args.get("where") current_time = datetime.datetime.now().strftime("%Y%m%d_%H%M") - + json_import_path = args.get("import_from_json") if json_import_path: if not args.get("update_mongo"): - raise ValueError("JSON 파일에서 가져온 결과를 MongoDB에 업데이트하려면 --update-mongo (-m) 옵션을 사용해야 합니다.") + raise ValueError( + "JSON 파일에서 가져온 결과를 MongoDB에 업데이트하려면 --update-mongo (-m) 옵션을 사용해야 합니다." + ) print("JSON 파일에서 결과를 가져옵니다. 다른 스크랩 관련 옵션은 무시됩니다.") results = import_results_from_json(json_import_path, where)