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

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,6 @@ 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}")
+        validate_status_code(response)
+        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):
@@ -53,13 +55,8 @@ class FileClient(BaseClient):
                 headers=headers,
                 files=files
             )
-            try:
-                result = response.json()
-                return result
-            except JSONDecodeError as e:
-                logger.error(
-                    f"Unable to upload file {file_name} in project {project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-                raise InvalidAPIResponseException(f"Unable to upload file {file_name}: {response.text}")
+            validate_status_code(response)
+            return parse_json_response(response, "upload file in project", file_name=file_name, project_id=project_id)
 
         finally:
             files["file"].close()
@@ -82,12 +79,8 @@ 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}")
+        validate_status_code(response)
+        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 +106,8 @@ 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}")
+        validate_status_code(response)
+        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 +152,5 @@ 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}")
+        validate_status_code(response)
+        return parse_json_response(response, "retrieve file list for project", project=project)

pygeai/core/files/managers.py

@@ -1,3 +1,7 @@
+import tempfile
+from pathlib import Path
+from typing import Optional
+
 from pygeai import logger
 from pygeai.admin.clients import AdminClient
 from pygeai.core.base.mappers import ErrorMapper, ResponseMapper
@@ -180,3 +184,41 @@ class FileManager:
 
         result = FileResponseMapper.map_to_file_list_response(response_data)
         return result
+
+    def upload_file_from_content(
+            self,
+            file_name: str,
+            content: bytes,
+            folder: Optional[str] = None
+    ) -> UploadFileResponse:
+        """
+        Uploads a file from binary content to the specified organization and project.
+
+        This method creates a temporary file from the provided content, uploads it,
+        and then cleans up the temporary file.
+
+        :param file_name: str - The name for the uploaded file.
+        :param content: bytes - The binary content of the file.
+        :param folder: str, optional - Destination folder (default is None, which means temporary storage).
+        :return: UploadFileResponse - The response object containing the uploaded file details.
+        :raises APIError: If the API returns errors.
+        """
+        temp_file = None
+        try:
+            suffix = Path(file_name).suffix or ""
+            with tempfile.NamedTemporaryFile(mode='wb', suffix=suffix, delete=False) as temp_file:
+                temp_file.write(content)
+                temp_file_path = temp_file.name
+
+            upload_file = UploadFile(
+                path=temp_file_path,
+                name=file_name,
+                folder=folder
+            )
+            return self.upload_file(upload_file)
+        finally:
+            if temp_file:
+                try:
+                    Path(temp_file_path).unlink(missing_ok=True)
+                except Exception as e:
+                    logger.warning(f"Failed to delete temporary file {temp_file_path}: {e}")

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,8 @@ 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}")
+        validate_status_code(response)
+        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 +22,8 @@ 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}")
+        validate_status_code(response)
+        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 +31,8 @@ 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}")
+        validate_status_code(response)
+        return parse_json_response(response, "obtain provider models", provider_name=provider_name)
 
     def get_model_data(
             self,
@@ -60,9 +48,6 @@ 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
+        validate_status_code(response)
+        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,6 @@ 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}")
+        validate_status_code(response)
+        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,6 @@ 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}")
+        validate_status_code(response)
+        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,8 @@ 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}")
+        validate_status_code(response)
+        return parse_json_response(response, "list secrets with params")
 
     def get_secret(self, secret_id: str) -> dict:
         """
@@ -69,12 +66,8 @@ 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}")
+        validate_status_code(response)
+        return parse_json_response(response, "get secret with ID", secret_id=secret_id)
 
     def create_secret(
             self,
@@ -111,12 +104,8 @@ 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}")
+        validate_status_code(response)
+        return parse_json_response(response, "create secret with name", name=name)
 
     def update_secret(
             self,
@@ -157,12 +146,8 @@ 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}")
+        validate_status_code(response)
+        return parse_json_response(response, "update secret with ID", secret_id=secret_id)
 
     def set_secret_accesses(
             self,
@@ -202,12 +187,8 @@ 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}")
+        validate_status_code(response)
+        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 +208,5 @@ 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}")
+        validate_status_code(response)
+        return parse_json_response(response, "get accesses for secret with ID", secret_id=secret_id)

pygeai/core/services/rest.py

@@ -388,7 +388,7 @@ class ApiService:
 
     def _add_endpoint_to_url(self, endpoint: str):
         clean_base_url = self.base_url.rstrip('/')
-        url = f"{clean_base_url}/{endpoint}" if self._has_valid_protocol(clean_base_url) else f"https://{clean_base_url}/{endpoint}"
+        url = f"{clean_base_url}/{endpoint.lstrip('/')}" if self._has_valid_protocol(clean_base_url) else f"https://{clean_base_url}/{endpoint}"
         return url
 
     def _has_valid_protocol(self, url: str):

pygeai/core/utils/parsers.py

@@ -0,0 +1,32 @@
+from json import JSONDecodeError
+
+from pygeai import logger
+from pygeai.core.common.exceptions import InvalidAPIResponseException
+
+
+def parse_json_response(response, operation: str, **context):
+    """
+    Parse JSON response with standardized error handling.
+
+    :param response: HTTP response object
+    :param operation: Description of operation (e.g., "get project API token")
+    :param context: Additional context (e.g., api_token_id="123")
+    :return: Parsed JSON response
+    :raises InvalidAPIResponseException: If JSON parsing fails
+    """
+    try:
+        return response.json()
+    except JSONDecodeError as e:
+        full_msg = f"Unable to {operation}"
+        if context:
+            if len(context) == 1:
+                # Single context value: append as 'value'
+                value = list(context.values())[0]
+                full_msg += f" '{value}'"
+            else:
+                # Multiple context values: format as (key1='value1', key2='value2')
+                context_str = ", ".join([f"{k}='{v}'" for k, v in context.items()])
+                full_msg += f" ({context_str})"
+
+        logger.error(f"{full_msg}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
+        raise InvalidAPIResponseException(f"{full_msg}: {response.text}")

pygeai/core/utils/validators.py

@@ -0,0 +1,10 @@
+from pygeai import logger
+from pygeai.core.common.exceptions import APIResponseError
+
+
+def validate_status_code(response):
+    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}")
+
+

pygeai/dbg/__init__.py

@@ -0,0 +1,3 @@
+from pygeai.dbg.debugger import Debugger, Breakpoint
+
+__all__ = ['Debugger', 'Breakpoint']