e-data 2.0.0.dev112__py3-none-any.whl → 2.0.0.dev120__py3-none-any.whl

{e_data-2.0.0.dev112.dist-info → e_data-2.0.0.dev120.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.0.dev112
+Version: 2.0.0.dev120
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -823,7 +823,7 @@ async def main():
     # Mostrar resumen
     total_cost = sum(b.value_eur for b in bills)
     print(f"Coste total: {total_cost:.2f} €")
-    print(f"Consumo total: {sum(e.value_kWh for e in energy):.2f} kWh")
+    print(f"Consumo total: {sum(e.value_kwh for e in energy):.2f} kWh")
 
 # Ejecutar
 asyncio.run(main())
@@ -841,7 +841,7 @@ python -m edata.cli show-supplies <username>
 python -m edata.cli download-all --cups ES0000000000000000XX <username>
 
 # Actualizar facturación con tarifa fija
-python -m edata.cli update-bill \
+python -m edata.cli update-custom-bill \
   --cups ES0000000000000000XX \
   --p1-kw-year-eur 30.67 \
   --p2-kw-year-eur 1.42 \

e_data-2.0.0.dev120.dist-info/RECORD

@@ -0,0 +1,28 @@
+e_data-2.0.0.dev120.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+edata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+edata/cli.py,sha256=0pmlaaXPVfbxPVHMovsuK9qf8PGXl38AV3gtIsk95O4,4010
+edata/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+edata/core/const.py,sha256=X9J2f7lt9jXJnghqz0JFi-J7USa3xlYvbuiki70eHNE,43
+edata/core/utils.py,sha256=P4vEPVnymvBp8W2rwwc_XMvd8_6Vx6N0GKnVx0WxE0I,1938
+edata/database/__init__.py,sha256=HP_pDbGLzeMY9Ufm_Dps5cxzW_3YTonT8w8dstG558c,46
+edata/database/controller.py,sha256=_KQJALolxUTf5G405USCoSDxYebg2819aYYgiTZF1kU,16358
+edata/database/models.py,sha256=4rlRpPErULqYr6QJxZar1NBpJPWTcHftDN1MB3bwGyA,5096
+edata/database/queries.py,sha256=kGoTWs0VJ4KjMJqBbhQGUeio55sZAysKABYGBUUGBE8,6687
+edata/database/utils.py,sha256=V-FJfyAh8YJBGHB85BbWtG3Ilq09pM9Gl-L86TffB4g,1062
+edata/models/__init__.py,sha256=nMPPPkGjUsF51PBFlChgHyb5C3aQiccTRiVHUdJjNj4,153
+edata/models/bill.py,sha256=-qZ4l9f8BnPFlykFRoNYnmRe6-ELWmuNh6usks_k4X0,2674
+edata/models/data.py,sha256=O1aj0H_G92mnJjm6mYhC8fnl8ZOoatGiokRf8b7ziD8,2388
+edata/models/supply.py,sha256=qM0Q22-7PfBN93-Tu3ljAE58p5gfob0YWw-o5FccjrI,878
+edata/providers/__init__.py,sha256=5xaRKPttYM6EpVE1I_vhUAF25L9pEM_qK_5Ix6xnQe0,104
+edata/providers/datadis.py,sha256=ChV7IDO2Rc9YxpwQ-b9Scq527i_z2z2UiQa52mxZYmA,20143
+edata/providers/redata.py,sha256=uvxO2TTtSNSfPRWHZifLjbaP7zAr6O7CZ1oRQFNbIhQ,3122
+edata/services/bill_service.py,sha256=bjBIL1jl0Lcb2TG5VLKZgqT55PXdMPtEQW6fIPjWrVk,13411
+edata/services/data_service.py,sha256=65w-fVllJY8GFM9eUZ7uVF_XK-QgKeYl4wfrqBFpXjE,16772
+edata/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+edata/tests/test_datadis_connector.py,sha256=O3mjI5uIOgFz3PzQsApcG6J2yXd8rlEtj8By-9dsDbg,9270
+edata/tests/test_redata_connector.py,sha256=SBvxsma5t-qvz2drxNisNM2P1STTurqEs1TSDgwaPJ8,508
+edata/tests/test_services.py,sha256=XiwppLWqxm5vjgRtNmBeDFUaV5vVcQxerGgjnBJgmmk,4521
+e_data-2.0.0.dev120.dist-info/METADATA,sha256=YZ4hqEryOAJoiurPpRmvZ-CQ2F11Qxu4RS8XwOk5_u8,48075
+e_data-2.0.0.dev120.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+e_data-2.0.0.dev120.dist-info/top_level.txt,sha256=Ez-fReWtUVTMcFuH0dzCnoKIgMBHgjLaBuba8QiKC7g,6
+e_data-2.0.0.dev120.dist-info/RECORD,,

{e_data-2.0.0.dev112.dist-info → e_data-2.0.0.dev120.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

edata/cli.py

@@ -17,7 +17,7 @@ app = typer.Typer()
 
 
 @app.command()
-def show_supplies(username: str):
+def show_supplies(username: str) -> None:
     """Show supplies and contracts for a given datadis user."""
 
     password = getpass()
@@ -28,7 +28,7 @@ def show_supplies(username: str):
         typer.echo(supply.model_dump_json())
     if supplies:
         cups = supplies[0].cups
-        distributor = supplies[0].distributorCode
+        distributor = supplies[0].distributor_code
         contracts = connector.get_contract_detail(cups, distributor)
         typer.echo("\nContracts:")
         for contract in contracts:
@@ -41,7 +41,7 @@ async def _download_all(
     nif: str,
     cups: str,
     authorized_nif: str | None = None,
-):
+) -> None:
     """Download all data for a given datadis account and CUPS."""
 
     password = getpass()
@@ -63,7 +63,7 @@ def download_all(
     nif: str,
     cups: Annotated[str, typer.Option(help="The identifier of the Supply")],
     authorized_nif: str | None = None,
-):
+) -> None:
     """Download all data for a given datadis account and CUPS."""
 
     asyncio.run(_download_all(nif, cups, authorized_nif))
@@ -77,7 +77,7 @@ async def _update_custom_bill(
     p2_kwh_eur: float,
     p3_kwh_eur: float,
     meter_month_eur: float,
-):
+) -> None:
     """Download all data for a given datadis account and CUPS."""
 
     bs = BillService(cups, storage_path="./edata_cli")
@@ -105,7 +105,7 @@ def update_custom_bill(
     p2_kwh_eur: Annotated[float, typer.Option(help="Price per kWh at P2 tariff")],
     p3_kwh_eur: Annotated[float, typer.Option(help="Price per kWh at P3 tariff")],
     meter_month_eur: Annotated[float, typer.Option(help="Monthly cost of the meter")],
-):
+) -> None:
     """Download all data for a given datadis account and CUPS."""
 
     asyncio.run(
@@ -121,7 +121,7 @@ def update_custom_bill(
     )
 
 
-async def _update_pvpc_bill(cups: str):
+async def _update_pvpc_bill(cups: str) -> None:
     """Download all data for a given datadis account and CUPS."""
 
     bs = BillService(cups, storage_path="./edata_cli")
@@ -131,7 +131,7 @@ async def _update_pvpc_bill(cups: str):
 @app.command()
 def update_pvpc_bill(
     cups: Annotated[str, typer.Option(help="The identifier of the Supply")],
-):
+) -> None:
     """Download all data for a given datadis account and CUPS."""
 
     asyncio.run(

edata/core/utils.py

@@ -43,7 +43,7 @@ def get_tariff(dt: datetime) -> int:
     return 0
 
 
-def get_contract_for_dt(contracts: list[Contract], date: datetime):
+def get_contract_for_dt(contracts: list[Contract], date: datetime) -> Contract | None:
     """Return the active contract for a provided datetime."""
 
     for contract in contracts:

edata/database/controller.py

@@ -49,12 +49,12 @@ class EdataDB:
         return cls._instance
 
     @property
-    def engine(self):
+    def engine(self) -> AsyncEngine | None:
         """Return the async database engine."""
 
         return self._engine
 
-    async def _ensure_tables(self):
+    async def _ensure_tables(self) -> None:
         """Create tables if not already created (lazy init)."""
 
         if self._tables_initialized:
@@ -84,11 +84,11 @@ class EdataDB:
         self,
         session: AsyncSession,
         query: SelectOfScalar,
-        data,
+        data: typing.Any,
         commit: bool = True,
         overrides: dict[str, typing.Any] | None = None,
     ) -> T | None:  # type: ignore
-        """Updates a single record in the database."""
+        """Update a single record in the database."""
 
         result = await session.exec(query)
         existing = result.first()
@@ -240,7 +240,7 @@ class EdataDB:
                 session, q.get_energy(cups, energy.datetime), record
             )
 
-    async def add_energy_list(self, cups: str, energy: list[Energy]):
+    async def add_energy_list(self, cups: str, energy: list[Energy]) -> None:
         """Add or update a list of energy records."""
 
         await self._ensure_tables()
@@ -264,7 +264,7 @@ class EdataDB:
                 session, q.get_power(cups, power.datetime), record
             )
 
-    async def add_power_list(self, cups: str, power: list[Power]):
+    async def add_power_list(self, cups: str, power: list[Power]) -> None:
         """Add or update a list of power records."""
 
         await self._ensure_tables()
@@ -285,7 +285,7 @@ class EdataDB:
                 session, q.get_pvpc(pvpc.datetime), record
             )
 
-    async def add_pvpc_list(self, pvpc: list[EnergyPrice]):
+    async def add_pvpc_list(self, pvpc: list[EnergyPrice]) -> None:
         """Add or update a list of pvpc records."""
 
         await self._ensure_tables()
@@ -351,7 +351,7 @@ class EdataDB:
         confhash: str,
         complete: bool,
         bill: list[Bill],
-    ):
+    ) -> None:
         """Add or update a list of bill records."""
 
         await self._ensure_tables()
@@ -374,7 +374,7 @@ class EdataDB:
                 session, queries, items, override=["complete", "confhash"]
             )
 
-    async def list_supplies(self):
+    async def list_supplies(self) -> typing.Sequence[SupplyModel]:
         """List all supply records."""
 
         await self._ensure_tables()
@@ -382,7 +382,9 @@ class EdataDB:
             result = await session.exec(q.list_supply())
             return result.all()
 
-    async def list_contracts(self, cups: str | None = None):
+    async def list_contracts(
+        self, cups: str | None = None
+    ) -> typing.Sequence[ContractModel]:
         """List all contract records."""
 
         await self._ensure_tables()
@@ -395,7 +397,7 @@ class EdataDB:
         cups: str,
         date_from: datetime | None = None,
         date_to: datetime | None = None,
-    ):
+    ) -> typing.Sequence[EnergyModel]:
         """List energy records."""
 
         await self._ensure_tables()
@@ -408,7 +410,7 @@ class EdataDB:
         cups: str,
         date_from: datetime | None = None,
         date_to: datetime | None = None,
-    ):
+    ) -> typing.Sequence[PowerModel]:
         """List power records."""
 
         await self._ensure_tables()
@@ -420,7 +422,7 @@ class EdataDB:
         self,
         date_from: datetime | None = None,
         date_to: datetime | None = None,
-    ):
+    ) -> typing.Sequence[PVPCModel]:
         """List pvpc records."""
 
         await self._ensure_tables()
@@ -435,7 +437,7 @@ class EdataDB:
         date_from: datetime | None = None,
         date_to: datetime | None = None,
         complete: bool | None = None,
-    ):
+    ) -> typing.Sequence[StatisticsModel]:
         """List statistics records filtered by type ('day' or 'month') and date range."""
 
         await self._ensure_tables()
@@ -452,7 +454,7 @@ class EdataDB:
         date_from: datetime | None = None,
         date_to: datetime | None = None,
         complete: bool | None = None,
-    ):
+    ) -> typing.Sequence[BillModel]:
         """List bill records filtered by type ('hour', 'day' or 'month') and date range."""
 
         await self._ensure_tables()

edata/database/queries.py

@@ -215,7 +215,9 @@ def list_pvpc(
     return query
 
 
-def get_bill(cups, type_, datetime_):
+def get_bill(
+    cups: str, type_: typing.Literal["hour", "day", "month"], datetime_: datetime | None
+) -> SelectOfScalar[BillModel]:
     """Query that selects a bill."""
 
     query = select(BillModel).where(BillModel.cups == cups)

edata/database/utils.py

@@ -7,10 +7,7 @@ T = TypeVar("T", bound=BaseModel)
 
 
 class PydanticJSON(TypeDecorator):
-    """
-    Tipo de SQLAlchemy para guardar modelos Pydantic como JSON.
-    Automáticamente serializa al guardar y deserializa al leer.
-    """
+    """SQLAlchemy type to guard Pydantic models as JSON."""
 
     impl = JSON
     cache_ok = True
@@ -20,6 +17,7 @@ class PydanticJSON(TypeDecorator):
         self.pydantic_model = pydantic_model
 
     def process_bind_param(self, value: T | None, dialect: Any) -> Any:
+        """Process binding parameter."""
         # Python -> Base de Datos
         if value is None:
             return None
@@ -27,6 +25,7 @@ class PydanticJSON(TypeDecorator):
         return value.model_dump(mode="json")
 
     def process_result_value(self, value: Any, dialect: Any) -> T | None:
+        """Process result value."""
         # Base de Datos -> Python
         if value is None:
             return None

edata/models/bill.py

@@ -6,15 +6,15 @@ from pydantic import BaseModel, Field
 
 
 class EnergyPrice(BaseModel):
-    """Data structure to represent pricing data."""
+    """Represent pricing data."""
 
     datetime: datetime
-    value_eur_kWh: float
+    value_eur_kwh: float
     delta_h: float
 
 
 class Bill(BaseModel):
-    """Data structure to represent a bill during a period."""
+    """Represent a bill during a period."""
 
     datetime: datetime
     delta_h: float
@@ -26,7 +26,7 @@ class Bill(BaseModel):
 
 
 class BillingRules(BaseModel):
-    """Data structure to represent a generic billing rule."""
+    """Represent a generic billing rule."""
 
     p1_kw_year_eur: float
     p2_kw_year_eur: float
@@ -50,7 +50,7 @@ class BillingRules(BaseModel):
 
 
 class PVPCBillingRules(BillingRules):
-    """Data structure to represent a PVPC billing rule."""
+    """Represent a PVPC billing rule."""
 
     p1_kw_year_eur: float = Field(default=30.67266)
     p2_kw_year_eur: float = Field(default=1.4243591)

edata/models/data.py

@@ -6,32 +6,84 @@ from pydantic import BaseModel, Field
 
 
 class Energy(BaseModel):
-    """Data structure to represent energy consumption and/or surplus measurements."""
+    """Represent energy consumption and/or surplus measurements."""
 
     datetime: datetime
     delta_h: float
-    value_kWh: float
-    surplus_kWh: float = Field(0)
+    consumption_kwh: float
+    surplus_kwh: float = Field(0)
+    generation_kwh: float = Field(0)
+    selfconsumption_kwh: float = Field(0)
     real: bool
 
 
 class Power(BaseModel):
-    """Data structure to represent power measurements."""
+    """Represent power measurements."""
 
     datetime: datetime
-    value_kW: float
+    value_kw: float
 
 
 class Statistics(BaseModel):
-    """Data structure to represent aggregated energy/surplus data."""
+    """Represent aggregated energy/surplus data."""
 
     datetime: datetime
     delta_h: float = Field(0)
-    value_kWh: float = Field(0)
-    value_p1_kWh: float = Field(0)
-    value_p2_kWh: float = Field(0)
-    value_p3_kWh: float = Field(0)
-    surplus_kWh: float = Field(0)
-    surplus_p1_kWh: float = Field(0)
-    surplus_p2_kWh: float = Field(0)
-    surplus_p3_kWh: float = Field(0)
+    consumption_kwh: float = Field(0)
+    consumption_by_tariff: list[float] = Field(default_factory=lambda: [0.0, 0.0, 0.0])
+    surplus_kwh: float = Field(0)
+    surplus_by_tariff: list[float] = Field(default_factory=lambda: [0.0, 0.0, 0.0])
+    generation_kwh: float = Field(0)
+    generation_by_tariff: list[float] = Field(default_factory=lambda: [0.0, 0.0, 0.0])
+    selfconsumption_kwh: float = Field(0)
+    selfconsumption_by_tariff: list[float] = Field(
+        default_factory=lambda: [0.0, 0.0, 0.0]
+    )
+
+    @property
+    def consumption_p1_kwh(self) -> float:
+        return self.consumption_by_tariff[0]
+
+    @property
+    def consumption_p2_kwh(self) -> float:
+        return self.consumption_by_tariff[1]
+
+    @property
+    def consumption_p3_kwh(self) -> float:
+        return self.consumption_by_tariff[2]
+
+    @property
+    def surplus_p1_kwh(self) -> float:
+        return self.surplus_by_tariff[0]
+
+    @property
+    def surplus_p2_kwh(self) -> float:
+        return self.surplus_by_tariff[1]
+
+    @property
+    def surplus_p3_kwh(self) -> float:
+        return self.surplus_by_tariff[2]
+
+    @property
+    def generation_p1_kwh(self) -> float:
+        return self.generation_by_tariff[0]
+
+    @property
+    def generation_p2_kwh(self) -> float:
+        return self.generation_by_tariff[1]
+
+    @property
+    def generation_p3_kwh(self) -> float:
+        return self.generation_by_tariff[2]
+
+    @property
+    def selfconsumption_p1_kwh(self) -> float:
+        return self.selfconsumption_by_tariff[0]
+
+    @property
+    def selfconsumption_p2_kwh(self) -> float:
+        return self.selfconsumption_by_tariff[1]
+
+    @property
+    def selfconsumption_p3_kwh(self) -> float:
+        return self.selfconsumption_by_tariff[2]

edata/models/supply.py

@@ -16,8 +16,8 @@ class Supply(BaseModel):
     province: str | None
     municipality: str | None
     distributor: str | None
-    pointType: int
-    distributorCode: str
+    point_type: int
+    distributor_code: str
 
 
 class Contract(BaseModel):
@@ -26,6 +26,15 @@ class Contract(BaseModel):
     date_start: datetime
     date_end: datetime
     marketer: str
-    distributorCode: str
-    power_p1: float | None
-    power_p2: float | None
+    distributor_code: str
+    power: list[float]
+
+    @property
+    def power_p1(self) -> float | None:
+        """Return power P1."""
+        return self.power[0] if len(self.power) > 0 else None
+
+    @property
+    def power_p2(self) -> float | None:
+        """Return power P2."""
+        return self.power[1] if len(self.power) > 1 else None

edata/providers/datadis.py

@@ -1,10 +1,4 @@
-"""Datadis API connector.
-
-To fetch data from datadis.es private API.
-There a few issues that are workarounded:
- - You have to wait 24h between two identical requests.
- - Datadis server does not like ranges greater than 1 month.
-"""
+"""Datadis API connector."""
 
 import asyncio
 import contextlib
@@ -28,7 +22,7 @@ TOKEN_USERNAME = "username"
 TOKEN_PASSWD = "password"
 
 # Supplies-related constants
-URL_GET_SUPPLIES = "https://datadis.es/api-private/api/get-supplies"
+URL_GET_SUPPLIES = "https://datadis.es/api-private/api/get-supplies-v2"
 GET_SUPPLIES_MANDATORY_FIELDS = [
     "cups",
     "validDateFrom",
@@ -38,7 +32,7 @@ GET_SUPPLIES_MANDATORY_FIELDS = [
 ]
 
 # Contracts-related constants
-URL_GET_CONTRACT_DETAIL = "https://datadis.es/api-private/api/get-contract-detail"
+URL_GET_CONTRACT_DETAIL = "https://datadis.es/api-private/api/get-contract-detail-v2"
 GET_CONTRACT_DETAIL_MANDATORY_FIELDS = [
     "startDate",
     "endDate",
@@ -47,7 +41,7 @@ GET_CONTRACT_DETAIL_MANDATORY_FIELDS = [
 ]
 
 # Consumption-related constants
-URL_GET_CONSUMPTION_DATA = "https://datadis.es/api-private/api/get-consumption-data"
+URL_GET_CONSUMPTION_DATA = "https://datadis.es/api-private/api/get-consumption-data-v2"
 GET_CONSUMPTION_DATA_MANDATORY_FIELDS = [
     "time",
     "date",
@@ -56,7 +50,7 @@ GET_CONSUMPTION_DATA_MANDATORY_FIELDS = [
 ]
 
 # Maximeter-related constants
-URL_GET_MAX_POWER = "https://datadis.es/api-private/api/get-max-power"
+URL_GET_MAX_POWER = "https://datadis.es/api-private/api/get-max-power-v2"
 GET_MAX_POWER_MANDATORY_FIELDS = ["time", "date", "maxPower"]
 
 # Timing constants
@@ -68,7 +62,7 @@ QUERY_LIMIT = timedelta(hours=24)  # a datadis limitation, again...
 RECENT_CACHE_SUBDIR = "cache"
 
 
-def migrate_storage(storage_dir):
+def migrate_storage(storage_dir: str) -> None:
     """Migrate storage from older versions."""
     with contextlib.suppress(FileNotFoundError):
         os.remove(os.path.join(storage_dir, "edata_recent_queries.json"))
@@ -102,9 +96,8 @@ class DatadisConnector:
         os.makedirs(self._recent_cache_dir, exist_ok=True)
         self._cache = diskcache.Cache(self._recent_cache_dir)
 
-    def _get_hash(self, item: str):
+    def _get_hash(self, item: str) -> str:
         """Return a hash."""
-
         return hashlib.md5(item.encode()).hexdigest()
 
     def _set_cache(self, key: str, data: dict | None = None) -> None:
@@ -121,7 +114,7 @@ class DatadisConnector:
         hash_query = self._get_hash(key)
         return hash_query in self._cache
 
-    def _get_cache(self, key: str):
+    def _get_cache(self, key: str) -> dict | None:
         """Return cached response for a query (diskcache)."""
         hash_query = self._get_hash(key)
         try:
@@ -129,7 +122,7 @@ class DatadisConnector:
         except Exception:
             return None
 
-    async def _async_get_token(self):
+    async def _async_get_token(self) -> bool:
         """Private async method that fetches a new token if needed."""
         _LOGGER.debug("No token found, fetching a new one")
         is_valid_token = False
@@ -158,11 +151,11 @@ class DatadisConnector:
                 _LOGGER.error("Exception while retrieving token: %s", e)
         return is_valid_token
 
-    async def async_login(self):
+    async def async_login(self) -> bool:
         """Test to login with provided credentials (async)."""
         return await self._async_get_token()
 
-    def login(self):
+    def login(self) -> bool:
         """Test to login with provided credentials (sync wrapper)."""
         return asyncio.run(self.async_login())
 
@@ -288,6 +281,7 @@ class DatadisConnector:
     async def async_get_supplies(
         self, authorized_nif: str | None = None
     ) -> list[Supply]:
+        """Datadis 'get_supplies' query."""
         data = {}
         if authorized_nif is not None:
             data["authorizedNif"] = authorized_nif
@@ -296,7 +290,7 @@ class DatadisConnector:
         )
         supplies = []
         tomorrow_str = (datetime.today() + timedelta(days=1)).strftime("%Y/%m/%d")
-        for i in response:
+        for i in response.get("supplies", []):
             if all(k in i for k in GET_SUPPLIES_MANDATORY_FIELDS):
                 supplies.append(
                     Supply(
@@ -322,8 +316,8 @@ class DatadisConnector:
                         province=i.get("province", None),
                         municipality=i.get("municipality", None),
                         distributor=i.get("distributor", None),
-                        pointType=i["pointType"],
-                        distributorCode=i["distributorCode"],
+                        point_type=i["pointType"],
+                        distributor_code=i["distributorCode"],
                     )
                 )
             else:
@@ -333,13 +327,14 @@ class DatadisConnector:
                 )
         return supplies
 
-    def get_supplies(self, authorized_nif: str | None = None):
+    def get_supplies(self, authorized_nif: str | None = None) -> list[Supply]:
         """Datadis 'get_supplies' query (sync wrapper)."""
         return asyncio.run(self.async_get_supplies(authorized_nif=authorized_nif))
 
     async def async_get_contract_detail(
         self, cups: str, distributor_code: str, authorized_nif: str | None = None
     ) -> list[Contract]:
+        """Datadis 'get_contract_detail' query."""
         data = {"cups": cups, "distributorCode": distributor_code}
         if authorized_nif is not None:
             data["authorizedNif"] = authorized_nif
@@ -348,7 +343,7 @@ class DatadisConnector:
         )
         contracts = []
         tomorrow_str = (datetime.today() + timedelta(days=1)).strftime("%Y/%m/%d")
-        for i in response:
+        for i in response.get("contract", []):
             if all(k in i for k in GET_CONTRACT_DETAIL_MANDATORY_FIELDS):
                 contracts.append(
                     Contract(
@@ -361,17 +356,8 @@ class DatadisConnector:
                             "%Y/%m/%d",
                         ),
                         marketer=i["marketer"],
-                        distributorCode=distributor_code,
-                        power_p1=(
-                            i["contractedPowerkW"][0]
-                            if isinstance(i["contractedPowerkW"], list)
-                            else None
-                        ),
-                        power_p2=(
-                            i["contractedPowerkW"][1]
-                            if (len(i["contractedPowerkW"]) > 1)
-                            else None
-                        ),
+                        distributor_code=distributor_code,
+                        power=i["contractedPowerkW"],
                     )
                 )
             else:
@@ -383,7 +369,7 @@ class DatadisConnector:
 
     def get_contract_detail(
         self, cups: str, distributor_code: str, authorized_nif: str | None = None
-    ):
+    ) -> list[Contract]:
         """Datadis get_contract_detail query (sync wrapper)."""
         return asyncio.run(
             self.async_get_contract_detail(cups, distributor_code, authorized_nif)
@@ -399,7 +385,7 @@ class DatadisConnector:
         point_type: int,
         authorized_nif: str | None = None,
     ) -> list[Energy]:
-
+        """Datadis 'get_consumption_data' query."""
         data = {
             "cups": cups,
             "distributorCode": distributor_code,
@@ -414,7 +400,7 @@ class DatadisConnector:
         response = await self._async_get(URL_GET_CONSUMPTION_DATA, request_data=data)
 
         consumptions = []
-        for i in response:
+        for i in response.get("timeCurve", []):
             if "consumptionKWh" in i:
                 if all(k in i for k in GET_CONSUMPTION_DATA_MANDATORY_FIELDS):
                     hour = str(int(i["time"].split(":")[0]) - 1)
@@ -423,15 +409,26 @@ class DatadisConnector:
                     )
                     if not (start_date <= date_as_dt <= end_date):
                         continue  # skip element if dt is out of range
-                    _surplus = i.get("surplusEnergyKWh", 0)
-                    if _surplus is None:
-                        _surplus = 0
+
+                    # sanitize these values
+                    _surplus_kwh = i.get("surplusEnergyKWh", 0)
+                    if _surplus_kwh is None:
+                        _surplus_kwh = 0
+                    _generation_kwh = i.get("generationEnergyKWh", 0)
+                    if _generation_kwh is None:
+                        _generation_kwh = 0
+                    _selfconsumption_kwh = i.get("selfConsumptionEnergyKWh", 0)
+                    if _selfconsumption_kwh is None:
+                        _selfconsumption_kwh = 0
+
                     consumptions.append(
                         Energy(
                             datetime=date_as_dt,
                             delta_h=1,
-                            value_kWh=i["consumptionKWh"],
-                            surplus_kWh=_surplus,
+                            consumption_kwh=i["consumptionKWh"],
+                            surplus_kwh=_surplus_kwh,
+                            generation_kwh=_generation_kwh,
+                            selfconsumption_kwh=_selfconsumption_kwh,
                             real=i["obtainMethod"] == "Real",
                         )
                     )
@@ -451,7 +448,7 @@ class DatadisConnector:
         measurement_type: str,
         point_type: int,
         authorized_nif: str | None = None,
-    ):
+    ) -> list[Energy]:
         """Datadis get_consumption_data query (sync wrapper)."""
         return asyncio.run(
             self.async_get_consumption_data(
@@ -473,6 +470,7 @@ class DatadisConnector:
         end_date: datetime,
         authorized_nif: str | None = None,
     ) -> list[Power]:
+        """Datadis 'get_max_power' query."""
         data = {
             "cups": cups,
             "distributorCode": distributor_code,
@@ -483,14 +481,14 @@ class DatadisConnector:
             data["authorizedNif"] = authorized_nif
         response = await self._async_get(URL_GET_MAX_POWER, request_data=data)
         maxpower_values = []
-        for i in response:
+        for i in response.get("maxPower", []):
             if all(k in i for k in GET_MAX_POWER_MANDATORY_FIELDS):
                 maxpower_values.append(
                     Power(
                         datetime=datetime.strptime(
                             f"{i['date']} {i['time']}", "%Y/%m/%d %H:%M"
                         ),
-                        value_kW=i["maxPower"],
+                        value_kw=i["maxPower"],
                     )
                 )
             else:
@@ -507,7 +505,7 @@ class DatadisConnector:
         start_date: datetime,
         end_date: datetime,
         authorized_nif: str | None = None,
-    ):
+    ) -> list[Power]:
         """Datadis get_max_power query (sync wrapper)."""
         return asyncio.run(
             self.async_get_max_power(

edata/providers/redata.py

@@ -62,7 +62,7 @@ class REDataConnector:
                                     datetime=parser.parse(element["datetime"]).replace(
                                         tzinfo=None
                                     ),
-                                    value_eur_kWh=element["value"] / 1000,
+                                    value_eur_kwh=element["value"] / 1000,
                                     delta_h=1,
                                 )
                             )
@@ -79,7 +79,7 @@ class REDataConnector:
 
     def get_realtime_prices(
         self, dt_from: dt.datetime, dt_to: dt.datetime, is_ceuta_melilla: bool = False
-    ) -> list:
+    ) -> list[EnergyPrice]:
         """GET query to fetch realtime pvpc prices, historical data is limited to current month (sync wrapper)"""
         return asyncio.run(
             self.async_get_realtime_prices(dt_from, dt_to, is_ceuta_melilla)

edata/services/bill_service.py

@@ -115,12 +115,12 @@ class BillService:
             pvpc = await self._get_pvpc()
             billing_rules = PVPCBillingRules(**billing_rules.model_dump())
             bills = await asyncio.to_thread(
-                self._compile_pvpc, contracts, energy, pvpc, billing_rules
+                self.simulate_pvpc, contracts, energy, pvpc, billing_rules
             )
             confighash = f"pvpc-{hash(billing_rules.model_dump_json())}"
         else:
             bills = await asyncio.to_thread(
-                self._compile_j2, contracts, energy, billing_rules
+                self.simulate_custom, contracts, energy, billing_rules
             )
             confighash = f"custom-{hash(billing_rules.model_dump_json())}"
 
@@ -143,7 +143,7 @@ class BillService:
         await self._update_daily_statistics(start, end)
         await self._update_monthly_statistics(start, end)
 
-    async def _update_daily_statistics(self, start: datetime, end: datetime):
+    async def _update_daily_statistics(self, start: datetime, end: datetime) -> None:
         """Update daily statistics within a date range."""
 
         day_start = get_day(start)
@@ -171,7 +171,7 @@ class BillService:
                     stat.datetime.date(),
                 )
 
-    async def _update_monthly_statistics(self, start: datetime, end: datetime):
+    async def _update_monthly_statistics(self, start: datetime, end: datetime) -> None:
         """Update monthly statistics within a date range."""
 
         month_start = get_month(start)
@@ -202,7 +202,7 @@ class BillService:
                     stat.datetime.date(),
                 )
 
-    async def _find_missing_stats(self):
+    async def _find_missing_stats(self) -> list[datetime]:
         """Return the list of days that are missing billing data."""
 
         stats = await self.db.list_bill(self._cups, "day", complete=False)
@@ -247,7 +247,7 @@ class BillService:
 
         return [agg_data[x] for x in agg_data]
 
-    async def fix_missing_statistics(self):
+    async def fix_missing_statistics(self) -> None:
         """Recompile statistics to fix missing data."""
 
         missing = await self._find_missing_stats()
@@ -264,7 +264,7 @@ class BillService:
             end = month + relativedelta.relativedelta(months=1) - timedelta(minutes=1)
             await self._update_monthly_statistics(month, end)
 
-    def _compile_pvpc(
+    def simulate_pvpc(
         self,
         contracts: list[Contract],
         energy: list[Energy],
@@ -306,8 +306,8 @@ class BillService:
             bill.energy_term = (
                 rules.electricity_tax
                 * rules.iva_tax
-                * p[dt].value_eur_kWh
-                * e[dt].value_kWh
+                * p[dt].value_eur_kwh
+                * e[dt].consumption_kwh
             )
             bill.power_term = (
                 rules.electricity_tax
@@ -326,12 +326,12 @@ class BillService:
 
         return [x for x in b.values()]
 
-    def _compile_j2(
+    def simulate_custom(
         self,
         contracts: list[Contract],
         energy: list[Energy],
         rules: BillingRules,
-    ):
+    ) -> list[Bill]:
         """Compile bills from custom rules."""
 
         e = {x.datetime: x for x in energy}
@@ -358,7 +358,7 @@ class BillService:
             params = rules.model_dump()
             params["p1_kw"] = p1_kw
             params["p2_kw"] = p2_kw
-            params["kwh"] = e[dt].value_kWh
+            params["kwh"] = e[dt].consumption_kwh
 
             tariff = get_tariff(dt)
             if tariff == 1:
@@ -388,25 +388,26 @@ class BillService:
         return [x for x in b.values()]
 
     async def _get_contracts(self) -> list[Contract]:
-
+        """Get contracts."""
         res = await self.db.list_contracts(self._cups)
         return [x.data for x in res]
 
     async def _get_energy(
         self, start: datetime | None = None, end: datetime | None = None
     ) -> list[Energy]:
+        """Get energy."""
         res = await self.db.list_energy(self._cups, start, end)
         return [x.data for x in res]
 
     async def _get_pvpc(
         self, start: datetime | None = None, end: datetime | None = None
     ) -> list[EnergyPrice]:
+        """Get PVPC."""
         res = await self.db.list_pvpc(start, end)
         return [x.data for x in res]
 
     async def _get_last_bill_dt(self) -> datetime | None:
         """Return the timestamp of the latest bill record."""
-
         last_record = await self.db.get_last_bill(self._cups)
         if last_record:
             return last_record.datetime

edata/services/data_service.py

@@ -109,7 +109,7 @@ class DataService:
         data = await self.db.list_statistics(self._cups, type_, start, end, complete)
         return [x.data for x in data]
 
-    async def fix_missing_statistics(self):
+    async def fix_missing_statistics(self) -> None:
         """Recompile statistics to fix missing data."""
 
         missing = await self._find_missing_stats()
@@ -236,12 +236,12 @@ class DataService:
 
         return True
 
-    async def login(self):
+    async def login(self) -> bool:
         """Test login at Datadis."""
 
         return await self.datadis.async_login()
 
-    async def update_supplies(self):
+    async def update_supplies(self) -> None:
         """Update the list of supplies for the configured user."""
 
         self._supplies = await self.datadis.async_get_supplies(self._authorized_nif)
@@ -255,7 +255,7 @@ class DataService:
         supply = self._find_supply_for_cups(cups)
         if supply:
             self._contracts = await self.datadis.async_get_contract_detail(
-                cups, supply.distributorCode, self._authorized_nif
+                cups, supply.distributor_code, self._authorized_nif
             )
             for c in self._contracts:
                 await self.db.add_contract(self._cups, c)
@@ -263,7 +263,7 @@ class DataService:
         _LOGGER.warning("Unable to fetch contract details for %s", self._scups)
         return False
 
-    async def update_energy(self, start: datetime, end: datetime):
+    async def update_energy(self, start: datetime, end: datetime) -> bool:
         """Update the list of energy consumptions for the selected cups."""
 
         cups = self._cups
@@ -271,11 +271,11 @@ class DataService:
         if supply:
             data = await self.datadis.async_get_consumption_data(
                 cups,
-                supply.distributorCode,
+                supply.distributor_code,
                 start,
                 end,
                 self._measurement_type,
-                supply.pointType,
+                supply.point_type,
                 self._authorized_nif,
             )
             await self.db.add_energy_list(self._cups, data)
@@ -283,14 +283,14 @@ class DataService:
         _LOGGER.warning("Unable to fetch energy data for %s", self._scups)
         return False
 
-    async def update_power(self, start: datetime, end: datetime):
+    async def update_power(self, start: datetime, end: datetime) -> bool:
         """Update the list of power peaks for the selected cups."""
         cups = self._cups
         supply = self._find_supply_for_cups(cups)
         if supply:
             data = await self.datadis.async_get_max_power(
                 cups,
-                supply.distributorCode,
+                supply.distributor_code,
                 start,
                 end,
                 self._authorized_nif,
@@ -300,7 +300,7 @@ class DataService:
         _LOGGER.warning("Unable to fetch power data for %s", self._scups)
         return False
 
-    async def update_pvpc(self, start: datetime, end: datetime):
+    async def update_pvpc(self, start: datetime, end: datetime) -> bool:
         """Update recent pvpc prices."""
 
         cups = self._cups
@@ -324,13 +324,13 @@ class DataService:
         _LOGGER.warning("%s unable to fetch pvpc prices", self._scups)
         return False
 
-    async def update_statistics(self, start: datetime, end: datetime):
+    async def update_statistics(self, start: datetime, end: datetime) -> None:
         """Update the statistics during a period."""
 
         await self._update_daily_statistics(start, end)
         await self._update_monthly_statistics(start, end)
 
-    async def _update_daily_statistics(self, start: datetime, end: datetime):
+    async def _update_daily_statistics(self, start: datetime, end: datetime) -> None:
         """Update daily statistics within a date range."""
 
         day_start = get_day(start)
@@ -358,7 +358,7 @@ class DataService:
                     stat.datetime.date(),
                 )
 
-    async def _update_monthly_statistics(self, start: datetime, end: datetime):
+    async def _update_monthly_statistics(self, start: datetime, end: datetime) -> None:
         """Update monthly statistics within a date range."""
 
         month_start = get_month(start)
@@ -420,33 +420,34 @@ class DataService:
                 agg_data[agg_dt] = Statistics(
                     datetime=agg_dt,
                     delta_h=0,
-                    value_kWh=0,
-                    value_p1_kWh=0,
-                    value_p2_kWh=0,
-                    value_p3_kWh=0,
-                    surplus_kWh=0,
-                    surplus_p1_kWh=0,
-                    surplus_p2_kWh=0,
-                    surplus_p3_kWh=0,
+                    value_kwh=0,
+                    consumption_by_tariff=[0.0, 0.0, 0.0],
+                    surplus_kwh=0,
+                    surplus_by_tariff=[0.0, 0.0, 0.0],
+                    generation_kwh=0,
+                    generation_by_tariff=[0.0, 0.0, 0.0],
+                    selfconsumption_kwh=0,
+                    selfconsumption_by_tariff=[0.0, 0.0, 0.0],
                 )
 
             ref = agg_data[agg_dt]
             ref.delta_h += item.delta_h
-            ref.value_kWh += item.value_kWh
-            ref.surplus_kWh += item.surplus_kWh
-            if 1 == tariff:
-                ref.value_p1_kWh += item.value_kWh
-                ref.surplus_p1_kWh += item.surplus_kWh
-            elif 2 == tariff:
-                ref.value_p2_kWh += item.value_kWh
-                ref.surplus_p2_kWh += item.surplus_kWh
-            elif 3 == tariff:
-                ref.value_p3_kWh += item.value_kWh
-                ref.surplus_p3_kWh += item.surplus_kWh
+            ref.consumption_kwh += item.consumption_kwh
+            ref.surplus_kwh += item.surplus_kwh
+            ref.generation_kwh += item.generation_kwh
+            ref.selfconsumption_kwh += item.selfconsumption_kwh
+            if 1 <= tariff <= 3:
+                idx = tariff - 1
+                ref.consumption_by_tariff[idx] += item.consumption_kwh
+                ref.surplus_by_tariff[idx] += item.surplus_kwh
+                ref.generation_by_tariff[idx] += item.generation_kwh
+                ref.selfconsumption_by_tariff[idx] += item.selfconsumption_kwh
 
         return [agg_data[x] for x in agg_data]
 
-    async def _find_missing_stats(self, agg: typing.Literal["day", "month"] = "day"):
+    async def _find_missing_stats(
+        self, agg: typing.Literal["day", "month"] = "day"
+    ) -> list[datetime]:
         """Return the list of days that are missing energy data."""
 
         stats = await self.get_statistics(agg, complete=False)
@@ -473,7 +474,7 @@ class DataService:
         if last_record:
             return last_record.datetime
 
-    async def _sync(self):
+    async def _sync(self) -> None:
         """Load state."""
 
         self._supplies = await self.get_supplies()

edata/tests/test_datadis_connector.py

@@ -8,65 +8,73 @@ from edata.providers.datadis import DatadisConnector
 MOCK_USERNAME = "USERNAME"
 MOCK_PASSWORD = "PASSWORD"
 
-SUPPLIES_RESPONSE = [
-    {
-        "cups": "ESXXXXXXXXXXXXXXXXTEST",
-        "validDateFrom": "2022/03/09",
-        "validDateTo": "2022/10/28",
-        "address": "-",
-        "postalCode": "-",
-        "province": "-",
-        "municipality": "-",
-        "distributor": "-",
-        "pointType": 5,
-        "distributorCode": "2",
-    }
-]
+SUPPLIES_RESPONSE = {
+    "supplies": [
+        {
+            "cups": "ESXXXXXXXXXXXXXXXXTEST",
+            "validDateFrom": "2022/03/09",
+            "validDateTo": "2022/10/28",
+            "address": "-",
+            "postalCode": "-",
+            "province": "-",
+            "municipality": "-",
+            "distributor": "-",
+            "pointType": 5,
+            "distributorCode": "2",
+        }
+    ]
+}
 
-CONTRACTS_RESPONSE = [
-    {
-        "startDate": "2022/03/09",
-        "endDate": "2022/10/28",
-        "marketer": "MARKETER",
-        "distributorCode": "2",
-        "contractedPowerkW": [4.4, 4.4],
-    }
-]
+CONTRACTS_RESPONSE = {
+    "contract": [
+        {
+            "startDate": "2022/03/09",
+            "endDate": "2022/10/28",
+            "marketer": "MARKETER",
+            "distributorCode": "2",
+            "contractedPowerkW": [4.4, 4.4],
+        }
+    ]
+}
 
-CONSUMPTIONS_RESPONSE = [
-    {
-        "date": "2022/10/22",
-        "time": "01:00",
-        "consumptionKWh": 0.203,
-        "surplusEnergyKWh": 0,
-        "obtainMethod": "Real",
-    },
-    {
-        "date": "2022/10/22",
-        "time": "02:00",
-        "consumptionKWh": 0.163,
-        "surplusEnergyKWh": 0,
-        "obtainMethod": "Real",
-    },
-]
+CONSUMPTIONS_RESPONSE = {
+    "timeCurve": [
+        {
+            "date": "2022/10/22",
+            "time": "01:00",
+            "consumptionKWh": 0.203,
+            "surplusEnergyKWh": 0,
+            "obtainMethod": "Real",
+        },
+        {
+            "date": "2022/10/22",
+            "time": "02:00",
+            "consumptionKWh": 0.163,
+            "surplusEnergyKWh": 0,
+            "obtainMethod": "Real",
+        },
+    ]
+}
 
-MAXIMETER_RESPONSE = [
-    {
-        "date": "2022/03/10",
-        "time": "14:15",
-        "maxPower": 2.436,
-    },
-    {
-        "date": "2022/03/14",
-        "time": "13:15",
-        "maxPower": 3.008,
-    },
-    {
-        "date": "2022/03/27",
-        "time": "10:30",
-        "maxPower": 3.288,
-    },
-]
+MAXIMETER_RESPONSE = {
+    "maxPower": [
+        {
+            "date": "2022/03/10",
+            "time": "14:15",
+            "maxPower": 2.436,
+        },
+        {
+            "date": "2022/03/14",
+            "time": "13:15",
+            "maxPower": 3.008,
+        },
+        {
+            "date": "2022/03/27",
+            "time": "10:30",
+            "maxPower": 3.288,
+        },
+    ]
+}
 
 
 @patch("aiohttp.ClientSession.get")
@@ -157,7 +165,7 @@ def test_get_supplies_empty_response(mock_token, mock_get, snapshot):
     mock_response = MagicMock()
     mock_response.status = 200
     mock_response.text = AsyncMock(return_value="text")
-    mock_response.json = AsyncMock(return_value=[])
+    mock_response.json = AsyncMock(return_value={"supplies": []})
     mock_get.return_value.__aenter__.return_value = mock_response
     connector = DatadisConnector(MOCK_USERNAME, MOCK_PASSWORD)
     assert connector.get_supplies() == snapshot
@@ -169,7 +177,7 @@ def test_get_supplies_empty_response(mock_token, mock_get, snapshot):
 )
 def test_get_supplies_malformed_response(mock_token, mock_get, snapshot):
     """Test get_supplies with malformed response (missing required fields, syrupy snapshot)."""
-    malformed = [{"validDateFrom": "2022/03/09"}]  # missing 'cups', etc.
+    malformed = {"supplies": [{"validDateFrom": "2022/03/09"}]}  # missing 'cups', etc.
     mock_response = MagicMock()
     mock_response.status = 200
     mock_response.text = AsyncMock(return_value="text")
@@ -185,10 +193,10 @@ def test_get_supplies_malformed_response(mock_token, mock_get, snapshot):
 )
 def test_get_supplies_partial_response(mock_token, mock_get, snapshot):
     """Test get_supplies with partial valid/invalid response."""
-    partial = [
-        SUPPLIES_RESPONSE[0],
+    partial = {"supplies": [
+        SUPPLIES_RESPONSE["supplies"][0],
         {"validDateFrom": "2022/03/09"},  # invalid
-    ]
+    ]}
     mock_response = MagicMock()
     mock_response.status = 200
     mock_response.text = AsyncMock(return_value="text")
@@ -244,20 +252,22 @@ def test_get_consumption_data_cache(mock_token, mock_get, snapshot):
 )
 def test_get_supplies_optional_fields_none(mock_token, mock_get, snapshot):
     """Test get_supplies with optional fields as None."""
-    response = [
-        {
-            "cups": "ESXXXXXXXXXXXXXXXXTEST",
-            "validDateFrom": "2022/03/09",
-            "validDateTo": "2022/10/28",
-            "address": None,
-            "postalCode": None,
-            "province": None,
-            "municipality": None,
-            "distributor": None,
-            "pointType": 5,
-            "distributorCode": "2",
-        }
-    ]
+    response = {
+        "supplies": [
+            {
+                "cups": "ESXXXXXXXXXXXXXXXXTEST",
+                "validDateFrom": "2022/03/09",
+                "validDateTo": "2022/10/28",
+                "address": None,
+                "postalCode": None,
+                "province": None,
+                "municipality": None,
+                "distributor": None,
+                "pointType": 5,
+                "distributorCode": "2",
+            }
+        ]
+    }
     mock_response = MagicMock()
     mock_response.status = 200
     mock_response.text = AsyncMock(return_value="text")

e_data-2.0.0.dev112.dist-info/RECORD

@@ -1,28 +0,0 @@
-e_data-2.0.0.dev112.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-edata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edata/cli.py,sha256=BuYQF9kSJsZM8UbsTP3x4b0Y733ZyEimWpoto14tbW8,3953
-edata/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edata/core/const.py,sha256=X9J2f7lt9jXJnghqz0JFi-J7USa3xlYvbuiki70eHNE,43
-edata/core/utils.py,sha256=_zUsS116gIDJIOIUIeLFqb8_9g5knGObic_SyXTWtpg,1919
-edata/database/__init__.py,sha256=HP_pDbGLzeMY9Ufm_Dps5cxzW_3YTonT8w8dstG558c,46
-edata/database/controller.py,sha256=uGv7tR72Vuxb-kg8M_Q3uGSsYYgU1UPM8JQPUts_pyU,16046
-edata/database/models.py,sha256=4rlRpPErULqYr6QJxZar1NBpJPWTcHftDN1MB3bwGyA,5096
-edata/database/queries.py,sha256=EHRslAMQCAS9swIwKl6PvfqHHt4tclfLskcGDSFi6PI,6590
-edata/database/utils.py,sha256=8-QP9h-iol8NEs_qFdNAoHeHa0zQBMwQlgzJhMmZ0VE,1070
-edata/models/__init__.py,sha256=nMPPPkGjUsF51PBFlChgHyb5C3aQiccTRiVHUdJjNj4,153
-edata/models/bill.py,sha256=iJ5ccoNQdo8MMyh5WjVe6ffm-wBfZAb2PSlIVnWxaR0,2746
-edata/models/data.py,sha256=zHUD453aUq6xkE-qSUfgVS26kQugH1LI90eatIFNrF8,893
-edata/models/supply.py,sha256=i4Gj7mN7xyGfFURbsPRmEmjGT6vntLDvgNNjsDTlE8U,610
-edata/providers/__init__.py,sha256=5xaRKPttYM6EpVE1I_vhUAF25L9pEM_qK_5Ix6xnQe0,104
-edata/providers/datadis.py,sha256=g47D54E-1y_ITLiwMIvz5yKrY0fp4v5GaBK7TH8sOA8,19786
-edata/providers/redata.py,sha256=i5qcbWRPfAzuMd2r4gtcHMmw8SXjN--k1UcnnaTqhYo,3109
-edata/services/bill_service.py,sha256=fYqaJOiAem68l5RiNmHCMz-28FKyyJ6hLHbeyqAm5ug,13258
-edata/services/data_service.py,sha256=51-K-XhAshnlkpNT-GWm8fg4QahOOxWYocORoj764K0,16490
-edata/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-edata/tests/test_datadis_connector.py,sha256=OaECc9GfZ1lt-DNirPbphdYXISInyKCL9feBkC24U_8,8847
-edata/tests/test_redata_connector.py,sha256=SBvxsma5t-qvz2drxNisNM2P1STTurqEs1TSDgwaPJ8,508
-edata/tests/test_services.py,sha256=XiwppLWqxm5vjgRtNmBeDFUaV5vVcQxerGgjnBJgmmk,4521
-e_data-2.0.0.dev112.dist-info/METADATA,sha256=r2t05BWQ1jDxcZc2nf_sqe99GTuKNrFBPXIMz-iwLQk,48068
-e_data-2.0.0.dev112.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-e_data-2.0.0.dev112.dist-info/top_level.txt,sha256=Ez-fReWtUVTMcFuH0dzCnoKIgMBHgjLaBuba8QiKC7g,6
-e_data-2.0.0.dev112.dist-info/RECORD,,