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

pygeai/lab/tools/clients.py

@@ -6,7 +6,7 @@ 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_V4
+    PUBLISH_TOOL_REVISION_V2, GET_PARAMETER_V2, SET_PARAMETER_V2, DELETE_TOOL_V2
 from pygeai.lab.clients import AILabClient
 
 
@@ -103,23 +103,14 @@ class ToolClient(AILabClient):
         if automatic_publish:
             endpoint = f"{endpoint}?automaticPublish=true"
 
-        headers = {
-            "Accept": "application/json",
-            "Content-Type": "application/json",
-            "Authorization": self.api_service.token,
-            "ProjectId": self.project_id
-        }
-
         response = self.api_service.post(
             endpoint=endpoint,
-            headers=headers,
             data=data
         )
         
         validate_status_code(response)
         return parse_json_response(response, f"create tool for project {self.project_id}")
 
-
     def list_tools(
             self,
             id: str = "",
@@ -141,10 +132,6 @@ class ToolClient(AILabClient):
         :return: dict or str - JSON response containing the list of tools if successful, otherwise the raw response text.
         """
         endpoint = LIST_TOOLS_V2
-        headers = {
-            "Authorization": self.api_service.token,
-            "ProjectId": self.project_id
-        }
 
         if scope and scope not in VALID_SCOPES:
             raise ValueError(f"Scope must be one of {', '.join(VALID_SCOPES)}.")
@@ -153,7 +140,6 @@ class ToolClient(AILabClient):
 
         response = self.api_service.get(
             endpoint=endpoint,
-            headers=headers,
             params={
                 "id": id,
                 "count": count,
@@ -166,7 +152,6 @@ class ToolClient(AILabClient):
         validate_status_code(response)
         return parse_json_response(response, f"list tools for project {self.project_id}")
 
-
     def get_tool(
             self,
             tool_id: str,
@@ -184,16 +169,10 @@ class ToolClient(AILabClient):
         :return: dict or str - JSON response containing the tool details if successful, otherwise the raw response text.
         """
         endpoint = GET_TOOL_V2.format(toolId=tool_id)
-        headers = {
-            "Authorization": self.api_service.token,
-            "ProjectId": self.project_id
-        }
-
         logger.debug(f"Retrieving detail of tool with ID: {tool_id}")
 
         response = self.api_service.get(
             endpoint=endpoint,
-            headers=headers,
             params={
                 "revision": revision,
                 "version": version,
@@ -222,10 +201,6 @@ class ToolClient(AILabClient):
             raise ValueError("Either tool_id or tool_name must be provided.")
 
         endpoint = DELETE_TOOL_V2.format(toolId=tool_id if tool_id else tool_name)
-        headers = {
-            "Authorization": self.api_service.token,
-            "ProjectId": self.project_id
-        }
 
         if tool_id:
             logger.debug(f"Deleting tool with ID {tool_id}")
@@ -234,7 +209,6 @@ class ToolClient(AILabClient):
 
         response = self.api_service.delete(
             endpoint=endpoint,
-            headers=headers
         )
         validate_status_code(response)
 
@@ -345,19 +319,13 @@ class ToolClient(AILabClient):
         if automatic_publish:
             endpoint = f"{endpoint}?automaticPublish=true"
 
-        headers = {
-            "Authorization": self.api_service.token,
-            "ProjectId": self.project_id
-        }
         response = self.api_service.put(
             endpoint=endpoint,
-            headers=headers,
             data=data
         )
         validate_status_code(response)
         return parse_json_response(response, f"update tool {tool_id} in project {self.project_id}")
 
-
     def publish_tool_revision(
             self,
             tool_id: str,
@@ -371,16 +339,10 @@ class ToolClient(AILabClient):
         :return: dict or str - JSON response containing the result of the publish operation if successful, otherwise the raw response text.
         """
         endpoint = PUBLISH_TOOL_REVISION_V2.format(toolId=tool_id)
-        headers = {
-            "Authorization": self.api_service.token,
-            "ProjectId": self.project_id
-        }
-
         logger.debug(f"Publishing revision {revision} for tool with ID {tool_id}")
 
         response = self.api_service.post(
             endpoint=endpoint,
-            headers=headers,
             data={
                 "revision": revision,
             }
@@ -417,14 +379,8 @@ class ToolClient(AILabClient):
             logger.debug(f"Retrieving parameter for tool with name '{tool_public_name}'")
 
         endpoint = GET_PARAMETER_V2.format(toolPublicName=tool_public_name) if tool_public_name else GET_PARAMETER_V2.format(toolPublicName=tool_id)
-        headers = {
-            "Authorization": self.api_service.token,
-            "ProjectId": self.project_id
-        }
-
         response = self.api_service.get(
             endpoint=endpoint,
-            headers=headers,
             params={
                 "revision": revision,
                 "version": version,
@@ -435,7 +391,6 @@ class ToolClient(AILabClient):
         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}")
 
-
     def set_parameter(
             self,
             tool_id: str = None,
@@ -459,12 +414,6 @@ class ToolClient(AILabClient):
             raise ValueError("Parameters list must be provided and non-empty.")
 
         endpoint = SET_PARAMETER_V2.format(toolPublicName=tool_public_name) if tool_public_name else SET_PARAMETER_V2.format(toolPublicName=tool_id)
-        headers = {
-            "Authorization": self.api_service.token,
-            "ProjectId": self.project_id,
-            "Content-Type": "application/json",
-            "Accept": "application/json"
-        }
 
         data = {
             "parameterDefinition": {
@@ -479,7 +428,6 @@ class ToolClient(AILabClient):
 
         response = self.api_service.post(
             endpoint=endpoint,
-            headers=headers,
             data=data
         )
         if response.status_code != 204:
@@ -506,16 +454,10 @@ class ToolClient(AILabClient):
             raise MissingRequirementException("tool_id must be specified in order to retrieve the tool")
 
         endpoint = EXPORT_TOOL_V4.format(toolId=tool_id)
-        headers = {
-            "Authorization": self.api_service.token,
-            "ProjectId": self.project_id
-        }
-
         logger.debug(f"Exporting tool with ID {tool_id}")
 
         response = self.api_service.get(
             endpoint=endpoint,
-            headers=headers,
         )
         validate_status_code(response)
         return parse_json_response(response, f"export tool {tool_id} for project {self.project_id}")

pygeai/migration/__init__.py

@@ -7,7 +7,8 @@ from pygeai.migration.strategies import (
     TaskMigrationStrategy,
     UsageLimitMigrationStrategy,
     RAGAssistantMigrationStrategy,
-    FileMigrationStrategy
+    FileMigrationStrategy,
+    SecretMigrationStrategy
 )
 from pygeai.migration.tools import (
     MigrationTool,
@@ -25,6 +26,7 @@ __all__ = [
     "UsageLimitMigrationStrategy",
     "RAGAssistantMigrationStrategy",
     "FileMigrationStrategy",
+    "SecretMigrationStrategy",
     "MigrationTool",
     "MigrationPlan",
     "MigrationOrchestrator"

pygeai/migration/strategies.py

@@ -3,6 +3,7 @@ from abc import ABC, abstractmethod
 from typing import Optional
 
 from pygeai import logger
+from pygeai.core.files.responses import UploadFileResponse
 from pygeai.core.models import Project, UsageLimit
 from pygeai.core.base.responses import ErrorListResponse
 from pygeai.core.utils.console import Console
@@ -14,6 +15,7 @@ from pygeai.organization.limits.managers import UsageLimitManager
 from pygeai.organization.managers import OrganizationManager
 from pygeai.assistant.managers import AssistantManager
 from pygeai.assistant.rag.models import RAGAssistant
+from pygeai.core.secrets.clients import SecretClient
 
 
 class MigrationStrategy(ABC):
@@ -507,10 +509,10 @@ class FileMigrationStrategy(MigrationStrategy):
         
         :raises ValueError: If file retrieval or upload fails
         """
-        new_file = self._migrate_file()
+        upload_file_response = self._migrate_file()
         logger.info(f"Successfully migrated file {self.file_id}")
 
-    def _migrate_file(self) -> File:
+    def _migrate_file(self) -> UploadFileResponse:
         """
         Retrieve file from source and upload to destination.
         
@@ -528,7 +530,74 @@ class FileMigrationStrategy(MigrationStrategy):
                 content=file_content,
                 folder=None
             )
-            return upload_response.file
+            return upload_response
         except Exception as e:
             logger.error(f"File migration failed: {e}")
             raise ValueError(f"File migration failed: {e}") from e
+
+
+class SecretMigrationStrategy(MigrationStrategy):
+    """
+    Migrate secret from a GEAI project.
+    The target project can be in another organization or the same one; in the same instance or another.
+    """
+
+    def __init__(
+            self,
+            from_api_key: str,
+            from_instance: str,
+            secret_id: str,
+            to_api_key: Optional[str] = None,
+            to_instance: Optional[str] = None
+    ):
+        super().__init__(from_api_key, from_instance, to_api_key, to_instance)
+        self.secret_id = secret_id
+        self._source_client = SecretClient(
+            api_key=self.from_api_key,
+            base_url=self.from_instance
+        )
+        self._destination_client = SecretClient(
+            api_key=self.to_api_key,
+            base_url=self.to_instance
+        )
+
+    def get_display_info(self) -> str:
+        return f"secret {self.secret_id}"
+
+    def migrate(self):
+        """
+        Execute the secret migration from source to destination project.
+        
+        :raises ValueError: If secret retrieval or creation fails
+        """
+        new_secret = self._migrate_secret()
+        logger.info(f"Successfully migrated secret {self.secret_id}")
+
+    def _migrate_secret(self) -> dict:
+        """
+        Retrieve secret from source and create in destination.
+        
+        :return: The newly created secret
+        :raises ValueError: If migration fails
+        """
+        try:
+            source_secret = self._source_client.get_secret(secret_id=self.secret_id)
+            if not isinstance(source_secret, dict):
+                raise ValueError(f"Unable to retrieve secret {self.secret_id}")
+
+            secret_name = source_secret.get("name")
+            secret_string = source_secret.get("secretString")
+            secret_description = source_secret.get("description")
+            
+            if not secret_name or not secret_string:
+                raise ValueError(f"Secret {self.secret_id} missing required fields (name or secretString)")
+
+            new_secret = self._destination_client.create_secret(
+                name=secret_name,
+                secret_string=secret_string,
+                description=secret_description
+            )
+            return new_secret
+        except Exception as e:
+            logger.error(f"Secret migration failed: {e}")
+            raise ValueError(f"Secret migration failed: {e}") from e

pygeai/organization/clients.py

@@ -4,7 +4,8 @@ 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, \
     GET_MEMBERSHIPS_V2, GET_PROJECT_MEMBERSHIPS_V2, GET_PROJECT_ROLES_V2, GET_PROJECT_MEMBERS_V2, \
-    GET_ORGANIZATION_MEMBERS_V2
+    GET_ORGANIZATION_MEMBERS_V2, ADD_PROJECT_MEMBER_V2, CREATE_ORGANIZATION_V2, GET_ORGANIZATION_LIST_V2, \
+    DELETE_ORGANIZATION_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
@@ -311,3 +312,111 @@ class OrganizationClient(BaseClient):
         response = self.api_service.get(endpoint=GET_ORGANIZATION_MEMBERS_V2, params={"organizationId": organization_id})
         validate_status_code(response)
         return parse_json_response(response, "get organization members for organization", organization_id=organization_id)
+
+    def add_project_member(
+            self,
+            project_id: str,
+            user_email: str,
+            roles: list
+    ) -> dict:
+        """
+        Adds a user to a project by sending an invitation with the specified roles.
+
+        :param project_id: str - The unique identifier (GUID) of the project (required). Will be sent as header.
+        :param user_email: str - The email address of the user to invite (required).
+        :param roles: list - A list of role names or GUIDs to assign to the user (required).
+        :return: dict - The API response confirming the invitation was sent, in JSON format.
+        """
+        headers = {"project-id": project_id}
+        data = {
+            "userEmail": user_email,
+            "roles": roles
+        }
+        response = self.api_service.post(
+            endpoint=ADD_PROJECT_MEMBER_V2,
+            data=data,
+            headers=headers
+        )
+        validate_status_code(response)
+        return parse_json_response(response, "add project member", user_email=user_email)
+
+    def create_organization(
+            self,
+            name: str,
+            administrator_user_email: str
+    ) -> dict:
+        """
+        Creates a new organization with the provided details.
+
+        This endpoint requires an OAuth access token from the System Administrator role.
+
+        :param name: str - The name of the new organization (required).
+        :param administrator_user_email: str - The email address of the organization administrator (required).
+        :return: dict - The API response with details of the created organization in JSON format.
+        """
+        response = self.api_service.post(
+            endpoint=CREATE_ORGANIZATION_V2,
+            data={
+                "name": name,
+                "administratorUserEmail": administrator_user_email
+            }
+        )
+        validate_status_code(response)
+        return parse_json_response(response, "create organization with name", name=name)
+
+    def get_organization_list(
+            self,
+            start_page: int = None,
+            page_size: int = None,
+            order_key: str = None,
+            order_direction: str = "desc",
+            filter_key: str = None,
+            filter_value: str = None
+    ) -> dict:
+        """
+        Retrieves a list of organizations based on the specified search criteria.
+
+        This endpoint requires an OAuth access token from the System Administrator role.
+
+        :param start_page: int - The page number for pagination (optional).
+        :param page_size: int - The number of items per page (optional).
+        :param order_key: str - Field for sorting. Only 'name' is supported (optional).
+        :param order_direction: str - Sort direction: 'asc' or 'desc' (default is 'desc').
+        :param filter_key: str - Field for filtering. Only 'name' is supported (optional).
+        :param filter_value: str - Value to filter by (optional).
+        :return: dict - The API response containing the list of organizations in JSON format.
+        """
+        params = {
+            "orderDirection": order_direction
+        }
+        if start_page is not None:
+            params["startPage"] = start_page
+        if page_size is not None:
+            params["pageSize"] = page_size
+        if order_key:
+            params["orderKey"] = order_key
+        if filter_key:
+            params["filterKey"] = filter_key
+        if filter_value:
+            params["filterValue"] = filter_value
+
+        response = self.api_service.get(endpoint=GET_ORGANIZATION_LIST_V2, params=params)
+        validate_status_code(response)
+        return parse_json_response(response, "get organization list")
+
+    def delete_organization(
+            self,
+            organization_id: str
+    ) -> dict:
+        """
+        Deletes an existing organization using its unique identifier.
+
+        This endpoint requires an OAuth access token from the System Administrator role.
+
+        :param organization_id: str - The unique identifier (GUID) of the organization to delete (required).
+        :return: dict - The API response confirming the deletion of the organization, in JSON format.
+        """
+        endpoint = DELETE_ORGANIZATION_V2.format(organizationId=organization_id)
+        response = self.api_service.delete(endpoint=endpoint)
+        validate_status_code(response)
+        return parse_json_response(response, "delete organization with ID", organization_id=organization_id)

pygeai/organization/endpoints.py

@@ -1,13 +1,17 @@
 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
-UPDATE_PROJECT_V1 = "v1/organization/project/{id}"	                # PUT - Updates a project
-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_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
+UPDATE_PROJECT_V1 = "v1/organization/project/{id}"                      # PUT - Updates a project
+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
+ADD_PROJECT_MEMBER_V2 = "v2/accessControl/projects/members"        # POST - Adds a member to a project by sending an invitation
+CREATE_ORGANIZATION_V2 = "v2/admin/organizations"                  # POST - Creates a new Organization
+GET_ORGANIZATION_LIST_V2 = "v2/admin/organizations"                # GET - Retrieves all the organizations available based on a given search criteria
+DELETE_ORGANIZATION_V2 = "v2/admin/organizations/{organizationId}"  # DELETE - Deletes the created Organization

pygeai/organization/managers.py

@@ -1,13 +1,14 @@
 from pygeai import logger
 from pygeai.core.base.mappers import ErrorMapper, ResponseMapper
 from pygeai.core.handlers import ErrorHandler
-from pygeai.core.models import Project
+from pygeai.core.models import Project, Organization
 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, MembershipsResponse, ProjectMembershipsResponse, \
-    ProjectRolesResponse, ProjectMembersResponse, OrganizationMembersResponse
+    ProjectRolesResponse, ProjectMembersResponse, OrganizationMembersResponse, OrganizationListResponse, \
+    OrganizationDataResponse
 from pygeai.core.common.exceptions import APIError
 
 
@@ -403,3 +404,134 @@ class OrganizationManager:
 
         result = OrganizationResponseMapper.map_to_organization_members_response(response_data)
         return result
+
+    def add_project_member(
+            self,
+            project_id: str,
+            user_email: str,
+            roles: list
+    ) -> EmptyResponse:
+        """
+        Adds a user to a project by sending an invitation with the specified roles.
+
+        This method calls `OrganizationClient.add_project_member` to invite a user to the project
+        and maps the response to an `EmptyResponse`.
+
+        :param project_id: str - The unique identifier of the project.
+        :param user_email: str - The email address of the user to invite.
+        :param roles: list - A list of role names or GUIDs to assign to the user.
+        :return: EmptyResponse - An empty response indicating successful invitation.
+        :raises APIError: If the API returns errors.
+        """
+        response_data = self.__organization_client.add_project_member(
+            project_id=project_id,
+            user_email=user_email,
+            roles=roles
+        )
+        if ErrorHandler.has_errors(response_data):
+            error = ErrorHandler.extract_error(response_data)
+            logger.error(f"Error received while adding project member: {error}")
+            raise APIError(f"Error received while adding project member: {error}")
+
+        result = ResponseMapper.map_to_empty_response(response_data or "Invitation sent successfully")
+        return result
+
+    def create_organization(
+            self,
+            name: str,
+            administrator_user_email: str
+    ) -> OrganizationDataResponse:
+        """
+        Creates a new organization with the given details.
+
+        This endpoint requires an OAuth access token from the System Administrator role.
+
+        This method calls `OrganizationClient.create_organization` to create a new organization and maps the response
+        using `OrganizationResponseMapper` into an `OrganizationDataResponse` object.
+
+        :param name: str - The name of the new organization (required).
+        :param administrator_user_email: str - The email address of the organization administrator (required).
+        :return: OrganizationDataResponse - The mapped response containing the created organization details.
+        :raises APIError: If the API returns errors.
+        """
+        response_data = self.__organization_client.create_organization(
+            name=name,
+            administrator_user_email=administrator_user_email
+        )
+
+        if ErrorHandler.has_errors(response_data):
+            error = ErrorHandler.extract_error(response_data)
+            logger.error(f"Error received while creating organization: {error}")
+            raise APIError(f"Error received while creating organization: {error}")
+
+        result = OrganizationResponseMapper.map_to_organization_data_response(response_data)
+        return result
+
+    def get_organization_list(
+            self,
+            start_page: int = None,
+            page_size: int = None,
+            order_key: str = None,
+            order_direction: str = "desc",
+            filter_key: str = None,
+            filter_value: str = None
+    ) -> OrganizationListResponse:
+        """
+        Retrieves a list of organizations based on the specified search criteria.
+
+        This endpoint requires an OAuth access token from the System Administrator role.
+
+        This method calls `OrganizationClient.get_organization_list` to fetch organization data
+        and maps the response using `OrganizationResponseMapper` into an `OrganizationListResponse` object.
+
+        :param start_page: int, optional - The page number for pagination.
+        :param page_size: int, optional - The number of items per page.
+        :param order_key: str, optional - Field for sorting. Only 'name' is supported.
+        :param order_direction: str - Sort direction: 'asc' or 'desc' (default is 'desc').
+        :param filter_key: str, optional - Field for filtering. Only 'name' is supported.
+        :param filter_value: str, optional - Value to filter by.
+        :return: OrganizationListResponse - The mapped response containing the list of organizations.
+        :raises APIError: If the API returns errors.
+        """
+        response_data = self.__organization_client.get_organization_list(
+            start_page=start_page,
+            page_size=page_size,
+            order_key=order_key,
+            order_direction=order_direction,
+            filter_key=filter_key,
+            filter_value=filter_value
+        )
+        if ErrorHandler.has_errors(response_data):
+            error = ErrorHandler.extract_error(response_data)
+            logger.error(f"Error received while retrieving organization list: {error}")
+            raise APIError(f"Error received while retrieving organization list: {error}")
+
+        result = OrganizationResponseMapper.map_to_organization_list_response(response_data)
+        return result
+
+    def delete_organization(
+            self,
+            organization_id: str
+    ) -> EmptyResponse:
+        """
+        Deletes an organization by its unique identifier.
+
+        This endpoint requires an OAuth access token from the System Administrator role.
+
+        This method calls `OrganizationClient.delete_organization` to remove an organization and maps the response
+        using `ResponseMapper.map_to_empty_response`.
+
+        :param organization_id: str - The unique identifier of the organization to be deleted.
+        :return: EmptyResponse - An empty response indicating successful deletion.
+        :raises APIError: If the API returns errors.
+        """
+        response_data = self.__organization_client.delete_organization(
+            organization_id=organization_id
+        )
+        if ErrorHandler.has_errors(response_data):
+            error = ErrorHandler.extract_error(response_data)
+            logger.error(f"Error received while deleting organization: {error}")
+            raise APIError(f"Error received while deleting organization: {error}")
+
+        result = ResponseMapper.map_to_empty_response(response_data or "Organization deleted successfully")
+        return result

pygeai/organization/mappers.py

@@ -1,8 +1,9 @@
 from pygeai.core.base.mappers import ModelMapper
-from pygeai.core.models import Assistant, Project, Role, Member, OrganizationMembership, ProjectMembership
+from pygeai.core.models import Assistant, Project, Role, Member, OrganizationMembership, ProjectMembership, Organization
 from pygeai.organization.responses import AssistantListResponse, ProjectListResponse, ProjectDataResponse, \
     ProjectTokensResponse, ProjectItemListResponse, MembershipsResponse, ProjectMembershipsResponse, \
-    ProjectRolesResponse, ProjectMembersResponse, OrganizationMembersResponse
+    ProjectRolesResponse, ProjectMembersResponse, OrganizationMembersResponse, OrganizationListResponse, \
+    OrganizationDataResponse
 
 
 class OrganizationResponseMapper:
@@ -150,3 +151,28 @@ class OrganizationResponseMapper:
             members=members
         )
 
+    @classmethod
+    def map_to_organization_list_response(cls, data: dict) -> OrganizationListResponse:
+        count = data.get("count", 0)
+        pages = data.get("pages", 0)
+        organizations_data = data.get("organizations", [])
+        organizations = []
+        
+        for org_data in organizations_data:
+            organization = Organization.model_validate(org_data)
+            organizations.append(organization)
+
+        return OrganizationListResponse(
+            count=count,
+            pages=pages,
+            organizations=organizations
+        )
+
+    @classmethod
+    def map_to_organization_data_response(cls, data: dict) -> OrganizationDataResponse:
+        organization = Organization.model_validate(data)
+
+        return OrganizationDataResponse(
+            organization=organization
+        )
+

pygeai/organization/responses.py

@@ -1,7 +1,7 @@
 from pydantic.main import BaseModel
 
 from pygeai.core.models import Assistant, Project, ProjectToken, \
-    RequestItem, Role, Member, OrganizationMembership, ProjectMembership
+    RequestItem, Role, Member, OrganizationMembership, ProjectMembership, Organization
 
 
 class AssistantListResponse(BaseModel):
@@ -69,3 +69,13 @@ class ProjectMembersResponse(BaseModel):
 
 class OrganizationMembersResponse(BaseModel):
     members: list[Member]
+
+
+class OrganizationListResponse(BaseModel):
+    count: int
+    pages: int
+    organizations: list[Organization]
+
+
+class OrganizationDataResponse(BaseModel):
+    organization: Organization