From 3e47a9a8ff8f1350c9a1b9dd8141b3845cd1b98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E8=89=BA=E4=B8=B9?= <53546877+Craven1701@users.noreply.github.com> Date: Fri, 30 May 2025 09:47:54 +0800 Subject: [PATCH] cleancode --- omniadvisor/src/omniadvisor/interface/hijack_recommend.py | 3 +-- .../src/omniadvisor/repository/exam_record_repository.py | 5 +++-- .../src/omniadvisor/repository/tuning_record_repository.py | 3 +-- .../src/omniadvisor/service/tuning_result/tuning_result.py | 3 ++- omniadvisor/src/omniadvisor/utils/logger.py | 3 ++- omniadvisor/src/omniadvisor/utils/utils.py | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/omniadvisor/src/omniadvisor/interface/hijack_recommend.py b/omniadvisor/src/omniadvisor/interface/hijack_recommend.py index 4c66a468e..1dd539ee0 100644 --- a/omniadvisor/src/omniadvisor/interface/hijack_recommend.py +++ b/omniadvisor/src/omniadvisor/interface/hijack_recommend.py @@ -1,4 +1,5 @@ import sys +from common.constant import OA_CONF from omniadvisor.service.spark_service.spark_cmd_parser import SparkCMDParser from omniadvisor.repository.model.load import Load @@ -8,8 +9,6 @@ from omniadvisor.service.tuning_result.tuning_result import get_tuning_result from omniadvisor.utils.logger import global_logger from omniadvisor.service.spark_service.spark_run import spark_run -from common.constant import OA_CONF - def _query_or_create_load(name: str, exec_attr: dict, default_config: dict): """ diff --git a/omniadvisor/src/omniadvisor/repository/exam_record_repository.py b/omniadvisor/src/omniadvisor/repository/exam_record_repository.py index 381e9f4d4..8be549647 100644 --- a/omniadvisor/src/omniadvisor/repository/exam_record_repository.py +++ b/omniadvisor/src/omniadvisor/repository/exam_record_repository.py @@ -1,12 +1,13 @@ from datetime import datetime from django.utils import timezone - +from common.constant import OA_CONF from server.app.models import DatabaseLoad, DatabaseExamRecord + from omniadvisor.repository.model.load import Load from omniadvisor.repository.model.exam_record import ExamRecord from omniadvisor.repository.repository import Repository -from common.constant import OA_CONF + class ExamRecordRepository(Repository): diff --git a/omniadvisor/src/omniadvisor/repository/tuning_record_repository.py b/omniadvisor/src/omniadvisor/repository/tuning_record_repository.py index e23cbbd6a..d612b9a79 100644 --- a/omniadvisor/src/omniadvisor/repository/tuning_record_repository.py +++ b/omniadvisor/src/omniadvisor/repository/tuning_record_repository.py @@ -1,11 +1,10 @@ +from common.constant import OA_CONF from server.app.models import DatabaseLoad, DatabaseTuningRecord from omniadvisor.repository.model.load import Load from omniadvisor.repository.model.tuning_record import TuningRecord from omniadvisor.repository.repository import Repository -from common.constant import OA_CONF - class TuningRecordRepository(Repository): """ diff --git a/omniadvisor/src/omniadvisor/service/tuning_result/tuning_result.py b/omniadvisor/src/omniadvisor/service/tuning_result/tuning_result.py index 006bb2293..13cb3380b 100644 --- a/omniadvisor/src/omniadvisor/service/tuning_result/tuning_result.py +++ b/omniadvisor/src/omniadvisor/service/tuning_result/tuning_result.py @@ -1,12 +1,13 @@ from typing import List from algo.common.model import Tuning, Trace +from common.constant import OA_CONF + from omniadvisor.repository.model.load import Load from omniadvisor.repository.model.tuning_record import TuningRecord from omniadvisor.repository.model.exam_record import ExamRecord from omniadvisor.repository.tuning_record_repository import TuningRecordRepository from omniadvisor.repository.exam_record_repository import ExamRecordRepository -from common.constant import OA_CONF def get_tuning_result(load: Load, config: dict): diff --git a/omniadvisor/src/omniadvisor/utils/logger.py b/omniadvisor/src/omniadvisor/utils/logger.py index f1e070a31..616a690d9 100755 --- a/omniadvisor/src/omniadvisor/utils/logger.py +++ b/omniadvisor/src/omniadvisor/utils/logger.py @@ -9,7 +9,8 @@ LOGGING_CONFIG = { 'formatters': { 'colorFormatter': { '()': 'colorlog.ColoredFormatter', - 'format': '%(log_color)s%(asctime)s [%(levelname)s] %(filename)s:%(lineno)d in %(funcName)s - %(message)s%(reset)s', + 'format': '%(log_color)s%(asctime)s [%(levelname)s] ' + '%(filename)s:%(lineno)d in %(funcName)s - %(message)s%(reset)s', 'datefmt': '%Y-%m-%d %H:%M:%S', 'log_colors': { 'DEBUG': 'cyan', diff --git a/omniadvisor/src/omniadvisor/utils/utils.py b/omniadvisor/src/omniadvisor/utils/utils.py index 97dcc017a..4c919f612 100644 --- a/omniadvisor/src/omniadvisor/utils/utils.py +++ b/omniadvisor/src/omniadvisor/utils/utils.py @@ -47,9 +47,9 @@ def save_trace_data(data: List[Dict[str, str]], data_dir): json.dump(data, f, ensure_ascii=False, indent=4) global_logger.info(f"数据已成功保存到 {file_path}") except IOError as e: - raise IOError(f"出现IO错误: {e}") + raise IOError(f"出现IO错误: {e}") from e except Exception as e: - raise Exception(f"保存过程中出现错误: {e}") + raise Exception(f"保存过程中出现错误: {e}") from e return file_path -- Gitee