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

pygeai/lab/strategies/clients.py

@@ -1,7 +1,8 @@
-from json import JSONDecodeError
 
 from pygeai import logger
 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.lab.clients import AILabClient
 from pygeai.lab.strategies.endpoints import LIST_REASONING_STRATEGIES_V2, CREATE_REASONING_STRATEGY_V2, \
     UPDATE_REASONING_STRATEGY_V2, UPSERT_REASONING_STRATEGY_V2, GET_REASONING_STRATEGY_V2
@@ -46,13 +47,8 @@ class ReasoningStrategyClient(AILabClient):
         logger.debug("Listing reasoning strategies")
 
         response = self.api_service.get(endpoint=endpoint, headers=headers, params=params)
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to list reasoning strategies: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to list reasoning strategies: {response.text}")
+        return parse_json_response(response, "list reasoning strategies")
 
-        return result
 
     def create_reasoning_strategy(
             self,
@@ -98,13 +94,8 @@ class ReasoningStrategyClient(AILabClient):
         logger.debug(f"Creating reasoning strategy with data: {data}")
 
         response = self.api_service.post(endpoint=endpoint, headers=headers, data=data)
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to create reasoning strategy for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to create reasoning strategy for project {self.project_id}: {response.text}")
+        return parse_json_response(response, f"create reasoning strategy for project {self.project_id}")
 
-        return result
 
     def update_reasoning_strategy(
             self,
@@ -174,13 +165,8 @@ class ReasoningStrategyClient(AILabClient):
             headers=headers,
             data=data
         )
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to update reasoning strategy {reasoning_strategy_id} in project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to update reasoning strategy {reasoning_strategy_id} in project {self.project_id}: {response.text}")
+        return parse_json_response(response, f"update reasoning strategy {reasoning_strategy_id} in project {self.project_id}")
 
-        return result
 
     def get_reasoning_strategy(
             self,
@@ -216,11 +202,7 @@ class ReasoningStrategyClient(AILabClient):
             endpoint=endpoint,
             headers=headers
         )
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to retrieve reasoning strategy {reasoning_strategy_id or reasoning_strategy_name} for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to retrieve reasoning strategy {reasoning_strategy_id or reasoning_strategy_name} for project {self.project_id}: {response.text}")
+        strategy_identifier = reasoning_strategy_id or reasoning_strategy_name
+        return parse_json_response(response, f"retrieve reasoning strategy {strategy_identifier} for project {self.project_id}")
 
-        return result
     

pygeai/lab/tools/clients.py

@@ -1,11 +1,12 @@
 import json
-from json import JSONDecodeError
 
 from pygeai import logger
 from pygeai.core.common.exceptions import InvalidAPIResponseException, MissingRequirementException, APIResponseError
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 from pygeai.lab.constants import VALID_SCOPES, VALID_ACCESS_SCOPES, VALID_REPORT_EVENTS
 from pygeai.lab.tools.endpoints import CREATE_TOOL_V2, LIST_TOOLS_V2, GET_TOOL_V2, UPDATE_TOOL_V2, UPSERT_TOOL_V2, \
-    PUBLISH_TOOL_REVISION_V2, GET_PARAMETER_V2, SET_PARAMETER_V2, DELETE_TOOL_V2, EXPORT_TOOL_V2
+    PUBLISH_TOOL_REVISION_V2, GET_PARAMETER_V2, SET_PARAMETER_V2, DELETE_TOOL_V2, EXPORT_TOOL_V4
 from pygeai.lab.clients import AILabClient
 
 
@@ -115,16 +116,9 @@ class ToolClient(AILabClient):
             data=data
         )
         
-        if response.status_code >= 300:
-            logger.error(f"Invalid status code returned from the API endpoint: {response.text}")
-            raise APIResponseError(f"API returned an error: {response.text}")
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to create tool for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to create tool for project {self.project_id}: {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"create tool for project {self.project_id}")
 
-        return result
 
     def list_tools(
             self,
@@ -169,16 +163,9 @@ class ToolClient(AILabClient):
                 "allowExternal": allow_external
             }
         )
-        if response.status_code >= 300:
-            logger.error(f"Invalid status code returned from the API endpoint: {response.text}")
-            raise APIResponseError(f"API returned an error: {response.text}")
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to list tools for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to list tools for project {self.project_id}: {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"list tools for project {self.project_id}")
 
-        return result
 
     def get_tool(
             self,
@@ -213,16 +200,9 @@ class ToolClient(AILabClient):
                 "allowDrafts": allow_drafts,
             }
         )
-        if response.status_code >= 300:
-            logger.error(f"Invalid status code returned from the API endpoint: {response.text}")
-            raise APIResponseError(f"API returned an error: {response.text}")
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to retrieve tool {tool_id} for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to retrieve tool {tool_id} for project {self.project_id}: {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"retrieve tool {tool_id} for project {self.project_id}")
 
-        return result
 
     def delete_tool(
             self,
@@ -256,9 +236,7 @@ class ToolClient(AILabClient):
             endpoint=endpoint,
             headers=headers
         )
-        if response.status_code >= 300:
-            logger.error(f"Invalid status code returned from the API endpoint: {response.text}")
-            raise APIResponseError(f"API returned an error: {response.text}")
+        validate_status_code(response)
 
         if response.status_code != 204:
             logger.error(f"Unable to delete tool {tool_id or tool_name} in project {self.project_id}: JSON parsing error (status {response.status_code}). Response: {response.text}")
@@ -376,16 +354,9 @@ class ToolClient(AILabClient):
             headers=headers,
             data=data
         )
-        if response.status_code >= 300:
-            logger.error(f"Invalid status code returned from the API endpoint: {response.text}")
-            raise APIResponseError(f"API returned an error: {response.text}")
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to update tool {tool_id} in project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to update tool {tool_id} in project {self.project_id}: {response.text}")
+        validate_status_code(response)
+        return parse_json_response(response, f"update tool {tool_id} in project {self.project_id}")
 
-        return result
 
     def publish_tool_revision(
             self,
@@ -414,13 +385,8 @@ class ToolClient(AILabClient):
                 "revision": revision,
             }
         )
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to publish revision {revision} for tool {tool_id} in project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to publish revision {revision} for tool {tool_id} in project {self.project_id}: {response.text}")
+        return parse_json_response(response, f"publish revision {revision} for tool {tool_id} in project {self.project_id}")
 
-        return result
 
     def get_parameter(
             self,
@@ -464,16 +430,10 @@ class ToolClient(AILabClient):
                 "allowDrafts": allow_drafts,
             }
         )
-        if response.status_code >= 300:
-            logger.error(f"Invalid status code returned from the API endpoint: {response.text}")
-            raise APIResponseError(f"API returned an error: {response.text}")
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to retrieve parameters for tool {tool_id or tool_public_name} in project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to retrieve parameters for tool {tool_id or tool_public_name} in project {self.project_id}: {response.text}")
+        validate_status_code(response)
+        tool_identifier = tool_id or tool_public_name
+        return parse_json_response(response, f"retrieve parameters for tool {tool_identifier} in project {self.project_id}")
 
-        return result
 
     def set_parameter(
             self,
@@ -527,6 +487,7 @@ class ToolClient(AILabClient):
         else:
             return {}
 
+    '''
     def export_tool(
             self,
             tool_id: str,
@@ -543,7 +504,7 @@ class ToolClient(AILabClient):
         if not tool_id:
             raise MissingRequirementException("tool_id must be specified in order to retrieve the tool")
 
-        endpoint = EXPORT_TOOL_V2.format(toolId=tool_id)
+        endpoint = EXPORT_TOOL_V4.format(toolId=tool_id)
         headers = {
             "Authorization": self.api_service.token,
             "ProjectId": self.project_id
@@ -555,13 +516,7 @@ class ToolClient(AILabClient):
             endpoint=endpoint,
             headers=headers,
         )
-        if response.status_code >= 300:
-            logger.error(f"Invalid status code returned from the API endpoint: {response.text}")
-            raise APIResponseError(f"API returned an error: {response.text}")
-        try:
-            result = response.json()
-        except JSONDecodeError as e:
-            logger.error(f"Unable to export tool {tool_id} for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to export tool {tool_id} for project {self.project_id}: {response.text}")
-
-        return result
+        validate_status_code(response)
+        return parse_json_response(response, f"export tool {tool_id} for project {self.project_id}")
+
+    '''

pygeai/lab/tools/endpoints.py

@@ -8,3 +8,6 @@ PUBLISH_TOOL_REVISION_V2 = "v2/tools/{toolId}/publish-revision"  # POST -> Publi
 GET_PARAMETER_V2 = "v2/tools/{toolPublicName}/config"  # GET -> Get tool parameter
 SET_PARAMETER_V2 = "v2/tools/{toolPublicName}/config"  # POST -> Set tool parameter
 EXPORT_TOOL_V2 = "v2/tools/{toolId}/export"  # GET -> Export tool
+IMPORT_TOOL_V2 = "v2/tools/import"  # POST -> Import tool
+EXPORT_TOOL_V4 = "v4/tools/{toolId}/export"  # GET -> Export tool
+IMPORT_TOOL_V4 = "v4/tools/import"  # POST -> Import tool

pygeai/organization/clients.py

@@ -1,11 +1,13 @@
-import json
-from json import JSONDecodeError
 
 from pygeai import logger
 from pygeai.core.common.exceptions import InvalidAPIResponseException
 from pygeai.organization.endpoints import GET_ASSISTANT_LIST_V1, GET_PROJECT_LIST_V1, GET_PROJECT_V1, \
-    CREATE_PROJECT_V1, UPDATE_PROJECT_V1, DELETE_PROJECT_V1, GET_PROJECT_TOKENS_V1, GET_REQUEST_DATA_V1
+    CREATE_PROJECT_V1, UPDATE_PROJECT_V1, DELETE_PROJECT_V1, GET_PROJECT_TOKENS_V1, GET_REQUEST_DATA_V1, \
+    GET_MEMBERSHIPS_V2, GET_PROJECT_MEMBERSHIPS_V2, GET_PROJECT_ROLES_V2, GET_PROJECT_MEMBERS_V2, \
+    GET_ORGANIZATION_MEMBERS_V2
 from pygeai.core.base.clients import BaseClient
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 
 
 class OrganizationClient(BaseClient):
@@ -23,12 +25,7 @@ class OrganizationClient(BaseClient):
         :return: AssistantListResponse - The API response containing the list of assistants and the project.
         """
         response = self.api_service.get(endpoint=GET_ASSISTANT_LIST_V1, params={"detail": detail})
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get assistant list: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get assistant list: {response.text}")
+        return parse_json_response(response, "get assistant list")
 
     def get_project_list(
             self,
@@ -59,12 +56,7 @@ class OrganizationClient(BaseClient):
                     "detail": detail
                 }
             )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get project list: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get project list: {response.text}")
+        return parse_json_response(response, "get project list")
 
     def get_project_data(
             self,
@@ -80,12 +72,7 @@ class OrganizationClient(BaseClient):
         response = self.api_service.get(
             endpoint=endpoint
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get project data for ID '{project_id}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get project data for ID '{project_id}': {response.text}")
+        return parse_json_response(response, "get project data for ID", project_id=project_id)
 
     def create_project(
             self,
@@ -122,12 +109,7 @@ class OrganizationClient(BaseClient):
                     "description": description
                 }
             )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to create project with name '{name}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to create project with name '{name}': {response.text}")
+        return parse_json_response(response, "create project with name", name=name)
 
     def update_project(
             self,
@@ -151,12 +133,7 @@ class OrganizationClient(BaseClient):
                 "description": description
             }
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to update project with ID '{project_id}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to update project with ID '{project_id}': {response.text}")
+        return parse_json_response(response, "update project with ID", project_id=project_id)
 
     def delete_project(
             self,
@@ -170,12 +147,7 @@ class OrganizationClient(BaseClient):
         """
         endpoint = DELETE_PROJECT_V1.format(id=project_id)
         response = self.api_service.delete(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to delete project with ID '{project_id}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to delete project with ID '{project_id}': {response.text}")
+        return parse_json_response(response, "delete project with ID", project_id=project_id)
 
     def get_project_tokens(
             self,
@@ -189,12 +161,7 @@ class OrganizationClient(BaseClient):
         """
         endpoint = GET_PROJECT_TOKENS_V1.format(id=project_id)
         response = self.api_service.get(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get tokens for project with ID '{project_id}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get tokens for project with ID '{project_id}': {response.text}")
+        return parse_json_response(response, "get tokens for project with ID", project_id=project_id)
 
     def export_request_data(
             self,
@@ -221,9 +188,113 @@ class OrganizationClient(BaseClient):
                 "count": count
             }
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to export request data: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to export request data: {response.text}")
+        return parse_json_response(response, "export request data")
+
+    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
+    ) -> dict:
+        """
+        Retrieves a list of Organizations and Projects a user belongs to with their Roles.
+
+        :param email: str - The email address of the user to search for (optional, 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 - Field for sorting. Only 'organizationName' is supported (optional).
+        :param order_direction: str - Sort direction: 'asc' or 'desc' (default is 'desc').
+        :param role_types: str - Comma-separated list of role types: 'backend', 'frontend' (optional, case-insensitive).
+        :return: dict - The API response containing the list of organizations and projects with roles, in JSON format.
+        """
+        params = {
+            "startPage": start_page,
+            "pageSize": page_size,
+            "orderDirection": order_direction
+        }
+        if email:
+            params["email"] = email
+        if order_key:
+            params["orderKey"] = order_key
+        if role_types:
+            params["roleTypes"] = role_types
+
+        response = self.api_service.get(endpoint=GET_MEMBERSHIPS_V2, params=params)
+        return parse_json_response(response, "get memberships")
+
+    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
+    ) -> dict:
+        """
+        Retrieves a list of Projects and Roles for a user within a specific Organization.
+
+        :param email: str - The email address of the user to search for (optional, 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 - Field for sorting. Only 'projectName' is supported (optional).
+        :param order_direction: str - Sort direction: 'asc' or 'desc' (default is 'desc').
+        :param role_types: str - Comma-separated list of role types: 'backend', 'frontend' (optional, case-insensitive).
+        :return: dict - The API response containing the list of projects with roles, in JSON format.
+        """
+        params = {
+            "startPage": start_page,
+            "pageSize": page_size,
+            "orderDirection": order_direction
+        }
+        if email:
+            params["email"] = email
+        if order_key:
+            params["orderKey"] = order_key
+        if role_types:
+            params["roleTypes"] = role_types
+
+        response = self.api_service.get(endpoint=GET_PROJECT_MEMBERSHIPS_V2, params=params)
+        return parse_json_response(response, "get project memberships")
+
+    def get_project_roles(
+            self,
+            project_id: str
+    ) -> dict:
+        """
+        Retrieves all Roles supported by a specific Project.
+
+        :param project_id: str - The unique identifier (GUID) of the project (required).
+        :return: dict - The API response containing the list of roles for the project, in JSON format.
+        """
+        response = self.api_service.get(endpoint=GET_PROJECT_ROLES_V2, params={"projectId": project_id})
+        return parse_json_response(response, "get project roles for project", project_id=project_id)
+
+    def get_project_members(
+            self,
+            project_id: str
+    ) -> dict:
+        """
+        Retrieves all members and their Roles for a specific Project.
+
+        :param project_id: str - The unique identifier (GUID) of the project (required).
+        :return: dict - The API response containing the list of members with their roles, in JSON format.
+        """
+        response = self.api_service.get(endpoint=GET_PROJECT_MEMBERS_V2, params={"projectId": project_id})
+        return parse_json_response(response, "get project members for project", project_id=project_id)
+
+    def get_organization_members(
+            self,
+            organization_id: str
+    ) -> dict:
+        """
+        Retrieves all members and their Roles for a specific Organization.
+
+        :param organization_id: str - The unique identifier (GUID) of the organization (required).
+        :return: dict - The API response containing the list of members with their roles, in JSON format.
+        """
+        response = self.api_service.get(endpoint=GET_ORGANIZATION_MEMBERS_V2, params={"organizationId": organization_id})
+        return parse_json_response(response, "get organization members for organization", organization_id=organization_id)

pygeai/organization/endpoints.py

@@ -1,4 +1,4 @@
-GET_ASSISTANT_LIST_V1 = "v1/organization/assistants"                # GET – Gets the list of assistants
+GET_ASSISTANT_LIST_V1 = "v1/organization/assistants"                # GET - Gets the list of assistants
 GET_PROJECT_LIST_V1 = "v1/organization/projects"	                # GET - Gets the list of projects
 GET_PROJECT_V1 = "v1/organization/project/{id}"	                    # GET - Gets project details
 CREATE_PROJECT_V1 = "v1/organization/project"	                    # POST - Creates a project
@@ -6,3 +6,8 @@ UPDATE_PROJECT_V1 = "v1/organization/project/{id}"	                # PUT - Updat
 DELETE_PROJECT_V1 = "v1/organization/project/{id}"	                # DELETE - Deletes a project
 GET_PROJECT_TOKENS_V1 = "v1/organization/project/{id}/tokens"	    # GET - Gets the list of Tokens for the project
 GET_REQUEST_DATA_V1 = "v1/organization/request/export"	            # GET - Exports request data
+GET_MEMBERSHIPS_V2 = "v2/accessControl/memberships"                # GET - Lists Organizations and Projects a user belongs to with their Roles
+GET_PROJECT_MEMBERSHIPS_V2 = "v2/accessControl/projects/memberships"   # GET - Lists Projects and Roles for a user within a specific Organization
+GET_PROJECT_ROLES_V2 = "v2/accessControl/projects/roles"           # GET - Lists all Roles supported by a specific Project
+GET_PROJECT_MEMBERS_V2 = "v2/accessControl/projects/members"       # GET - Lists all members and their Roles for a specific Project
+GET_ORGANIZATION_MEMBERS_V2 = "v2/accessControl/organizations/members"  # GET - Lists all members and their Roles for a specific Organization