Fixed issue #9

The fix just implements the `-q` flag on `tdp-finder.py`,
`cpuinfo-tdp-finder.py` and `modelname-tdp-finder.py`
to only print the found TDP value.

Author: jmfernandez

README.md

@@ -145,31 +145,45 @@ For the third source, there is a scraping program within this repository, which
 python -m treecript.tdp_sources cpumark_table.csv
 ```
 
+### `tdp-finder.py`
+
 Once these datasets are locally available, usage of `tdp-finder.py` would be something like next, using an already generated (or even ongoing) metrics directory:
 
 ```bash
 python tdp-finder.py sample-series/Wetlab2Variations_metrics/2025_05_20-02_19-14001/ cpu-spec-dataset_Josua/dataset/*.csv cpumark_table.csv
 ```
 
 ```
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/benchmark-cpus.csv
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/cpuworld-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/benchmark-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/cpuworld-cpus.csv
 Model [11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz] => TDP [Configurable TDP-up] => 28.0 W => File cpu-spec-dataset_Josua/dataset/intel-cpus.csv
 ```
 
+In case you want to gather the TDP value without parsing the output, you can use the `-q` parameter:
+
+```bash
+python tdp-finder.py -q sample-series/Wetlab2Variations_metrics/2025_05_20-02_19-14001/ cpu-spec-dataset_Josua/dataset/*.csv cpumark_table.csv
+```
+
+```
+28.0
+```
+
+### `cpuinfo-tdp-finder.py`
+
 Usage of `cpuinfo-tdp-finder.py` (which does not require to have a gathered metrics directory) would be something like next:
 
 ```bash
 python cpuinfo-tdp-finder.py /proc/cpuinfo cpu-spec-dataset_Josua/dataset/*.csv cpumark_table.csv
 ```
 
 ```
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/benchmark-cpus.csv
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/cpuworld-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/benchmark-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/cpuworld-cpus.csv
 Model [11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz] => TDP [Configurable TDP-up] => 28.0 W => File cpu-spec-dataset_Josua/dataset/intel-cpus.csv
 ```
 
@@ -180,22 +194,24 @@ python cpuinfo-tdp-finder.py sample_cpuinfo/cpuinfo-amd.txt cpu-spec-dataset_Jos
 ```
 
 ```
-Unable to match a valid processor row for AMD EPYC 7742 64-Core Processor in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
-Unable to match a valid processor row for AMD EPYC 7742 64-Core Processor in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for AMD EPYC 7742 64-Core Processor in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for AMD EPYC 7742 64-Core Processor in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
 Model [AMD EPYC 7742 64-Core Processor] => TDP [TDP] => 225.0 W => File cpu-spec-dataset_Josua/dataset/benchmark-cpus.csv
 ```
 
+### `modelname-tdp-finder.py`
+
 If we have the processor model string, usage of `modelname-tdp-finder.py` would be something like next:
 
 ```bash
 python modelname-tdp-finder.py "11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz" cpu-spec-dataset_Josua/dataset/*.csv cpumark_table.csv
 ```
 
 ```
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/benchmark-cpus.csv
-Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/cpuworld-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/benchmark-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for 11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz in file cpu-spec-dataset_Josua/dataset/cpuworld-cpus.csv
 Model [11th Gen Intel(R) Core(TM) i7-1185G7 @ 3.00GHz] => TDP [Configurable TDP-up] => 28.0 W => File cpu-spec-dataset_Josua/dataset/intel-cpus.csv
 ```
 
@@ -204,8 +220,8 @@ python modelname-tdp-finder.py "AMD EPYC 7742 64-Core Processor" cpu-spec-datase
 ```
 
 ```
-Unable to match a valid processor row for AMD EPYC 7742 64-Core Processor in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
-Unable to match a valid processor row for AMD EPYC 7742 64-Core Processor in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for AMD EPYC 7742 64-Core Processor in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for AMD EPYC 7742 64-Core Processor in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
 Model [AMD EPYC 7742 64-Core Processor] => TDP [TDP] => 225.0 W => File cpu-spec-dataset_Josua/dataset/benchmark-cpus.csv
 ```
 
@@ -214,11 +230,11 @@ python modelname-tdp-finder.py "AMD EPYC 9V74 80-Core Processor" cpu-spec-datase
 ```
 
 ```
-Unable to match a valid processor row for AMD EPYC 9V74 80-Core Processor in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
-Unable to match a valid processor row for AMD EPYC 9V74 80-Core Processor in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
-Unable to match a valid processor row for AMD EPYC 9V74 80-Core Processor in file cpu-spec-dataset_Josua/dataset/benchmark-cpus.csv
-Unable to match a valid processor row for AMD EPYC 9V74 80-Core Processor in file cpu-spec-dataset_Josua/dataset/cpuworld-cpus.csv
-Unable to match a valid processor row for AMD EPYC 9V74 80-Core Processor in file cpu-spec-dataset_Josua/dataset/intel-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for AMD EPYC 9V74 80-Core Processor in file cpu-spec-dataset_Josua/dataset/amd-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for AMD EPYC 9V74 80-Core Processor in file cpu-spec-dataset_Josua/dataset/ampere-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for AMD EPYC 9V74 80-Core Processor in file cpu-spec-dataset_Josua/dataset/benchmark-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for AMD EPYC 9V74 80-Core Processor in file cpu-spec-dataset_Josua/dataset/cpuworld-cpus.csv
+WARNING:treecript.common:Unable to match a valid processor row for AMD EPYC 9V74 80-Core Processor in file cpu-spec-dataset_Josua/dataset/intel-cpus.csv
 Model [AMD EPYC 9V74 80-Core Processor] => TDP [TDP] => 400.0 W => File cpumark_table.csv
 ```
 

treecript/common.py

@@ -150,7 +150,7 @@ def _tdp_finder_from_model_name(
 
     if len(filtered_cpus) == 0:
         errmsg = f"Unable to match a valid processor row for {model_name} in file {processors_file.as_posix()}"
-        logger.error(errmsg)
+        logger.warning(errmsg)
         raise LookupError(errmsg)
 
     matches: "List[Tuple[str, Union[str, float, int]]]" = []
@@ -181,7 +181,7 @@ def _tdp_finder_from_model_name(
         else:
             submsg = "no match on model description"
         errmsg = f"Unable to find processor package consumption values for {model_name} in file {processors_file.as_posix()} ({submsg})"
-        logger.error(errmsg)
+        logger.warning(errmsg)
         raise ValueError(errmsg)
     elif len(matches) > 1:
         # Now, sort by consumption

treecript/tdp_finder.py

@@ -18,10 +18,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+import argparse
 import json
 import logging
 import pathlib
-import sys
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -71,48 +71,145 @@ def tdp_finder_from_raw(
 
 
 def main_tdp_finder() -> "None":
-    if len(sys.argv) >= 3:
-        for model_name, tdp_column, tdp_in_w, processors_file in tdp_finder_from_series(
-            pathlib.Path(sys.argv[1]), list(map(pathlib.Path, sys.argv[2:]))
-        ):
+    par_parser = argparse.ArgumentParser()
+
+    meg = par_parser.add_mutually_exclusive_group()
+    meg.add_argument(
+        "-q",
+        dest="logging_level",
+        const=logging.ERROR,
+        help="Be quiet, print only the consumption",
+        action="store_const",
+    )
+    meg.add_argument(
+        "-d",
+        dest="logging_level",
+        const=logging.DEBUG,
+        help="Switch logging to Be quiet, print only the consumption",
+        action="store_const",
+    )
+
+    par_parser.add_argument(
+        "series_dir",
+        help="Directory of the gathered metrics timeline, where the CPU details were recorded",
+    )
+    par_parser.add_argument(
+        "cpu_database_files",
+        nargs="+",
+        help="The CSV files where the list of CPUs are available, along with their consumptions",
+    )
+
+    args = par_parser.parse_args()
+
+    logging_level = (
+        args.logging_level if args.logging_level is not None else logging.WARNING
+    )
+
+    logging.basicConfig(level=logging_level)
+
+    for model_name, tdp_column, tdp_in_w, processors_file in tdp_finder_from_series(
+        pathlib.Path(args.series_dir), list(map(pathlib.Path, args.cpu_database_files))
+    ):
+        if logging_level < logging.ERROR:
             print(
                 f"Model [{model_name}] => TDP [{tdp_column}] => {tdp_in_w} W => File {processors_file.as_posix()}"
             )
-    else:
-        print(
-            f"Usage: {sys.argv[0]} {{series_dir}} {{intel_datasheets_dir}}",
-            file=sys.stderr,
-        )
-        sys.exit(1)
+        else:
+            print(str(tdp_in_w))
 
 
 def main_cpuinfo_tdp_finder() -> "None":
-    if len(sys.argv) >= 3:
-        for model_name, tdp_column, tdp_in_w, processors_file in tdp_finder_from_raw(
-            pathlib.Path(sys.argv[1]), list(map(pathlib.Path, sys.argv[2:]))
-        ):
+    par_parser = argparse.ArgumentParser()
+
+    meg = par_parser.add_mutually_exclusive_group()
+    meg.add_argument(
+        "-q",
+        dest="logging_level",
+        const=logging.ERROR,
+        help="Be quiet, print only the consumption",
+        action="store_const",
+    )
+    meg.add_argument(
+        "-d",
+        dest="logging_level",
+        const=logging.DEBUG,
+        help="Switch logging to Be quiet, print only the consumption",
+        action="store_const",
+    )
+
+    par_parser.add_argument(
+        "cpuinfo_file",
+        help="CPU details provided by Linux kernel, usually available at /proc/cpuinfo",
+    )
+    par_parser.add_argument(
+        "cpu_database_files",
+        nargs="+",
+        help="The CSV files where the list of CPUs are available, along with their consumptions",
+    )
+
+    args = par_parser.parse_args()
+
+    logging_level = (
+        args.logging_level if args.logging_level is not None else logging.WARNING
+    )
+
+    logging.basicConfig(level=logging_level)
+
+    for model_name, tdp_column, tdp_in_w, processors_file in tdp_finder_from_raw(
+        pathlib.Path(args.cpuinfo_file),
+        list(map(pathlib.Path, args.cpu_database_files)),
+    ):
+        if logging_level < logging.ERROR:
             print(
                 f"Model [{model_name}] => TDP [{tdp_column}] => {tdp_in_w} W => File {processors_file.as_posix()}"
             )
-    else:
-        print(
-            f"Usage: {sys.argv[0]} {{cpuinfo_file}} {{intel_datasheets_dir}}",
-            file=sys.stderr,
-        )
-        sys.exit(1)
+        else:
+            print(str(tdp_in_w))
 
 
 def main_modelname_tdp_finder() -> "None":
-    if len(sys.argv) >= 3:
-        model_name, tdp_column, tdp_in_w, processors_file = tdp_finder_from_model_name(
-            sys.argv[1], list(map(pathlib.Path, sys.argv[2:]))
-        )
+    par_parser = argparse.ArgumentParser()
+
+    meg = par_parser.add_mutually_exclusive_group()
+    meg.add_argument(
+        "-q",
+        dest="logging_level",
+        const=logging.ERROR,
+        help="Be quiet, print only the consumption",
+        action="store_const",
+    )
+    meg.add_argument(
+        "-d",
+        dest="logging_level",
+        const=logging.DEBUG,
+        help="Switch logging to Be quiet, print only the consumption",
+        action="store_const",
+    )
+
+    par_parser.add_argument(
+        "model_string",
+        help="Processor model string to be searched",
+    )
+    par_parser.add_argument(
+        "cpu_database_files",
+        nargs="+",
+        help="The CSV files where the list of CPUs are available, along with their consumptions",
+    )
+
+    args = par_parser.parse_args()
+
+    logging_level = (
+        args.logging_level if args.logging_level is not None else logging.WARNING
+    )
+
+    logging.basicConfig(level=logging_level)
+
+    model_name, tdp_column, tdp_in_w, processors_file = tdp_finder_from_model_name(
+        args.model_string, list(map(pathlib.Path, args.cpu_database_files))
+    )
+    if logging_level < logging.ERROR:
         print(
             f"Model [{model_name}] => TDP [{tdp_column}] => {tdp_in_w} W => File {processors_file.as_posix()}"
         )
     else:
-        print(
-            f"Usage: {sys.argv[0]} {{model_string}} {{intel_datasheets_dir}}",
-            file=sys.stderr,
-        )
-        sys.exit(1)
+        print(str(tdp_in_w))