python-entsoe 0.6.0__tar.gz → 0.6.1__tar.gz

python_entsoe-0.6.1/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.6.1"
+}

{python_entsoe-0.6.0 → python_entsoe-0.6.1}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.6.1](https://github.com/datons/python-entsoe/compare/python-entsoe-v0.6.0...python-entsoe-v0.6.1) (2026-05-16)
+
+
+### Bug Fixes
+
+* restore catalog imports broken by incomplete refactor in dcc35f7 ([74c0814](https://github.com/datons/python-entsoe/commit/74c0814bbdd3bd8d43981e77a1ab573ddf80a483))
+
 ## [0.6.0](https://github.com/datons/python-entsoe/compare/python-entsoe-v0.5.0...python-entsoe-v0.6.0) (2026-03-04)
 
 

{python_entsoe-0.6.0 → python_entsoe-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-entsoe
-Version: 0.6.0
+Version: 0.6.1
 Summary: Python client for the ENTSO-E Transparency Platform API
 Project-URL: Homepage, https://github.com/datons/python-entsoe
 Project-URL: Repository, https://github.com/datons/python-entsoe
@@ -21,7 +21,6 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Requires-Dist: pandas>=2.0
 Requires-Dist: pyarrow>=23.0.1
-Requires-Dist: pyyaml>=6.0
 Requires-Dist: requests>=2.28
 Requires-Dist: rich>=13.0
 Requires-Dist: typer>=0.9

{python_entsoe-0.6.0 → python_entsoe-0.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-entsoe"
-version = "0.6.0"
+version = "0.6.1"
 description = "Python client for the ENTSO-E Transparency Platform API"
 readme = "README.md"
 license = "MIT"
@@ -22,7 +22,6 @@ classifiers = [
 ]
 dependencies = [
     "pandas>=2.0",
-    "pyyaml>=6.0",
     "requests>=2.28",
     "typer>=0.9",
     "rich>=13.0",
@@ -47,9 +46,6 @@ packages = ["src/entsoe"]
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
-markers = [
-    "integration: tests that hit real APIs (deselect with -m 'not integration')",
-]
 
 [dependency-groups]
 dev = [

{python_entsoe-0.6.0 → python_entsoe-0.6.1}/src/entsoe/_mappings.py

@@ -399,7 +399,6 @@ NEIGHBOURS: dict[str, set[str]] = {
     "BG": {"RO", "RS", "MK", "GR", "TR"},
     "MK": {"RS", "BG", "GR", "AL"},
     "GR": {"BG", "MK", "AL", "IT_SUD", "TR"},
-    "IT_SUD": {"GR"},
     "AL": {"RS", "MK", "GR", "ME"},
     "ME": {"RS", "BA", "AL"},
     "TR": {"BG", "GR"},

python_entsoe-0.6.1/src/entsoe/catalog.py

@@ -0,0 +1,228 @@
+"""Built-in data catalog for ENTSO-E Transparency Platform.
+
+Provides structured metadata about available data categories, endpoints,
+country codes, PSR types, and border groups — so users don't need to
+consult external documentation every time.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+
+
+@dataclass(frozen=True)
+class Endpoint:
+    """A queryable data endpoint."""
+
+    name: str
+    description: str
+    method: str  # Python client method name
+    cli: str  # CLI command
+    resolution: str  # e.g. "15min", "hourly", "daily"
+    columns: tuple[str, ...]  # key columns returned
+    units: str
+    notes: str = ""
+
+
+@dataclass(frozen=True)
+class Category:
+    """A top-level data category grouping related endpoints."""
+
+    name: str
+    description: str
+    namespace: str  # Python client namespace (e.g. "prices")
+    endpoints: tuple[Endpoint, ...]
+
+
+# ── Prices ──────────────────────────────────────────────────────────────
+
+PRICES = Category(
+    name="Prices",
+    description="Day-ahead electricity market prices",
+    namespace="prices",
+    endpoints=(
+        Endpoint(
+            name="Day-Ahead Prices",
+            description="Hourly day-ahead market clearing prices per bidding zone",
+            method="client.prices.day_ahead(start, end, country='FR')",
+            cli="entsoe prices day-ahead -s 2024-06-01 -e 2024-06-08 -c FR",
+            resolution="hourly",
+            columns=("timestamp", "country", "value", "currency", "quantity_unit"),
+            units="EUR/MWh",
+        ),
+    ),
+)
+
+# ── Load ────────────────────────────────────────────────────────────────
+
+LOAD = Category(
+    name="Load",
+    description="Actual system load and day-ahead load forecasts",
+    namespace="load",
+    endpoints=(
+        Endpoint(
+            name="Actual Total Load",
+            description="Actual total electricity consumption per control area",
+            method="client.load.actual(start, end, country='FR')",
+            cli="entsoe load actual -s 2024-06-01 -e 2024-06-08 -c FR",
+            resolution="15min or hourly (varies by country)",
+            columns=("timestamp", "country", "value", "quantity_unit"),
+            units="MW",
+        ),
+        Endpoint(
+            name="Day-Ahead Load Forecast",
+            description="Day-ahead forecast of total electricity consumption",
+            method="client.load.forecast(start, end, country='FR')",
+            cli="entsoe load forecast -s 2024-06-01 -e 2024-06-08 -c FR",
+            resolution="15min or hourly (varies by country)",
+            columns=("timestamp", "country", "value", "quantity_unit"),
+            units="MW",
+        ),
+    ),
+)
+
+# ── Generation ──────────────────────────────────────────────────────────
+
+GENERATION = Category(
+    name="Generation",
+    description="Actual generation, forecasts, installed capacity, and per-plant output",
+    namespace="generation",
+    endpoints=(
+        Endpoint(
+            name="Actual Generation per Type",
+            description="Actual electricity generation broken down by fuel/technology type (PSR)",
+            method="client.generation.actual(start, end, country='FR')",
+            cli="entsoe generation actual -s 2024-06-01 -e 2024-06-08 -c FR",
+            resolution="15min or hourly",
+            columns=("timestamp", "country", "psr_type", "value", "quantity_unit"),
+            units="MW",
+            notes="Filter by PSR type: --psr solar --psr wind_onshore",
+        ),
+        Endpoint(
+            name="Generation Forecast (Wind/Solar)",
+            description="Day-ahead forecast for wind and solar generation",
+            method="client.generation.forecast(start, end, country='FR')",
+            cli="entsoe generation forecast -s 2024-06-01 -e 2024-06-08 -c FR",
+            resolution="15min or hourly",
+            columns=("timestamp", "country", "psr_type", "value", "quantity_unit"),
+            units="MW",
+        ),
+        Endpoint(
+            name="Installed Generation Capacity",
+            description="Installed generation capacity per type (updated annually or on change)",
+            method="client.generation.installed_capacity(start, end, country='FR')",
+            cli="entsoe generation capacity -s 2024-06-01 -e 2024-06-08 -c FR",
+            resolution="yearly (point-in-time)",
+            columns=("timestamp", "country", "psr_type", "value", "quantity_unit"),
+            units="MW",
+        ),
+        Endpoint(
+            name="Actual Generation per Plant",
+            description="Generation output per individual production unit (>= 100 MW)",
+            method="client.generation.per_plant(start, end, country='FR')",
+            cli="entsoe generation per-plant -s 2024-06-01 -e 2024-06-08 -c FR",
+            resolution="15min or hourly",
+            columns=("timestamp", "country", "unit_name", "psr_type", "value", "quantity_unit"),
+            units="MW",
+        ),
+    ),
+)
+
+# ── Transmission ────────────────────────────────────────────────────────
+
+TRANSMISSION = Category(
+    name="Transmission",
+    description="Cross-border physical flows, scheduled exchanges, and transfer capacity",
+    namespace="transmission",
+    endpoints=(
+        Endpoint(
+            name="Physical Cross-Border Flows",
+            description="Actual measured electricity flows between bidding zones",
+            method="client.transmission.crossborder_flows(start, end, country_from='FR', country_to='DE_LU')",
+            cli="entsoe transmission flows -s 2024-06-01 -e 2024-06-08 --from FR --to DE_LU",
+            resolution="15min or hourly",
+            columns=("timestamp", "in_domain", "value", "quantity_unit"),
+            units="MW",
+            notes="Use --border for multi-border queries: --border FR-*, --border iberian",
+        ),
+        Endpoint(
+            name="Scheduled Commercial Exchanges",
+            description="Day-ahead scheduled commercial power exchanges between zones",
+            method="client.transmission.scheduled_exchanges(start, end, country_from='FR', country_to='ES')",
+            cli="entsoe transmission exchanges -s 2024-06-01 -e 2024-06-08 --from FR --to ES",
+            resolution="hourly",
+            columns=("timestamp", "in_domain", "value", "quantity_unit"),
+            units="MW",
+        ),
+        Endpoint(
+            name="Net Transfer Capacity",
+            description="Available transfer capacity (NTC) between bidding zones",
+            method="client.transmission.net_transfer_capacity(start, end, country_from='FR', country_to='ES')",
+            cli="entsoe transmission capacity -s 2024-06-01 -e 2024-06-08 --from FR --to ES",
+            resolution="hourly",
+            columns=("timestamp", "in_domain", "value", "quantity_unit"),
+            units="MW",
+        ),
+    ),
+)
+
+# ── Balancing ───────────────────────────────────────────────────────────
+
+BALANCING = Category(
+    name="Balancing",
+    description="System imbalance prices and volumes",
+    namespace="balancing",
+    endpoints=(
+        Endpoint(
+            name="Imbalance Prices",
+            description="System imbalance settlement prices",
+            method="client.balancing.imbalance_prices(start, end, country='FR')",
+            cli="entsoe balancing prices -s 2024-06-01 -e 2024-06-08 -c FR",
+            resolution="15min or hourly (varies by country)",
+            columns=("timestamp", "country", "value", "quantity_unit"),
+            units="EUR/MWh",
+        ),
+        Endpoint(
+            name="Imbalance Volumes",
+            description="Net system imbalance volumes",
+            method="client.balancing.imbalance_volumes(start, end, country='FR')",
+            cli="entsoe balancing volumes -s 2024-06-01 -e 2024-06-08 -c FR",
+            resolution="15min or hourly (varies by country)",
+            columns=("timestamp", "country", "value", "quantity_unit"),
+            units="MW",
+        ),
+    ),
+)
+
+# ── Full catalog ────────────────────────────────────────────────────────
+
+CATEGORIES: dict[str, Category] = {
+    "prices": PRICES,
+    "load": LOAD,
+    "generation": GENERATION,
+    "transmission": TRANSMISSION,
+    "balancing": BALANCING,
+}
+
+
+def get_category(name: str) -> Category:
+    """Look up a category by name (case-insensitive)."""
+    key = name.lower().strip()
+    if key not in CATEGORIES:
+        raise KeyError(
+            f"Unknown category '{name}'. Available: {', '.join(CATEGORIES.keys())}"
+        )
+    return CATEGORIES[key]
+
+
+def summary() -> str:
+    """Return a human-readable summary of all available data."""
+    lines = ["ENTSO-E Data Catalog", "=" * 50, ""]
+    for key, cat in CATEGORIES.items():
+        lines.append(f"{cat.name} ({cat.namespace})")
+        lines.append(f"  {cat.description}")
+        for ep in cat.endpoints:
+            lines.append(f"    - {ep.name}: {ep.description}")
+            lines.append(f"      Resolution: {ep.resolution} | Units: {ep.units}")
+        lines.append("")
+    return "\n".join(lines)

{python_entsoe-0.6.0 → python_entsoe-0.6.1}/src/entsoe/client.py

@@ -7,7 +7,6 @@ from pathlib import Path
 
 from ._http import HttpClient
 from .cache import CacheConfig, CacheStore
-from .catalog_manager import ENTSOECatalogManager
 from .namespaces import (
     BalancingNamespace,
     GenerationNamespace,
@@ -101,8 +100,6 @@ class ENTSOEClient:
         self.transmission = TransmissionNamespace(http, tz=tz, cache=cache_store)
         self.balancing = BalancingNamespace(http, tz=tz, cache=cache_store)
 
-        self.catalog = ENTSOECatalogManager(self)
-
         # Expose for CLI cache commands
         self._cache = cache_store
 

{python_entsoe-0.6.0 → python_entsoe-0.6.1}/uv.lock

@@ -1705,13 +1705,12 @@ wheels = [
 
 [[package]]
 name = "python-entsoe"
-version = "0.5.0"
+version = "0.4.1"
 source = { editable = "." }
 dependencies = [
     { name = "pandas", version = "2.3.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
     { name = "pandas", version = "3.0.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
     { name = "pyarrow" },
-    { name = "pyyaml" },
     { name = "requests" },
     { name = "rich" },
     { name = "typer" },
@@ -1729,7 +1728,6 @@ dev = [
 requires-dist = [
     { name = "pandas", specifier = ">=2.0" },
     { name = "pyarrow", specifier = ">=23.0.1" },
-    { name = "pyyaml", specifier = ">=6.0" },
     { name = "requests", specifier = ">=2.28" },
     { name = "rich", specifier = ">=13.0" },
     { name = "typer", specifier = ">=0.9" },

python_entsoe-0.6.0/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "0.6.0"
-}

python_entsoe-0.6.0/src/entsoe/catalog.py

@@ -1,51 +0,0 @@
-"""Built-in data catalog for ENTSO-E Transparency Platform.
-
-Provides structured metadata about available data categories, endpoints,
-country codes, PSR types, and border groups — so users don't need to
-consult external documentation every time.
-"""
-
-from __future__ import annotations
-
-# Re-export dataclasses for backward compatibility
-from entsoe._models import Category, Endpoint
-from entsoe.catalog_manager import ENTSOECatalogManager as _Manager
-
-__all__ = ["Category", "Endpoint", "CATEGORIES", "get_category", "summary"]
-
-# ── Load categories from YAML ──────────────────────────────────────────
-
-_mgr = _Manager()
-_cats = {c.key: c for c in _mgr._load_categories()}
-
-CATEGORIES: dict[str, Category] = _cats
-
-# Individual constants for backward compatibility
-PRICES = CATEGORIES["prices"]
-LOAD = CATEGORIES["load"]
-GENERATION = CATEGORIES["generation"]
-TRANSMISSION = CATEGORIES["transmission"]
-BALANCING = CATEGORIES["balancing"]
-
-
-def get_category(name: str) -> Category:
-    """Look up a category by name (case-insensitive)."""
-    key = name.lower().strip()
-    if key not in CATEGORIES:
-        raise KeyError(
-            f"Unknown category '{name}'. Available: {', '.join(CATEGORIES.keys())}"
-        )
-    return CATEGORIES[key]
-
-
-def summary() -> str:
-    """Return a human-readable summary of all available data."""
-    lines = ["ENTSO-E Data Catalog", "=" * 50, ""]
-    for key, cat in CATEGORIES.items():
-        lines.append(f"{cat.name} ({cat.namespace})")
-        lines.append(f"  {cat.description}")
-        for ep in cat.endpoints:
-            lines.append(f"    - {ep.name}: {ep.description}")
-            lines.append(f"      Resolution: {ep.resolution} | Units: {ep.units}")
-        lines.append("")
-    return "\n".join(lines)