Merge branch 'master' into Prometheus_Exporter_Update

Author: Matyro

.conda/recipe.yaml

@@ -1,4 +1,4 @@
-# Read package version in pyproject.toml and replace it in .conda/recipe.yaml
+# Read package version in pyproject.toml
 # Also provides version coherence checking across multiple files
 
 import argparse
@@ -132,48 +132,10 @@ def get_versions():
     }
 
 
-def replace_in_file(filepath: str, info: dict):
-    """
-    ::filepath:: Path to recipe.yaml, with filename
-    ::info:: Dict with information to populate
-    """
-    with open(filepath, "rt") as fin:
-        meta = fin.read()
-    # Replace with info from pyproject.toml
-    if PACKAGE_VERSION not in meta:
-        raise Exception(f"{PACKAGE_VERSION=} not found in {filepath}")
-    meta = meta.replace(PACKAGE_VERSION, info["package_version"])
-    if "    - dependencies" not in meta:
-        raise Exception(f'"    - dependencies" not found in {filepath}')
-    dependencies = ""
-    for dep in info["dependencies"]:
-        if "fief-client" in dep:
-            # Prevent to have unsupported "fief-client[cli]" in dependencies
-            dependencies += "    - fief-client-fastapi\n    - yaspin\n"
-        else:
-            dependencies += f"    - {dep}\n"
-    meta = meta.replace("    - dependencies", dependencies)
-    with open(filepath, "wt") as fout:
-        fout.write(meta)
-    logging.info(
-        f"File {filepath} has been updated with informations from pyproject.toml."
-    )
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "-r",
-        "--replace",
-        action="store_true",
-        help="replace in file",
-    )
-    parser.add_argument(
-        "-f",
-        "--filename",
-        type=str,
-        default=".conda/recipe.yaml",
-        help="Path to recipe.yaml, with filename",
+def main():
+    """Main entry point for the script."""
+    parser = argparse.ArgumentParser(
+        description="Read package version and check version coherence"
     )
     parser.add_argument(
         "-o",
@@ -187,27 +149,39 @@ def replace_in_file(filepath: str, info: dict):
         action="store_true",
         help="Check version coherence across all bumpver-managed files",
     )
+
+    # Parse arguments - all arguments are optional, so this works fine with no args
     args = parser.parse_args()
 
-    # Check version coherence first if requested or before any operations
+    # Check version coherence first if requested
     if args.check_coherence:
         coherence_ok = check_version_coherence()
         sys.exit(0 if coherence_ok else 1)
 
-    # Always check coherence before doing replacements or showing versions
-    if not check_version_coherence(quiet=True):
-        logging.error("Aborting due to version coherence issues.")
+    # If only_package_version is requested, just print version and exit
+    if args.only_package_version:
+        try:
+            info = get_versions()
+            print(f'{info["package_version"]}')
+            sys.exit(0)
+        except Exception as e:
+            logging.error(f"Error getting version: {e}")
+            sys.exit(1)
+
+    # Default behavior: check coherence quietly, then show versions
+    try:
+        if not check_version_coherence(quiet=True):
+            logging.error("Aborting due to version coherence issues.")
+            sys.exit(1)
+
+        info = get_versions()
+        logging.info("Versions:")
+        print(info)  # noqa: T201
+        sys.exit(0)
+    except Exception as e:
+        logging.error(f"Error: {e}")
         sys.exit(1)
 
-    info = get_versions()
-    file = args.filename
-    if args.only_package_version:
-        print(f'{info["package_version"]}')
-        exit()
-    logging.info("Versions :")
-    print(info)  # noqa: T201
-    if args.replace:
-        logging.info(f"Replace in {file}")
-        replace_in_file(file, info)
-    else:
-        logging.info("Dry mode, no replace made")
+
+if __name__ == "__main__":
+    main()

.conda/variants.yaml

@@ -70,48 +70,3 @@ jobs:
         # Test that the CLI is functional
         codecarbon --help
         python -c "from codecarbon import EmissionsTracker; print('✓ Package import successful')"
-
-  build-conda:
-      runs-on: ubuntu-24.04
-      steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Cache build
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-        with:
-          path: /tmp/conda-bld
-          key: build-conda-${{ github.sha }}
-      - name: set version
-        run: |
-          python3 .github/pyproject_versions.py --check_coherence --replace
-      - name: Build conda package
-        uses: prefix-dev/rattler-build-action@20cb88d3095cc01fa181385021c57f886d624879 # v0.2.16
-        with:
-          build-args: --channel codecarbon --channel conda-forge --output-dir /tmp/conda-bld
-          recipe-path: .conda/recipe.yaml
-          upload-artifact: false
-  test-conda:
-      runs-on: ubuntu-24.04
-      needs: [ build-conda ]
-      steps:
-      # Checkout needed to get github.sha
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Setup conda
-        uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
-        with:
-          activate-environment: codecarbon
-          miniforge-version: latest
-          python-version: 3.12
-          use-mamba: true
-      - name: Restore build
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-        with:
-          path: /tmp/conda-bld
-          key: build-conda-${{ github.sha }}
-          fail-on-cache-miss: true
-      - name: Install package
-        shell: bash -l {0}
-        run: mamba install --channel file:///tmp/conda-bld --channel codecarbon codecarbon
-      - name: Test conda package
-        shell: bash -l {0}
-        run: codecarbon --help

.github/pyproject_versions.py

@@ -33,32 +33,3 @@ jobs:
       run: uv build
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # release/v1.13.0
-  publish-to-conda:
-    runs-on: ubuntu-24.04
-    needs: [ deploy-pypi ]
-    steps:
-        - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        - name: Restore build
-          uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-          with:
-            path: /tmp/conda-bld
-            key: build-conda-${{ github.sha }}
-            fail-on-cache-miss: true
-        - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
-          with:
-            activate-environment: codecarbon
-            miniforge-version: latest
-            python-version: 3.12
-            use-mamba: true
-        - name: Install package
-          shell: bash -l {0}
-          run: mamba install --channel file:///tmp/conda-bld --channel codecarbon codecarbon
-        - name: Test conda package
-          shell: bash -l {0}
-          run: codecarbon --help
-        - name: Conda upload already build package
-          shell: bash -l {0}
-          env:
-            ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
-          run: |
-            anaconda upload --user codecarbon /tmp/conda-bld/noarch/codecarbon-*.tar.bz2

.github/workflows/package.yml

@@ -0,0 +1 @@
+.github/copilot-instructions.md

.github/workflows/python-publish.yml

@@ -70,7 +70,7 @@ You have a cool idea, but do not know know if it fits with Code Carbon? You can
 <!-- TOC --><a name="installation"></a>
 ### Installation
 
-CodeCarbon is a Python package, to contribute to it, you need to have Python installed on your machine, natively or with [Conda](https://docs.conda.io/projects/conda/en/latest/user-guide/install/), or better, faster, stronger with [UV](https://github.com/astral-sh/uv).
+CodeCarbon is a Python package, to contribute to it, you need to have Python installed on your machine, natively or with [UV](https://github.com/astral-sh/uv).
 
 Between April 2024 and July 2025 we use Hatch for managing development environment. Since August 2025 we use UV manages the environments, Python versions, and dependencies - it's a fast, reliable way to work with Python projects.
 
@@ -258,7 +258,6 @@ Dependencies are defined in different places:
 
 -   In [pyproject.toml](pyproject.toml#L28), those are all the dependencies.
 -   In [uv.lock](uv.lock), those are the locked dependencies managed by UV, do not edit them.
--   In [.conda/meta.yaml](.conda/meta.yaml#L21), those are the dependencies for the Conda pacakge targeting Python 3.7 and higher versions.
 
 
 <!-- TOC --><a name="build-documentation-"></a>
@@ -288,20 +287,6 @@ to regenerate the html files.
 - Wait for the Github Action `ReleaseDrafter` to finish running on the merge commit.
 - [Edit the Draft release](https://github.com/mlco2/codecarbon/releases/) on Github and give it a tag, `v1.0.0` for the version 1.0.0. Github will automatically create a Git tag for it. Complete help [here](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository).
 -   A [Github Action](https://github.com/mlco2/codecarbon/actions) _Upload Python Package_ will be run automaticaly to upload the package.
--   For conda, we now have a [feedstock](https://github.com/conda-forge/codecarbon-feedstock/pulls) to publish to Conda-Forge channel.
-
-If you still want to publish to the Anaconda CodeCarbon channel:
-
-Start a Docker image in the same directory and bind-mount the current directory with:
-
-`docker run -ti --rm=true -v $PWD:/data continuumio/anaconda3`.
-
-Inside the docker container, run:
-
--   `conda install -y conda-build conda-verify`
--   `cd /data && mkdir -p /conda_dist`
--   `conda build --python 3.11 .conda/ -c conda-forge --output-folder /conda_dist`
--   `anaconda upload --user codecarbon /conda_dist/noarch/codecarbon-*.tar.bz2`
 
 #### Test the build in Docker
 
@@ -392,7 +377,7 @@ api_endpoint = http://localhost:8008
 Before using it, you need an experiment_id, to get one, run:
 
 ```
-codecarbon init
+codecarbon login
 ```
 
 It will ask the API for an experiment_id on the default project and save it to `.codecarbon.config` for you.

CLAUDE.md

@@ -13,8 +13,6 @@ CodeCarbon websites:
 
 <br/>
 
-[![](https://anaconda.org/conda-forge/codecarbon/badges/version.svg)](https://anaconda.org/conda-forge/codecarbon)
-[![](https://anaconda.org/codecarbon/codecarbon/badges/version.svg)](https://anaconda.org/codecarbon/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)
 <!-- [![Downloads](https://static.pepy.tech/badge/codecarbon/month)](https://pepy.tech/project/codecarbon) -->
@@ -63,10 +61,13 @@ Our hope is that this package will be used widely for estimating the carbon foot
 pip install codecarbon
 ```
 
-**From Conda repository**
-```python
-conda install -c codecarbon codecarbon
+**Using Conda environments**
+If you're using Conda, you can install CodeCarbon with pip in your Conda environment:
+```bash
+conda activate your_env
+pip install codecarbon
 ```
+
 To see more installation options please refer to the documentation: [**Installation**](https://mlco2.github.io/codecarbon/installation.html#)
 
 ## Start to estimate your impact 📏

CONTRIBUTING.md

@@ -21,6 +21,9 @@ class Emission(Base):
     gpu_energy = Column(Float)
     ram_energy = Column(Float)
     energy_consumed = Column(Float)
+    cpu_utilization_percent = Column(Float, nullable=True)
+    gpu_utilization_percent = Column(Float, nullable=True)
+    ram_utilization_percent = Column(Float, nullable=True)
     wue = Column(Float, nullable=False, default=0)
     run_id = Column(UUID(as_uuid=True), ForeignKey("runs.id", ondelete="CASCADE"))
     run = relationship("Run", back_populates="emissions")

README.md

@@ -41,6 +41,9 @@ def add_emission(self, emission: EmissionCreate) -> UUID:
                 gpu_energy=emission.gpu_energy,
                 ram_energy=emission.ram_energy,
                 energy_consumed=emission.energy_consumed,
+                cpu_utilization_percent=emission.cpu_utilization_percent,
+                gpu_utilization_percent=emission.gpu_utilization_percent,
+                ram_utilization_percent=emission.ram_utilization_percent,
                 wue=emission.wue,
                 run_id=emission.run_id,
             )
@@ -105,6 +108,9 @@ def map_sql_to_schema(emission: sql_models.Emission) -> Emission:
             gpu_energy=emission.gpu_energy,
             ram_energy=emission.ram_energy,
             energy_consumed=emission.energy_consumed,
+            cpu_utilization_percent=emission.cpu_utilization_percent,
+            gpu_utilization_percent=emission.gpu_utilization_percent,
+            ram_utilization_percent=emission.ram_utilization_percent,
             wue=emission.wue,
             run_id=emission.run_id,
         )