217 custom query

py_experimenter/database_connector.py

@@ -409,3 +409,14 @@ def get_table(self, table_name: Optional[str] = None, condition:Optional[str] =
             df = pd.read_sql(query, connection)
         self.close_connection(connection)
         return df
+
+    def execute_custom_query(self, query: str) -> pd.DataFrame:
+        connection = self.connect()
+        # suppress warning for pandas
+        import warnings
+
+        with warnings.catch_warnings():
+            warnings.filterwarnings("ignore", category=UserWarning)
+            df = pd.read_sql(query, connection)
+        self.close_connection(connection)
+        return df

py_experimenter/experimenter.py

@@ -517,7 +517,7 @@ def get_table(self, condition:Optional[str] = None) -> pd.DataFrame:
         :return: The database table as `Pandas.DataFrame`.
         :rtype: pd.DataFrame
         """
-        return self.db_connector.get_table()
+        return self.db_connector.get_table(condition=condition)
 
     def get_logtable(self, logtable_name: str, condition:Optional[str] = None) -> pd.DataFrame:
         """
@@ -542,3 +542,14 @@ def get_codecarbon_table(self) -> pd.DataFrame:
             return self.db_connector.get_codecarbon_table()
         else:
             raise ValueError("CodeCarbon is not used in this experiment.")
+
+    def execute_custom_query(self, query: str) -> pd.DataFrame:
+        """
+        Executes the given custom query and returns the result as `Pandas.DataFrame`.
+
+        :raises ValueError: If no custom query is given in the configuration file.
+        :return: The result of the custom query as `Pandas.DataFrame`.
+        """
+        if not query:
+            raise ValueError("No custom query given.")
+        return self.db_connector.execute_custom_query(query)

py_experimenter/utils.py

@@ -70,7 +70,6 @@ def extract_codecarbon_columns() -> Dict[str, str]:
             ("ram_total_size", "DOUBLE"),
             ("tracking_mode", "VARCHAR(255)"),
             ("on_cloud", "VARCHAR(255)"),
-            ("power_usage_efficiency", "DOUBLE"),
             ("offline_mode", "BOOL"),
         ]
     )

pyproject.toml

@@ -33,7 +33,7 @@ numpy = ">=1.15"
 pandas = ">=1.0"
 jupyterlab = "^3.5.0"
 joblib = "^1.2.0"
-codecarbon = ">=2.2.1"
+codecarbon = "==2.2.1"
 pymysql = "^1.0.3"
 omegaconf = "^2.3.0"
 sshtunnel = "^0.4.0"

test/test_codecarbon/test_integration_mysql.py

@@ -62,8 +62,7 @@ def test_integration(experimenter: PyExperimenter):
         "ram_total_size",
         "tracking_mode",
         "on_cloud",
-        "power_usage_efficiency",
         "offline_mode",
     ]
-    assert table.shape == (12, 34)
+    assert table.shape == (12, 33)
     assert set(table["experiment_id"]) == {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}

test/test_codecarbon/test_integration_sqlite.py

@@ -66,8 +66,7 @@ def test_integration(experimenter: PyExperimenter):
         "ram_total_size",
         "tracking_mode",
         "on_cloud",
-        "power_usage_efficiency",
         "offline_mode",
     ]
-    assert table.shape == (12, 34)
+    assert table.shape == (12, 33)
     assert set(table["experiment_id"]) == {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}