codecarbon 2.1.3__tar.gz → 2.2.0__tar.gz

codecarbon-2.2.0/PKG-INFO

@@ -0,0 +1,140 @@
+Metadata-Version: 2.1
+Name: codecarbon
+Version: 2.2.0
+Author: Mila, DataForGood, BCG GAMMA, Comet.ml, Haverford College
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: License :: OSI Approved :: MIT License
+Requires-Python: >3.6
+Description-Content-Type: text/markdown
+Provides-Extra: viz
+Provides-Extra: dashboard
+License-File: LICENSE
+
+![banner](docs/edit/images/banner.png)
+
+Estimate and track carbon emissions from your computer, quantify and analyze their impact.
+
+[**Documentation**](https://mlco2.github.io/codecarbon)
+
+<br/>
+
+[![](https://anaconda.org/conda-forge/codecarbon/badges/version.svg)](https://anaconda.org/conda-forge/codecarbon)
+[![](https://img.shields.io/pypi/v/codecarbon?color=024758)](https://pypi.org/project/codecarbon/)
+[![DOI](https://zenodo.org/badge/263364731.svg)](https://zenodo.org/badge/latestdoi/263364731)
+
+
+- [About CodeCarbon 💡](#about-codecarbon-)
+- [Quickstart 🚀](#quickstart-)
+    - [Installation 🔧](#installation-)
+    - [Start to estimate your impact 📏](#start-to-estimate-your-impact-)
+      - [Monitoring your whole machine](#monitoring-your-machine-)
+      - [In your python code](#in-your-python-code-)
+      - [Visualize](#visualize-)
+- [Contributing 🤝](#contributing-)
+- [Contact 📝](#contact-)
+
+# About CodeCarbon 💡
+
+**CodeCarbon** started with a quite simple question: 
+
+**What is the carbon emission impact of my computer program? :shrug:**
+
+We found some global data like "computing currently represents roughly 0.5% of the world’s energy consumption" but nothing on our individual/organisation level impact.
+
+At **CodeCarbon**, we believe, along with Niels Bohr, that "Nothing exists until it is measured". So we found a way to estimate how much CO<sub>2</sub> we produce while running our code.
+
+*How?*
+
+We created a Python package that estimates your hardware electricity power consumption (GPU + CPU + RAM) and we apply to it the carbon intensity of the region where the computing is done.
+
+![calculation Summary](docs/edit/images/calculation.png)
+
+We explain more about this calculation in the [**Methodology**](https://mlco2.github.io/codecarbon/methodology.html#) section of the documentation.
+
+Our hope is that this package will be used widely for estimating the carbon footprint of computing, and for establishing best practices with regards to the disclosure and reduction of this footprint.
+
+**So ready to "change the world one run at a time"? Let's start with a very quick set up.**
+
+# Quickstart 🚀
+
+## Installation 🔧
+
+**From PyPI repository**
+```python
+pip install codecarbon
+```
+
+**From Conda repository**
+```python
+conda install -c conda-forge codecarbon
+```
+To see more installation options please refer to the documentation : [**Installation**](https://mlco2.github.io/codecarbon/installation.html#)
+
+## Start to estimate your impact 📏
+
+To get an experiment_id enter:
+```python
+! codecarbon init
+```
+You can now store it in a **.codecarbon.config** at the root of your project 
+```python
+[codecarbon]
+log_level = DEBUG
+save_to_api = True
+experiment_id = 2bcbcbb8-850d-4692-af0d-76f6f36d79b2 #the experiment_id you get with init
+```
+Now you have 2 main options:
+
+### Monitoring your machine 💻
+
+In your command prompt use:
+```codecarbon monitor```
+The package will track your emissions independently from your code.
+
+### In your Python code 🐍
+```python
+from codecarbon import track_emissions
+@track_emissions()
+def your_function_to_track():
+  # your code
+  ```
+The package will track the emissions generated by the execution of your function.
+
+There is other ways to use **codecarbon** package, please refer to the documentation to learn more about it:  [**Usage**](https://mlco2.github.io/codecarbon/usage.html#)
+
+## Visualize 📊
+
+You can now visualize your experiment emissions on the [dashboard](https://dashboard.codecarbon.io/).
+![dashboard](docs/edit/images/dashboard.png)
+
+*Note that for now, all emissions data send to codecarbon API are public.*
+
+> Hope you enjoy your first steps monitoring your carbon computing impact!
+> Thanks to the incredible codecarbon community 💪🏼 a lot more options are available using *codecarbon* including:
+> - offline mode
+> - cloud mode
+> - comet integration...
+>
+> Please explore the [**Documentation**](https://mlco2.github.io/codecarbon) to learn about it
+> If ever what your are looking for is not yet implemented, let us know through the *issues* and even better become one of our 🦸🏼‍♀️🦸🏼‍♂️ contributors! more info 👇🏼
+
+
+# Contributing 🤝
+
+We are hoping that the open-source community will help us edit the code and make it better!
+
+You are welcome to open issues, even suggest solutions and better still contribute the fix/improvement! We can guide you if you're not sure where to start but want to help us out 🥇
+
+In order to contribute a change to our code base, please submit a pull request (PR) via GitHub and someone from our team will go over it and accept it.
+
+Check out our [contribution guidelines :arrow_upper_right:](https://github.com/mlco2/codecarbon/blob/master/CONTRIBUTING.md)
+
+Contact [@vict0rsch](https://github.com/vict0rsch) to be added to our slack workspace if you want to contribute regularly!
+
+
+# Contact 📝
+
+Maintainers are [@vict0rsch](https://github.com/vict0rsch) [@benoit-cty](https://github.com/benoit-cty) and [@SaboniAmine](https://github.com/saboniamine). Codecarbon is developed by volunteers from [**Mila**](http://mila.quebec) and the [**DataForGoodFR**](https://twitter.com/dataforgood_fr) community alongside donated professional time of engineers at [**Comet.ml**](https://comet.ml) and [**BCG GAMMA**](https://www.bcg.com/en-nl/beyond-consulting/bcg-gamma/default).

codecarbon-2.2.0/README.md

@@ -0,0 +1,125 @@
+![banner](docs/edit/images/banner.png)
+
+Estimate and track carbon emissions from your computer, quantify and analyze their impact.
+
+[**Documentation**](https://mlco2.github.io/codecarbon)
+
+<br/>
+
+[![](https://anaconda.org/conda-forge/codecarbon/badges/version.svg)](https://anaconda.org/conda-forge/codecarbon)
+[![](https://img.shields.io/pypi/v/codecarbon?color=024758)](https://pypi.org/project/codecarbon/)
+[![DOI](https://zenodo.org/badge/263364731.svg)](https://zenodo.org/badge/latestdoi/263364731)
+
+
+- [About CodeCarbon 💡](#about-codecarbon-)
+- [Quickstart 🚀](#quickstart-)
+    - [Installation 🔧](#installation-)
+    - [Start to estimate your impact 📏](#start-to-estimate-your-impact-)
+      - [Monitoring your whole machine](#monitoring-your-machine-)
+      - [In your python code](#in-your-python-code-)
+      - [Visualize](#visualize-)
+- [Contributing 🤝](#contributing-)
+- [Contact 📝](#contact-)
+
+# About CodeCarbon 💡
+
+**CodeCarbon** started with a quite simple question: 
+
+**What is the carbon emission impact of my computer program? :shrug:**
+
+We found some global data like "computing currently represents roughly 0.5% of the world’s energy consumption" but nothing on our individual/organisation level impact.
+
+At **CodeCarbon**, we believe, along with Niels Bohr, that "Nothing exists until it is measured". So we found a way to estimate how much CO<sub>2</sub> we produce while running our code.
+
+*How?*
+
+We created a Python package that estimates your hardware electricity power consumption (GPU + CPU + RAM) and we apply to it the carbon intensity of the region where the computing is done.
+
+![calculation Summary](docs/edit/images/calculation.png)
+
+We explain more about this calculation in the [**Methodology**](https://mlco2.github.io/codecarbon/methodology.html#) section of the documentation.
+
+Our hope is that this package will be used widely for estimating the carbon footprint of computing, and for establishing best practices with regards to the disclosure and reduction of this footprint.
+
+**So ready to "change the world one run at a time"? Let's start with a very quick set up.**
+
+# Quickstart 🚀
+
+## Installation 🔧
+
+**From PyPI repository**
+```python
+pip install codecarbon
+```
+
+**From Conda repository**
+```python
+conda install -c conda-forge codecarbon
+```
+To see more installation options please refer to the documentation : [**Installation**](https://mlco2.github.io/codecarbon/installation.html#)
+
+## Start to estimate your impact 📏
+
+To get an experiment_id enter:
+```python
+! codecarbon init
+```
+You can now store it in a **.codecarbon.config** at the root of your project 
+```python
+[codecarbon]
+log_level = DEBUG
+save_to_api = True
+experiment_id = 2bcbcbb8-850d-4692-af0d-76f6f36d79b2 #the experiment_id you get with init
+```
+Now you have 2 main options:
+
+### Monitoring your machine 💻
+
+In your command prompt use:
+```codecarbon monitor```
+The package will track your emissions independently from your code.
+
+### In your Python code 🐍
+```python
+from codecarbon import track_emissions
+@track_emissions()
+def your_function_to_track():
+  # your code
+  ```
+The package will track the emissions generated by the execution of your function.
+
+There is other ways to use **codecarbon** package, please refer to the documentation to learn more about it:  [**Usage**](https://mlco2.github.io/codecarbon/usage.html#)
+
+## Visualize 📊
+
+You can now visualize your experiment emissions on the [dashboard](https://dashboard.codecarbon.io/).
+![dashboard](docs/edit/images/dashboard.png)
+
+*Note that for now, all emissions data send to codecarbon API are public.*
+
+> Hope you enjoy your first steps monitoring your carbon computing impact!
+> Thanks to the incredible codecarbon community 💪🏼 a lot more options are available using *codecarbon* including:
+> - offline mode
+> - cloud mode
+> - comet integration...
+>
+> Please explore the [**Documentation**](https://mlco2.github.io/codecarbon) to learn about it
+> If ever what your are looking for is not yet implemented, let us know through the *issues* and even better become one of our 🦸🏼‍♀️🦸🏼‍♂️ contributors! more info 👇🏼
+
+
+# Contributing 🤝
+
+We are hoping that the open-source community will help us edit the code and make it better!
+
+You are welcome to open issues, even suggest solutions and better still contribute the fix/improvement! We can guide you if you're not sure where to start but want to help us out 🥇
+
+In order to contribute a change to our code base, please submit a pull request (PR) via GitHub and someone from our team will go over it and accept it.
+
+Check out our [contribution guidelines :arrow_upper_right:](https://github.com/mlco2/codecarbon/blob/master/CONTRIBUTING.md)
+
+Contact [@vict0rsch](https://github.com/vict0rsch) to be added to our slack workspace if you want to contribute regularly!
+
+
+# Contact 📝
+
+Maintainers are [@vict0rsch](https://github.com/vict0rsch) [@benoit-cty](https://github.com/benoit-cty) and [@SaboniAmine](https://github.com/saboniamine). Codecarbon is developed by volunteers from [**Mila**](http://mila.quebec) and the [**DataForGoodFR**](https://twitter.com/dataforgood_fr) community alongside donated professional time of engineers at [**Comet.ml**](https://comet.ml) and [**BCG GAMMA**](https://www.bcg.com/en-nl/beyond-consulting/bcg-gamma/default).

{codecarbon-2.1.3 → codecarbon-2.2.0}/carbonserver/carbonserver/api/errors.py

@@ -2,6 +2,14 @@ from dataclasses import dataclass
 from enum import Enum
 
 
+class EmptyResultException(Exception):
+    """
+    The request return an empty result.
+    """
+
+    pass
+
+
 @dataclass
 class ErrorBase:
     code: str

{codecarbon-2.1.3 → codecarbon-2.2.0}/carbonserver/carbonserver/api/routers/authenticate.py

@@ -25,8 +25,7 @@ def auth_user(
     verified_user = user_service.verify_user(user)
     if verified_user:
         return Token(access_token="a", token_type="access")
-    else:
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Incorrect password or email!",
-        )
+    raise HTTPException(
+        status_code=status.HTTP_401_UNAUTHORIZED,
+        detail="Incorrect password or email!",
+    )

{codecarbon-2.1.3 → codecarbon-2.2.0}/carbonserver/carbonserver/api/routers/experiments.py

@@ -69,7 +69,6 @@ def read_project_experiments(
         Provide[ServerContainer.experiment_service]
     ),
 ) -> List[Experiment]:
-
     return experiment_service.get_experiments_from_project(project_id)
 
 

{codecarbon-2.1.3 → codecarbon-2.2.0}/carbonserver/carbonserver/api/routers/runs.py

@@ -1,5 +1,5 @@
 from datetime import datetime, timedelta
-from typing import List, Optional
+from typing import List, Optional, Union
 
 import dateutil.relativedelta
 from container import ServerContainer
@@ -8,11 +8,13 @@ from fastapi import APIRouter, Depends
 from starlette import status
 
 from carbonserver.api.dependencies import get_token_header
-from carbonserver.api.schemas import Run, RunCreate, RunReport
+from carbonserver.api.errors import EmptyResultException
+from carbonserver.api.schemas import Empty, Run, RunCreate, RunReport
 from carbonserver.api.services.run_service import RunService
 from carbonserver.api.usecases.run.experiment_sum_by_run import (
     ExperimentSumsByRunUsecase,
 )
+from carbonserver.logger import logger
 
 RUNS_ROUTER_TAGS = ["Runs"]
 
@@ -105,7 +107,7 @@ def read_experiment_detailed_sums_by_run(
     "/lastrun/project/{project_id}",
     tags=RUNS_ROUTER_TAGS,
     status_code=status.HTTP_200_OK,
-    response_model=Run,
+    response_model=Union[Run, Empty],
 )
 @inject
 def read_project_last_run(
@@ -113,11 +115,15 @@ def read_project_last_run(
     start_date: Optional[datetime] = None,
     end_date: Optional[datetime] = None,
     run_service: RunService = Depends(Provide[ServerContainer.run_service]),
-) -> Run:
+) -> Union[Run, Empty]:
     start_date = (
         start_date
         if start_date
         else datetime.now() - dateutil.relativedelta.relativedelta(months=3)
     )
     end_date = end_date if end_date else datetime.now() + timedelta(days=1)
-    return run_service.read_project_last_run(project_id, start_date, end_date)
+    try:
+        return run_service.read_project_last_run(project_id, start_date, end_date)
+    except EmptyResultException as e:
+        logger.warning(f"read_project_last_run : {e}")
+        return Empty()

{codecarbon-2.1.3 → codecarbon-2.2.0}/carbonserver/carbonserver/api/schemas.py

@@ -12,7 +12,11 @@ from datetime import datetime
 from typing import List, Optional
 from uuid import UUID
 
-from pydantic import BaseModel, EmailStr, Field, SecretStr
+from pydantic import BaseModel, EmailStr, Extra, Field, SecretStr
+
+
+class Empty(BaseModel, extra=Extra.forbid):
+    pass
 
 
 class EmissionBase(BaseModel):
@@ -81,6 +85,7 @@ class RunBase(BaseModel):
     experiment_id: UUID
     os: Optional[str]
     python_version: Optional[str]
+    codecarbon_version: Optional[str]
     cpu_count: Optional[int]
     cpu_model: Optional[str]
     gpu_count: Optional[int]
@@ -99,6 +104,7 @@ class RunBase(BaseModel):
                 "experiment_id": "8edb03e1-9a28-452a-9c93-a3b6560136d7",
                 "os": "macOS-10.15.7-x86_64-i386-64bit",
                 "python_version": "3.8.0",
+                "codecarbon_version": "2.1.3",
                 "cpu_count": 12,
                 "cpu_model": "Intel(R) Core(TM) i7-8850H CPU @ 2.60GHz",
                 "gpu_count": 4,
@@ -122,8 +128,10 @@ class Run(RunBase):
 
 
 class RunReport(RunBase):
+    run_id: UUID
     timestamp: datetime
-    emission: float
+    experiment_id: Optional[UUID]
+    emissions: float
     cpu_power: float
     gpu_power: float
     ram_power: float
@@ -183,9 +191,9 @@ class ExperimentReport(ExperimentBase):
     country_iso_code: str
     region: str
     on_cloud: str
-    cloud_provider: str
-    cloud_region: str
-    emission: float
+    cloud_provider: Optional[str] = None
+    cloud_region: Optional[str] = None
+    emissions: float
     cpu_power: float
     gpu_power: float
     ram_power: float
@@ -198,7 +206,6 @@ class ExperimentReport(ExperimentBase):
     emissions_count: int
 
     class Config:
-
         schema_extra = {
             "experiment_id": "943b2aa5-9e21-41a9-8a38-562505b4b2aa",
             "timestamp": "2021-10-07T20:19:27.716693",
@@ -248,11 +255,11 @@ class Project(ProjectBase):
     experiments: Optional[List[Experiment]] = []
 
 
-class ProjectReport(ExperimentBase):
+class ProjectReport(ProjectBase):
     project_id: UUID
     name: str
     description: str
-    emission: float
+    emissions: float
     cpu_power: float
     gpu_power: float
     ram_power: float
@@ -319,7 +326,7 @@ class OrganizationReport(OrganizationBase):
     organization_id: UUID
     name: str
     description: str
-    emission: float
+    emissions: float
     cpu_power: float
     gpu_power: float
     ram_power: float

{codecarbon-2.1.3 → codecarbon-2.2.0}/carbonserver/container.py

@@ -32,7 +32,6 @@ from carbonserver.config import settings
 
 
 class ServerContainer(containers.DeclarativeContainer):
-
     config = providers.Configuration()
     db_url = settings.db_url
     db = providers.Singleton(

{codecarbon-2.1.3 → codecarbon-2.2.0}/carbonserver/main.py

@@ -19,6 +19,7 @@ from carbonserver.api.routers import (
     users,
 )
 from carbonserver.database.database import engine
+from carbonserver.logger import logger
 
 
 async def db_exception_handler(request: Request, exc: DBException):
@@ -30,16 +31,17 @@ async def generic_exception_handler(request: Request, exc: Exception):
 
 
 async def validation_exception_handler(request: Request, exc: ValidationError):
+    logger.error(f"ValidationError {exc}")
     return JSONResponse(
         {
-            "detail": "Validation error : a data is missing or in wrong format. Could be an error in our answer, not only in your request"
+            "detail": "Validation error : a data is missing or in wrong format. Could be an error in our answer, not only in your request",
+            "validation_error_message": str(exc),
         },
         status_code=400,
     )
 
 
 def create_app() -> FastAPI:
-
     container = init_container()
 
     init_db(container)

{codecarbon-2.1.3 → codecarbon-2.2.0}/codecarbon/__init__.py

@@ -2,6 +2,7 @@
 The Carbon Tracker module. The following objects/decorators belong to the Public API
 """
 
+from ._version import __version__  # noqa
 from .emissions_tracker import (
     EmissionsTracker,
     OfflineEmissionsTracker,
@@ -9,5 +10,3 @@ from .emissions_tracker import (
 )
 
 __all__ = ["EmissionsTracker", "OfflineEmissionsTracker", "track_emissions"]
-
-__version__ = "2.1.3"

codecarbon-2.2.0/codecarbon/_version.py

@@ -0,0 +1 @@
+__version__ = "2.2.0"

{codecarbon-2.1.3 → codecarbon-2.2.0}/codecarbon/cli/main.py

@@ -1,3 +1,4 @@
+import sys
 import time
 
 import click
@@ -76,7 +77,7 @@ def monitor(measure_power_secs, api_call_interval, api):
     experiment_id = get_existing_local_exp_id()
     if api and experiment_id is None:
         click.echo("ERROR: No experiment id, call 'codecarbon init' first.")
-        exit(1)
+        sys.exit(1)
     click.echo("CodeCarbon is going in an infinite loop to monitor this machine.")
     with EmissionsTracker(
         measure_power_secs=measure_power_secs,

{codecarbon-2.1.3 → codecarbon-2.2.0}/codecarbon/core/api_client.py

@@ -114,12 +114,14 @@ class ApiClient:  # (AsyncClient)
                 experiment_id=experiment_id,
                 os=self.conf.get("os"),
                 python_version=self.conf.get("python_version"),
+                codecarbon_version=self.conf.get("codecarbon_version"),
                 cpu_count=self.conf.get("cpu_count"),
                 cpu_model=self.conf.get("cpu_model"),
                 gpu_count=self.conf.get("gpu_count"),
                 gpu_model=self.conf.get("gpu_model"),
-                longitude=self.conf.get("longitude"),
-                latitude=self.conf.get("latitude"),
+                # Reduce precision for Privacy
+                longitude=round(self.conf.get("longitude"), 1),
+                latitude=round(self.conf.get("latitude"), 1),
                 region=self.conf.get("region"),
                 provider=self.conf.get("provider"),
                 ram_total_size=self.conf.get("ram_total_size"),
@@ -138,6 +140,11 @@ class ApiClient:  # (AsyncClient)
                 + f"Experiment ID: {self.experiment_id}\n"
             )
             return self.run_id
+        except requests.exceptions.ConnectionError as e:
+            logger.error(
+                f"Failed to connect to API, please check the configuration. {e}",
+                exc_info=False,
+            )
         except Exception as e:
             logger.error(e, exc_info=True)
 

{codecarbon-2.1.3 → codecarbon-2.2.0}/codecarbon/core/cloud.py

@@ -26,7 +26,7 @@ import requests
 from codecarbon.external.logger import logger
 
 
-def postprocess_gcp_cloud_metadata(cloud_metadata):
+def postprocess_gcp_cloud_metadata(cloud_metadata: Dict[str, Any]) -> Dict[str, Any]:
     # type: (Dict[str, Any]) -> Dict[str, Any]
 
     # Attributes contains custom metadata and also contains Kubernetes config,
@@ -54,7 +54,7 @@ CLOUD_METADATA_MAPPING: Dict[str, Dict[str, Any]] = {
 }
 
 
-def get_env_cloud_details(timeout=1):
+def get_env_cloud_details(timeout: int = 1) -> Optional[Any]:
     # type: (int) -> Optional[Any]
     """
     >>> get_env_cloud_details()
@@ -89,9 +89,7 @@ def get_env_cloud_details(timeout=1):
                 response_data = postprocess_function(response_data)
 
             return {"provider": provider, "metadata": response_data}
-        except Exception as e:
-            logger.debug(
-                "Not running on %s, couldn't retrieve metadata: %r", provider, e
-            )
+        except requests.exceptions.RequestException:
+            logger.debug("Not running on %s", provider)
 
     return None

{codecarbon-2.1.3 → codecarbon-2.2.0}/codecarbon/core/cpu.py

@@ -200,15 +200,22 @@ class IntelRAPL:
                 if "package" in name:
                     name = f"Processor Energy Delta_{i}(kWh)"
                     i += 1
+                # RAPL file to take measurement from
                 rapl_file = os.path.join(self._lin_rapl_dir, file, "energy_uj")
+                # RAPL file containing maximum possible value of energy_uj above which it wraps
+                rapl_file_max = os.path.join(
+                    self._lin_rapl_dir, file, "max_energy_range_uj"
+                )
                 try:
                     # Try to read the file to be sure we can
                     with open(rapl_file, "r") as f:
                         _ = float(f.read())
-                    self._rapl_files.append(RAPLFile(name=name, path=rapl_file))
+                    self._rapl_files.append(
+                        RAPLFile(name=name, path=rapl_file, max_path=rapl_file_max)
+                    )
                     logger.debug(f"We will read Intel RAPL files at {rapl_file}")
                 except PermissionError as e:
-                    logger.error(
+                    raise PermissionError(
                         "Unable to read Intel RAPL files for CPU power, we will use a constant for your CPU power."
                         + " Please view https://github.com/mlco2/codecarbon/issues/244"
                         + f" for workarounds : {e}"
@@ -269,8 +276,7 @@ class TDP:
         if cpu_matching:
             power = self._get_cpu_constant_power(cpu_matching, cpu_power_df)
             return power
-        else:
-            return None
+        return None
 
     @staticmethod
     def _get_cpus(cpu_df, cpu_idxs) -> list:
@@ -341,15 +347,13 @@ class TDP:
         # Check if an indirect match exists
         if max_ratio_token_set < THRESHOLD_TOKEN_SET:
             return None
-        else:
-            cpu_idxs = self._get_max_idxs(ratios_token_set, max_ratio_token_set)
-            cpu_machings = self._get_cpus(cpu_df, cpu_idxs)
+        cpu_idxs = self._get_max_idxs(ratios_token_set, max_ratio_token_set)
+        cpu_machings = self._get_cpus(cpu_df, cpu_idxs)
 
-            if (cpu_machings and len(cpu_machings) == 1) or greedy:
-                cpu_matched = cpu_machings[0]
-                return cpu_matched
-            else:
-                return None
+        if (cpu_machings and len(cpu_machings) == 1) or greedy:
+            cpu_matched = cpu_machings[0]
+            return cpu_matched
+        return None
 
     @staticmethod
     def _get_max_idxs(ratios: list, max_ratio: int) -> list:
@@ -371,17 +375,15 @@ class TDP:
                     f"CPU : We detect a {cpu_model_detected} with a TDP of {power} W"
                 )
                 return cpu_model_detected, power
-            else:
-                logger.warning(
-                    f"We saw that you have a {cpu_model_detected} but we don't know it."
-                    + " Please contact us."
-                )
-                return cpu_model_detected, None
-        else:
             logger.warning(
-                "We were unable to detect your CPU using the `cpuinfo` package."
-                + " Resorting to a default power consumption of 85W."
+                f"We saw that you have a {cpu_model_detected} but we don't know it."
+                + " Please contact us."
             )
+            return cpu_model_detected, None
+        logger.warning(
+            "We were unable to detect your CPU using the `cpuinfo` package."
+            + " Resorting to a default power consumption of 85W."
+        )
         return "Unknown", None
 
     def start(self):