modify: 优化参数传递~

entitys/metric_config_entity.py

@@ -7,7 +7,7 @@
 
 
 class MetricConfigEntity():
-    def __init__(self, *args, metric_code: str, metric_func: str, **kwargs):
+    def __init__(self, metric_code: str, metric_func: str, *args, **kwargs):
         self._args = args
         self._kwargs = kwargs
         # metric_code 用于填充模板时查找

metrics/metric_by_sql_general.py

@@ -13,16 +13,14 @@ from .metric_base import MetricBase
 
 class MetricBySqlGeneral(MetricBase):
 
-    def __init__(self, *args, data_loader: DataLoaderBase, sql: str, **kwargs):
-        self._data_loader = data_loader
+    def __init__(self, sql: str, *args,  **kwargs):
         self._sql = sql
 
     def validate_data(self):
         pass
 
-    def load_data(self, ) -> pd.DataFrame:
-        return self._data_loader.get_data(self._sql)
-
-    def calculate(self, ) -> MetricFucEntity:
-        return MetricFucEntity(table=self.load_data())
+    def load_data(self, data_loader: DataLoaderBase) -> pd.DataFrame:
+        return data_loader.get_data(self._sql)
 
+    def calculate(self, data_loader: DataLoaderBase) -> MetricFucEntity:
+        return MetricFucEntity(table=self.load_data(data_loader))