fiftyfive 0.2.0__tar.gz → 0.4.0__tar.gz

{fiftyfive-0.2.0 → fiftyfive-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fiftyfive
-Version: 0.2.0
+Version: 0.4.0
 Summary: Python 3 package to retrieve EV charger data from 50five
 Project-URL: Homepage, https://github.com/Crazy-Duck/fiftyfive
 Project-URL: Bug Tracker, https://github.com/Crazy-Duck/fiftyfive/issues
@@ -29,14 +29,14 @@ pip3 install fiftyfive
 import asyncio
 
 from aiohttp import ClientSession
-from fiftyfive import Api, Market, NetworkOverview
+from fiftyfive import Api, CustomerType, Market, NetworkOverview
 
 
 async def main():
     """Main module"""
 
     async with ClientSession() as session:
-        api = Api(session, "email", "password", Market.BELUX)
+        api = Api(session, "email", "password", Market.BELUX, CustomerType.FORMER_SHELL)
 
         result = await api.make_requests([NetworkOverview()])
         print(result)
@@ -49,7 +49,8 @@ if __name__ == "__main__":
 
 ## WARNING
 
-50five uses separate endpoints depending on the market (belux, nl, de, ...). As
-I myself only have access to an account in the belux market, I cannot do any
-testing/reverse engineering on the other markets, so I can't give any guarantee
-anything will work for accounts in them.
+50five uses separate endpoints depending on the market (belux, nl, de, ...) as
+well as whether or not you were migrated over from Shell Recharge. As I myself
+only have access to an account in the belux market as an ex-Shell customer, I
+cannot do any testing/reverse engineering on the other markets, so I can't give
+any guarantee anything will work for accounts in them.

{fiftyfive-0.2.0 → fiftyfive-0.4.0}/README.md

@@ -14,14 +14,14 @@ pip3 install fiftyfive
 import asyncio
 
 from aiohttp import ClientSession
-from fiftyfive import Api, Market, NetworkOverview
+from fiftyfive import Api, CustomerType, Market, NetworkOverview
 
 
 async def main():
     """Main module"""
 
     async with ClientSession() as session:
-        api = Api(session, "email", "password", Market.BELUX)
+        api = Api(session, "email", "password", Market.BELUX, CustomerType.FORMER_SHELL)
 
         result = await api.make_requests([NetworkOverview()])
         print(result)
@@ -34,7 +34,8 @@ if __name__ == "__main__":
 
 ## WARNING
 
-50five uses separate endpoints depending on the market (belux, nl, de, ...). As
-I myself only have access to an account in the belux market, I cannot do any
-testing/reverse engineering on the other markets, so I can't give any guarantee
-anything will work for accounts in them.
+50five uses separate endpoints depending on the market (belux, nl, de, ...) as
+well as whether or not you were migrated over from Shell Recharge. As I myself
+only have access to an account in the belux market as an ex-Shell customer, I
+cannot do any testing/reverse engineering on the other markets, so I can't give
+any guarantee anything will work for accounts in them.

{fiftyfive-0.2.0 → fiftyfive-0.4.0}/example.py

@@ -9,7 +9,7 @@ from sys import stdout
 from aiohttp import ClientSession
 from dotenv import load_dotenv
 
-from fiftyfive import Api, Market, NetworkOverview, NetworkOverviewDetails, Channel
+from fiftyfive import Api, CustomerType, Market, NetworkOverview, Overview
 
 load_dotenv()
 
@@ -18,19 +18,20 @@ async def main():
     """Main module"""
 
     async with ClientSession() as session:
-        api = Api(session, getenv("50FIVE_EMAIL"), getenv("50FIVE_PASSWORD"), Market.BELUX)
+        api = Api(session, getenv("50FIVE_EMAIL"), getenv("50FIVE_PASSWORD"), Market.BELUX, CustomerType.FORMER_SHELL)
 
-        result = await api.make_requests([NetworkOverview()])
-        print(result)
+        networks = await api.make_requests([NetworkOverview()])
+        networks[0] += networks[0]
 
         details = await api.make_requests(
             [
-                NetworkOverviewDetails([Channel(charger["IDX"], charger["CHANNEL"])])
-                for charger in result[0]
+                Overview(network["IDX"])
+                for network in networks[0]
             ]
         )
 
-        [print(d) for d in details[0]]
+        result = [c | d[0] for c, d in zip(networks[0], details, strict=True)]
+        [print(r) for r in result]
 
 
 if __name__ == "__main__":

{fiftyfive-0.2.0 → fiftyfive-0.4.0}/fiftyfive/api.py

@@ -19,17 +19,29 @@ class Market(StrEnum):
     UK = "uk"
 
 
+class CustomerType(StrEnum):
+    """Enum type for customers."""
+
+    FIFTYFIVE = "fiftyfive"
+    FORMER_SHELL = "shell"
+
+
 class Api:
     """Class to make API requests"""
 
     def __init__(
-        self, session: ClientSession, email: str, password: str, market: Market
+        self,
+        session: ClientSession,
+        email: str,
+        password: str,
+        market: Market,
+        customer_type=CustomerType.FORMER_SHELL,
     ):
         """Initilaize the session."""
         self.session = session
         self.email = email
         self.password = password
-        self.url = f"https://50five-s{market}.evc-net.com"
+        self.url = f"https://50five{'-s' if customer_type == CustomerType.FORMER_SHELL else ''}{market}.evc-net.com"
         self.api = f"{self.url}/api/ajax"
         self.logger = logging.getLogger("50five")
 

{fiftyfive-0.2.0 → fiftyfive-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fiftyfive"
-version = "0.2.0"
+version = "0.4.0"
 description = "Python 3 package to retrieve EV charger data from 50five"
 dependencies = [
     "aiohttp",