Merge pull request #441 from mlco2/bug/dash-org-refresh

Load the organization list

Author: benoit-cty

.conda/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "2.3.0" %}
+{% set version = "2.3.1" %}
 
 package:
   name: codecarbon

codecarbon/_version.py

@@ -1 +1 @@
-__version__ = "2.3.0"
+__version__ = "2.3.1"

codecarbon/emissions_tracker.py

@@ -433,7 +433,8 @@ def start_task(self, task_name=None) -> None:
         :return: None
         """
         # Stop scheduler as we do not want it to interfere with the task measurement
-        self._scheduler.stop()
+        if self._scheduler:
+            self._scheduler.stop()
 
         if self._active_task:
             logger.info("A task is already under measure")

codecarbon/external/scheduler.py

@@ -45,7 +45,8 @@ def stop(self):
         """
         Stop the scheduler.
         """
-        self._lock.acquire()
-        self._stopped = True
-        self._timer.cancel()
-        self._lock.release()
+        if not self._stopped:
+            self._lock.acquire()
+            self._stopped = True
+            self._timer.cancel()
+            self._lock.release()

codecarbon/prometheus/metric_definitions.py

@@ -61,17 +61,17 @@
 )
 cpu_energy_gauge = Gauge(
     "codecarbon_cpu_energy",
-    "Energy used per CPU (kW)",
+    "Energy used per CPU (kWh)",
     registry=registry,
 )
 gpu_energy_gauge = Gauge(
     "codecarbon_gpu_energy",
-    "Energy used per GPU (kW)",
+    "Energy used per GPU (kWh)",
     registry=registry,
 )
 ram_energy_gauge = Gauge(
     "codecarbon_ram_energy",
-    "Energy used per RAM (kW)",
+    "Energy used per RAM (kWh)",
     registry=registry,
 )
 energy_consumed_gauge = Gauge(

dashboard/layout/app.py

@@ -77,7 +77,7 @@ def serve_layout():
                                             df_org.name, df_org.id
                                         )
                                     ],
-                                    # multi=False,
+                                    clearable=False,
                                     value=orga_id,
                                     # value=df_org.id.unique().tolist()[0],
                                     # value="Select your organization",

dashboard/layout/callbacks.py

@@ -9,6 +9,7 @@
     get_experiment_sums,
     get_lastrun,
     get_orga_sums,
+    get_organization_list,
     get_project,
     get_project_list,
     get_project_sums,
@@ -595,3 +596,21 @@ def update_map(start_date, end_date, project, kpi):
             showland=True, landcolor="#6f898e", showocean=True, oceancolor="#759FA8"
         )
     return container, fig
+
+
+# Refresh organizations list
+@app.callback(
+    [
+        Output(component_id="org-dropdown", component_property="options"),
+        Output(component_id="org-dropdown", component_property="value"),
+    ],
+    [Input("url-location", "pathname")],
+)
+def refresh_org_list(url):
+    df_org = get_organization_list()
+    org_id = df_org.id.unique().tolist()[1]
+    options = [
+        {"label": orgName, "value": orgId}
+        for orgName, orgId in zip(df_org.name, df_org.id)
+    ]
+    return options, org_id

dashboard/layout/components.py

@@ -13,6 +13,7 @@ def get_header():
                     [html.Img(src="/assets/logo.png")], href="https://codecarbon.io"
                 ),
                 html.P("Track and reduce CO2 emissions from your computing"),
+                dcc.Location(id="url-location", refresh=False),
                 dcc.DatePickerRange(
                     id="periode",
                     day_size=39,

docs/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 81e476ce26cd3132ed5caa32c12cc2be
+config: c3b8b30a290e8beba1f269fcdc97e097
 tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/_sources/output.rst.txt

@@ -3,7 +3,7 @@
 Output
 ======
 
-CSV 
+CSV
 ---
 
 The package has an in-built logger that logs data into a CSV file named ``emissions.csv`` in the ``output_dir``, provided as an
@@ -36,13 +36,13 @@ input parameter (defaults to the current directory), for each experiment tracked
    * - ram_power
      - RAM power (W)
    * - cpu_energy
-     - Energy used per CPU (kW)
+     - Energy used per CPU (kWh)
    * - gpu_energy
-     - Energy used per GPU (kW)
+     - Energy used per GPU (kWh)
    * - ram_energy
-     - Energy used per RAM (kW)
+     - Energy used per RAM (kWh)
    * - energy_consumed
-     - sum of cpu_energy, gpu_energy and ram_energy (kW)
+     - sum of cpu_energy, gpu_energy and ram_energy (kWh)
    * - country_name
      - Name of the country where the infrastructure is hosted
    * - country_iso_code