leneda-client 0.1.0__tar.gz → 0.2.0__tar.gz

{leneda_client-0.1.0 → leneda_client-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: leneda-client
-Version: 0.1.0
+Version: 0.2.0
 Summary: Python client for the Leneda energy data platform
 Home-page: https://github.com/fedus/leneda-client
 Author: fedus

{leneda_client-0.1.0 → leneda_client-0.2.0}/examples/advanced_usage.py

@@ -10,8 +10,8 @@ LENEDA_API_KEY: Your Leneda API key
 LENEDA_ENERGY_ID: Your Energy ID
 
 Usage:
-python advanced_usage.py --api-key YOUR_API_KEY --energy-id YOUR_ENERGY_ID
-python advanced_usage.py --metering-point LU-METERING_POINT1 --example 2
+python advanced_usage.py --api-key YOUR_API_KEY --energy-id YOUR_ENERGY_ID --metering-point LU-METERING_POINT1
+python advanced_usage.py --api-key YOUR_API_KEY --energy-id YOUR_ENERGY_ID --metering-point LU-METERING_POINT1 --example 2
 """
 
 import argparse
@@ -24,12 +24,9 @@ from typing import Optional
 import matplotlib.pyplot as plt
 import pandas as pd
 
-from leneda import (
-    AggregatedMeteringData,
-    ElectricityConsumption,
-    LenedaClient,
-    MeteringData,
-)
+from leneda import LenedaClient
+from leneda.models import AggregatedMeteringData, MeteringData
+from leneda.obis_codes import ObisCode
 
 # Set up logging
 logging.basicConfig(
@@ -193,7 +190,7 @@ def compare_consumption_periods(
     # Get data for period 1
     period1_data = client.get_metering_data(
         metering_point_code=metering_point,
-        obis_code=ElectricityConsumption.ACTIVE,
+        obis_code=ObisCode.ELEC_CONSUMPTION_ACTIVE,
         start_date_time=period1_start,
         end_date_time=period1_end,
     )
@@ -201,7 +198,7 @@ def compare_consumption_periods(
     # Get data for period 2
     period2_data = client.get_metering_data(
         metering_point_code=metering_point,
-        obis_code=ElectricityConsumption.ACTIVE,
+        obis_code=ObisCode.ELEC_CONSUMPTION_ACTIVE,
         start_date_time=period2_start,
         end_date_time=period2_end,
     )
@@ -290,7 +287,7 @@ def analyze_monthly_trends(
 
     monthly_data = client.get_aggregated_metering_data(
         metering_point_code=metering_point,
-        obis_code=ElectricityConsumption.ACTIVE,
+        obis_code=ObisCode.ELEC_CONSUMPTION_ACTIVE,
         start_date=start_date,
         end_date=end_date,
         aggregation_level="Month",
@@ -355,7 +352,7 @@ def detect_consumption_anomalies(
     # Get hourly consumption data
     consumption_data = client.get_metering_data(
         metering_point_code=metering_point,
-        obis_code=ElectricityConsumption.ACTIVE,
+        obis_code=ObisCode.ELEC_CONSUMPTION_ACTIVE,
         start_date_time=start_date,
         end_date_time=end_date,
     )
@@ -473,7 +470,7 @@ def main():
             )
             consumption_data = client.get_metering_data(
                 metering_point_code=metering_point,
-                obis_code=ElectricityConsumption.ACTIVE,
+                obis_code=ObisCode.ELEC_CONSUMPTION_ACTIVE,
                 start_date_time=start_date,
                 end_date_time=end_date,
             )

{leneda_client-0.1.0 → leneda_client-0.2.0}/examples/basic_usage.py

@@ -9,8 +9,7 @@ Environment variables:
     LENEDA_ENERGY_ID: Your Energy ID
 
 Usage:
-    python basic_usage.py --api-key YOUR_API_KEY --energy-id YOUR_ENERGY_ID
-    python basic_usage.py --metering-point LU-METERING_POINT1
+    python basic_usage.py --api-key YOUR_API_KEY --energy-id YOUR_ENERGY_ID --metering-point LU-METERING_POINT1
 """
 
 import argparse
@@ -19,7 +18,8 @@ import os
 import sys
 from datetime import datetime, timedelta
 
-from leneda import ElectricityConsumption, LenedaClient
+from leneda import LenedaClient
+from leneda.obis_codes import ObisCode
 
 # Set up logging
 logging.basicConfig(
@@ -45,7 +45,6 @@ def parse_arguments():
     # Other parameters
     parser.add_argument(
         "--metering-point",
-        default="LU-METERING_POINT1",
         help="Metering point code (default: LU-METERING_POINT1)",
     )
     parser.add_argument(
@@ -107,7 +106,7 @@ def main():
         print(f"\nExample 1: Getting hourly electricity consumption data for the last {days} days")
         consumption_data = client.get_metering_data(
             metering_point_code=metering_point,
-            obis_code=ElectricityConsumption.ACTIVE,
+            obis_code=ObisCode.ELEC_CONSUMPTION_ACTIVE,
             start_date_time=start_date.strftime("%Y-%m-%dT%H:%M:%SZ"),
             end_date_time=end_date.strftime("%Y-%m-%dT%H:%M:%SZ"),
         )
@@ -136,7 +135,7 @@ def main():
         print(f"\nExample 2: Getting monthly aggregated electricity consumption for {today.year}")
         monthly_consumption = client.get_aggregated_metering_data(
             metering_point_code=metering_point,
-            obis_code=ElectricityConsumption.ACTIVE,
+            obis_code=ObisCode.ELEC_CONSUMPTION_ACTIVE,
             start_date=first_day.strftime("%Y-%m-%d"),
             end_date=last_day.strftime("%Y-%m-%d"),
             aggregation_level="Month",

{leneda_client-0.1.0 → leneda_client-0.2.0}/src/leneda/__init__.py

@@ -17,7 +17,7 @@ from .models import (
 )
 
 # Import the OBIS code constants
-from .obis_codes import ElectricityConsumption, ElectricityProduction, GasConsumption
+from .obis_codes import ObisCode
 
 # Import the version
 from .version import __version__
@@ -25,9 +25,7 @@ from .version import __version__
 # Define what's available when using "from leneda import *"
 __all__ = [
     "LenedaClient",
-    "ElectricityConsumption",
-    "ElectricityProduction",
-    "GasConsumption",
+    "ObisCode",
     "MeteringValue",
     "MeteringData",
     "AggregatedMeteringValue",

{leneda_client-0.1.0 → leneda_client-0.2.0}/src/leneda/client.py

@@ -8,11 +8,15 @@ energy consumption and production data for electricity and gas.
 import json
 import logging
 from datetime import datetime
-from typing import Any, Dict, Union
+from typing import Any, Dict, List, Optional, Union
 
 import requests
 
-from .models import AggregatedMeteringData, MeteringData
+from .models import (
+    AggregatedMeteringData,
+    MeteringData,
+)
+from .obis_codes import ObisCode
 
 # Set up logging
 logger = logging.getLogger("leneda.client")
@@ -50,22 +54,22 @@ class LenedaClient:
 
     def _make_request(
         self,
+        method: str,
         endpoint: str,
-        method: str = "GET",
-        params: Dict[str, Any] = None,
-        data: Dict[str, Any] = None,
-    ) -> Dict[str, Any]:
+        params: Optional[dict] = None,
+        json_data: Optional[dict] = None,
+    ) -> dict:
         """
         Make a request to the Leneda API.
 
         Args:
-            endpoint: API endpoint to call
-            method: HTTP method to use
-            params: Query parameters
-            data: Request body data
+            method: The HTTP method to use
+            endpoint: The API endpoint to call
+            params: Optional query parameters
+            json_data: Optional JSON data to send in the request body
 
         Returns:
-            API response as a dictionary
+            The JSON response from the API
         """
         url = f"{self.BASE_URL}/{endpoint}"
 
@@ -73,13 +77,13 @@ class LenedaClient:
         logger.debug(f"Making {method} request to {url}")
         if params:
             logger.debug(f"Query parameters: {params}")
-        if data:
-            logger.debug(f"Request data: {data}")
+        if json_data:
+            logger.debug(f"Request data: {json.dumps(json_data, indent=2)}")
 
         try:
             # Make the request
             response = requests.request(
-                method=method, url=url, headers=self.headers, params=params, json=data
+                method=method, url=url, headers=self.headers, params=params, json=json_data
             )
 
             # Check for HTTP errors
@@ -117,7 +121,7 @@ class LenedaClient:
     def get_metering_data(
         self,
         metering_point_code: str,
-        obis_code: str,
+        obis_code: ObisCode,
         start_date_time: Union[str, datetime],
         end_date_time: Union[str, datetime],
     ) -> MeteringData:
@@ -126,7 +130,7 @@ class LenedaClient:
 
         Args:
             metering_point_code: The metering point code
-            obis_code: The OBIS code
+            obis_code: The OBIS code (from ElectricityConsumption, ElectricityProduction, or GasConsumption)
             start_date_time: Start date and time (ISO format string or datetime object)
             end_date_time: End date and time (ISO format string or datetime object)
 
@@ -142,23 +146,21 @@ class LenedaClient:
         # Set up the endpoint and parameters
         endpoint = f"metering-points/{metering_point_code}/time-series"
         params = {
-            "obisCode": obis_code,
+            "obisCode": obis_code.value,  # Use enum value for API request
             "startDateTime": start_date_time,
             "endDateTime": end_date_time,
         }
 
         # Make the request
-        response_data = self._make_request(endpoint, params=params)
+        response_data = self._make_request(method="GET", endpoint=endpoint, params=params)
 
         # Parse the response into a MeteringData object
-        return MeteringData.from_dict(
-            response_data, metering_point_code=metering_point_code, obis_code=obis_code
-        )
+        return MeteringData.from_dict(response_data)
 
     def get_aggregated_metering_data(
         self,
         metering_point_code: str,
-        obis_code: str,
+        obis_code: ObisCode,
         start_date: Union[str, datetime],
         end_date: Union[str, datetime],
         aggregation_level: str = "Day",
@@ -169,11 +171,11 @@ class LenedaClient:
 
         Args:
             metering_point_code: The metering point code
-            obis_code: The OBIS code
+            obis_code: The OBIS code (from ElectricityConsumption, ElectricityProduction, or GasConsumption)
             start_date: Start date (ISO format string or datetime object)
             end_date: End date (ISO format string or datetime object)
-            aggregation_level: Aggregation level (Day, Week, Month, Quarter, Year)
-            transformation_mode: Transformation mode (Accumulation, Average, Maximum, Minimum)
+            aggregation_level: Aggregation level (Hour, Day, Week, Month, Infinite)
+            transformation_mode: Transformation mode (Accumulation)
 
         Returns:
             AggregatedMeteringData object containing the aggregated time series data
@@ -187,7 +189,7 @@ class LenedaClient:
         # Set up the endpoint and parameters
         endpoint = f"metering-points/{metering_point_code}/time-series/aggregated"
         params = {
-            "obisCode": obis_code,
+            "obisCode": obis_code.value,  # Use enum value for API request
             "startDate": start_date,
             "endDate": end_date,
             "aggregationLevel": aggregation_level,
@@ -195,32 +197,40 @@ class LenedaClient:
         }
 
         # Make the request
-        response_data = self._make_request(endpoint, params=params)
+        response_data = self._make_request(method="GET", endpoint=endpoint, params=params)
 
         # Parse the response into an AggregatedMeteringData object
-        return AggregatedMeteringData.from_dict(
-            response_data,
-            metering_point_code=metering_point_code,
-            obis_code=obis_code,
-            aggregation_level=aggregation_level,
-            transformation_mode=transformation_mode,
-        )
-
-    def request_metering_data_access(self, metering_point_code: str) -> Dict[str, Any]:
+        return AggregatedMeteringData.from_dict(response_data)
+
+    def request_metering_data_access(
+        self,
+        from_energy_id: str,
+        from_name: str,
+        metering_point_codes: List[str],
+        obis_codes: List[ObisCode],
+    ) -> Dict[str, Any]:
         """
         Request access to metering data for a specific metering point.
 
         Args:
-            metering_point_code: The metering point code
+            from_energy_id: The energy ID of the requester
+            from_name: The name of the requester
+            metering_point_codes: The metering point codes to access
+            obis_point_codes: The OBIS point codes to access (from ElectricityConsumption, ElectricityProduction, or GasConsumption)
 
         Returns:
             Response data from the API
         """
         # Set up the endpoint and data
         endpoint = "metering-data-access-request"
-        data = {"meteringPointCode": metering_point_code}
+        data = {
+            "from": from_energy_id,
+            "fromName": from_name,
+            "meteringPointCodes": metering_point_codes,
+            "obisCodes": [code.value for code in obis_codes],  # Use enum values for API request
+        }
 
         # Make the request
-        response_data = self._make_request(endpoint, method="POST", data=data)
+        response_data = self._make_request(method="POST", endpoint=endpoint, json_data=data)
 
         return response_data

{leneda_client-0.1.0 → leneda_client-0.2.0}/src/leneda/models.py

@@ -12,6 +12,8 @@ from typing import Any, Dict, List
 
 from dateutil import parser
 
+from .obis_codes import ObisCode
+
 # Set up logging
 logger = logging.getLogger("leneda.models")
 
@@ -64,23 +66,21 @@ class MeteringData:
     """Metering data for a specific metering point and OBIS code."""
 
     metering_point_code: str
-    obis_code: str
+    obis_code: ObisCode
     interval_length: str
     unit: str
     items: List[MeteringValue] = field(default_factory=list)
 
     @classmethod
-    def from_dict(
-        cls, data: Dict[str, Any], metering_point_code: str = "", obis_code: str = ""
-    ) -> "MeteringData":
+    def from_dict(cls, data: Dict[str, Any]) -> "MeteringData":
         """Create a MeteringData from a dictionary."""
         try:
             # Log the raw data for debugging
             logger.debug(f"Creating MeteringData from: {data}")
 
-            # Use values from the response, falling back to provided values if not in response
-            metering_point_code_value = data.get("meteringPointCode", metering_point_code)
-            obis_code_value = data.get("obisCode", obis_code)
+            # Use values from the response
+            metering_point_code_value = data["meteringPointCode"]
+            obis_code_value = ObisCode(data["obisCode"])
 
             # Extract items safely
             items_data = data.get("items", [])
@@ -101,6 +101,10 @@ class MeteringData:
                 unit=data.get("unit", ""),
                 items=items,
             )
+        except KeyError as e:
+            logger.error(f"Missing key in API response: {e}")
+            logger.debug(f"API response data: {data}")
+            raise
         except Exception as e:
             logger.error(f"Error creating MeteringData: {e}")
             logger.debug(f"API response data: {data}")
@@ -184,10 +188,6 @@ class AggregatedMeteringData:
     def from_dict(
         cls,
         data: Dict[str, Any],
-        metering_point_code: str = "",
-        obis_code: str = "",
-        aggregation_level: str = "",
-        transformation_mode: str = "",
     ) -> "AggregatedMeteringData":
         """Create an AggregatedMeteringData from a dictionary."""
         try:
@@ -206,7 +206,11 @@ class AggregatedMeteringData:
                     logger.warning(f"Skipping invalid aggregated item: {e}")
                     logger.debug(f"Invalid item data: {item_data}")
 
-            return cls(unit=data.get("unit", ""), aggregated_time_series=time_series)
+            return cls(unit=data["unit"], aggregated_time_series=time_series)
+        except KeyError as e:
+            logger.error(f"Missing key in API response: {e}")
+            logger.debug(f"API response data: {data}")
+            raise
         except Exception as e:
             logger.error(f"Error creating AggregatedMeteringData: {e}")
             logger.debug(f"API response data: {data}")

{leneda_client-0.1.0 → leneda_client-0.2.0}/src/leneda/obis_codes.py

@@ -20,139 +20,136 @@ class ObisCodeInfo:
     description: str
 
 
-class ElectricityConsumption(str, Enum):
-    """OBIS codes for electricity consumption."""
+class ObisCode(str, Enum):
+    """OBIS codes for all energy types."""
 
-    ACTIVE = "1-1:1.29.0"  # Measured active consumption (kW)
-    REACTIVE = "1-1:3.29.0"  # Measured reactive consumption (kVAR)
+    # Electricity Consumption
+    ELEC_CONSUMPTION_ACTIVE = "1-1:1.29.0"  # Measured active consumption (kW)
+    ELEC_CONSUMPTION_REACTIVE = "1-1:3.29.0"  # Measured reactive consumption (kVAR)
 
     # Consumption covered by production sharing groups
-    COVERED_LAYER1 = "1-65:1.29.1"  # Layer 1 sharing Group (AIR)
-    COVERED_LAYER2 = "1-65:1.29.3"  # Layer 2 sharing Group (ACR/ACF/AC1)
-    COVERED_LAYER3 = "1-65:1.29.2"  # Layer 3 sharing Group (CEL)
-    COVERED_LAYER4 = "1-65:1.29.4"  # Layer 4 sharing Group (APS/CER/CEN)
-    REMAINING = "1-65:1.29.9"  # Remaining consumption after sharing invoiced by supplier
-
+    ELEC_CONSUMPTION_COVERED_LAYER1 = "1-65:1.29.1"  # Layer 1 sharing Group (AIR)
+    ELEC_CONSUMPTION_COVERED_LAYER2 = "1-65:1.29.3"  # Layer 2 sharing Group (ACR/ACF/AC1)
+    ELEC_CONSUMPTION_COVERED_LAYER3 = "1-65:1.29.2"  # Layer 3 sharing Group (CEL)
+    ELEC_CONSUMPTION_COVERED_LAYER4 = "1-65:1.29.4"  # Layer 4 sharing Group (APS/CER/CEN)
+    ELEC_CONSUMPTION_REMAINING = (
+        "1-65:1.29.9"  # Remaining consumption after sharing invoiced by supplier
+    )
 
-class ElectricityProduction(str, Enum):
-    """OBIS codes for electricity production."""
-
-    ACTIVE = "1-1:2.29.0"  # Measured active production (kW)
-    REACTIVE = "1-1:4.29.0"  # Measured reactive production (kVAR)
+    # Electricity Production
+    ELEC_PRODUCTION_ACTIVE = "1-1:2.29.0"  # Measured active production (kW)
+    ELEC_PRODUCTION_REACTIVE = "1-1:4.29.0"  # Measured reactive production (kVAR)
 
     # Production shared within sharing groups
-    SHARED_LAYER1 = "1-65:2.29.1"  # Layer 1 sharing Group (AIR)
-    SHARED_LAYER2 = "1-65:2.29.3"  # Layer 2 sharing Group (ACR/ACF/AC1)
-    SHARED_LAYER3 = "1-65:2.29.2"  # Layer 3 sharing Group (CEL)
-    SHARED_LAYER4 = "1-65:2.29.4"  # Layer 4 sharing Group (APS/CER/CEN)
-    REMAINING = "1-65:2.29.9"  # Remaining production after sharing sold to market
+    ELEC_PRODUCTION_SHARED_LAYER1 = "1-65:2.29.1"  # Layer 1 sharing Group (AIR)
+    ELEC_PRODUCTION_SHARED_LAYER2 = "1-65:2.29.3"  # Layer 2 sharing Group (ACR/ACF/AC1)
+    ELEC_PRODUCTION_SHARED_LAYER3 = "1-65:2.29.2"  # Layer 3 sharing Group (CEL)
+    ELEC_PRODUCTION_SHARED_LAYER4 = "1-65:2.29.4"  # Layer 4 sharing Group (APS/CER/CEN)
+    ELEC_PRODUCTION_REMAINING = "1-65:2.29.9"  # Remaining production after sharing sold to market
 
-
-class GasConsumption(str, Enum):
-    """OBIS codes for gas consumption."""
-
-    VOLUME = "7-1:99.23.15"  # Measured consumed volume (m³)
-    STANDARD_VOLUME = "7-1:99.23.17"  # Measured consumed standard volume (Nm³)
-    ENERGY = "7-20:99.33.17"  # Measured consumed energy (kWh)
+    # Gas Consumption
+    GAS_CONSUMPTION_VOLUME = "7-1:99.23.15"  # Measured consumed volume (m³)
+    GAS_CONSUMPTION_STANDARD_VOLUME = "7-1:99.23.17"  # Measured consumed standard volume (Nm³)
+    GAS_CONSUMPTION_ENERGY = "7-20:99.33.17"  # Measured consumed energy (kWh)
 
 
 # Complete mapping of all OBIS codes to their details
 OBIS_CODES: Dict[str, ObisCodeInfo] = {
     # Electricity Consumption
-    ElectricityConsumption.ACTIVE: ObisCodeInfo(
-        ElectricityConsumption.ACTIVE,
+    ObisCode.ELEC_CONSUMPTION_ACTIVE: ObisCodeInfo(
+        ObisCode.ELEC_CONSUMPTION_ACTIVE,
         "kW",
         "Consumption",
         "Measured active consumption",
     ),
-    ElectricityConsumption.REACTIVE: ObisCodeInfo(
-        ElectricityConsumption.REACTIVE,
+    ObisCode.ELEC_CONSUMPTION_REACTIVE: ObisCodeInfo(
+        ObisCode.ELEC_CONSUMPTION_REACTIVE,
         "kVAR",
         "Consumption",
         "Measured reactive consumption",
     ),
-    ElectricityConsumption.COVERED_LAYER1: ObisCodeInfo(
-        ElectricityConsumption.COVERED_LAYER1,
+    ObisCode.ELEC_CONSUMPTION_COVERED_LAYER1: ObisCodeInfo(
+        ObisCode.ELEC_CONSUMPTION_COVERED_LAYER1,
         "kW",
         "Consumption",
         "Consumption covered by production of layer 1 sharing Group (AIR)",
     ),
-    ElectricityConsumption.COVERED_LAYER2: ObisCodeInfo(
-        ElectricityConsumption.COVERED_LAYER2,
+    ObisCode.ELEC_CONSUMPTION_COVERED_LAYER2: ObisCodeInfo(
+        ObisCode.ELEC_CONSUMPTION_COVERED_LAYER2,
         "kW",
         "Consumption",
         "Consumption covered by production of layer 2 sharing Group (ACR/ACF/AC1)",
     ),
-    ElectricityConsumption.COVERED_LAYER3: ObisCodeInfo(
-        ElectricityConsumption.COVERED_LAYER3,
+    ObisCode.ELEC_CONSUMPTION_COVERED_LAYER3: ObisCodeInfo(
+        ObisCode.ELEC_CONSUMPTION_COVERED_LAYER3,
         "kW",
         "Consumption",
         "Consumption covered by production of layer 3 sharing Group (CEL)",
     ),
-    ElectricityConsumption.COVERED_LAYER4: ObisCodeInfo(
-        ElectricityConsumption.COVERED_LAYER4,
+    ObisCode.ELEC_CONSUMPTION_COVERED_LAYER4: ObisCodeInfo(
+        ObisCode.ELEC_CONSUMPTION_COVERED_LAYER4,
         "kW",
         "Consumption",
         "Consumption covered by production of layer 4 sharing Group (APS/CER/CEN)",
     ),
-    ElectricityConsumption.REMAINING: ObisCodeInfo(
-        ElectricityConsumption.REMAINING,
+    ObisCode.ELEC_CONSUMPTION_REMAINING: ObisCodeInfo(
+        ObisCode.ELEC_CONSUMPTION_REMAINING,
         "kW",
         "Consumption",
         "Remaining consumption after sharing invoiced by supplier",
     ),
     # Electricity Production
-    ElectricityProduction.ACTIVE: ObisCodeInfo(
-        ElectricityProduction.ACTIVE, "kW", "Production", "Measured active production"
+    ObisCode.ELEC_PRODUCTION_ACTIVE: ObisCodeInfo(
+        ObisCode.ELEC_PRODUCTION_ACTIVE, "kW", "Production", "Measured active production"
     ),
-    ElectricityProduction.REACTIVE: ObisCodeInfo(
-        ElectricityProduction.REACTIVE,
+    ObisCode.ELEC_PRODUCTION_REACTIVE: ObisCodeInfo(
+        ObisCode.ELEC_PRODUCTION_REACTIVE,
         "kVAR",
         "Consumption",
         "Measured reactive production",
     ),
-    ElectricityProduction.SHARED_LAYER1: ObisCodeInfo(
-        ElectricityProduction.SHARED_LAYER1,
+    ObisCode.ELEC_PRODUCTION_SHARED_LAYER1: ObisCodeInfo(
+        ObisCode.ELEC_PRODUCTION_SHARED_LAYER1,
         "kW",
         "Production",
         "Production shared within layer 1 sharing Group (AIR)",
     ),
-    ElectricityProduction.SHARED_LAYER2: ObisCodeInfo(
-        ElectricityProduction.SHARED_LAYER2,
+    ObisCode.ELEC_PRODUCTION_SHARED_LAYER2: ObisCodeInfo(
+        ObisCode.ELEC_PRODUCTION_SHARED_LAYER2,
         "kW",
         "Production",
         "Production shared within layer 2 sharing Group (ACR/ACF/AC1)",
     ),
-    ElectricityProduction.SHARED_LAYER3: ObisCodeInfo(
-        ElectricityProduction.SHARED_LAYER3,
+    ObisCode.ELEC_PRODUCTION_SHARED_LAYER3: ObisCodeInfo(
+        ObisCode.ELEC_PRODUCTION_SHARED_LAYER3,
         "kW",
         "Production",
         "Production shared within layer 3 sharing Group (CEL)",
     ),
-    ElectricityProduction.SHARED_LAYER4: ObisCodeInfo(
-        ElectricityProduction.SHARED_LAYER4,
+    ObisCode.ELEC_PRODUCTION_SHARED_LAYER4: ObisCodeInfo(
+        ObisCode.ELEC_PRODUCTION_SHARED_LAYER4,
         "kW",
         "Production",
         "Production shared within layer 4 sharing Group (APS/CER/CEN)",
     ),
-    ElectricityProduction.REMAINING: ObisCodeInfo(
-        ElectricityProduction.REMAINING,
+    ObisCode.ELEC_PRODUCTION_REMAINING: ObisCodeInfo(
+        ObisCode.ELEC_PRODUCTION_REMAINING,
         "kW",
         "Production",
         "Remaining production after sharing sold to market",
     ),
     # Gas Consumption
-    GasConsumption.VOLUME: ObisCodeInfo(
-        GasConsumption.VOLUME, "m³", "Consumption", "Measured consumed volume"
+    ObisCode.GAS_CONSUMPTION_VOLUME: ObisCodeInfo(
+        ObisCode.GAS_CONSUMPTION_VOLUME, "m³", "Consumption", "Measured consumed volume"
     ),
-    GasConsumption.STANDARD_VOLUME: ObisCodeInfo(
-        GasConsumption.STANDARD_VOLUME,
+    ObisCode.GAS_CONSUMPTION_STANDARD_VOLUME: ObisCodeInfo(
+        ObisCode.GAS_CONSUMPTION_STANDARD_VOLUME,
         "Nm³",
         "Consumption",
         "Measured consumed standard volume",
     ),
-    GasConsumption.ENERGY: ObisCodeInfo(
-        GasConsumption.ENERGY, "kWh", "Consumption", "Measured consumed energy"
+    ObisCode.GAS_CONSUMPTION_ENERGY: ObisCodeInfo(
+        ObisCode.GAS_CONSUMPTION_ENERGY, "kWh", "Consumption", "Measured consumed energy"
     ),
 }
 
@@ -171,7 +168,7 @@ def get_obis_info(obis_code: str) -> ObisCodeInfo:
         KeyError: If the OBIS code is not found
 
     Example:
-        >>> info = get_obis_info(ElectricityConsumption.ACTIVE)
+        >>> info = get_obis_info(ObisCode.ELEC_CONSUMPTION_ACTIVE)
         >>> print(info.unit)
         'kW'
     """
@@ -192,7 +189,7 @@ def get_unit(obis_code: str) -> str:
         KeyError: If the OBIS code is not found
 
     Example:
-        >>> unit = get_unit(ElectricityConsumption.ACTIVE)
+        >>> unit = get_unit(ObisCode.ELEC_CONSUMPTION_ACTIVE)
         >>> print(unit)
         'kW'
     """

{leneda_client-0.1.0 → leneda_client-0.2.0}/src/leneda/version.py

@@ -1,3 +1,3 @@
 """Version information."""
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"

{leneda_client-0.1.0 → leneda_client-0.2.0}/src/leneda_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: leneda-client
-Version: 0.1.0
+Version: 0.2.0
 Summary: Python client for the Leneda energy data platform
 Home-page: https://github.com/fedus/leneda-client
 Author: fedus

{leneda_client-0.1.0 → leneda_client-0.2.0}/tests/test_client.py

@@ -20,6 +20,7 @@ from src.leneda.models import (
     MeteringData,
     MeteringValue,
 )
+from src.leneda.obis_codes import ObisCode
 
 
 class TestLenedaClient(unittest.TestCase):
@@ -34,7 +35,7 @@ class TestLenedaClient(unittest.TestCase):
         # Sample response data
         self.sample_metering_data = {
             "meteringPointCode": "LU-METERING_POINT1",
-            "obisCode": "1.1.1.8.0.255",
+            "obisCode": ObisCode.ELEC_CONSUMPTION_ACTIVE,
             "intervalLength": "PT15M",
             "unit": "kWh",
             "items": [
@@ -86,7 +87,7 @@ class TestLenedaClient(unittest.TestCase):
         # Call the method
         result = self.client.get_metering_data(
             "LU-METERING_POINT1",
-            "1.1.1.8.0.255",
+            ObisCode.ELEC_CONSUMPTION_ACTIVE,
             "2023-01-01T00:00:00Z",
             "2023-01-02T00:00:00Z",
         )
@@ -94,7 +95,7 @@ class TestLenedaClient(unittest.TestCase):
         # Check the result
         self.assertIsInstance(result, MeteringData)
         self.assertEqual(result.metering_point_code, "LU-METERING_POINT1")
-        self.assertEqual(result.obis_code, "1.1.1.8.0.255")
+        self.assertEqual(result.obis_code, ObisCode.ELEC_CONSUMPTION_ACTIVE)
         self.assertEqual(result.unit, "kWh")
         self.assertEqual(len(result.items), 2)
 
@@ -116,7 +117,7 @@ class TestLenedaClient(unittest.TestCase):
                 "Content-Type": "application/json",
             },
             params={
-                "obisCode": "1.1.1.8.0.255",
+                "obisCode": ObisCode.ELEC_CONSUMPTION_ACTIVE.value,
                 "startDateTime": "2023-01-01T00:00:00Z",
                 "endDateTime": "2023-01-02T00:00:00Z",
             },
@@ -136,7 +137,7 @@ class TestLenedaClient(unittest.TestCase):
         # Call the method
         result = self.client.get_aggregated_metering_data(
             "LU-METERING_POINT1",
-            "1.1.1.8.0.255",
+            ObisCode.ELEC_CONSUMPTION_ACTIVE,
             "2023-01-01",
             "2023-01-31",
             "Day",
@@ -171,7 +172,7 @@ class TestLenedaClient(unittest.TestCase):
                 "Content-Type": "application/json",
             },
             params={
-                "obisCode": "1.1.1.8.0.255",
+                "obisCode": ObisCode.ELEC_CONSUMPTION_ACTIVE.value,
                 "startDate": "2023-01-01",
                 "endDate": "2023-01-31",
                 "aggregationLevel": "Day",
@@ -186,12 +187,20 @@ class TestLenedaClient(unittest.TestCase):
         # Set up the mock response
         mock_response = MagicMock()
         mock_response.status_code = 200
-        mock_response.json.return_value = dict()
-        mock_response.content = "{}"
+        mock_response.json.return_value = {"requestId": "test-request-id", "status": "PENDING"}
         mock_request.return_value = mock_response
 
         # Call the method
-        self.client.request_metering_data_access("LU-METERING_POINT1")
+        result = self.client.request_metering_data_access(
+            from_energy_id="test_energy_id",
+            from_name="Test User",
+            metering_point_codes=["LU-METERING_POINT1"],
+            obis_codes=[ObisCode.ELEC_CONSUMPTION_ACTIVE],
+        )
+
+        # Check the result
+        self.assertEqual(result["requestId"], "test-request-id")
+        self.assertEqual(result["status"], "PENDING")
 
         # Check that the request was made correctly
         mock_request.assert_called_once_with(
@@ -203,7 +212,12 @@ class TestLenedaClient(unittest.TestCase):
                 "Content-Type": "application/json",
             },
             params=None,
-            json={"meteringPointCode": "LU-METERING_POINT1"},
+            json={
+                "from": "test_energy_id",
+                "fromName": "Test User",
+                "meteringPointCodes": ["LU-METERING_POINT1"],
+                "obisCodes": [ObisCode.ELEC_CONSUMPTION_ACTIVE.value],
+            },
         )
 
     @patch("requests.request")
@@ -216,7 +230,7 @@ class TestLenedaClient(unittest.TestCase):
         with self.assertRaises(requests.exceptions.HTTPError):
             self.client.get_metering_data(
                 "LU-METERING_POINT1",
-                "1.1.1.8.0.255",
+                ObisCode.ELEC_CONSUMPTION_ACTIVE,
                 "2023-01-01T00:00:00Z",
                 "2023-01-02T00:00:00Z",
             )