Merge pull request #547 from powerapi-ng/refactor/collections-concatenation

refactor: Concatenate collections with iterable unpacking

Author: gfieni

.ruff.toml

@@ -19,7 +19,6 @@ ignore = [
     "B006",   # mutable-argument-default
     "B008",   # function-call-in-default-argument
     "F401",   # unused-import
-    "RUF005", # collection-literal-concatenation
     "RUF013", # implicit-optional
     "RUF015", # unnecessary-iterable-allocation-for-first-element
 

src/powerapi/database/prometheus_db.py

@@ -113,7 +113,7 @@ def __iter__(self):
     def _init_metrics(self):
 
         if not self.metrics_initialized:
-            self.energy_metric_labels_names = [SENSOR_TAG, TARGET_TAG] + self.tags
+            self.energy_metric_labels_names = [SENSOR_TAG, TARGET_TAG, *self.tags]
             self.energy_metric = Gauge(self.metric_name, self.metric_description, self.energy_metric_labels_names)
             self.metrics_initialized = True
 

src/powerapi/dispatch_rule/power_dispatch_rule.py

@@ -55,9 +55,9 @@ def extract_id_from_report(report: PowerReport, depth: PowerDepthLevel) -> tuple
         return (report.sensor,)
 
     if depth == PowerDepthLevel.SOCKET:
-        return extract_id_from_report(report, depth - 1) + (report.metadata['socket'],)
+        return *extract_id_from_report(report, depth - 1), report.metadata['socket']
 
-    return extract_id_from_report(report, depth - 1) + (report.metadata['core'],)
+    return *extract_id_from_report(report, depth - 1), report.metadata['core']
 
 
 class PowerDispatchRule(DispatchRule):

src/powerapi/dispatcher/dispatcher_actor.py

@@ -65,7 +65,7 @@ def add_formula(self, formula_id: tuple) -> FormulaActor:
         :param formula_id: The formula ID
         :return: The new formula actor
         """
-        formula = self.actor.formula_init_function(name=str((self.actor.name,) + formula_id), pushers=self.pushers)
+        formula = self.actor.formula_init_function(name=str((self.actor.name, *formula_id)), pushers=self.pushers)
         self.supervisor.launch_actor(formula, False)
         self.formula_dict[formula_id] = formula
         return formula

src/powerapi/report/formula_report.py

@@ -35,7 +35,7 @@
 
 from powerapi.report.report import Report, CSV_HEADER_COMMON
 
-CSV_HEADER_FORMULA_REPORT = CSV_HEADER_COMMON + ['metadata']
+CSV_HEADER_FORMULA_REPORT = [*CSV_HEADER_COMMON, 'metadata']
 
 
 class FormulaReport(Report):

src/powerapi/report/hwpc_report.py

@@ -38,7 +38,7 @@
 SOCKET_KEY = 'socket'
 CPU_KEY = 'cpu'
 
-CSV_HEADER_HWPC = CSV_HEADER_COMMON + [SOCKET_KEY, CPU_KEY]
+CSV_HEADER_HWPC = [*CSV_HEADER_COMMON, SOCKET_KEY, CPU_KEY]
 
 
 class HWPCReport(Report):

src/powerapi/report/power_report.py

@@ -34,7 +34,7 @@
 
 from powerapi.report.report import Report, CSV_HEADER_COMMON, BadInputData, CsvLines
 
-CSV_HEADER_POWER = CSV_HEADER_COMMON + ['power', 'socket']
+CSV_HEADER_POWER = [*CSV_HEADER_COMMON, 'power', 'socket']
 
 
 class PowerReport(Report):

src/powerapi/report/procfs_report.py

@@ -36,7 +36,7 @@
 from powerapi.report.report import Report, BadInputData, CSV_HEADER_COMMON, CsvLines
 
 
-CSV_HEADER_PROCFS = CSV_HEADER_COMMON + ['socket', 'cpu', 'usage', 'global_cpu_usage']
+CSV_HEADER_PROCFS = [*CSV_HEADER_COMMON, 'socket', 'cpu', 'usage', 'global_cpu_usage']
 
 
 class ProcfsReport(Report):

tests/unit/dispatcher/test_dispatcher_actor.py

@@ -133,7 +133,7 @@ def __init__(self, primary=False):
 
     def get_formula_id(self, report):
         b2_id = [] if report.b2 is None else [(report.a, report.b2)]
-        return [(report.a, report.b)] + b2_id
+        return [(report.a, report.b), *b2_id]
 
 
 class Report2(Report):
@@ -191,7 +191,7 @@ def __init__(self, primary=False):
 
     def get_formula_id(self, report):
         c2_ids = [] if report.c2 is None else [(report.a, report.c2)]
-        return [(report.a, report.c)] + c2_ids
+        return [(report.a, report.c), *c2_ids]
 
 
 class Report3(Report):