pygeai 0.3.2__py3-none-any.whl → 0.4.0__py3-none-any.whl

pygeai/cli/commands/lab/options.py

@@ -0,0 +1,8 @@
+from pygeai.cli.commands import Option
+
+PROJECT_ID_OPTION = Option(
+    "project_id",
+    ["--project-id", "--pid"],
+    "GUID of the project (optional)",
+    True
+)

pygeai/cli/commands/lab/utils.py

@@ -0,0 +1,13 @@
+from pygeai import logger
+from pygeai.admin.clients import AdminClient
+from pygeai.core.common.exceptions import APIError
+
+
+def get_project_id():
+    response = None
+    try:
+        response = AdminClient().validate_api_token()
+        return response.get("projectId")
+    except Exception as e:
+        logger.error(f"Error retrieving project_id from GEAI. Response: {response}: {e}")
+        raise APIError(f"Error retrieving project_id from GEAI: {e}")

pygeai/cli/geai.py

@@ -6,7 +6,8 @@ from pygeai.cli.commands import ArgumentsEnum, Command
 from pygeai.cli.parsers import CommandParser
 from pygeai.cli.texts.help import CLI_USAGE
 from pygeai.core.base.session import get_session
-from pygeai.core.common.exceptions import UnknownArgumentError, MissingRequirementException, WrongArgumentError
+from pygeai.core.common.exceptions import UnknownArgumentError, MissingRequirementException, WrongArgumentError, \
+    InvalidAgentException
 from pygeai.core.utils.console import Console
 
 
@@ -69,10 +70,12 @@ class CLIDriver:
             Console.write_stderr()
         except MissingRequirementException as e:
             Console.write_stderr(f"ERROR: Something is missing! \nDetail: {e}")
+        except InvalidAgentException as e:
+            Console.write_stderr(f"ERROR: There was an error retrieving the agent. \nDetail: {e}")
         except KeyboardInterrupt:
             Console.write_stdout()
         except Exception as e:
-            Console.write_stderr(f"Unexpected error. Please report this bug to the developers. Error: {e}")
+            Console.write_stderr(f"CRITICAL: There has ben an unexpected error. Please report this bug to geai-sdk@globant.com. Error: {e}")
             return 255
 
     def process_command(self, command: Command, arguments: list[str]):

pygeai/cli/texts/help.py

@@ -214,6 +214,18 @@ SYNOPSIS
 DESCRIPTION
     geai chat is a command from geai cli utility, developed to chat with assistant in GEAI.
     
+    The model needs to specify an assistant_type and a specific_parameter whose format depends on that type. Its format is as follows:
+
+    "model": "saia:<assistant_type>:<specific_parameter>"
+    
+    assistant_type can be:
+    - agent: Identifies a Agent.
+    - flow: Identifies a Flow.
+    - assistant: Identifies an Assistant API, Data Analyst Assistant, Chat with Data Assistant and API Assistant.
+    - search: Identifies a RAG Assistant.
+
+    For more information, refer to the GEAI Wiki: https://wiki.genexus.com/enterprise-ai/wiki?34,Chat+API
+    
     The options are as follows:
     {{available_commands}}
     

pygeai/core/common/config.py

@@ -114,9 +114,7 @@ def get_settings():
 
 if __name__ == "__main__":
     settings = get_settings()
-    geai_api_key = settings.get_api_key()
     geai_base_url = settings.get_base_url()
     geai_eval_url = settings.get_eval_url()
-    print(f"api_key: {geai_api_key}")
     print(f"base_url: {geai_base_url}")
     print(f"eval_url: {geai_eval_url}")

pygeai/core/common/exceptions.py

@@ -50,5 +50,11 @@ class InvalidResponseException(GEAIException):
     pass
 
 
+class InvalidAgentException(GEAIException):
+    """There was an error getting a response from the server"""
+    pass
 
 
+class APIResponseError(GEAIException):
+    pass
+

pygeai/lab/agents/clients.py

@@ -2,18 +2,17 @@ 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 MissingRequirementException, InvalidAPIResponseException
 from pygeai.lab.agents.endpoints import CREATE_AGENT_V2, LIST_AGENTS_V2, GET_AGENT_V2, CREATE_SHARING_LINK_V2, \
     PUBLISH_AGENT_REVISION_V2, DELETE_AGENT_V2, UPDATE_AGENT_V2, UPSERT_AGENT_V2, EXPORT_AGENT_V2, IMPORT_AGENT_V2
 from pygeai.lab.constants import VALID_ACCESS_SCOPES
+from pygeai.lab.clients import AILabClient
 
 
-class AgentClient(BaseClient):
+class AgentClient(AILabClient):
 
     def list_agents(
             self,
-            project_id: str,
             status: str = "",
             start: int = "",
             count: int = "",
@@ -24,7 +23,6 @@ class AgentClient(BaseClient):
         """
         Retrieves a list of agents associated with the specified project.
 
-        :param project_id: str - Unique identifier of the project to query agents from.
         :param status: str, optional - Filter agents by status (e.g., "active", "draft"). Defaults to "" (no filtering).
         :param start: int, optional - Starting index for pagination. Defaults to "" (no offset).
         :param count: int, optional - Maximum number of agents to retrieve. Defaults to "" (no limit).
@@ -37,10 +35,10 @@ class AgentClient(BaseClient):
         endpoint = LIST_AGENTS_V2
         headers = {
             "Authorization": self.api_service.token,
-            "ProjectId": project_id
+            "ProjectId": self.project_id
         }
 
-        logger.debug(f"Listing agents for project with ID {project_id}")
+        logger.debug(f"Listing agents for project with ID {self.project_id}")
 
         response = self.api_service.get(
             endpoint=endpoint,
@@ -57,14 +55,13 @@ class AgentClient(BaseClient):
         try:
             result = response.json()
         except JSONDecodeError as e:
-            logger.error(f"Unable to list agents for project {project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to list agents for project {project_id}: {response.text}")
+            logger.error(f"Unable to list agents for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
+            raise InvalidAPIResponseException(f"Unable to list agents for project {self.project_id}: {response.text}")
 
         return result
 
     def create_agent(
             self,
-            project_id: str,
             name: str,
             access_scope: str,
             public_name: str,
@@ -81,7 +78,6 @@ class AgentClient(BaseClient):
         """
         Creates a new agent in the specified project.
 
-        :param project_id: str - Unique identifier of the project where the agent will be created.
         :param name: str - Name of the agent (must be unique within the project, non-empty, and exclude ':' or '/').
         :param access_scope: str - Access scope of the agent ("public" or "private").
         :param public_name: str - Public name for the agent, required if access_scope is "public" (must follow domain/library convention, e.g., 'com.example.my-agent').
@@ -134,7 +130,7 @@ class AgentClient(BaseClient):
 
         headers = {
             "Authorization": self.api_service.token,
-            "ProjectId": project_id
+            "ProjectId": self.project_id
         }
 
         response = self.api_service.post(
@@ -146,14 +142,13 @@ class AgentClient(BaseClient):
         try:
             result = response.json()
         except JSONDecodeError as e:
-            logger.error(f"Unable to create agent for project {project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to create agent for project {project_id}: {response.text}")
+            logger.error(f"Unable to create agent for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
+            raise InvalidAPIResponseException(f"Unable to create agent for project {self.project_id}: {response.text}")
 
         return result
 
     def get_agent(
             self,
-            project_id: str,
             agent_id: str,
             revision: str = 0,
             version: int = 0,
@@ -162,7 +157,6 @@ class AgentClient(BaseClient):
         """
         Retrieves details of a specific agent from the specified project.
 
-        :param project_id: str - Unique identifier of the project containing the agent.
         :param agent_id: str - Unique identifier of the agent to retrieve.
         :param revision: str, optional - Specific revision of the agent to retrieve (default: 0, latest revision).
         :param version: int, optional - Specific version of the agent to retrieve (default: 0, latest version).
@@ -171,16 +165,13 @@ class AgentClient(BaseClient):
         :raises InvalidAPIResponseException: If the response cannot be parsed as JSON or an error occurs.
         :raises MissingRequirementException: If project_id or agent_id is not provided.
         """
-        if not project_id:
-            raise MissingRequirementException("Cannot retrieve agent without specifying project_id")
-
         if not agent_id:
             raise MissingRequirementException("agent_id must be specified in order to retrieve the agent")
 
         endpoint = GET_AGENT_V2.format(agentId=agent_id)
         headers = {
             "Authorization": self.api_service.token,
-            "ProjectId": project_id
+            "ProjectId": self.project_id
         }
 
         logger.debug(f"Retrieving agent detail with ID {agent_id}")
@@ -197,36 +188,30 @@ class AgentClient(BaseClient):
         try:
             result = response.json()
         except JSONDecodeError as e:
-            logger.error(f"Unable to retrieve agent {agent_id} for project {project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to retrieve agent {agent_id} for project {project_id}: {response.text}")
+            logger.error(f"Unable to retrieve agent {agent_id} for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
+            raise InvalidAPIResponseException(f"Unable to retrieve agent {agent_id} for project {self.project_id}: {response.text}")
 
         return result
 
     def create_sharing_link(
             self,
-            project_id: str,
             agent_id: str,
     ) -> dict:
         """
         Creates a sharing link for a specific agent in the specified project.
 
-        :param project_id: str - Unique identifier of the project containing the agent.
         :param agent_id: str - Unique identifier of the agent for which to create a sharing link.
         :return: dict - JSON response containing the sharing link details.
         :raises InvalidAPIResponseException: If the response cannot be parsed as JSON or an error occurs.
         :raises MissingRequirementException: If project_id or agent_id is not provided.
         """
-        if not project_id:
-            raise MissingRequirementException("Cannot create sharing link without specifying project_id")
-
         if not agent_id:
             raise MissingRequirementException("agent_id must be specified in order to create sharing link")
 
-
         endpoint = CREATE_SHARING_LINK_V2.format(agentId=agent_id)
         headers = {
             "Authorization": self.api_service.token,
-            "ProjectId": project_id
+            "ProjectId": self.project_id
         }
 
         logger.debug(f"Creating sharing link for agent with ID {agent_id}")
@@ -239,21 +224,19 @@ class AgentClient(BaseClient):
         try:
             result = response.json()
         except JSONDecodeError as e:
-            logger.error(f"Unable to create sharing link for agent {agent_id} in project {project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to create sharing link for agent {agent_id} in project {project_id}: {response.text}")
+            logger.error(f"Unable to create sharing link for agent {agent_id} in project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
+            raise InvalidAPIResponseException(f"Unable to create sharing link for agent {agent_id} in project {self.project_id}: {response.text}")
 
         return result
 
     def publish_agent_revision(
             self,
-            project_id: str,
             agent_id: str,
             revision: str
     ) -> dict:
         """
         Publishes a specific revision of an agent in the specified project.
 
-        :param project_id: str - Unique identifier of the project containing the agent.
         :param agent_id: str - Unique identifier of the agent to publish.
         :param revision: str - Revision of the agent to publish.
         :return: dict - JSON response containing the result of the publish operation.
@@ -262,7 +245,7 @@ class AgentClient(BaseClient):
         endpoint = PUBLISH_AGENT_REVISION_V2.format(agentId=agent_id)
         headers = {
             "Authorization": self.api_service.token,
-            "ProjectId": project_id
+            "ProjectId": self.project_id
         }
 
         logger.debug(f"Publishing revision {revision} for agent with ID {agent_id}")
@@ -277,20 +260,18 @@ class AgentClient(BaseClient):
         try:
             result = response.json()
         except JSONDecodeError as e:
-            logger.error(f"Unable to publish revision {revision} for agent {agent_id} in project {project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to publish revision {revision} for agent {agent_id} in project {project_id}: {response.text}")
+            logger.error(f"Unable to publish revision {revision} for agent {agent_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 agent {agent_id} in project {self.project_id}: {response.text}")
 
         return result
 
     def delete_agent(
             self,
-            project_id: str,
             agent_id: str,
     ) -> dict:
         """
         Deletes a specific agent from the specified project.
 
-        :param project_id: str - Unique identifier of the project containing the agent.
         :param agent_id: str - Unique identifier of the agent to delete.
         :return: dict - JSON response confirming the deletion.
         :raises InvalidAPIResponseException: If the response cannot be parsed as JSON or an error occurs.
@@ -298,7 +279,7 @@ class AgentClient(BaseClient):
         endpoint = DELETE_AGENT_V2.format(agentId=agent_id)
         headers = {
             "Authorization": self.api_service.token,
-            "ProjectId": project_id
+            "ProjectId": self.project_id
         }
 
         logger.debug(f"Deleting agent with ID {agent_id}")
@@ -309,14 +290,13 @@ class AgentClient(BaseClient):
             data={}
         )
         if response.status_code != 204:
-            logger.error(f"Unable to delete agent {agent_id} from project {project_id}: JSON parsing error (status {response.status_code}). Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to delete agent {agent_id} from project {project_id}: {response.text}")
+            logger.error(f"Unable to delete agent {agent_id} from project {self.project_id}: JSON parsing error (status {response.status_code}). Response: {response.text}")
+            raise InvalidAPIResponseException(f"Unable to delete agent {agent_id} from project {self.project_id}: {response.text}")
         else:
             return {}
 
     def update_agent(
             self,
-            project_id: str,
             agent_id: str,
             name: str,
             access_scope: str,
@@ -335,7 +315,6 @@ class AgentClient(BaseClient):
         """
         Updates an existing agent in the specified project or upserts it if specified.
 
-        :param project_id: str - Unique identifier of the project containing the agent.
         :param agent_id: str - Unique identifier of the agent to update (required for updates).
         :param name: str - Updated name of the agent (must be unique, non-empty, exclude ':' or '/'; optional).
         :param access_scope: str - Updated access scope ("public" or "private").
@@ -393,7 +372,7 @@ class AgentClient(BaseClient):
 
         headers = {
             "Authorization": self.api_service.token,
-            "ProjectId": project_id
+            "ProjectId": self.project_id
         }
 
         response = self.api_service.put(
@@ -405,35 +384,30 @@ class AgentClient(BaseClient):
         try:
             result = response.json()
         except JSONDecodeError as e:
-            logger.error(f"Unable to update agent {agent_id} in project {project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to update agent {agent_id} in project {project_id}: {response.text}")
+            logger.error(f"Unable to update agent {agent_id} in project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
+            raise InvalidAPIResponseException(f"Unable to update agent {agent_id} in project {self.project_id}: {response.text}")
 
         return result
 
     def export_agent(
             self,
-            project_id: str,
             agent_id: str,
     ) -> dict:
         """
         Retrieves details of a specific agent from the specified project.
 
-        :param project_id: str - Unique identifier of the project containing the agent.
         :param agent_id: str - Unique identifier of the agent to retrieve.
         :return: dict - JSON response containing the agent details.
         :raises InvalidAPIResponseException: If the response cannot be parsed as JSON or an error occurs.
         :raises MissingRequirementException: If project_id or agent_id is not provided.
         """
-        if not project_id:
-            raise MissingRequirementException("Cannot export agent without specifying project_id")
-
         if not agent_id:
             raise MissingRequirementException("agent_id must be specified in order to export the agent")
 
         endpoint = EXPORT_AGENT_V2.format(agentId=agent_id)
         headers = {
             "Authorization": self.api_service.token,
-            "ProjectId": project_id
+            "ProjectId": self.project_id
         }
 
         logger.debug(f"Exporting agent with ID {agent_id}")
@@ -445,35 +419,30 @@ class AgentClient(BaseClient):
         try:
             result = response.json()
         except JSONDecodeError as e:
-            logger.error(f"Unable to export agent {agent_id} for project {project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to export agent {agent_id} for project {project_id}: {response.text}")
+            logger.error(f"Unable to export agent {agent_id} for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
+            raise InvalidAPIResponseException(f"Unable to export agent {agent_id} for project {self.project_id}: {response.text}")
 
         return result
 
     def import_agent(
             self,
-            project_id: str,
             data: dict,
     ) -> dict:
         """
         Retrieves details of a specific agent from the specified project.
 
-        :param project_id: str - Unique identifier of the project containing the agent.
         :param data: dict - Agent specification to import
         :return: dict - JSON response containing the agent details.
         :raises InvalidAPIResponseException: If the response cannot be parsed as JSON or an error occurs.
         :raises MissingRequirementException: If project_id or agent_id is not provided.
         """
-        if not project_id:
-            raise MissingRequirementException("Cannot import agent without specifying project_id")
-
         if not data:
             raise MissingRequirementException("data for spec must be specified in order to import the agent")
 
         endpoint = IMPORT_AGENT_V2
         headers = {
             "Authorization": self.api_service.token,
-            "ProjectId": project_id
+            "ProjectId": self.project_id
         }
 
         response = self.api_service.post(
@@ -484,7 +453,7 @@ class AgentClient(BaseClient):
         try:
             result = response.json()
         except JSONDecodeError as e:
-            logger.error(f"Unable to import agent for project {project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
-            raise InvalidAPIResponseException(f"Unable to import agent for project {project_id}: {response.text}")
+            logger.error(f"Unable to import agent for project {self.project_id}: JSON parsing error (status {response.status_code}): {e}. Response: {response.text}")
+            raise InvalidAPIResponseException(f"Unable to import agent for project {self.project_id}: {response.text}")
 
         return result

pygeai/lab/clients.py

@@ -0,0 +1,20 @@
+from pygeai import logger
+from pygeai.admin.clients import AdminClient
+from pygeai.core.base.clients import BaseClient
+from pygeai.core.common.exceptions import APIError
+
+
+class AILabClient(BaseClient):
+
+    def __init__(self, api_key: str = None, base_url: str = None, alias: str = None, project_id: str = None):
+        super().__init__(api_key, base_url, alias)
+        self.project_id = project_id if project_id else self.__get_project_id()
+
+    def __get_project_id(self):
+        response = None
+        try:
+            response = AdminClient().validate_api_token()
+            return response.get("projectId")
+        except Exception as e:
+            logger.error(f"Error retrieving project_id from GEAI. Response: {response}: {e}")
+            raise APIError(f"Error retrieving project_id from GEAI: {e}")