codecarbon 2.7.4__tar.gz → 2.8.1__tar.gz

{codecarbon-2.7.4 → codecarbon-2.8.1}/.gitignore

@@ -88,7 +88,8 @@ celerybeat-schedule
 
 # Environments
 .env
-.venv
+.venv/
+.venv-notebook-data/
 env/
 venv/
 ENV/
@@ -130,6 +131,5 @@ tests/test_data/rapl/*
 #asciinema
 *.cast
 
-
 # credentials
 credentials.json

{codecarbon-2.7.4 → codecarbon-2.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: codecarbon
-Version: 2.7.4
+Version: 2.8.1
 Project-URL: Homepage, https://codecarbon.io/
 Project-URL: Repository, https://github.com/mlco2/codecarbon
 Project-URL: Dashboard, http://dashboard.codecarbon.io/

codecarbon-2.8.1/codecarbon/_version.py

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

{codecarbon-2.7.4 → codecarbon-2.8.1}/codecarbon/cli/main.py

@@ -316,16 +316,26 @@ def monitor(
         api (Annotated[bool, typer.Option, optional): Choose to call Code Carbon API or not. Defaults to True.
     """
     experiment_id = get_existing_local_exp_id()
-    if api and experiment_id is None:
-        print("ERROR: No experiment id, call 'codecarbon init' first.", err=True)
+    token = None
+    if api:
+        if experiment_id is None:
+            print("ERROR: No experiment id, call 'codecarbon init' first.", err=True)
+        token = _get_access_token()
     print("CodeCarbon is going in an infinite loop to monitor this machine.")
     with EmissionsTracker(
         measure_power_secs=measure_power_secs,
         api_call_interval=api_call_interval,
         save_to_api=api,
-    ):
+        access_token=token,
+    ) as tracker:
         # Infinite loop
         while True:
+            if (
+                hasattr(tracker, "_another_instance_already_running")
+                and tracker._another_instance_already_running
+            ):
+                print("Another instance of CodeCarbon is already running. Exiting.")
+                break
             time.sleep(300)
 
 

{codecarbon-2.7.4 → codecarbon-2.8.1}/codecarbon/core/api_client.py

@@ -43,6 +43,7 @@ class ApiClient:  # (AsyncClient)
         endpoint_url="https://dash-dev.cleverapps.io/api",  # beta API
         experiment_id=None,
         api_key=None,
+        access_token=None,
         conf=None,
     ):
         """
@@ -54,7 +55,7 @@ class ApiClient:  # (AsyncClient)
         self.experiment_id = experiment_id
         self.api_key = api_key
         self.conf = conf
-        self.access_token = None
+        self.access_token = access_token
         if self.experiment_id is not None:
             self._create_run(self.experiment_id)
         import warnings

{codecarbon-2.7.4 → codecarbon-2.8.1}/codecarbon/core/config.py

@@ -3,6 +3,8 @@ import os
 from pathlib import Path
 from typing import List
 
+from codecarbon.external.logger import logger
+
 
 def clean_env_key(k: str) -> str:
     """
@@ -96,6 +98,16 @@ def get_hierarchical_config():
     home = Path.home()
     global_path = str((home / ".codecarbon.config").expanduser().resolve())
     local_path = str((cwd / ".codecarbon.config").expanduser().resolve())
+    if Path(global_path).exists():
+        logger.info(
+            f"Codecarbon is taking the configuration from global file: {global_path}"
+        )
+        if Path(local_path).exists():
+            logger.info(f"Some variables are overriden by the local file: {local_path}")
+    elif Path(local_path).exists():
+        logger.info(
+            f"Codecarbon is taking the configuration from the local file {local_path}"
+        )
 
     config.read([global_path, local_path])
     config.read_dict(parse_env_config())