fix: add debug code for time diff options

Signed-off-by: seolmin <seolmin@megazone.com>
cloudforet-io · Dec 30, 2024 · 6da757b · 6da757b
1 parent 908d6b2
commit 6da757b
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/src/spaceone/dashboard/manager/data_table_manager/data_source_manager.py b/src/spaceone/dashboard/manager/data_table_manager/data_source_manager.py
@@ -93,24 +93,26 @@ def load(
         end: str = None,
         vars: dict = None,
     ) -> pd.DataFrame:
-        try:
-            start, end = self._get_time_from_granularity(granularity, start, end)
+        # try:
+        start, end = self._get_time_from_granularity(granularity, start, end)
 
-            if self.source_type == "COST":
-                self._analyze_cost(granularity, start, end, vars)
-            elif self.source_type == "ASSET":
-                self._analyze_asset(granularity, start, end, vars)
+        if self.source_type == "COST":
+            self._analyze_cost(granularity, start, end, vars)
+        elif self.source_type == "ASSET":
+            self._analyze_asset(granularity, start, end, vars)
+        _LOGGER.debug(f"[before load] {self.df}")
+        if self.timediff:
+            self.df = self._apply_timediff(granularity, start, end, vars)
 
-            if self.timediff:
-                self.df = self._apply_timediff(granularity, start, end, vars)
+        _LOGGER.debug(f"[after load] {self.df}")
 
-            self.state = "AVAILABLE"
-            self.error_message = None
+        self.state = "AVAILABLE"
+        self.error_message = None
 
-        except Exception as e:
-            self.state = "UNAVAILABLE"
-            self.error_message = e.message if hasattr(e, "message") else str(e)
-            _LOGGER.error(f"[load] add {self.source_type} source error: {e}")
+        # except Exception as e:
+        #     self.state = "UNAVAILABLE"
+        #     self.error_message = e.message if hasattr(e, "message") else str(e)
+        #     _LOGGER.error(f"[load] add {self.source_type} source error: {e}")
 
         return self.df
 
@@ -190,7 +192,7 @@ def _apply_timediff(
             self._analyze_cost(granularity, start, end, vars)
         elif self.source_type == "ASSET":
             self._analyze_asset(granularity, start, end, vars)
-
+        _LOGGER.debug(f"[timediff] {self.timediff}")
         self.df["Date"] = self.df["Date"].apply(
             lambda x: self._change_date_by_timediff(x)
         )
@@ -204,6 +206,10 @@ def _apply_timediff(
         ]
         join_keys = list(set(origin_label_keys) & set(diff_label_keys))
 
+        _LOGGER.debug(f"[origin_label_keys] {origin_label_keys}")
+        _LOGGER.debug(f"[diff_label_keys] {diff_label_keys}")
+        _LOGGER.debug(f"[join_keys] {join_keys}")
+
         merged_df = pd.merge(origin_df, self.df, on=join_keys, how="left")
 
         fill_na = {key: 0 for key in [self.data_name, self.timediff_data_name]}