e-data 1.3.2__tar.gz → 1.3.3__tar.gz

{e_data-1.3.2/e_data.egg-info → e_data-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 1.3.2
+Version: 1.3.3
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE

{e_data-1.3.2 → e_data-1.3.3/e_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: e-data
-Version: 1.3.2
+Version: 1.3.3
 Summary: Python library for managing spanish energy data from various web providers
 Author-email: VMG <vmayorg@outlook.es>
 License:                     GNU GENERAL PUBLIC LICENSE

{e_data-1.3.2 → e_data-1.3.3}/e_data.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ e_data.egg-info/dependency_links.txt
 e_data.egg-info/requires.txt
 e_data.egg-info/top_level.txt
 edata/__init__.py
+edata/cli.py
 edata/const.py
 edata/definitions.py
 edata/helpers.py

e_data-1.3.3/edata/cli.py

@@ -0,0 +1,24 @@
+import typer
+from getpass import getpass
+from edata.connectors.datadis import DatadisConnector
+import json
+
+def main():
+    """CLI básica para mostrar supplies y contracts de Datadis."""
+    username = typer.prompt("Usuario (NIF)")
+    password = getpass("Contraseña: ")
+    connector = DatadisConnector(username, password)
+    supplies = connector.get_supplies()
+    typer.echo("\nSupplies:")
+    typer.echo(json.dumps(supplies, indent=2, default=str))
+    if supplies:
+        cups = supplies[0]["cups"]
+        distributor = supplies[0]["distributorCode"]
+        contracts = connector.get_contract_detail(cups, distributor)
+        typer.echo("\nContracts:")
+        typer.echo(json.dumps(contracts, indent=2, default=str))
+    else:
+        typer.echo("No se encontraron supplies.")
+
+if __name__ == "__main__":
+    typer.run(main)

{e_data-1.3.2 → e_data-1.3.3}/edata/connectors/datadis.py

@@ -143,8 +143,8 @@ class DatadisConnector:
                 async with session.post(
                     URL_TOKEN,
                     data={
-                        TOKEN_USERNAME: self._usr.encode("utf-8"),
-                        TOKEN_PASSWD: self._pwd.encode("utf-8"),
+                        TOKEN_USERNAME: self._usr,
+                        TOKEN_PASSWD: self._pwd,
                     },
                 ) as response:
                     text = await response.text()
@@ -223,7 +223,7 @@ class DatadisConnector:
                         if reply.status == 200:
                             _LOGGER.info("Got 200 OK")
                             try:
-                                json_data = await reply.json()
+                                json_data = await reply.json(content_type=None)
                                 if json_data:
                                     response = json_data
                                     if not ignore_recent_queries:
@@ -232,7 +232,7 @@ class DatadisConnector:
                                     _LOGGER.info("Got an empty response")
                                     if not ignore_recent_queries:
                                         self._update_recent_queries(url + params)
-                            except Exception:
+                            except Exception as e:
                                 _LOGGER.warning("Failed to parse JSON response")
                         elif reply.status == 401 and not refresh_token:
                             response = await self._async_get(

{e_data-1.3.2 → e_data-1.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "e-data"
-version = "1.3.2"
+version = "1.3.3"
 description = "Python library for managing spanish energy data from various web providers"
 readme = "README.md"
 authors = [