pygeai 0.6.0b14__py3-none-any.whl → 0.7.0b1__py3-none-any.whl

pygeai/tests/organization/limits/test_clients.py

@@ -4,7 +4,7 @@ from unittest.mock import patch
 from pydantic import ValidationError
 
 from pygeai.organization.limits.clients import UsageLimitClient
-from pygeai.core.common.exceptions import InvalidAPIResponseException, APIError
+from pygeai.core.common.exceptions import InvalidAPIResponseException
 from pygeai.core.models import UsageLimit
 from pygeai.organization.limits.endpoints import SET_ORGANIZATION_USAGE_LIMIT_V2, GET_ORGANIZATION_LATEST_USAGE_LIMIT_V2, \
     GET_ALL_ORGANIZATION_USAGE_LIMITS_V2, DELETE_ORGANIZATION_USAGE_LIMIT_V2, SET_ORGANIZATION_HARD_LIMIT_V2, \
@@ -43,7 +43,7 @@ class TestUsageLimitClient(unittest.TestCase):
             "validUntil": "2025-06-28T12:00:00Z"
         }
 
-    @patch("pygeai.core.services.rest.ApiService.post")
+    @patch("pygeai.core.services.rest.GEAIApiService.post")
     def test_set_organization_usage_limit_success(self, mock_post):
         mock_response = mock_post.return_value
         mock_response.json.return_value = self.valid_response
@@ -58,7 +58,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, self.valid_response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.post")
+    @patch("pygeai.core.services.rest.GEAIApiService.post")
     def test_set_organization_usage_limit_json_decode_error(self, mock_post):
         mock_response = mock_post.return_value
         mock_response.status_code = 200
@@ -74,7 +74,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to set usage limit for organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.post")
+    @patch("pygeai.core.services.rest.GEAIApiService.post")
     def test_set_organization_usage_limit_invalid_usage_limit(self, mock_post):
         invalid_usage_limit = self.valid_usage_limit.copy()
         invalid_usage_limit["renewalStatus"] = "InvalidStatus"
@@ -92,7 +92,7 @@ class TestUsageLimitClient(unittest.TestCase):
         with self.assertRaises(ValidationError):
             UsageLimit.model_validate(invalid_usage_limit)
 
-    @patch("pygeai.core.services.rest.ApiService.get")
+    @patch("pygeai.core.services.rest.GEAIApiService.get")
     def test_get_organization_latest_usage_limit_success(self, mock_get):
         mock_response = mock_get.return_value
         mock_response.json.return_value = self.valid_response
@@ -106,7 +106,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, self.valid_response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.get")
+    @patch("pygeai.core.services.rest.GEAIApiService.get")
     def test_get_organization_latest_usage_limit_json_decode_error(self, mock_get):
         mock_response = mock_get.return_value
         mock_response.status_code = 200
@@ -121,7 +121,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to get latest usage limit for organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.get")
+    @patch("pygeai.core.services.rest.GEAIApiService.get")
     def test_get_all_usage_limits_from_organization_success(self, mock_get):
         response = {"limits": [self.valid_response]}
         mock_response = mock_get.return_value
@@ -137,7 +137,7 @@ class TestUsageLimitClient(unittest.TestCase):
         for limit in result["limits"]:
             UsageLimit.model_validate(limit)
 
-    @patch("pygeai.core.services.rest.ApiService.get")
+    @patch("pygeai.core.services.rest.GEAIApiService.get")
     def test_get_all_usage_limits_from_organization_json_decode_error(self, mock_get):
         mock_response = mock_get.return_value
         mock_response.status_code = 200
@@ -152,7 +152,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to get all usage limits for organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.delete")
+    @patch("pygeai.core.services.rest.GEAIApiService.delete")
     def test_delete_usage_limit_from_organization_success(self, mock_delete):
         response = {"status": "deleted"}
         mock_response = mock_delete.return_value
@@ -166,7 +166,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(result, response)
 
-    @patch("pygeai.core.services.rest.ApiService.delete")
+    @patch("pygeai.core.services.rest.GEAIApiService.delete")
     def test_delete_usage_limit_from_organization_json_decode_error(self, mock_delete):
         mock_response = mock_delete.return_value
         mock_response.status_code = 200
@@ -181,7 +181,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to delete usage limit with ID '{self.limit_id}' from organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_organization_hard_limit_success(self, mock_put):
         hard_limit = 3000.0
         response = self.valid_response.copy()
@@ -199,7 +199,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_organization_hard_limit_json_decode_error(self, mock_put):
         hard_limit = 3000.0
         mock_response = mock_put.return_value
@@ -216,7 +216,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to set hard limit for usage limit ID '{self.limit_id}' in organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_organization_soft_limit_success(self, mock_put):
         soft_limit = 1500.0
         response = self.valid_response.copy()
@@ -234,7 +234,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_organization_soft_limit_json_decode_error(self, mock_put):
         soft_limit = 1500.0
         mock_response = mock_put.return_value
@@ -251,7 +251,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to set soft limit for usage limit ID '{self.limit_id}' in organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_organization_renewal_status_success(self, mock_put):
         renewal_status = "NonRenewable"
         response = self.valid_response.copy()
@@ -269,7 +269,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_organization_renewal_status_json_decode_error(self, mock_put):
         renewal_status = "NonRenewable"
         mock_response = mock_put.return_value
@@ -286,7 +286,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to set renewal status for usage limit ID '{self.limit_id}' in organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.post")
+    @patch("pygeai.core.services.rest.GEAIApiService.post")
     def test_set_project_usage_limit_success(self, mock_post):
         mock_response = mock_post.return_value
         mock_response.json.return_value = self.valid_response
@@ -301,7 +301,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, self.valid_response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.post")
+    @patch("pygeai.core.services.rest.GEAIApiService.post")
     def test_set_project_usage_limit_json_decode_error(self, mock_post):
         mock_response = mock_post.return_value
         mock_response.status_code = 200
@@ -317,7 +317,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to set usage limit for project '{self.project}' in organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.post")
+    @patch("pygeai.core.services.rest.GEAIApiService.post")
     def test_set_project_usage_limit_invalid_usage_limit(self, mock_post):
         invalid_usage_limit = self.valid_usage_limit.copy()
         invalid_usage_limit["subscriptionType"] = "InvalidType"
@@ -335,7 +335,7 @@ class TestUsageLimitClient(unittest.TestCase):
         with self.assertRaises(ValidationError):
             UsageLimit.model_validate(invalid_usage_limit)
 
-    @patch("pygeai.core.services.rest.ApiService.get")
+    @patch("pygeai.core.services.rest.GEAIApiService.get")
     def test_get_all_usage_limits_from_project_success(self, mock_get):
         response = {"limits": [self.valid_response]}
         mock_response = mock_get.return_value
@@ -351,7 +351,7 @@ class TestUsageLimitClient(unittest.TestCase):
         for limit in result["limits"]:
             UsageLimit.model_validate(limit)
 
-    @patch("pygeai.core.services.rest.ApiService.get")
+    @patch("pygeai.core.services.rest.GEAIApiService.get")
     def test_get_all_usage_limits_from_project_json_decode_error(self, mock_get):
         mock_response = mock_get.return_value
         mock_response.status_code = 200
@@ -366,7 +366,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to get all usage limits for project '{self.project}' in organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.get")
+    @patch("pygeai.core.services.rest.GEAIApiService.get")
     def test_get_latest_usage_limit_from_project_success(self, mock_get):
         mock_response = mock_get.return_value
         mock_response.json.return_value = self.valid_response
@@ -380,7 +380,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, self.valid_response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.get")
+    @patch("pygeai.core.services.rest.GEAIApiService.get")
     def test_get_latest_usage_limit_from_project_json_decode_error(self, mock_get):
         mock_response = mock_get.return_value
         mock_response.status_code = 200
@@ -395,7 +395,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to get latest usage limit for project '{self.project}' in organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.get")
+    @patch("pygeai.core.services.rest.GEAIApiService.get")
     def test_get_active_usage_limit_from_project_success(self, mock_get):
         mock_response = mock_get.return_value
         mock_response.json.return_value = self.valid_response
@@ -409,7 +409,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, self.valid_response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.get")
+    @patch("pygeai.core.services.rest.GEAIApiService.get")
     def test_get_active_usage_limit_from_project_json_decode_error(self, mock_get):
         mock_response = mock_get.return_value
         mock_response.status_code = 200
@@ -424,7 +424,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to get active usage limit for project '{self.project}' in organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.delete")
+    @patch("pygeai.core.services.rest.GEAIApiService.delete")
     def test_delete_usage_limit_from_project_success(self, mock_delete):
         response = {"status": "deleted"}
         mock_response = mock_delete.return_value
@@ -438,7 +438,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(result, response)
 
-    @patch("pygeai.core.services.rest.ApiService.delete")
+    @patch("pygeai.core.services.rest.GEAIApiService.delete")
     def test_delete_usage_limit_from_project_json_decode_error(self, mock_delete):
         mock_response = mock_delete.return_value
         mock_response.status_code = 200
@@ -453,7 +453,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to delete usage limit with ID '{self.limit_id}' for project '{self.project}' in organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_hard_limit_for_active_usage_limit_from_project_success(self, mock_put):
         hard_limit = 4000.0
         response = self.valid_response.copy()
@@ -473,7 +473,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_hard_limit_for_active_usage_limit_from_project_json_decode_error(self, mock_put):
         hard_limit = 4000.0
         mock_response = mock_put.return_value
@@ -492,7 +492,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to set hard limit for usage limit ID '{self.limit_id}' for project '{self.project}' in organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_soft_limit_for_active_usage_limit_from_project_success(self, mock_put):
         soft_limit = 2000.0
         response = self.valid_response.copy()
@@ -512,7 +512,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_soft_limit_for_active_usage_limit_from_project_json_decode_error(self, mock_put):
         soft_limit = 2000.0
         mock_response = mock_put.return_value
@@ -531,7 +531,7 @@ class TestUsageLimitClient(unittest.TestCase):
         )
         self.assertEqual(str(context.exception), f"Unable to set soft limit for usage limit ID '{self.limit_id}' for project '{self.project}' in organization '{self.organization}': Invalid JSON response")
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_project_renewal_status_success(self, mock_put):
         renewal_status = "Renewable"
         response = self.valid_response.copy()
@@ -549,7 +549,7 @@ class TestUsageLimitClient(unittest.TestCase):
         self.assertEqual(result, response)
         UsageLimit.model_validate(result)
 
-    @patch("pygeai.core.services.rest.ApiService.put")
+    @patch("pygeai.core.services.rest.GEAIApiService.put")
     def test_set_project_renewal_status_json_decode_error(self, mock_put):
         renewal_status = "Renewable"
         mock_response = mock_put.return_value

pygeai/tests/organization/limits/test_managers.py

@@ -2,7 +2,7 @@ import unittest
 from datetime import datetime
 from unittest.mock import patch
 
-from pygeai.core.base.mappers import ModelMapper, ErrorMapper
+from pygeai.core.base.mappers import ModelMapper
 from pygeai.core.common.exceptions import APIError
 from pygeai.core.models import UsageLimit
 from pygeai.organization.limits.managers import UsageLimitManager
@@ -27,8 +27,8 @@ class TestUsageLimitManager(unittest.TestCase):
             subscription_type="Monthly",
             usage_unit="Cost",
             used_amount=0.0,
-            valid_from=datetime(2025, 2, 20, 19, 33, 0),
-            valid_until=datetime(2025, 3, 1, 0, 0, 0)
+            valid_from="2025-02-20T19:33:00",
+            valid_until="2025-03-01T00:00:00"
         )
         self.project_id = "1956c032-3c66-4435-acb8-6a06e52f819f"
         self.error_response = {"errors": [{"code": "400", "message": "Invalid request"}]}
@@ -154,8 +154,8 @@ class TestUsageLimitManager(unittest.TestCase):
             status=1,
             subscription_type="Monthly",
             usage_unit="Cost",
-            valid_from=datetime(2025, 2, 20, 19, 33, 0),
-            valid_until=datetime(2025, 3, 1, 0, 0, 0)
+            valid_from="2025-02-20T19:33:00",
+            valid_until="2025-03-01T00:00:00"
         )
         mock_hard.return_value = self.error_response
 
@@ -383,8 +383,8 @@ class TestUsageLimitManager(unittest.TestCase):
             status=1,
             subscription_type="Monthly",
             usage_unit="Cost",
-            valid_from=datetime(2025, 2, 20, 19, 33, 0),
-            valid_until=datetime(2025, 3, 1, 0, 0, 0)
+            valid_from="2025-02-20T19:33:00",
+            valid_until="2025-03-01T00:00:00"
         )
         mock_hard.return_value = self.error_response