refactor(report): Cleanup hwpc and power reports code

Author: gfieni

src/powerapi/report/__init__.py

@@ -27,9 +27,8 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from powerapi.report.report import Report, BadInputData
-from powerapi.report.power_report import PowerReport
-from powerapi.report.hwpc_report import HWPCReport
-from powerapi.report.control_report import ControlReport
-from powerapi.report.procfs_report import ProcfsReport
-from powerapi.report.formula_report import FormulaReport
+from .control_report import ControlReport
+from .formula_report import FormulaReport
+from .hwpc_report import HWPCReport
+from .power_report import PowerReport
+from .report import Report, BadInputData

src/powerapi/report/hwpc_report.py

@@ -185,10 +185,3 @@ def _create_group(row, groups, group_name):
         for current_key, value in row.items():
             if current_key not in CSV_HEADER_HWPC:
                 groups[group_name][row[SOCKET_KEY]][row[CPU_KEY]][current_key] = int(value)
-
-    @staticmethod
-    def create_empty_report():
-        """
-        Creates an empty report
-        """
-        return HWPCReport(None, None, None, {})

src/powerapi/report/power_report.py

@@ -139,17 +139,6 @@ def to_csv_lines(report: PowerReport, tags: list[str]) -> CsvLines:
         final_dict = {'PowerReport': [line]}
         return CSV_HEADER_POWER, final_dict
 
-    @staticmethod
-    def to_virtiofs_db(report: PowerReport) -> tuple[str, str]:
-        """
-        return a tuple containing the power value and the name of the file to store the value.
-        """
-        if 'socket' not in report:
-            raise BadInputData('no tag socket in power report', report)
-        filename = 'power_consumption_package' + str(report['socket'])
-        power = report.power
-        return filename, power
-
     def generate_tags(self, selected_tags: None | list[str] = None) -> dict[str, Any]:
         """
         Generate the report tags from its metadata.
@@ -205,10 +194,3 @@ def from_mongodb(data: dict) -> Report:
         :return: a PowerReport from a dictionary pulled from mongodb
         """
         return PowerReport.from_json(data)
-
-    @staticmethod
-    def create_empty_report():
-        """
-        Creates an empty report
-        """
-        return PowerReport(None, None, None, 0)

src/powerapi/report/report.py

@@ -133,13 +133,6 @@ def _extract_timestamp(ts):
 
         raise ValueError('Invalid timestamp format')
 
-    @staticmethod
-    def create_empty_report():
-        """
-        Creates an empty report
-        """
-        return Report(None, None, None)
-
     @staticmethod
     def sanitize_tags_name(tags: Iterable[str]) -> dict[str, str]:
         """

tests/unit/report/__init__.py

@@ -0,0 +1,28 @@
+# Copyright (c) 2025, Inria
+# Copyright (c) 2025, University of Lille
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+#
+# * Neither the name of the copyright holder nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

tests/unit/report/conftest.py

@@ -26,6 +26,7 @@
 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 from datetime import datetime
 
 import pytest