use model_dump as dict is deprecated

chargeamps/cli.py

@@ -33,7 +33,7 @@ async def command_list_chargepoints(
 ) -> None:
     res = []
     for cp in await client.get_chargepoints():
-        res.append(cp.to_dict())
+        res.append(cp.model_dump(by_alias=True))
     print(json.dumps(res, indent=4))
 
 
@@ -45,9 +45,9 @@ async def command_get_chargepoint_status(
     if args.connector_id:
         for c in cp.connector_statuses:
             if c.connector_id == args.connector_id:
-                print(json.dumps(c.to_dict(), indent=4))
+                print(json.dumps(c.model_dump(by_alias=True), indent=4))
     else:
-        print(json.dumps(cp.to_dict(), indent=4))
+        print(json.dumps(cp.model_dump(by_alias=True), indent=4))
 
 
 async def command_get_chargepoint_sessions(
@@ -68,7 +68,7 @@ async def command_get_chargepoint_sessions(
             charge_point_id, start_time, end_time
         ):
             if args.connector_id is None or args.connector_id == session.connector_id:
-                res.append(session.to_dict())
+                res.append(session.model_dump(by_alias=True))
         res = sorted(res, key=lambda i: i["id"])
         print(json.dumps(res, indent=4))
 
@@ -78,7 +78,7 @@ async def command_get_chargepoint_settings(
 ) -> None:
     charge_point_id = await get_chargepoint_id(client, args)
     settings = await client.get_chargepoint_settings(charge_point_id)
-    print(json.dumps(settings.to_dict(), indent=4))
+    print(json.dumps(settings.model_dump(by_alias=True), indent=4))
 
 
 async def command_set_chargepoint_settings(
@@ -92,7 +92,7 @@ async def command_set_chargepoint_settings(
         settings.down_light = args.downlight
     await client.set_chargepoint_settings(settings)
     settings = await client.get_chargepoint_settings(charge_point_id)
-    print(json.dumps(settings.to_dict(), indent=4))
+    print(json.dumps(settings.model_dump(by_alias=True), indent=4))
 
 
 async def command_get_connector_settings(
@@ -109,7 +109,7 @@ async def command_get_connector_settings(
         settings = await client.get_chargepoint_connector_settings(
             charge_point_id, connector_id
         )
-        res.append(settings.to_dict())
+        res.append(settings.model_dump(by_alias=True))
     print(json.dumps(res, indent=4))
 
 
@@ -133,7 +133,7 @@ async def command_set_connector_settings(
     settings = await client.get_chargepoint_connector_settings(
         charge_point_id, connector_id
     )
-    print(json.dumps(settings.to_dict(), indent=4))
+    print(json.dumps(settings.model_dump(by_alias=True), indent=4))
 
 
 def add_arg_chargepoint(parser, required=False) -> None:

chargeamps/external.py

@@ -135,7 +135,7 @@ async def get_chargepoint_settings(
 
     async def set_chargepoint_settings(self, settings: ChargePointSettings) -> None:
         """Set chargepoint settings"""
-        payload = settings.to_dict()
+        payload = settings.model_dump(by_alias=True)
         charge_point_id = settings.id
         request_uri = f"/api/{API_VERSION}/chargepoints/{charge_point_id}/settings"
         await self._put(request_uri, json=payload)
@@ -153,7 +153,7 @@ async def set_chargepoint_connector_settings(
         self, settings: ChargePointConnectorSettings
     ) -> None:
         """Get all owned chargepoints"""
-        payload = settings.to_dict()
+        payload = settings.model_dump(by_alias=True)
         charge_point_id = settings.charge_point_id
         connector_id = settings.connector_id
         request_uri = f"/api/{API_VERSION}/chargepoints/{charge_point_id}/connectors/{connector_id}/settings"
@@ -163,7 +163,7 @@ async def remote_start(
         self, charge_point_id: str, connector_id: int, start_auth: StartAuth
     ) -> None:
         """Remote start chargepoint"""
-        payload = start_auth.to_dict()
+        payload = start_auth.model_dump(by_alias=True)
         request_uri = f"/api/{API_VERSION}/chargepoints/{charge_point_id}/connectors/{connector_id}/remotestart"
         await self._put(request_uri, json=payload)
 

chargeamps/models.py

@@ -23,9 +23,6 @@ class FrozenBaseSchema(BaseModel):
         frozen=True,
     )
 
-    def to_dict(self) -> dict:
-        return self.dict(by_alias=True)
-
 
 class ChargePointConnector(FrozenBaseSchema):
     charge_point_id: str