pygeai 0.6.0b6__py3-none-any.whl → 0.6.0b10__py3-none-any.whl

pygeai/organization/limits/clients.py

@@ -1,8 +1,9 @@
-from json import JSONDecodeError
 
 from pygeai import logger
 from pygeai.core.base.clients import BaseClient
 from pygeai.core.common.exceptions import InvalidAPIResponseException
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 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, \
     SET_ORGANIZATION_SOFT_LIMIT_V2, SET_ORGANIZATION_RENEWAL_STATUS_V2, SET_PROJECT_USAGE_LIMIT_V2, \
@@ -33,12 +34,8 @@ class UsageLimitClient(BaseClient):
             endpoint=endpoint,
             data=usage_limit
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to set usage limit for organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to set usage limit for organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"set usage limit for organization", organization=organization)
 
     def get_organization_latest_usage_limit(self, organization: str) -> dict:
         """
@@ -49,12 +46,8 @@ class UsageLimitClient(BaseClient):
         """
         endpoint = GET_ORGANIZATION_LATEST_USAGE_LIMIT_V2.format(organization=organization)
         response = self.api_service.get(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get latest usage limit for organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get latest usage limit for organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"get latest usage limit for organization", organization=organization)
 
     def get_all_usage_limits_from_organization(self, organization: str) -> dict:
         """
@@ -65,12 +58,8 @@ class UsageLimitClient(BaseClient):
         """
         endpoint = GET_ALL_ORGANIZATION_USAGE_LIMITS_V2.format(organization=organization)
         response = self.api_service.get(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get all usage limits for organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get all usage limits for organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"get all usage limits for organization", organization=organization)
 
     def delete_usage_limit_from_organization(self, organization: str, limit_id: str) -> dict:
         """
@@ -82,12 +71,8 @@ class UsageLimitClient(BaseClient):
         """
         endpoint = DELETE_ORGANIZATION_USAGE_LIMIT_V2.format(organization=organization, id=limit_id)
         response = self.api_service.delete(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to delete usage limit with ID '{limit_id}' from organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to delete usage limit with ID '{limit_id}' from organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"delete usage limit with ID '{limit_id}' from organization", organization=organization)
 
     def set_organization_hard_limit(self, organization: str, limit_id: str, hard_limit: float) -> dict:
         """
@@ -105,12 +90,8 @@ class UsageLimitClient(BaseClient):
                 "hardLimit": hard_limit
             }
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to set hard limit for usage limit ID '{limit_id}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to set hard limit for usage limit ID '{limit_id}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"set hard limit for usage limit ID '{limit_id}' in organization", organization=organization)
 
     def set_organization_soft_limit(self, organization: str, limit_id: str, soft_limit: float) -> dict:
         """
@@ -128,12 +109,8 @@ class UsageLimitClient(BaseClient):
                 "softLimit": soft_limit
             }
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to set soft limit for usage limit ID '{limit_id}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to set soft limit for usage limit ID '{limit_id}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"set soft limit for usage limit ID '{limit_id}' in organization", organization=organization)
 
     def set_organization_renewal_status(self, organization: str, limit_id: str, renewal_status: str) -> dict:
         """
@@ -151,12 +128,8 @@ class UsageLimitClient(BaseClient):
                 "renewalStatus": renewal_status
             }
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to set renewal status for usage limit ID '{limit_id}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to set renewal status for usage limit ID '{limit_id}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"set renewal status for usage limit ID '{limit_id}' in organization", organization=organization)
 
     def set_project_usage_limit(self, organization: str, project: str, usage_limit: dict) -> dict:
         """
@@ -179,12 +152,8 @@ class UsageLimitClient(BaseClient):
             endpoint=endpoint,
             data=usage_limit
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to set usage limit for project '{project}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to set usage limit for project '{project}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"set usage limit for project '{project}' in organization", organization=organization)
 
     def get_all_usage_limits_from_project(self, organization: str, project: str) -> dict:
         """
@@ -196,12 +165,8 @@ class UsageLimitClient(BaseClient):
         """
         endpoint = GET_ALL_PROJECT_USAGE_LIMIT_V2.format(organization=organization, project=project)
         response = self.api_service.get(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get all usage limits for project '{project}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get all usage limits for project '{project}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"get all usage limits for project '{project}' in organization", organization=organization)
 
     def get_latest_usage_limit_from_project(self, organization: str, project: str) -> dict:
         """
@@ -213,12 +178,8 @@ class UsageLimitClient(BaseClient):
         """
         endpoint = GET_LATEST_PROJECT_USAGE_LIMIT_V2.format(organization=organization, project=project)
         response = self.api_service.get(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get latest usage limit for project '{project}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get latest usage limit for project '{project}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"get latest usage limit for project '{project}' in organization", organization=organization)
 
     def get_active_usage_limit_from_project(self, organization: str, project: str) -> dict:
         """
@@ -230,12 +191,8 @@ class UsageLimitClient(BaseClient):
         """
         endpoint = GET_PROJECT_ACTIVE_USAGE_LIMIT_V2.format(organization=organization, project=project)
         response = self.api_service.get(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get active usage limit for project '{project}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get active usage limit for project '{project}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"get active usage limit for project '{project}' in organization", organization=organization)
 
     def delete_usage_limit_from_project(self, organization: str, project: str, limit_id: str) -> dict:
         """
@@ -248,12 +205,8 @@ class UsageLimitClient(BaseClient):
         """
         endpoint = DELETE_PROJECT_USAGE_LIMIT_V2.format(organization=organization, project=project, id=limit_id)
         response = self.api_service.delete(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to delete usage limit with ID '{limit_id}' for project '{project}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to delete usage limit with ID '{limit_id}' for project '{project}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"delete usage limit with ID '{limit_id}' for project '{project}' in organization", organization=organization)
 
     def set_hard_limit_for_active_usage_limit_from_project(
             self,
@@ -278,12 +231,8 @@ class UsageLimitClient(BaseClient):
                 "hardLimit": hard_limit
             }
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to set hard limit for usage limit ID '{limit_id}' for project '{project}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to set hard limit for usage limit ID '{limit_id}' for project '{project}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"set hard limit for usage limit ID '{limit_id}' for project '{project}' in organization", organization=organization)
 
     def set_soft_limit_for_active_usage_limit_from_project(
             self,
@@ -308,12 +257,8 @@ class UsageLimitClient(BaseClient):
                 "softLimit": soft_limit
             }
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to set soft limit for usage limit ID '{limit_id}' for project '{project}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to set soft limit for usage limit ID '{limit_id}' for project '{project}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"set soft limit for usage limit ID '{limit_id}' for project '{project}' in organization", organization=organization)
 
     def set_project_renewal_status(self, organization: str, project: str, limit_id: str, renewal_status: str) -> dict:
         """
@@ -332,9 +277,5 @@ class UsageLimitClient(BaseClient):
                 "renewalStatus": renewal_status
             }
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to set renewal status for usage limit ID '{limit_id}' for project '{project}' in organization '{organization}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to set renewal status for usage limit ID '{limit_id}' for project '{project}' in organization '{organization}': {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"set renewal status for usage limit ID '{limit_id}' for project '{project}' in organization", organization=organization)

pygeai/organization/managers.py

@@ -6,7 +6,8 @@ from pygeai.core.base.responses import EmptyResponse
 from pygeai.organization.clients import OrganizationClient
 from pygeai.organization.mappers import OrganizationResponseMapper
 from pygeai.organization.responses import AssistantListResponse, ProjectListResponse, ProjectDataResponse, \
-    ProjectTokensResponse, ProjectItemListResponse
+    ProjectTokensResponse, ProjectItemListResponse, MembershipsResponse, ProjectMembershipsResponse, \
+    ProjectRolesResponse, ProjectMembersResponse, OrganizationMembersResponse
 from pygeai.core.common.exceptions import APIError
 
 
@@ -247,3 +248,158 @@ class OrganizationManager:
 
         result = OrganizationResponseMapper.map_to_item_list_response(response_data)
         return result
+
+    def get_memberships(
+            self,
+            email: str = None,
+            start_page: int = 1,
+            page_size: int = 20,
+            order_key: str = None,
+            order_direction: str = "desc",
+            role_types: str = None
+    ) -> MembershipsResponse:
+        """
+        Retrieves a list of Organizations and Projects a user belongs to with their Roles.
+
+        This method calls `OrganizationClient.get_memberships` to fetch membership data
+        and maps the response using `OrganizationResponseMapper.map_to_memberships_response`.
+
+        :param email: str, optional - The email address of the user to search for (case-insensitive).
+        :param start_page: int - The page number for pagination (default is 1).
+        :param page_size: int - The number of items per page (default is 20).
+        :param order_key: str, optional - Field for sorting. Only 'organizationName' is supported.
+        :param order_direction: str - Sort direction: 'asc' or 'desc' (default is 'desc').
+        :param role_types: str, optional - Comma-separated list of role types: 'backend', 'frontend' (case-insensitive).
+        :return: MembershipsResponse - The mapped response containing organizations and projects with roles.
+        :raises APIError: If the API returns errors.
+        """
+        response_data = self.__organization_client.get_memberships(
+            email=email,
+            start_page=start_page,
+            page_size=page_size,
+            order_key=order_key,
+            order_direction=order_direction,
+            role_types=role_types
+        )
+        if ErrorHandler.has_errors(response_data):
+            error = ErrorHandler.extract_error(response_data)
+            logger.error(f"Error received while retrieving memberships: {error}")
+            raise APIError(f"Error received while retrieving memberships: {error}")
+
+        result = OrganizationResponseMapper.map_to_memberships_response(response_data)
+        return result
+
+    def get_project_memberships(
+            self,
+            email: str = None,
+            start_page: int = 1,
+            page_size: int = 20,
+            order_key: str = None,
+            order_direction: str = "desc",
+            role_types: str = None
+    ) -> ProjectMembershipsResponse:
+        """
+        Retrieves a list of Projects and Roles for a user within a specific Organization.
+
+        This method calls `OrganizationClient.get_project_memberships` to fetch project membership data
+        and maps the response using `OrganizationResponseMapper.map_to_project_memberships_response`.
+
+        :param email: str, optional - The email address of the user to search for (case-insensitive).
+        :param start_page: int - The page number for pagination (default is 1).
+        :param page_size: int - The number of items per page (default is 20).
+        :param order_key: str, optional - Field for sorting. Only 'projectName' is supported.
+        :param order_direction: str - Sort direction: 'asc' or 'desc' (default is 'desc').
+        :param role_types: str, optional - Comma-separated list of role types: 'backend', 'frontend' (case-insensitive).
+        :return: ProjectMembershipsResponse - The mapped response containing projects with roles.
+        :raises APIError: If the API returns errors.
+        """
+        response_data = self.__organization_client.get_project_memberships(
+            email=email,
+            start_page=start_page,
+            page_size=page_size,
+            order_key=order_key,
+            order_direction=order_direction,
+            role_types=role_types
+        )
+        if ErrorHandler.has_errors(response_data):
+            error = ErrorHandler.extract_error(response_data)
+            logger.error(f"Error received while retrieving project memberships: {error}")
+            raise APIError(f"Error received while retrieving project memberships: {error}")
+
+        result = OrganizationResponseMapper.map_to_project_memberships_response(response_data)
+        return result
+
+    def get_project_roles(
+            self,
+            project_id: str
+    ) -> ProjectRolesResponse:
+        """
+        Retrieves all Roles supported by a specific Project.
+
+        This method calls `OrganizationClient.get_project_roles` to fetch project roles
+        and maps the response using `OrganizationResponseMapper.map_to_project_roles_response`.
+
+        :param project_id: str - The unique identifier of the project.
+        :return: ProjectRolesResponse - The mapped response containing the list of roles.
+        :raises APIError: If the API returns errors.
+        """
+        response_data = self.__organization_client.get_project_roles(
+            project_id=project_id
+        )
+        if ErrorHandler.has_errors(response_data):
+            error = ErrorHandler.extract_error(response_data)
+            logger.error(f"Error received while retrieving project roles: {error}")
+            raise APIError(f"Error received while retrieving project roles: {error}")
+
+        result = OrganizationResponseMapper.map_to_project_roles_response(response_data)
+        return result
+
+    def get_project_members(
+            self,
+            project_id: str
+    ) -> ProjectMembersResponse:
+        """
+        Retrieves all members and their Roles for a specific Project.
+
+        This method calls `OrganizationClient.get_project_members` to fetch project members
+        and maps the response using `OrganizationResponseMapper.map_to_project_members_response`.
+
+        :param project_id: str - The unique identifier of the project.
+        :return: ProjectMembersResponse - The mapped response containing members with their roles.
+        :raises APIError: If the API returns errors.
+        """
+        response_data = self.__organization_client.get_project_members(
+            project_id=project_id
+        )
+        if ErrorHandler.has_errors(response_data):
+            error = ErrorHandler.extract_error(response_data)
+            logger.error(f"Error received while retrieving project members: {error}")
+            raise APIError(f"Error received while retrieving project members: {error}")
+
+        result = OrganizationResponseMapper.map_to_project_members_response(response_data)
+        return result
+
+    def get_organization_members(
+            self,
+            organization_id: str
+    ) -> OrganizationMembersResponse:
+        """
+        Retrieves all members and their Roles for a specific Organization.
+
+        This method calls `OrganizationClient.get_organization_members` to fetch organization members
+        and maps the response using `OrganizationResponseMapper.map_to_organization_members_response`.
+
+        :param organization_id: str - The unique identifier of the organization.
+        :return: OrganizationMembersResponse - The mapped response containing members with their roles.
+        :raises APIError: If the API returns errors.
+        """
+        response_data = self.__organization_client.get_organization_members(
+            organization_id=organization_id
+        )
+        if ErrorHandler.has_errors(response_data):
+            error = ErrorHandler.extract_error(response_data)
+            logger.error(f"Error received while retrieving organization members: {error}")
+            raise APIError(f"Error received while retrieving organization members: {error}")
+
+        result = OrganizationResponseMapper.map_to_organization_members_response(response_data)
+        return result

pygeai/organization/mappers.py

@@ -1,7 +1,8 @@
 from pygeai.core.base.mappers import ModelMapper
-from pygeai.core.models import Assistant, Project
+from pygeai.core.models import Assistant, Project, Role, Member, OrganizationMembership, ProjectMembership
 from pygeai.organization.responses import AssistantListResponse, ProjectListResponse, ProjectDataResponse, \
-    ProjectTokensResponse, ProjectItemListResponse
+    ProjectTokensResponse, ProjectItemListResponse, MembershipsResponse, ProjectMembershipsResponse, \
+    ProjectRolesResponse, ProjectMembersResponse, OrganizationMembersResponse
 
 
 class OrganizationResponseMapper:
@@ -76,3 +77,76 @@ class OrganizationResponseMapper:
             items=item_list
         )
 
+    @classmethod
+    def map_to_memberships_response(cls, data: dict) -> MembershipsResponse:
+        count = data.get("count", 0)
+        pages = data.get("pages", 0)
+        organizations_data = data.get("organizations", [])
+        organizations = []
+        
+        for org_data in organizations_data:
+            org = OrganizationMembership.model_validate(org_data)
+            organizations.append(org)
+
+        return MembershipsResponse(
+            count=count,
+            pages=pages,
+            organizations=organizations
+        )
+
+    @classmethod
+    def map_to_project_memberships_response(cls, data: dict) -> ProjectMembershipsResponse:
+        count = data.get("count", 0)
+        pages = data.get("pages", 0)
+        projects_data = data.get("projects", [])
+        projects = []
+        
+        for project_data in projects_data:
+            project = ProjectMembership.model_validate(project_data)
+            projects.append(project)
+
+        return ProjectMembershipsResponse(
+            count=count,
+            pages=pages,
+            projects=projects
+        )
+
+    @classmethod
+    def map_to_project_roles_response(cls, data: dict) -> ProjectRolesResponse:
+        roles_data = data.get("roles", [])
+        roles = []
+        
+        for role_data in roles_data:
+            role = Role.model_validate(role_data)
+            roles.append(role)
+
+        return ProjectRolesResponse(
+            roles=roles
+        )
+
+    @classmethod
+    def map_to_project_members_response(cls, data: dict) -> ProjectMembersResponse:
+        members_data = data.get("members", [])
+        members = []
+        
+        for member_data in members_data:
+            member = Member.model_validate(member_data)
+            members.append(member)
+
+        return ProjectMembersResponse(
+            members=members
+        )
+
+    @classmethod
+    def map_to_organization_members_response(cls, data: dict) -> OrganizationMembersResponse:
+        members_data = data.get("members", [])
+        members = []
+        
+        for member_data in members_data:
+            member = Member.model_validate(member_data)
+            members.append(member)
+
+        return OrganizationMembersResponse(
+            members=members
+        )
+

pygeai/organization/responses.py

@@ -1,7 +1,7 @@
 from pydantic.main import BaseModel
 
 from pygeai.core.models import Assistant, Project, ProjectToken, \
-    RequestItem
+    RequestItem, Role, Member, OrganizationMembership, ProjectMembership
 
 
 class AssistantListResponse(BaseModel):
@@ -45,3 +45,27 @@ class ProjectItemListResponse(BaseModel):
         if self.items is None:
             self.items = []
         self.items.append(item)
+
+
+class MembershipsResponse(BaseModel):
+    count: int
+    pages: int
+    organizations: list[OrganizationMembership]
+
+
+class ProjectMembershipsResponse(BaseModel):
+    count: int
+    pages: int
+    projects: list[ProjectMembership]
+
+
+class ProjectRolesResponse(BaseModel):
+    roles: list[Role]
+
+
+class ProjectMembersResponse(BaseModel):
+    members: list[Member]
+
+
+class OrganizationMembersResponse(BaseModel):
+    members: list[Member]

pygeai/proxy/clients.py

@@ -4,6 +4,8 @@ import uuid
 import requests
 from urllib3.exceptions import MaxRetryError
 from pygeai.proxy.tool import ProxiedTool
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 
 
 @dataclass
@@ -150,7 +152,8 @@ class ProxyClient:
             response = self.session.request(method, url, **kwargs)
             response.raise_for_status()
             try:
-                return response.json()
+                validate_status_code(response)
+                return parse_json_response(response, "unknown operation")
             except ValueError:
                 return response.text
         except requests.exceptions.Timeout:

pygeai/tests/admin/test_clients.py

@@ -3,7 +3,7 @@ from unittest.mock import patch, MagicMock
 from json import JSONDecodeError
 
 from pygeai.admin.clients import AdminClient
-from pygeai.core.common.exceptions import InvalidAPIResponseException
+from pygeai.core.common.exceptions import InvalidAPIResponseException, APIResponseError, APIResponseError
 
 
 class TestAdminClient(unittest.TestCase):
@@ -18,6 +18,7 @@ class TestAdminClient(unittest.TestCase):
     @patch('pygeai.core.services.rest.ApiService.get')
     def test_validate_api_token_success(self, mock_get):
         self.mock_response.json.return_value = {"organizationId": "org-123", "projectId": "proj-123"}
+        self.mock_response.status_code = 200
         mock_get.return_value = self.mock_response
         
         result = self.client.validate_api_token()
@@ -32,13 +33,14 @@ class TestAdminClient(unittest.TestCase):
         self.mock_response.text = "Invalid response"
         mock_get.return_value = self.mock_response
         
-        with self.assertRaises(InvalidAPIResponseException) as context:
+        with self.assertRaises(APIResponseError) as context:
             self.client.validate_api_token()
-        self.assertIn("Unable to validate API token", str(context.exception))
+        self.assertIn("API returned an error", str(context.exception))  # "Unable to validate API token", str(context.exception))
 
     @patch('pygeai.core.services.rest.ApiService.get')
     def test_get_authorized_organizations_success(self, mock_get):
         self.mock_response.json.return_value = {"organizations": ["org1", "org2"]}
+        self.mock_response.status_code = 200
         mock_get.return_value = self.mock_response
         
         result = self.client.get_authorized_organizations()
@@ -53,13 +55,14 @@ class TestAdminClient(unittest.TestCase):
         self.mock_response.text = "Invalid response"
         mock_get.return_value = self.mock_response
         
-        with self.assertRaises(InvalidAPIResponseException) as context:
+        with self.assertRaises(APIResponseError) as context:
             self.client.get_authorized_organizations()
-        self.assertIn("Unable to retrieve authorized organizations", str(context.exception))
+        self.assertIn("API returned an error", str(context.exception))  # "Unable to retrieve authorized organizations", str(context.exception))
 
     @patch('pygeai.core.services.rest.ApiService.get')
     def test_get_authorized_projects_by_organization_success(self, mock_get):
         self.mock_response.json.return_value = {"projects": ["proj1", "proj2"]}
+        self.mock_response.status_code = 200
         mock_get.return_value = self.mock_response
         
         result = self.client.get_authorized_projects_by_organization("org-123")
@@ -76,13 +79,14 @@ class TestAdminClient(unittest.TestCase):
         self.mock_response.text = "Invalid response"
         mock_get.return_value = self.mock_response
         
-        with self.assertRaises(InvalidAPIResponseException) as context:
+        with self.assertRaises(APIResponseError) as context:
             self.client.get_authorized_projects_by_organization("org-123")
-        self.assertIn("Unable to retrieve authorized projects for organization", str(context.exception))
+        self.assertIn("API returned an error", str(context.exception))  # "Unable to retrieve authorized projects for organization", str(context.exception))
 
     @patch('pygeai.core.services.rest.ApiService.get')
     def test_get_project_visibility_success(self, mock_get):
         self.mock_response.json.return_value = {}
+        self.mock_response.status_code = 200
         mock_get.return_value = self.mock_response
         
         result = self.client.get_project_visibility(
@@ -105,13 +109,14 @@ class TestAdminClient(unittest.TestCase):
         self.mock_response.text = "Forbidden"
         mock_get.return_value = self.mock_response
         
-        with self.assertRaises(InvalidAPIResponseException) as context:
+        with self.assertRaises(APIResponseError) as context:
             self.client.get_project_visibility("org-123", "proj-456", "token-789")
-        self.assertIn("Unable to retrieve project visibility", str(context.exception))
+        self.assertIn("API returned an error", str(context.exception))  # "Unable to retrieve project visibility", str(context.exception))
 
     @patch('pygeai.core.services.rest.ApiService.get')
     def test_get_project_api_token_success(self, mock_get):
         self.mock_response.json.return_value = {"apiToken": "api-token-123"}
+        self.mock_response.status_code = 200
         mock_get.return_value = self.mock_response
         
         result = self.client.get_project_api_token(
@@ -134,9 +139,9 @@ class TestAdminClient(unittest.TestCase):
         self.mock_response.text = "Unauthorized"
         mock_get.return_value = self.mock_response
         
-        with self.assertRaises(InvalidAPIResponseException) as context:
+        with self.assertRaises(APIResponseError) as context:
             self.client.get_project_api_token("org-123", "proj-456", "token-789")
-        self.assertIn("Unable to retrieve project API token", str(context.exception))
+        self.assertIn("API returned an error", str(context.exception))  # "Unable to retrieve project API token", str(context.exception))
 
 
 if __name__ == '__main__':