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

pygeai/cli/commands/organization.py

@@ -288,6 +288,202 @@ export_request_data_options = [
     )
 ]
 
+
+def get_memberships(option_list: list):
+    email = None
+    start_page = 1
+    page_size = 20
+    order_key = None
+    order_direction = "desc"
+    role_types = None
+
+    for option_flag, option_arg in option_list:
+        if option_flag.name == "email":
+            email = option_arg
+        if option_flag.name == "start_page":
+            start_page = int(option_arg)
+        if option_flag.name == "page_size":
+            page_size = int(option_arg)
+        if option_flag.name == "order_key":
+            order_key = option_arg
+        if option_flag.name == "order_direction":
+            order_direction = option_arg
+        if option_flag.name == "role_types":
+            role_types = option_arg
+
+    client = OrganizationClient()
+    result = client.get_memberships(email, start_page, page_size, order_key, order_direction, role_types)
+    Console.write_stdout(f"Memberships: \n{result}")
+
+
+get_memberships_options = [
+    Option(
+        "email",
+        ["--email", "-e"],
+        "Email address of the user (optional, case-insensitive)",
+        True
+    ),
+    Option(
+        "start_page",
+        ["--start-page"],
+        "Page number for pagination (default: 1)",
+        True
+    ),
+    Option(
+        "page_size",
+        ["--page-size"],
+        "Number of items per page (default: 20)",
+        True
+    ),
+    Option(
+        "order_key",
+        ["--order-key"],
+        "Field for sorting (only 'organizationName' supported)",
+        True
+    ),
+    Option(
+        "order_direction",
+        ["--order-direction"],
+        "Sort direction: asc or desc (default: desc)",
+        True
+    ),
+    Option(
+        "role_types",
+        ["--role-types"],
+        "Comma-separated list: backend, frontend (optional, case-insensitive)",
+        True
+    ),
+]
+
+
+def get_project_memberships(option_list: list):
+    email = None
+    start_page = 1
+    page_size = 20
+    order_key = None
+    order_direction = "desc"
+    role_types = None
+
+    for option_flag, option_arg in option_list:
+        if option_flag.name == "email":
+            email = option_arg
+        if option_flag.name == "start_page":
+            start_page = int(option_arg)
+        if option_flag.name == "page_size":
+            page_size = int(option_arg)
+        if option_flag.name == "order_key":
+            order_key = option_arg
+        if option_flag.name == "order_direction":
+            order_direction = option_arg
+        if option_flag.name == "role_types":
+            role_types = option_arg
+
+    client = OrganizationClient()
+    result = client.get_project_memberships(email, start_page, page_size, order_key, order_direction, role_types)
+    Console.write_stdout(f"Project memberships: \n{result}")
+
+
+get_project_memberships_options = [
+    Option(
+        "email",
+        ["--email", "-e"],
+        "Email address of the user (optional, case-insensitive)",
+        True
+    ),
+    Option(
+        "start_page",
+        ["--start-page"],
+        "Page number for pagination (default: 1)",
+        True
+    ),
+    Option(
+        "page_size",
+        ["--page-size"],
+        "Number of items per page (default: 20)",
+        True
+    ),
+    Option(
+        "order_key",
+        ["--order-key"],
+        "Field for sorting (only 'projectName' supported)",
+        True
+    ),
+    Option(
+        "order_direction",
+        ["--order-direction"],
+        "Sort direction: asc or desc (default: desc)",
+        True
+    ),
+    Option(
+        "role_types",
+        ["--role-types"],
+        "Comma-separated list: backend, frontend (optional, case-insensitive)",
+        True
+    ),
+]
+
+
+def get_project_roles(option_list: list):
+    project_id = None
+    for option_flag, option_arg in option_list:
+        if option_flag.name == "project_id":
+            project_id = option_arg
+
+    if not project_id:
+        raise MissingRequirementException("Cannot retrieve project roles without project-id")
+
+    client = OrganizationClient()
+    result = client.get_project_roles(project_id)
+    Console.write_stdout(f"Project roles: \n{result}")
+
+
+get_project_roles_options = [
+    PROJECT_ID_OPTION,
+]
+
+
+def get_project_members(option_list: list):
+    project_id = None
+    for option_flag, option_arg in option_list:
+        if option_flag.name == "project_id":
+            project_id = option_arg
+
+    if not project_id:
+        raise MissingRequirementException("Cannot retrieve project members without project-id")
+
+    client = OrganizationClient()
+    result = client.get_project_members(project_id)
+    Console.write_stdout(f"Project members: \n{result}")
+
+
+get_project_members_options = [
+    PROJECT_ID_OPTION,
+]
+
+
+def get_organization_members(option_list: list):
+    organization_id = None
+    for option_flag, option_arg in option_list:
+        if option_flag.name == "organization_id":
+            organization_id = option_arg
+
+    if not organization_id:
+        raise MissingRequirementException("Cannot retrieve organization members without organization-id")
+
+    client = OrganizationClient()
+    result = client.get_organization_members(organization_id)
+    Console.write_stdout(f"Organization members: \n{result}")
+
+
+get_organization_members_options = [
+    Option(
+        "organization_id",
+        ["--organization-id", "--oid"],
+        "GUID of the organization (required)",
+        True
+    ),
+]
+
 organization_commands = [
     Command(
         "help",
@@ -370,4 +566,49 @@ organization_commands = [
         [],
         export_request_data_options
     ),
+    Command(
+        "get_memberships",
+        ["get-memberships"],
+        "Get user memberships across organizations and projects",
+        get_memberships,
+        ArgumentsEnum.OPTIONAL,
+        [],
+        get_memberships_options
+    ),
+    Command(
+        "get_project_memberships",
+        ["get-project-memberships"],
+        "Get user project memberships within an organization",
+        get_project_memberships,
+        ArgumentsEnum.OPTIONAL,
+        [],
+        get_project_memberships_options
+    ),
+    Command(
+        "get_project_roles",
+        ["get-project-roles"],
+        "Get all roles supported by a project",
+        get_project_roles,
+        ArgumentsEnum.REQUIRED,
+        [],
+        get_project_roles_options
+    ),
+    Command(
+        "get_project_members",
+        ["get-project-members"],
+        "Get all members and their roles for a project",
+        get_project_members,
+        ArgumentsEnum.REQUIRED,
+        [],
+        get_project_members_options
+    ),
+    Command(
+        "get_organization_members",
+        ["get-organization-members"],
+        "Get all members and their roles for an organization",
+        get_organization_members,
+        ArgumentsEnum.REQUIRED,
+        [],
+        get_organization_members_options
+    ),
 ]

pygeai/core/base/clients.py

@@ -3,6 +3,7 @@ from abc import ABC
 from pygeai.core.base.session import get_session, Session
 from pygeai.core.common.exceptions import MissingRequirementException
 from pygeai.core.services.rest import ApiService
+from pygeai.core.utils.validators import validate_status_code
 
 
 class BaseClient(ABC):

pygeai/core/embeddings/clients.py

@@ -1,9 +1,10 @@
-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.embeddings.endpoints import GENERATE_EMBEDDINGS
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 
 
 class EmbeddingsClient(BaseClient):
@@ -73,10 +74,5 @@ class EmbeddingsClient(BaseClient):
             data=data,
             headers=headers
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to generate embeddings: JSON parsin error: {e}; Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to generate embeddings: {response.text}")
+        return parse_json_response(response, "generate embeddings")
 

pygeai/core/feedback/clients.py

@@ -1,11 +1,11 @@
-import json
-from json import JSONDecodeError
 from typing import Any, Union
 
 from pygeai import logger
 from pygeai.core.base.clients import BaseClient
 from pygeai.core.common.exceptions import InvalidAPIResponseException
 from pygeai.core.feedback.endpoints import SEND_FEEDBACK_V1
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 
 
 class FeedbackClient(BaseClient):
@@ -45,10 +45,5 @@ class FeedbackClient(BaseClient):
             endpoint=endpoint,
             data=data
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to send feedback. JSON parsing error: {e}. Response: {e}")
-            raise InvalidAPIResponseException(f"Unable to send feedback for request {request_id}: {response.text}")
+        return parse_json_response(response, "send feedback. JSON parsing error")
 

pygeai/core/files/clients.py

@@ -7,6 +7,8 @@ from pygeai.core.base.clients import BaseClient
 from pygeai.core.common.exceptions import InvalidAPIResponseException
 from pygeai.core.files.endpoints import UPLOAD_FILE_V1, GET_FILE_V1, DELETE_FILE_V1, GET_FILE_CONTENT_V1, \
     GET_ALL_FILES_V1
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 
 
 class FileClient(BaseClient):
@@ -82,12 +84,7 @@ class FileClient(BaseClient):
             }
         )
         logger.debug(f"Retrieving file details for id {file_id}")
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to retrieve file details for id {file_id} in project {project}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to retrieve file details for id {file_id}: {response.text}")
+        return parse_json_response(response, "retrieve file details for id in project", file_id=file_id, project=project)
 
     def delete_file(self, organization: str, project: str, file_id: str) -> dict:
         """
@@ -113,12 +110,7 @@ class FileClient(BaseClient):
                 "project": project
             }
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to delete file with id {file_id} in project {project}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to delete file with id {file_id}: {response.text}")
+        return parse_json_response(response, "delete file with id in project", file_id=file_id, project=project)
 
     def get_file_content(self, organization: str, project: str, file_id: str) -> bytes:
         """
@@ -163,9 +155,4 @@ class FileClient(BaseClient):
                 "project": project
             }
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to retrieve file list for project {project}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to retrieve file list for project {project}: {response.text}")
+        return parse_json_response(response, "retrieve file list for project", project=project)

pygeai/core/llm/clients.py

@@ -1,11 +1,11 @@
-import json
-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.llm.endpoints import GET_PROVIDER_LIST_V2, GET_PROVIDER_DATA_V2, GET_PROVIDER_MODELS_V2, \
     GET_MODEL_DATA_V2
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 
 
 class LlmClient(BaseClient):
@@ -13,12 +13,7 @@ class LlmClient(BaseClient):
     def get_provider_list(self) -> dict:
         logger.debug("Obtaining provider list")
         response = self.api_service.get(endpoint=GET_PROVIDER_LIST_V2)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to obtain provider list: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to obtain provider list: {response.text}")
+        return parse_json_response(response, "obtain provider list")
 
     def get_provider_data(self, provider_name: str) -> dict:
         endpoint = GET_PROVIDER_DATA_V2.format(providerName=provider_name)
@@ -26,12 +21,7 @@ class LlmClient(BaseClient):
         logger.debug(f"Obtaining provider data for {provider_name}")
 
         response = self.api_service.get(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to obtain provider data for {provider_name}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to obtain provider data for {provider_name}: {response.text}")
+        return parse_json_response(response, "obtain provider data", provider_name=provider_name)
 
     def get_provider_models(self, provider_name: str) -> dict:
         endpoint = GET_PROVIDER_MODELS_V2.format(providerName=provider_name)
@@ -39,12 +29,7 @@ class LlmClient(BaseClient):
         logger.debug(f"Obtaining provider models for {provider_name}")
 
         response = self.api_service.get(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to obtain provider models for {provider_name}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to obtain provider models for {provider_name}: {response.text}")
+        return parse_json_response(response, "obtain provider models", provider_name=provider_name)
 
     def get_model_data(
             self,
@@ -60,9 +45,5 @@ class LlmClient(BaseClient):
         logger.debug(f"Obtaining model data for {provider_name}/{model_name or model_id}")
 
         response = self.api_service.get(endpoint=endpoint)
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to obtain model data for {provider_name}/{model_name or model_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to obtain model data for {provider_name}/{model_name or model_id}: {response.text}")
+        model_identifier = model_name or model_id
+        return parse_json_response(response, f"obtain model data for {provider_name}/{model_identifier}")

pygeai/core/models.py

@@ -690,3 +690,110 @@ class DataAnalystAssistant(Assistant):
 
 class ChatWithDataAssistant(Assistant):
     type: Literal["ChatWithData"] = "ChatWithData"
+
+
+class Role(CustomBaseModel):
+    """
+    {
+      "id": "string",
+      "name": "string",
+      "externalId": "string",
+      "type": "string",
+      "origin": "string"
+    }
+    """
+    id: str = Field(..., alias="id")
+    name: str = Field(..., alias="name")
+    external_id: Optional[str] = Field(None, alias="externalId")
+    type: Optional[str] = Field(None, alias="type")
+    origin: Optional[str] = Field(None, alias="origin")
+
+    def to_dict(self):
+        return self.model_dump(by_alias=True, exclude_none=True)
+
+    def __str__(self):
+        return str(self.to_dict())
+
+
+class Member(CustomBaseModel):
+    """
+    {
+      "email": "string",
+      "roles": [...]
+    }
+    """
+    email: str = Field(..., alias="email")
+    roles: Optional[List[Role]] = Field(default_factory=list, alias="roles")
+
+    @field_validator("roles", mode="before")
+    @classmethod
+    def normalize_roles(cls, value):
+        if isinstance(value, list):
+            return [Role.model_validate(item) if isinstance(item, dict) else item for item in value]
+        return value
+
+    def to_dict(self):
+        return self.model_dump(by_alias=True, exclude_none=True)
+
+    def __str__(self):
+        return str(self.to_dict())
+
+
+class ProjectMembership(CustomBaseModel):
+    """
+    {
+      "organizationId": "string",
+      "organizationName": "string",
+      "projectDescription": "string",
+      "projectId": "string",
+      "projectName": "string",
+      "roles": [...]
+    }
+    """
+    organization_id: Optional[str] = Field(None, alias="organizationId")
+    organization_name: Optional[str] = Field(None, alias="organizationName")
+    project_description: Optional[str] = Field(None, alias="projectDescription")
+    project_id: str = Field(..., alias="projectId")
+    project_name: str = Field(..., alias="projectName")
+    roles: Optional[List[Role]] = Field(default_factory=list, alias="roles")
+
+    @field_validator("roles", mode="before")
+    @classmethod
+    def normalize_roles(cls, value):
+        if isinstance(value, list):
+            return [Role.model_validate(item) if isinstance(item, dict) else item for item in value]
+        return value
+
+    def to_dict(self):
+        return self.model_dump(by_alias=True, exclude_none=True)
+
+    def __str__(self):
+        return str(self.to_dict())
+
+
+class OrganizationMembership(CustomBaseModel):
+    """
+    {
+      "isStationAvailable": true,
+      "organizationId": "string",
+      "organizationName": "string",
+      "projects": [...]
+    }
+    """
+    is_station_available: Optional[bool] = Field(None, alias="isStationAvailable")
+    organization_id: str = Field(..., alias="organizationId")
+    organization_name: str = Field(..., alias="organizationName")
+    projects: Optional[List[ProjectMembership]] = Field(default_factory=list, alias="projects")
+
+    @field_validator("projects", mode="before")
+    @classmethod
+    def normalize_projects(cls, value):
+        if isinstance(value, list):
+            return [ProjectMembership.model_validate(item) if isinstance(item, dict) else item for item in value]
+        return value
+
+    def to_dict(self):
+        return self.model_dump(by_alias=True, exclude_none=True)
+
+    def __str__(self):
+        return str(self.to_dict())

pygeai/core/plugins/clients.py

@@ -1,10 +1,11 @@
-from json import JSONDecodeError
 from typing import Optional, List, Dict
 
 from pygeai import logger
 from pygeai.core.base.clients import BaseClient
 from pygeai.core.common.exceptions import InvalidAPIResponseException
 from pygeai.core.plugins.endpoints import LIST_ASSISTANTS_PLUGINS_V1
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 
 
 class PluginClient(BaseClient):
@@ -26,10 +27,5 @@ class PluginClient(BaseClient):
             endpoint=LIST_ASSISTANTS_PLUGINS_V1,
             params=params
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to list assistants for organization {organization_id} and project {project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to list assistants for organization {organization_id} and project {project_id}: {response.text}")
+        return parse_json_response(response, f"list assistants for organization {organization_id} and project {project_id}")
 

pygeai/core/rerank/clients.py

@@ -1,11 +1,11 @@
-import json
-from json import JSONDecodeError
 from typing import Any, Union
 
 from pygeai import logger
 from pygeai.core.base.clients import BaseClient
 from pygeai.core.common.exceptions import InvalidAPIResponseException
 from pygeai.core.rerank.endpoints import RERANK_V1
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 
 
 class RerankClient(BaseClient):
@@ -30,10 +30,5 @@ class RerankClient(BaseClient):
             endpoint=RERANK_V1,
             data=data
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to rerank chunks for query '{query}' with model {model}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to rerank chunks for query '{query}' with model {model}: {response.text}")
+        return parse_json_response(response, "rerank chunks for query with model", query=query, model=model)
 

pygeai/core/secrets/clients.py

@@ -1,4 +1,3 @@
-from json import JSONDecodeError
 from typing import Optional, List, Dict
 
 from pygeai import logger
@@ -6,6 +5,8 @@ from pygeai.core.base.clients import BaseClient
 from pygeai.core.common.exceptions import InvalidAPIResponseException
 from pygeai.core.secrets.endpoints import LIST_SECRETS_V1, GET_SECRET_V1, CREATE_SECRET_V1, UPDATE_SECRET_V1, \
     SET_SECRET_ACCESSES_V1, GET_SECRET_ACCESSES_V1
+from pygeai.core.utils.validators import validate_status_code
+from pygeai.core.utils.parsers import parse_json_response
 
 
 class SecretClient(BaseClient):
@@ -44,12 +45,7 @@ class SecretClient(BaseClient):
             endpoint=LIST_SECRETS_V1,
             params=params
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to list secrets with params {params}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to list secrets with params {params}: {response.text}")
+        return parse_json_response(response, "list secrets with params")
 
     def get_secret(self, secret_id: str) -> dict:
         """
@@ -69,12 +65,7 @@ class SecretClient(BaseClient):
         response = self.api_service.get(
             endpoint=endpoint
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get secret with ID '{secret_id}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get secret with ID '{secret_id}': {response.text}")
+        return parse_json_response(response, "get secret with ID", secret_id=secret_id)
 
     def create_secret(
             self,
@@ -111,12 +102,7 @@ class SecretClient(BaseClient):
             endpoint=CREATE_SECRET_V1,
             data=data
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to create secret with name '{name}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to create secret with name '{name}': {response.text}")
+        return parse_json_response(response, "create secret with name", name=name)
 
     def update_secret(
             self,
@@ -157,12 +143,7 @@ class SecretClient(BaseClient):
             endpoint=endpoint,
             data=data
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to update secret with ID '{secret_id}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to update secret with ID '{secret_id}': {response.text}")
+        return parse_json_response(response, "update secret with ID", secret_id=secret_id)
 
     def set_secret_accesses(
             self,
@@ -202,12 +183,7 @@ class SecretClient(BaseClient):
             endpoint=endpoint,
             data=data
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to set accesses for secret with ID '{secret_id}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to set accesses for secret with ID '{secret_id}': {response.text}")
+        return parse_json_response(response, "set accesses for secret with ID", secret_id=secret_id)
 
     def get_secret_accesses(self, secret_id: str) -> dict:
         """
@@ -227,9 +203,4 @@ class SecretClient(BaseClient):
         response = self.api_service.get(
             endpoint=endpoint
         )
-        try:
-            result = response.json()
-            return result
-        except JSONDecodeError as e:
-            logger.error(f"Unable to get accesses for secret with ID '{secret_id}': JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to get accesses for secret with ID '{secret_id}': {response.text}")
+        return parse_json_response(response, "get accesses for secret with ID", secret_id=secret_id)