myelectricaldatapy 2.2.5__tar.gz → 2.2.7__tar.gz

myelectricaldatapy-2.2.7/.devcontainer/devcontainer-lock.json

@@ -0,0 +1,14 @@
+{
+  "features": {
+    "ghcr.io/devcontainers-extra/features/prek:1": {
+      "version": "1.0.0",
+      "resolved": "ghcr.io/devcontainers-extra/features/prek@sha256:eb55e266252d8560cf726f27c5675e397bb833067a21428c50b273a59842f649",
+      "integrity": "sha256:eb55e266252d8560cf726f27c5675e397bb833067a21428c50b273a59842f649"
+    },
+    "ghcr.io/devcontainers-extra/features/uv:1": {
+      "version": "1.0.2",
+      "resolved": "ghcr.io/devcontainers-extra/features/uv@sha256:1ac5b9f17a9e9e745933d0ac2ecf758e06ed3da4423cd22c94cce4d482fd2dd8",
+      "integrity": "sha256:1ac5b9f17a9e9e745933d0ac2ecf758e06ed3da4423cd22c94cce4d482fd2dd8"
+    }
+  }
+}

myelectricaldatapy-2.2.7/.devcontainer/devcontainer.json

@@ -0,0 +1,60 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
+{
+  "name": "Python 3",
+  "image": "mcr.microsoft.com/devcontainers/python:3-3.14-trixie",
+  "features": {
+    "ghcr.io/devcontainers-extra/features/prek:1": {},
+    "ghcr.io/devcontainers-extra/features/uv:1": {}
+  },
+  "postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && prek install --overwrite && uv venv --seed --clear && uv pip install --no-cache-dir --link-mode=copy -e '.[dev]'",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "charliermarsh.ruff",
+        "esbenp.prettier-vscode",
+        "dbaeumer.vscode-eslint",
+        "ms-azuretools.vscode-docker",
+        "ms-vscode-remote.remote-containers",
+        "streetsidesoftware.code-spell-checker",
+        "streetsidesoftware.code-spell-checker-french",
+        "anthropic.claude-code"
+      ],
+      "settings": {
+        // ── Python ──────────────────────────────────────────────────────
+        "python.terminal.activateEnvInCurrentTerminal": true,
+        "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
+        "[python]": {
+          "pythonPath": "${workspaceFolder}/.venv/bin/python",
+          "editor.defaultFormatter": "charliermarsh.ruff",
+          "editor.formatOnSave": true,
+          "editor.formatOnPaste": false,
+          "editor.formatOnType": true,
+          "editor.codeActionsOnSave": {
+            "source.fixAll": "explicit",
+            "source.organizeImports": "explicit"
+          }
+        },
+        "ruff.enable": true,
+        "ruff.organizeImports": true,
+        "[json]": {
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
+        },
+        "[yaml]": {
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
+        },
+        // ── Général ──────────────────────────────────────────────────────
+        "editor.tabSize": 2,
+        "editor.insertSpaces": true,
+        "files.eol": "\n",
+        "files.insertFinalNewline": true,
+        "files.trimTrailingWhitespace": true
+      }
+    }
+  },
+  "mounts": [
+    "source=${env:HOME}/.claude,target=/home/vscode/.claude,type=bind,consistency=cached"
+  ]
+}

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/.github/workflows/python-lint.yml

@@ -13,18 +13,15 @@ jobs:
 
     steps:
       - name: 📥 Checkout the repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: 📦 Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install pylint
+        run: uv sync --extra dev
 
-      - name: Run pre-commit
-        uses: pre-commit/action@v3.0.1
+      - name: Run prek
+        run: uv run prek run --all-files

myelectricaldatapy-2.2.7/.github/workflows/python-publish.yml

@@ -0,0 +1,31 @@
+name: Upload Python Package
+
+on:
+  release:
+    types: ["published"]
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    name: Deploy to PyPi
+    environment: release
+    permissions:
+      id-token: write
+    steps:
+      - name: 📥 Checkout the repository
+        uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          python-version: "3.13"
+
+      - name: Build package
+        run: uv build
+
+      - name: 🚀 Publish to PyPi
+        uses: pypa/gh-action-pypi-publish@v1.14.2

myelectricaldatapy-2.2.7/.github/workflows/release.yml

@@ -0,0 +1,35 @@
+name: Create release
+on:
+  push:
+    tags:
+      - "*.*.*" # Push events to matching i.e. 1.0.0, 4.0.1
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      # To use this repository's private action, you must check out the repository
+      - name: 📥 Checkout the repository
+        uses: actions/checkout@v7
+
+      - name: Generate changelog
+        id: changelog
+        uses: metcalfc/changelog-generator@v4.7.0
+        with:
+          myToken: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v3
+        with:
+          name: ${{ github.ref_name }}
+          body: ${{ steps.changelog.outputs.changelog }}
+          draft: false
+          prerelease: ${{ contains(github.ref_name, '-') }}
+          token: ${{ secrets.RELEASE_TOKEN }}
+  publish:
+    needs: release
+    permissions:
+      contents: write
+      packages: write
+      id-token: write
+    if: ${{ ! contains(github.ref_name, '-') }}
+    uses: ./.github/workflows/python-publish.yml

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/.gitignore

@@ -2,7 +2,6 @@
 __pycache__/
 *.py[cod]
 *$py.class
-example_home.py
 
 # C extensions
 *.so
@@ -111,4 +110,7 @@ dmypy.json
 type_info.json
 
 # Secret files
-secrets.yaml
+secrets.yaml
+
+# Code
+*.code-workpace

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 ---
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.8
+    rev: v0.16.2
     hooks:
       - id: ruff
         args:
           - --fix
       - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.3
     hooks:
       - id: codespell
         args:
@@ -17,14 +17,14 @@ repos:
           - --quiet-level=2
         exclude_types: [csv, json]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-executables-have-shebangs
         stages: [manual]
       - id: check-json
         exclude: (.vscode|.devcontainer)
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.37.1
+    rev: v1.38.0
     hooks:
       - id: yamllint
         exclude: (.github|.vscode|.devcontainer)
@@ -33,7 +33,7 @@ repos:
     hooks:
       - id: prettier
   - repo: https://github.com/cdce8p/python-typing-update
-    rev: v0.7.1
+    rev: v0.8.1
     hooks:
       # Run `python-typing-update` hook manually from time to time
       # to update python typing syntax.
@@ -46,7 +46,7 @@ repos:
           - --force
           - --keep-updates
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v2.3.0
     hooks:
       - id: mypy
         args: [--strict, --ignore-missing-imports]

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/PKG-INFO

@@ -1,20 +1,21 @@
 Metadata-Version: 2.4
 Name: myelectricaldatapy
-Version: 2.2.5
+Version: 2.2.7
 Summary: Fetch Linky data from myelectricaldata.fr
 Author-email: Cyr-ius <cyr-ius@ipocus.net>
-License: GPL-3
+License-Expression: GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/cyr-ius/myelectricaldatapy
 Keywords: enedis,linky,async,myelectricaldata
+Platform: any
 Classifier: Programming Language :: Python
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Programming Language :: Python :: 3
 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: Framework :: AsyncIO
 Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.10.0
 Description-Content-Type: text/markdown
@@ -22,6 +23,10 @@ License-File: LICENSE
 Requires-Dist: aiohttp>=3.8.1
 Requires-Dist: pandas>=2.0.2
 Requires-Dist: voluptuous>=0.13.1
+Provides-Extra: dev
+Requires-Dist: prek; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: yamllint; extra == "dev"
 Dynamic: license-file
 
 # myelectricaldatapy

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/myelectricaldatapy/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding:utf-8 -*-
-
 """myelectricaldatapy package."""
 
 from .exceptions import (
@@ -13,8 +11,8 @@ from .mypdl import EnedisByPDL
 
 __all__ = [
     "Enedis",
-    "EnedisException",
     "EnedisByPDL",
+    "EnedisException",
     "HttpRequestError",
     "LimitReached",
     "TimeoutExceededError",

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/myelectricaldatapy/analytics.py

@@ -2,19 +2,35 @@
 
 from __future__ import annotations
 
+from collections.abc import Collection
 from datetime import datetime as dt, timedelta
+import os
 import re
-from typing import Any, Collection, Tuple
+from typing import Any
+from zoneinfo import ZoneInfo
 
 import pandas as pd
 
 from .const import ATTR_OFFPEAK, ATTR_STANDARD
 
 
+def _local_timezone() -> Any:
+    """Resolve the local IANA timezone so DST offsets stay correct per-date.
+
+    Falls back to the fixed UTC offset captured at call time when the
+    system timezone database cannot be resolved (e.g. non-Linux hosts).
+    """
+    try:
+        tz_path = os.path.realpath("/etc/localtime")
+        return ZoneInfo(tz_path.split("zoneinfo/")[-1])
+    except Exception:  # noqa: BLE001
+        return dt.now().astimezone().tzinfo
+
+
 class EnedisAnalytics:
     """Data analaytics."""
 
-    local_timezone = dt.now().astimezone().tzinfo
+    local_timezone = _local_timezone()
 
     def __init__(self, data: Collection[Collection[str]]) -> None:
         """Initialize Dataframe."""
@@ -25,15 +41,17 @@ class EnedisAnalytics:
         convertKwh: bool = False,
         convertUTC: bool = False,
         start_date: dt | None = None,
-        intervals: list[Tuple[str, str]] | None = None,
+        intervals: list[tuple[str, str]] | None = None,
         groupby: bool = False,
         summary: bool = False,
-        cum_value: dict[str, Any] = {},
-        cum_price: dict[str, Any] = {},
+        cum_value: dict[str, Any] | None = None,
+        cum_price: dict[str, Any] | None = None,
         prices: dict[str, Any] | None = None,
         tempo: dict[str, str] | None = None,
     ) -> Any:
         """Convert data to analyze."""
+        cum_value = cum_value or {}
+        cum_price = cum_price or {}
         step_hour = False
         if not self.df.empty:
             # Convert str to datetime
@@ -54,10 +72,7 @@ class EnedisAnalytics:
             if "interval_length" in self.df:
                 step_hour = True
                 self.df.loc[
-                    (
-                        self.df.date.dt.minute
-                        == dt.strptime("00:00:00", "%H:%M:%S").minute
-                    ),
+                    (self.df.date.dt.minute == 0),
                     "date",
                 ] = self.df.date - timedelta(minutes=1)
 
@@ -138,7 +153,7 @@ class EnedisAnalytics:
             return int(rslt[0]) / 60
         return 1
 
-    def _get_data_interval(self, intervals: list[Tuple[str, str]]) -> pd.DataFrame:
+    def _get_data_interval(self, intervals: list[tuple[str, str]]) -> pd.DataFrame:
         """Group date from range time."""
         for interval in intervals:
             # Convert str to datetime

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/myelectricaldatapy/myelectricaldata.py

@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
+from collections.abc import Generator
 from datetime import date, datetime as dt, timedelta
 import logging
 import re
-from typing import Any, Generator, cast
+from typing import Any, cast
 
 from aiohttp import ClientSession
 
@@ -27,7 +28,6 @@ class Enedis:
         self.auth = EnedisAuth(session, token, timeout)
         self.async_request = self.auth.async_request
         self.offpeaks: list[str] = []
-        self.dt_offpeak: list[dt] = []
         self.last_access: date | None = None
 
     async def async_fetch_datas(
@@ -68,13 +68,6 @@ class Enedis:
                 contract = usage_point.get("contracts", {})
                 if offpeak_hours := contract.get("offpeak_hours"):
                     self.offpeaks = re.findall("(?:(\\w+)-(\\w+))+", offpeak_hours)
-                    self.dt_offpeak = [
-                        (  # type: ignore
-                            dt.strptime(offpeak[0], "%HH%M"),
-                            dt.strptime(offpeak[1], "%HH%M"),
-                        )
-                        for offpeak in self.offpeaks
-                    ]
         return contract
 
     async def async_get_contracts(self, pdl: str) -> Any:
@@ -136,7 +129,7 @@ class Enedis:
             for range_time in self.offpeaks:
                 starting = dt.strptime(range_time[0], "%HH%M").time()
                 ending = dt.strptime(range_time[1], "%HH%M").time()
-                if ending <= start_time > starting:
+                if starting < start_time <= ending:
                     return True
         return False
 

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/myelectricaldatapy/mypdl.py

@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from datetime import date, datetime as dt, timedelta
 import logging
-from typing import Any, Callable, Tuple
+from typing import Any
 
 from aiohttp import ClientSession
 import voluptuous as vol
@@ -116,7 +117,7 @@ class EnedisByPDL:
         self.ecowatt: dict[str, Any] = {}
         self.has_collected: bool = False
         self.has_parameters: bool = False
-        self.intervals: list[Tuple[str, str]] = []
+        self.intervals: list[tuple[str, str]] = []
         self.last_access: dt = dt.now()
         self.last_refresh: date | None = None
         self.max_power: dict[str, Any] = {}
@@ -141,7 +142,7 @@ class EnedisByPDL:
     @property
     def tempo_day(self) -> str | None:
         """Tempo day."""
-        str_date = dt.now().strftime("%Y-%-m-%-d")
+        str_date = dt.now().strftime("%Y-%m-%d")
         return self.tempo.get(str_date)
 
     @property
@@ -181,13 +182,19 @@ class EnedisByPDL:
         start = dt.now() - timedelta(days=1095)
         end = dt.now() + timedelta(days=1)
         if force_refresh or self.last_access.date() != dt.now().date():
+            self.access = {}
             self.contract = {}
             self.address = {}
             self.ecowatt = {}
             self.max_power = {}
             self.has_collected = False
         try:
-            self.access = await self._api.async_valid_access(self.pdl)
+            if not self.access:
+                # Quota is scarce (ex: 50 calls/day on Enedis API), so the
+                # access/quota check is only refreshed once a day (or on
+                # force_refresh) instead of on every update cycle.
+                self.access = await self._api.async_valid_access(self.pdl)
+
             if self.access.get("quota_reached", False):
                 detail = self.access.get("information", "Quota reached")
                 raise LimitReached(409, {"detail": detail})
@@ -241,7 +248,7 @@ class EnedisByPDL:
         """Enable or Disable Max power Subscription."""
         self._maxpower_subs = activate is True
 
-    def _set_intervals(self, mode: str, intervals: list[Tuple[str, str]]) -> None:
+    def _set_intervals(self, mode: str, intervals: list[tuple[str, str]]) -> None:
         """Set intervals."""
         if isinstance(intervals, list):
             self.intervals = intervals
@@ -293,7 +300,7 @@ class EnedisByPDL:
         service: str,
         start: dt | None = None,
         end: dt | None = None,
-        intervals: list[Tuple[str, str]] | None = None,
+        intervals: list[tuple[str, str]] | None = None,
         prices: dict[str, Any] | None = None,
         cum_value: dict[str, Any] | None = None,
         cum_price: dict[str, Any] | None = None,

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/myelectricaldatapy.egg-info/PKG-INFO

@@ -1,20 +1,21 @@
 Metadata-Version: 2.4
 Name: myelectricaldatapy
-Version: 2.2.5
+Version: 2.2.7
 Summary: Fetch Linky data from myelectricaldata.fr
 Author-email: Cyr-ius <cyr-ius@ipocus.net>
-License: GPL-3
+License-Expression: GPL-3.0-or-later
 Project-URL: Homepage, https://github.com/cyr-ius/myelectricaldatapy
 Keywords: enedis,linky,async,myelectricaldata
+Platform: any
 Classifier: Programming Language :: Python
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Programming Language :: Python :: 3
 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: Framework :: AsyncIO
 Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.10.0
 Description-Content-Type: text/markdown
@@ -22,6 +23,10 @@ License-File: LICENSE
 Requires-Dist: aiohttp>=3.8.1
 Requires-Dist: pandas>=2.0.2
 Requires-Dist: voluptuous>=0.13.1
+Provides-Extra: dev
+Requires-Dist: prek; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: yamllint; extra == "dev"
 Dynamic: license-file
 
 # myelectricaldatapy

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/myelectricaldatapy.egg-info/SOURCES.txt

@@ -1,14 +1,12 @@
-.flake8
 .gitignore
 .pre-commit-config.yaml
 LICENSE
-MANIFEST.in
 README.md
 _secrets.yaml
 example.py
 pyproject.toml
-requirements-dev.txt
-requirements.txt
+.devcontainer/devcontainer-lock.json
+.devcontainer/devcontainer.json
 .github/dependabot.yml
 .github/workflows/auto-approve.yml
 .github/workflows/python-lint.yml
@@ -27,6 +25,8 @@ myelectricaldatapy.egg-info/PKG-INFO
 myelectricaldatapy.egg-info/SOURCES.txt
 myelectricaldatapy.egg-info/dependency_links.txt
 myelectricaldatapy.egg-info/requires.txt
+myelectricaldatapy.egg-info/scm_file_list.json
+myelectricaldatapy.egg-info/scm_version.json
 myelectricaldatapy.egg-info/top_level.txt
 tests/__init__.py
 tests/conftest.py

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/myelectricaldatapy.egg-info/requires.txt

@@ -1,3 +1,8 @@
 aiohttp>=3.8.1
 pandas>=2.0.2
 voluptuous>=0.13.1
+
+[dev]
+prek
+ruff
+yamllint

myelectricaldatapy-2.2.7/myelectricaldatapy.egg-info/scm_file_list.json

@@ -0,0 +1,40 @@
+{
+  "files": [
+    ".devcontainer/devcontainer-lock.json",
+    ".devcontainer/devcontainer.json",
+    ".github/dependabot.yml",
+    ".github/workflows/auto-approve.yml",
+    ".github/workflows/python-lint.yml",
+    ".github/workflows/python-publish.yml",
+    ".github/workflows/release.yml",
+    ".gitignore",
+    ".pre-commit-config.yaml",
+    ".vscode/settings.json",
+    "LICENSE",
+    "README.md",
+    "_secrets.yaml",
+    "example.py",
+    "myelectricaldatapy/__init__.py",
+    "myelectricaldatapy/analytics.py",
+    "myelectricaldatapy/auth.py",
+    "myelectricaldatapy/const.py",
+    "myelectricaldatapy/exceptions.py",
+    "myelectricaldatapy/myelectricaldata.py",
+    "myelectricaldatapy/mypdl.py",
+    "myelectricaldatapy/py.typed",
+    "pyproject.toml",
+    "tests/__init__.py",
+    "tests/conftest.py",
+    "tests/consts.py",
+    "tests/fixtures/access.json",
+    "tests/fixtures/address.json",
+    "tests/fixtures/contract.json",
+    "tests/fixtures/daily.json",
+    "tests/fixtures/detail.json",
+    "tests/fixtures/ecowatt.json",
+    "tests/fixtures/invalid_access.json",
+    "tests/fixtures/tempo.json",
+    "tests/test_analytics.py",
+    "tests/test_load_data.py"
+  ]
+}

myelectricaldatapy-2.2.7/myelectricaldatapy.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.2.7",
+  "distance": 0,
+  "node": "g3fb21c9929da8ebafc38ec5cfef31d7ccd6ac826",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-08-16"
+}

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name        = "myelectricaldatapy"
 dynamic     = ["version"]
-license     = {text = "GPL-3"}
+license     = "GPL-3.0-or-later"
 description = "Fetch Linky data from myelectricaldata.fr"
 readme      = "README.md"
 authors     = [
@@ -15,13 +15,13 @@ keywords    = ["enedis", "linky", "async", "myelectricaldata"]
 classifiers = [
     "Programming Language :: Python",
     "Development Status :: 5 - Production/Stable",
-    "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Framework :: AsyncIO",
     "Intended Audience :: Developers",
-    "Intended Audience :: System Administrators",
     "Topic :: Home Automation",
 ]
 requires-python = ">=3.10.0"
@@ -31,11 +31,21 @@ dependencies    = [
     "voluptuous>=0.13.1",
 ]
 
+[project.optional-dependencies]
+dev = [
+    "prek",
+    "ruff",
+    "yamllint",
+]
+
 [project.urls]
 Homepage = "https://github.com/cyr-ius/myelectricaldatapy"
 
 [tool.setuptools_scm]
 
+[tool.setuptools]
+platforms = ["any"]
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/tests/conftest.py

@@ -48,7 +48,7 @@ def mock_tempo(return_invalid: bool = False) -> dict[str, Any]:
 def mock_ecowatt(request) -> dict[str, Any]:
     if hasattr(request, "param") and request.param:
         return {
-            "detail": "Pas de données disponible entre la date du 2023-01-22 00:00:00 et 2023-01-22 00:00:00"  # noqa
+            "detail": "Pas de données disponible entre la date du 2023-01-22 00:00:00 et 2023-01-22 00:00:00"
         }
     return json.loads(load_fixture("ecowatt.json"))
 

myelectricaldatapy-2.2.7/tests/fixtures/tempo.json

@@ -0,0 +1 @@
+{ "2023-03-01": "blue", "2023-03-02": "red", "2023-03-03": "blue" }

{myelectricaldatapy-2.2.5 → myelectricaldatapy-2.2.7}/tests/test_load_data.py

@@ -44,7 +44,7 @@ async def test_tempoday(mock_enedis: Mock) -> None:  # pylint: disable=unused-ar
     """Test get tempo day."""
     api = Enedis(token=TOKEN, session=ClientSession())
     resultat = await api.async_get_tempo()
-    assert resultat["2023-3-1"] == "blue"
+    assert resultat["2023-03-01"] == "blue"
 
     mypdl = EnedisByPDL(pdl=PDL, token=TOKEN, session=ClientSession())
     mypdl.set_collects("consumption_load_curve")
@@ -54,6 +54,34 @@ async def test_tempoday(mock_enedis: Mock) -> None:  # pylint: disable=unused-ar
     assert mypdl.tempo_day == "blue"
 
 
+@freeze_time("2023-03-01")
+async def test_check_offpeak(mock_contract) -> None:
+    """Test off-peak hour detection against the real contract's schedule.
+
+    contract.json's offpeak_hours is "HC (1H30-8H00;12H30-14H00)". Patches
+    the HTTP layer (not async_get_contract itself) so the real parsing in
+    Enedis.async_get_contract runs and populates self.offpeaks.
+    """
+    with patch.object(
+        myelectricaldatapy.auth.EnedisAuth,
+        "async_request",
+        return_value=mock_contract,
+    ):
+        api = Enedis(token=TOKEN, session=ClientSession())
+        assert await api.async_has_offpeak(PDL) is True
+
+        # 03:00 falls inside the 01:30-08:00 off-peak window
+        assert await api.async_check_offpeak(PDL, dt(2023, 3, 1, 3, 0)) is True
+        # exactly on the lower bound is excluded (start, end] convention
+        assert await api.async_check_offpeak(PDL, dt(2023, 3, 1, 1, 30)) is False
+        # exactly on the upper bound is included
+        assert await api.async_check_offpeak(PDL, dt(2023, 3, 1, 8, 0)) is True
+        # standard hours, not off-peak
+        assert await api.async_check_offpeak(PDL, dt(2023, 3, 1, 10, 0)) is False
+        # second window 12:30-14:00
+        assert await api.async_check_offpeak(PDL, dt(2023, 3, 1, 13, 0)) is True
+
+
 async def test_valid_access(mock_enedis: Mock) -> None:  # pylint: disable=unused-argument
     """Test access."""
     api = Enedis(token=TOKEN, session=ClientSession())
@@ -92,7 +120,7 @@ async def test_fetch_data(mock_detail) -> None:
         )
         assert (
             resultat["meter_reading"]["interval_reading"]
-            == mock_detail["meter_reading"]["interval_reading"]  # noqa
+            == mock_detail["meter_reading"]["interval_reading"]
         )
 
 

myelectricaldatapy-2.2.5/.flake8

@@ -1,3 +0,0 @@
-[flake8]
-max-line-length = 88
-extend-ignore = E203

myelectricaldatapy-2.2.5/.github/workflows/python-publish.yml

@@ -1,36 +0,0 @@
-name: Upload Python Package
-
-on:
-  release:
-    types: ["published"]
-  workflow_call:
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    name: Deploy to PyPi
-    environment: release
-    permissions:
-      id-token: write
-    steps:
-      - name: 📥 Checkout the repository
-        uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-
-      - name: 📦 Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install setuptools wheel twine build
-
-      - name: Build package
-        shell: bash
-        run: |
-          python -m build
-
-      - name: 🚀 Publish to PyPi
-        uses: pypa/gh-action-pypi-publish@release/v1

myelectricaldatapy-2.2.5/.github/workflows/release.yml

@@ -1,59 +0,0 @@
-name: Create release
-on:
-  push:
-    tags:
-      - "*.*.*" # Push events to matching i.e. 1.0.0, 4.0.1
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      # To use this repository's private action, you must check out the repository
-      - name: 📥 Checkout the repository
-        uses: actions/checkout@v4
-
-      - name: Generate changelog
-        id: changelog
-        uses: metcalfc/changelog-generator@v4.6.2
-        with:
-          myToken: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          body: ${{ steps.changelog.outputs.changelog }}
-          draft: false
-          prerelease: ${{ contains(github.ref_name,'-') }}
-  publish:
-    runs-on: ubuntu-latest
-    needs: release
-    permissions:
-      contents: write
-      packages: write
-      id-token: write
-    if: ${{ ! contains(github.ref_name, '-') }}
-    steps:
-      - name: 📥 Checkout the repository
-        uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.x"
-
-      - name: 📦 Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install setuptools wheel twine build
-
-      - name: Build package
-        shell: bash
-        run: |
-          python -m build
-
-      - name: 🚀 Publish to PyPi
-        uses: pypa/gh-action-pypi-publish@release/v1

myelectricaldatapy-2.2.5/MANIFEST.in

@@ -1,6 +0,0 @@
-include LICENSE
-exclude example_home.py
-recursive-exclude * __pycache__
-recursive-exclude * *.pyc
-recursive-exclude * *.pyo
-recursive-exclude * *.orig

myelectricaldatapy-2.2.5/requirements-dev.txt

@@ -1,14 +0,0 @@
-# AIOSysbus
--r requirements.txt
-
-codespell
-mypy
-pre-commit
-pytest
-pytest-asyncio
-python-typing-update
-ruff
-setuptools_scm
-types-requests
-yamllint
-freezegun

myelectricaldatapy-2.2.5/requirements.txt

@@ -1,3 +0,0 @@
-aiohttp>=3.8.1
-pandas>=2.0.2
-voluptuous>=0.13.1

myelectricaldatapy-2.2.5/tests/fixtures/tempo.json

@@ -1 +0,0 @@
-{ "2023-3-1": "blue", "2023-3-2": "red", "2023-3-3": "blue" }