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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 2.0.0.dev112
+Version: 2.0.0.dev121
 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.dev121.dist-info/RECORD

@@ -0,0 +1,28 @@
+e_data-2.0.0.dev121.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=a084ArY83ncvrMQvMSD2BY1rHlhp42dwJJkU8avmleo,20137
+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.dev121.dist-info/METADATA,sha256=hhW170QW1yry_sAqkesWyOXXXKjbZm3ZvdvYgafEatg,48075
+e_data-2.0.0.dev121.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+e_data-2.0.0.dev121.dist-info/top_level.txt,sha256=Ez-fReWtUVTMcFuH0dzCnoKIgMBHgjLaBuba8QiKC7g,6
+e_data-2.0.0.dev121.dist-info/RECORD,,

{e_data-2.0.0.dev112.dist-info → e_data-2.0.0.dev121.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