From 381f11ccaf0064f3006b57995f028ab8a4669c12 Mon Sep 17 00:00:00 2001 From: "Evgeny (Krymmy) Momotov" Date: Thu, 25 Sep 2025 13:49:47 +0300 Subject: [PATCH] [GUP] dict > model_dump --- src/TaxisLibrary/taxis_client.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/TaxisLibrary/taxis_client.py b/src/TaxisLibrary/taxis_client.py index c2691a0..64413fa 100644 --- a/src/TaxisLibrary/taxis_client.py +++ b/src/TaxisLibrary/taxis_client.py @@ -264,7 +264,7 @@ class TaxisClient: return [PromptOut(**item) for item in result] async def create_prompt(self, prompt: 'PromptIn') -> 'PromptOut': - result = await self._request("POST", "/prompts/", json=prompt.dict()) + result = await self._request("POST", "/prompts/", json=prompt.model_dump()) return PromptOut(**result) async def get_prompt(self, prompt_id: int, **params) -> 'PromptOut': @@ -272,7 +272,7 @@ class TaxisClient: return PromptOut(**result) async def update_prompt(self, prompt_id: int, prompt: 'PromptIn') -> 'PromptOut': - result = await self._request("PUT", f"/prompts/{prompt_id}", json=prompt.dict()) + result = await self._request("PUT", f"/prompts/{prompt_id}", json=prompt.model_dump()) return PromptOut(**result) async def delete_prompt(self, prompt_id: int) -> None: @@ -284,7 +284,7 @@ class TaxisClient: return [CarOut(**item) for item in result] async def create_car(self, car: 'CarIn') -> 'CarOut': - result = await self._request("POST", "/cars/", json=car.dict()) + result = await self._request("POST", "/cars/", json=car.model_dump()) return CarOut(**result) async def get_car(self, car_id: int, **params) -> 'CarOut': @@ -292,7 +292,7 @@ class TaxisClient: return CarOut(**result) async def update_car(self, car_id: int, car: 'CarIn') -> 'CarOut': - result = await self._request("PUT", f"/cars/{car_id}", json=car.dict()) + result = await self._request("PUT", f"/cars/{car_id}", json=car.model_dump()) return CarOut(**result) async def delete_car(self, car_id: int) -> None: @@ -304,7 +304,7 @@ class TaxisClient: return [DriverOut(**item) for item in result] async def create_driver(self, driver: 'DriverIn') -> 'DriverOut': - result = await self._request("POST", "/drivers/", json=driver.dict()) + result = await self._request("POST", "/drivers/", json=driver.model_dump()) return DriverOut(**result) async def get_driver(self, driver_id: int, **params) -> 'DriverOut': @@ -316,14 +316,14 @@ class TaxisClient: return DriverOut(**result) async def update_driver(self, driver_id: int, driver: 'DriverIn') -> 'DriverOut': - result = await self._request("PUT", f"/drivers/{driver_id}", json=driver.dict()) + result = await self._request("PUT", f"/drivers/{driver_id}", json=driver.model_dump()) return DriverOut(**result) async def delete_driver(self, driver_id: int) -> None: await self._request("DELETE", f"/drivers/{driver_id}") async def update_driver_address(self, driver_id: int, address: 'DriverAddressUpdate') -> 'DriverOut': - result = await self._request("PUT", f"/drivers/{driver_id}/address", json=address.dict()) + result = await self._request("PUT", f"/drivers/{driver_id}/address", json=address.model_dump()) return DriverOut(**result) async def update_driver_status(self, driver_id: int, status: 'DriverStatus') -> 'DriverOut': @@ -352,7 +352,7 @@ class TaxisClient: return [ClientOut(**item) for item in result] async def create_client(self, client: 'ClientIn') -> 'ClientOut': - result = await self._request("POST", "/clients/", json=client.dict()) + result = await self._request("POST", "/clients/", json=client.model_dump()) return ClientOut(**result) async def get_client(self, client_id: int, **params) -> 'ClientOut': @@ -364,7 +364,7 @@ class TaxisClient: return ClientOut(**result) async def update_client(self, client_id: int, client: 'ClientIn') -> 'ClientOut': - result = await self._request("PUT", f"/clients/{client_id}", json=client.dict()) + result = await self._request("PUT", f"/clients/{client_id}", json=client.model_dump()) return ClientOut(**result) async def delete_client(self, client_id: int) -> None: @@ -376,7 +376,7 @@ class TaxisClient: return [OrderOut(**item) for item in result] async def create_order(self, order: 'OrderIn') -> 'OrderOut': - result = await self._request("POST", "/orders/", json=order.dict()) + result = await self._request("POST", "/orders/", json=order.model_dump()) return OrderOut(**result) async def get_order(self, order_id: int, **params) -> 'OrderOut': @@ -384,7 +384,7 @@ class TaxisClient: return OrderOut(**result) async def update_order(self, order_id: int, order: 'OrderInUpdate') -> 'OrderOut': - result = await self._request("PUT", f"/orders/{order_id}", json=order.dict()) + result = await self._request("PUT", f"/orders/{order_id}", json=order.model_dump()) return OrderOut(**result) async def delete_order(self, order_id: int) -> None: @@ -408,7 +408,7 @@ class TaxisClient: return [OrderNotificationsOut(**item) for item in result] async def create_order_notification(self, notification: 'OrderNotificationsIn') -> 'OrderNotificationsOut': - result = await self._request("POST", "/order_notifications/", json=notification.dict()) + result = await self._request("POST", "/order_notifications/", json=notification.model_dump()) return OrderNotificationsOut(**result) async def get_order_notification(self, notification_id: int, **params) -> 'OrderNotificationsOut': @@ -428,7 +428,7 @@ class TaxisClient: return GlobalSettingsOut(**result) async def update_global_settings(self, settings: 'GlobalSettingsUpdate') -> 'GlobalSettingsOut': - result = await self._request("PUT", "/settings/global", json=settings.dict()) + result = await self._request("PUT", "/settings/global", json=settings.model_dump()) return GlobalSettingsOut(**result) async def get_nominatium_settings(self, nominatium_id: int, **params) -> 'NominatiumSettingsOut': @@ -447,9 +447,9 @@ class TaxisClient: return Geocode(**result) async def get_distance(self, request: 'DistanceRequest') -> float: - result = await self._request("POST", "/union/distance", json=request.dict()) + result = await self._request("POST", "/union/distance", json=request.model_dump()) return float(result) async def get_distance_by_address(self, request: 'AddressRequest') -> float: - result = await self._request("POST", "/union/distance_by_address", json=request.dict()) + result = await self._request("POST", "/union/distance_by_address", json=request.model_dump()) return float(result)