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

pygeai/lab/managers.py

@@ -23,20 +23,10 @@ from pygeai.lab.tools.mappers import ToolMapper
 class AILabManager:
 
     def __init__(self, api_key: str = None, base_url: str = None, alias: str = "default", project_id: str = None):
-        self.__agent_client = AgentClient(api_key=api_key, base_url=base_url, alias=alias)
-        self.__tool_client = ToolClient(api_key=api_key, base_url=base_url, alias=alias)
-        self.__reasoning_strategy_client = ReasoningStrategyClient(api_key=api_key, base_url=base_url, alias=alias)
-        self.__process_client = AgenticProcessClient(api_key=api_key, base_url=base_url, alias=alias)
-        self.project_id = self.__get_project_id() if not project_id else 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}")
+        self.__agent_client = AgentClient(api_key=api_key, base_url=base_url, alias=alias, project_id=project_id)
+        self.__tool_client = ToolClient(api_key=api_key, base_url=base_url, alias=alias, project_id=project_id)
+        self.__reasoning_strategy_client = ReasoningStrategyClient(api_key=api_key, base_url=base_url, alias=alias, project_id=project_id)
+        self.__process_client = AgenticProcessClient(api_key=api_key, base_url=base_url, alias=alias, project_id=project_id)
 
     def get_agent_list(
             self,
@@ -57,7 +47,6 @@ class AILabManager:
             filter_settings = FilterSettings()
 
         response_data = self.__agent_client.list_agents(
-            project_id=self.project_id,
             status=filter_settings.status,
             start=filter_settings.start,
             count=filter_settings.count,
@@ -93,7 +82,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__agent_client.create_agent(
-            project_id=self.project_id,
             name=agent.name,
             access_scope=agent.access_scope,
             public_name=agent.public_name,
@@ -140,7 +128,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__agent_client.update_agent(
-            project_id=self.project_id,
             agent_id=agent.id,
             name=agent.name,
             access_scope=agent.access_scope,
@@ -189,7 +176,6 @@ class AILabManager:
             )
 
         response_data = self.__agent_client.get_agent(
-            project_id=self.project_id,
             agent_id=agent_id,
             revision=filter_settings.revision,
             version=filter_settings.version,
@@ -218,7 +204,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__agent_client.create_sharing_link(
-            project_id=self.project_id,
             agent_id=agent_id
         )
         if ErrorHandler.has_errors(response_data):
@@ -246,7 +231,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__agent_client.publish_agent_revision(
-            project_id=self.project_id,
             agent_id=agent_id,
             revision=revision
         )
@@ -273,7 +257,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__agent_client.delete_agent(
-            project_id=self.project_id,
             agent_id=agent_id
         )
         if ErrorHandler.has_errors(response_data):
@@ -308,7 +291,6 @@ class AILabManager:
         parameters = [param.to_dict() for param in tool.parameters] if tool.parameters else []
 
         response_data = self.__tool_client.create_tool(
-            project_id=self.project_id,
             name=tool.name,
             description=tool.description,
             scope=tool.scope,
@@ -356,7 +338,6 @@ class AILabManager:
         parameters = [param.to_dict() for param in tool.parameters] if tool.parameters else []
 
         response_data = self.__tool_client.update_tool(
-            project_id=self.project_id,
             tool_id=tool.id,
             name=tool.name,
             description=tool.description,
@@ -406,7 +387,6 @@ class AILabManager:
             )
 
         response_data = self.__tool_client.get_tool(
-            project_id=self.project_id,
             tool_id=tool_id,
             revision=filter_settings.revision,
             version=filter_settings.version,
@@ -442,7 +422,6 @@ class AILabManager:
             raise MissingRequirementException("Either tool_id or tool_name must be provided.")
 
         response_data = self.__tool_client.delete_tool(
-            project_id=self.project_id,
             tool_id=tool_id,
             tool_name=tool_name
         )
@@ -483,7 +462,6 @@ class AILabManager:
             )
 
         response_data = self.__tool_client.list_tools(
-            project_id=self.project_id,
             id=filter_settings.id,
             count=filter_settings.count,
             access_scope=filter_settings.access_scope,
@@ -517,7 +495,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__tool_client.publish_tool_revision(
-            project_id=self.project_id,
             tool_id=tool_id,
             revision=revision
         )
@@ -562,7 +539,6 @@ class AILabManager:
             )
 
         response_data = self.__tool_client.get_parameter(
-            project_id=self.project_id,
             tool_id=tool_id,
             tool_public_name=tool_public_name,
             revision=filter_settings.revision,
@@ -583,7 +559,7 @@ class AILabManager:
             tool_id: Optional[str] = None,
             tool_public_name: Optional[str] = None,
             parameters: List[ToolParameter] = None
-    ) -> Tool:
+    ) -> EmptyResponse:
         """
         Sets or updates parameters for a specific tool in the specified project.
 
@@ -605,7 +581,6 @@ class AILabManager:
         params_dict = [param.to_dict() for param in parameters]
 
         response_data = self.__tool_client.set_parameter(
-            project_id=self.project_id,
             tool_id=tool_id,
             tool_public_name=tool_public_name,
             parameters=params_dict
@@ -616,7 +591,7 @@ class AILabManager:
             logger.error(f"Error received while setting tool parameters: {error}")
             raise APIError(f"Error received while setting tool parameters: {error}")
 
-        result = ToolMapper.map_to_tool(response_data)
+        result = ResponseMapper.map_to_empty_response(response_data or "Parameter set successfully")
         return result
 
     def list_reasoning_strategies(
@@ -678,7 +653,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__reasoning_strategy_client.create_reasoning_strategy(
-            project_id=self.project_id,
             name=strategy.name,
             system_prompt=strategy.system_prompt,
             access_scope=strategy.access_scope,
@@ -717,7 +691,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__reasoning_strategy_client.update_reasoning_strategy(
-            project_id=self.project_id,
             reasoning_strategy_id=strategy.id,
             name=strategy.name,
             system_prompt=strategy.system_prompt,
@@ -757,7 +730,6 @@ class AILabManager:
             raise MissingRequirementException("Either reasoning_strategy_id or reasoning_strategy_name must be provided.")
 
         response_data = self.__reasoning_strategy_client.get_reasoning_strategy(
-            project_id=self.project_id,
             reasoning_strategy_id=reasoning_strategy_id,
             reasoning_strategy_name=reasoning_strategy_name
         )
@@ -789,7 +761,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__process_client.create_process(
-            project_id=self.project_id,
             key=process.key,
             name=process.name,
             description=process.description,
@@ -833,7 +804,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__process_client.update_process(
-            project_id=self.project_id,
             process_id=process.id,
             name=process.name,
             key=process.key,
@@ -883,7 +853,6 @@ class AILabManager:
 
         filter_settings = filter_settings or FilterSettings(revision="0", version="0", allow_drafts=True)
         response_data = self.__process_client.get_process(
-            project_id=self.project_id,
             process_id=process_id,
             process_name=process_name,
             revision=filter_settings.revision,
@@ -915,7 +884,6 @@ class AILabManager:
         """
         filter_settings = filter_settings or FilterSettings(start="0", count="100", allow_drafts=True)
         response_data = self.__process_client.list_processes(
-            project_id=self.project_id,
             id=filter_settings.id,
             name=filter_settings.name,
             status=filter_settings.status,
@@ -950,7 +918,6 @@ class AILabManager:
         """
         filter_settings = filter_settings or FilterSettings(start="0", count="10", is_active=True)
         response_data = self.__process_client.list_process_instances(
-            project_id=self.project_id,
             process_id=process_id,
             is_active=filter_settings.is_active,
             start=filter_settings.start,
@@ -986,7 +953,6 @@ class AILabManager:
             raise MissingRequirementException("Either process_id or process_name must be provided.")
 
         response_data = self.__process_client.delete_process(
-            project_id=self.project_id,
             process_id=process_id,
             process_name=process_name
         )
@@ -1022,7 +988,6 @@ class AILabManager:
             raise MissingRequirementException("Either process_id or process_name and revision must be provided.")
 
         response_data = self.__process_client.publish_process_revision(
-            project_id=self.project_id,
             process_id=process_id,
             process_name=process_name,
             revision=revision
@@ -1054,7 +1019,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__process_client.create_task(
-            project_id=self.project_id,
             name=task.name,
             description=task.description,
             title_template=task.title_template,
@@ -1093,7 +1057,6 @@ class AILabManager:
             raise MissingRequirementException("Either task_id or task_name must be provided.")
 
         response_data = self.__process_client.get_task(
-            project_id=self.project_id,
             task_id=task_id,
             task_name=task_name
         )
@@ -1122,7 +1085,6 @@ class AILabManager:
         """
         filter_settings = filter_settings or FilterSettings(start="0", count="100", allow_drafts=True)
         response_data = self.__process_client.list_tasks(
-            project_id=self.project_id,
             id=filter_settings.id,
             start=filter_settings.start,
             count=filter_settings.count,
@@ -1161,7 +1123,6 @@ class AILabManager:
             raise MissingRequirementException("Task ID must be provided for update.")
 
         response_data = self.__process_client.update_task(
-            project_id=self.project_id,
             task_id=task.id,
             name=task.name,
             description=task.description,
@@ -1202,7 +1163,6 @@ class AILabManager:
             raise MissingRequirementException("Either task_id or task_name must be provided.")
 
         response_data = self.__process_client.delete_task(
-            project_id=self.project_id,
             task_id=task_id,
             task_name=task_name
         )
@@ -1238,7 +1198,6 @@ class AILabManager:
             raise MissingRequirementException("Either task_id or task_name and revision must be provided.")
 
         response_data = self.__process_client.publish_task_revision(
-            project_id=self.project_id,
             task_id=task_id,
             task_name=task_name,
             revision=revision
@@ -1274,7 +1233,6 @@ class AILabManager:
             variables = VariableList(variables=variables)
 
         response_data = self.__process_client.start_instance(
-            project_id=self.project_id,
             process_name=process_name,
             subject=subject,
             variables=variables.to_dict()
@@ -1307,7 +1265,6 @@ class AILabManager:
             raise MissingRequirementException("Instance ID must be provided.")
 
         response_data = self.__process_client.abort_instance(
-            project_id=self.project_id,
             instance_id=instance_id
         )
 
@@ -1338,7 +1295,6 @@ class AILabManager:
             raise MissingRequirementException("Instance ID must be provided.")
 
         response_data = self.__process_client.get_instance(
-            project_id=self.project_id,
             instance_id=instance_id
         )
         if ErrorHandler.has_errors(response_data):
@@ -1368,7 +1324,6 @@ class AILabManager:
             raise MissingRequirementException("Instance ID must be provided.")
 
         response_data = self.__process_client.get_instance_history(
-            project_id=self.project_id,
             instance_id=instance_id
         )
 
@@ -1399,7 +1354,6 @@ class AILabManager:
             raise MissingRequirementException("Thread ID must be provided.")
 
         response_data = self.__process_client.get_thread_information(
-            project_id=self.project_id,
             thread_id=thread_id
         )
 
@@ -1432,7 +1386,6 @@ class AILabManager:
             raise MissingRequirementException("Instance ID and signal name must be provided.")
 
         response_data = self.__process_client.send_user_signal(
-            project_id=self.project_id,
             instance_id=instance_id,
             signal_name=signal_name
         )
@@ -1461,7 +1414,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__process_client.create_kb(
-            project_id=self.project_id,
             name=knowledge_base.name,
             artifacts=knowledge_base.artifacts if knowledge_base.artifacts else None,
             metadata=knowledge_base.metadata if knowledge_base.metadata else None
@@ -1493,7 +1445,6 @@ class AILabManager:
         :raises APIError: If the API returns errors.
         """
         response_data = self.__process_client.list_kbs(
-            project_id=self.project_id,
             name=name,
             start=start,
             count=count
@@ -1527,7 +1478,6 @@ class AILabManager:
             raise MissingRequirementException("Either kb_name or kb_id must be provided.")
 
         response_data = self.__process_client.get_kb(
-            project_id=self.project_id,
             kb_name=kb_name,
             kb_id=kb_id
         )
@@ -1560,7 +1510,6 @@ class AILabManager:
             raise MissingRequirementException("Either kb_name or kb_id must be provided.")
 
         response_data = self.__process_client.delete_kb(
-            project_id=self.project_id,
             kb_name=kb_name,
             kb_id=kb_id
         )
@@ -1595,7 +1544,6 @@ class AILabManager:
 
         filter_settings = filter_settings or FilterSettings(start="0", count="100")
         response_data = self.__process_client.list_jobs(
-            project_id=self.project_id,
             start=filter_settings.start,
             count=filter_settings.count,
             topic=topic,

pygeai/lab/models.py

@@ -94,7 +94,7 @@ class Model(CustomBaseModel):
     :param llm_config: Optional[LlmConfig] - Overrides default agent LLM settings.
     :param prompt: Optional[dict] - A tailored prompt specific to this model.
     """
-    name: str = Field(..., alias="name")
+    name: Optional[str] = Field(None, alias="name")
     llm_config: Optional[LlmConfig] = Field(None, alias="llmConfig")
     prompt: Optional[Dict[str, Any]] = Field(None, alias="prompt")
 
@@ -161,12 +161,13 @@ class Prompt(CustomBaseModel):
     :param context: Optional[str] - Background context for the agent # NOT IMPLEMENTED YET
     :param examples: List[PromptExample] - List of example input-output pairs.
     """
-    instructions: str = Field(..., alias="instructions")
+    instructions: Optional[str] = Field(None, alias="instructions")
     inputs: Optional[List[str]] = Field(None, alias="inputs")
     outputs: Optional[List[PromptOutput]] = Field([], alias="outputs")
     context: Optional[str] = Field(None, alias="context", description="Background context for the agent")
     examples: Optional[List[PromptExample]] = Field(None, alias="examples")
 
+    '''
     @field_validator("instructions")
     @classmethod
     def validate_instructions(cls, value: str) -> str:
@@ -174,6 +175,7 @@ class Prompt(CustomBaseModel):
             raise ValueError("instructions cannot be blank")
 
         return value
+    '''
 
     @field_validator("outputs", mode="before")
     @classmethod
@@ -687,7 +689,7 @@ class Tool(CustomBaseModel):
     :param status: Optional[str] - Current status of the tool (e.g., "active"), defaults to None.
     """
     name: str = Field(..., alias="name", description="The name of the tool")
-    description: str = Field(..., alias="description", description="Description of the tool's purpose")
+    description: Optional[str] = Field(None, alias="description", description="Description of the tool's purpose")
     scope: str = Field("builtin", alias="scope", description="The scope of the tool (e.g., 'builtin', 'external', 'api')")
     parameters: Optional[List[ToolParameter]] = Field(None, alias="parameters", description="List of parameters required by the tool")
     access_scope: Optional[str] = Field(None, alias="accessScope", description="The access scope of the tool ('public' or 'private')")
@@ -730,6 +732,7 @@ class Tool(CustomBaseModel):
             raise ValueError("public_name is required if access_scope is 'public'")
         return self
 
+    '''
     @model_validator(mode="after")
     def validate_api_tool_requirements(self):
         if self.scope == "api" and not (self.open_api or self.open_api_json):
@@ -739,6 +742,7 @@ class Tool(CustomBaseModel):
             if len(param_keys) != len(set(param_keys)):
                 raise ValueError("All parameter keys must be unique within the tool")
         return self
+    '''
 
     @field_validator("parameters", mode="before")
     @classmethod