tracarbon 0.7.2__tar.gz → 0.7.4__tar.gz

{tracarbon-0.7.2 → tracarbon-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tracarbon
-Version: 0.7.2
+Version: 0.7.4
 Summary: Tracarbon is a Python library that tracks your device's energy consumption and calculates your carbon emissions.
 License: Apache-2.0
 Keywords: energy,sustainability,energy-consumption,electricity-consumption,energy-efficiency,carbon-footprint,carbon-emissions
@@ -15,24 +15,25 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Provides-Extra: datadog
 Provides-Extra: kubernetes
 Provides-Extra: prometheus
 Requires-Dist: aiocache (>=0.12.1,<0.13.0)
-Requires-Dist: aiofiles (>=23.2.0,<24.0.0)
+Requires-Dist: aiofiles (>=23.2,<25.0)
 Requires-Dist: aiohttp (>=3.9.3,<4.0.0)
-Requires-Dist: asyncer (>=0.0.5,<0.0.6)
-Requires-Dist: datadog (>=0.44,<0.49) ; extra == "datadog"
+Requires-Dist: asyncer (>=0.0.5,<0.0.9)
+Requires-Dist: datadog (>=0.44,<0.51) ; extra == "datadog"
 Requires-Dist: ec2-metadata (>=2.13.0,<3.0.0)
-Requires-Dist: kubernetes (>=26.1,<30.0) ; extra == "kubernetes"
+Requires-Dist: kubernetes (>=26.1,<32.0) ; extra == "kubernetes"
 Requires-Dist: loguru (>=0.6,<0.8)
 Requires-Dist: msgpack (>=1.0.4,<2.0.0)
-Requires-Dist: prometheus-client (>=0.16,<0.21) ; extra == "prometheus"
-Requires-Dist: psutil (>=5.9.8,<6.0.0)
+Requires-Dist: prometheus-client (>=0.16,<0.22) ; extra == "prometheus"
+Requires-Dist: psutil (>=5.9.8)
 Requires-Dist: pydantic (>=1.10.7,<3.0.0)
 Requires-Dist: python-dotenv (>=0.21,<1.1)
-Requires-Dist: typer (>=0.7,<0.10)
+Requires-Dist: typer (>=0.7,<0.16)
 Requires-Dist: ujson (>=5.9.0,<6.0.0)
 Description-Content-Type: text/markdown
 

{tracarbon-0.7.2 → tracarbon-0.7.4}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "tracarbon"
 authors = ["Florian Valeye <fvaleye@github.com>"]
-version = "0.7.2"
+version = "0.7.4"
 description = "Tracarbon is a Python library that tracks your device's energy consumption and calculates your carbon emissions."
 readme = "README.md"
 license = "Apache-2.0"
@@ -18,40 +18,40 @@ python = "^3.8"
 loguru = ">=0.6,<0.8"
 aiohttp = "^3.9.3"
 aiocache = "^0.12.1"
-aiofiles = "^23.2.0"
-psutil = "^5.9.8"
+aiofiles = ">=23.2,<25.0"
+psutil = ">=5.9.8"
 ujson = "^5.9.0"
 msgpack = "^1.0.4"
 pydantic = ">=1.10.7,<3.0.0"
-typer = ">=0.7,<0.10"
+typer = ">=0.7,<0.16"
 ec2-metadata = "^2.13.0"
 python-dotenv = ">=0.21,<1.1"
-asyncer = "^0.0.5"
-datadog = {version = ">=0.44,<0.49", optional = true}
-prometheus-client = {version = ">=0.16,<0.21", optional = true}
-kubernetes = {version = ">=26.1,<30.0", optional = true}
+asyncer = ">=0.0.5,<0.0.9"
+datadog = {version = ">=0.44,<0.51", optional = true}
+prometheus-client = {version = ">=0.16,<0.22", optional = true}
+kubernetes = {version = ">=26.1,<32.0", optional = true}
 
 [tool.poetry.dev-dependencies]
-mypy = "^1.8"
-ruff = "^0.3.3"
-pytest = "^8.1.1"
-pytest-mock = "^3.12.0"
-pytest-asyncio = "^0.23.5"
-pytest-cov = "^4.1.0"
-pytest-xdist = "^3.5.0"
+mypy = "^1.10"
+ruff = "^0.8.5"
+pytest = "^8.2.1"
+pytest-mock = "^3.14.0"
+pytest-asyncio = "^0.24.0"
+pytest-cov = "^5.0.0"
+pytest-xdist = "^3.6.1"
 pytest-clarity = "^1.0.1"
 sphinx = "^7.1.2"
 pydata-sphinx-theme = "^0.14.4"
 toml = "^0.10.2"
-types-ujson = "^5.9.0"
-datadog = ">=0.44,<0.49"
-prometheus-client = ">=0.16,<0.21"
+types-ujson = "^5.10.0"
+datadog = ">=0.44,<0.51"
+prometheus-client = ">=0.16,<0.22"
 types-requests = "^2.31.0"
-bandit = "^1.7.7"
+bandit = "^1.7.9"
 radon = "^6.0.1"
-types-aiofiles = "^23.2.0"
-kubernetes = ">=26.1,<30.0"
-autodoc_pydantic = "1.9.0"
+types-aiofiles = "^24.1.0"
+kubernetes = ">=26.1,<32.0"
+autodoc_pydantic = "1.9.1"
 
 [tool.poetry.extras]
 datadog = ["datadog"]

{tracarbon-0.7.2 → tracarbon-0.7.4}/tracarbon/hardwares/rapl.py

@@ -1,6 +1,7 @@
 import os
 import re
 from datetime import datetime
+from pathlib import Path
 from typing import Dict
 from typing import List
 from typing import Optional
@@ -76,8 +77,10 @@ class RAPL(BaseModel):
             if not self.file_list:
                 self.get_rapl_files_list()
             for file_path in self.file_list:
+                name_prefix = Path(file_path).name.replace("intel-rapl", "")
                 async with aiofiles.open(f"{file_path}/name", "r") as rapl_name:
                     name = await rapl_name.read()
+                    name = f"{name_prefix}-{name}"
                     async with aiofiles.open(f"{file_path}/energy_uj", "r") as rapl_energy:
                         energy_uj = float(await rapl_energy.read())
                     async with aiofiles.open(f"{file_path}/max_energy_range_uj", "r") as rapl_max_energy:

{tracarbon-0.7.2 → tracarbon-0.7.4}/tracarbon/hardwares/sensors.py

@@ -81,7 +81,7 @@ class MacEnergyConsumption(EnergyConsumption):
     Energy Consumption of the Mac, working only if it's plugged into plugged-in wall adapter, in watts.
     """
 
-    shell_command: str = """/usr/sbin/ioreg -rw0 -c AppleSmartBattery | grep BatteryData | grep -o '"AdapterPower"=[0-9]*' | cut -c 16- | xargs -I %  lldb --batch -o "print/f %" | grep -o '$0 = [0-9.]*' | cut -c 6-"""
+    shell_command: str = """ioreg -rw0 -a -c AppleSmartBattery | plutil -extract '0.BatteryData.AdapterPower' raw -"""
 
     async def get_energy_usage(self) -> EnergyUsage:
         """