aixplain
diff --git a/Diff for: ‎aixplain/factories/agent_factory/__init__.py
+7-7 b/Diff for: ‎aixplain/factories/agent_factory/__init__.py
+7-7
diff --git a/Diff for: ‎aixplain/factories/agent_factory/utils.py
+1-1 b/Diff for: ‎aixplain/factories/agent_factory/utils.py
+1-1
diff --git a/Diff for: ‎aixplain/factories/file_factory.py
+5-4 b/Diff for: ‎aixplain/factories/file_factory.py
+5-4
diff --git a/Diff for: ‎aixplain/factories/model_factory/utils.py
+2-2 b/Diff for: ‎aixplain/factories/model_factory/utils.py
+2-2
diff --git a/Diff for: ‎aixplain/modules/agent/__init__.py
+5-4 b/Diff for: ‎aixplain/modules/agent/__init__.py
+5-4
diff --git a/Diff for: ‎aixplain/modules/agent/tool/custom_python_code_tool.py
+7-2 b/Diff for: ‎aixplain/modules/agent/tool/custom_python_code_tool.py
+7-2
diff --git a/Diff for: ‎aixplain/modules/model/utility_model.py
+1 b/Diff for: ‎aixplain/modules/model/utility_model.py
+1
diff --git a/Diff for: ‎aixplain/modules/pipeline/designer/nodes.py
+46-21 b/Diff for: ‎aixplain/modules/pipeline/designer/nodes.py
+46-21
diff --git a/Diff for: ‎aixplain/utils/file_utils.py
+8-6 b/Diff for: ‎aixplain/utils/file_utils.py
+8-6
diff --git a/Diff for: ‎tests/functional/agent/agent_functional_test.py
+7-7 b/Diff for: ‎tests/functional/agent/agent_functional_test.py
+7-7
@@ -47,7 +47,7 @@ def create(
         cls,
         name: Text,
         description: Text,
-        role: Optional[Text] = None,
+        instructions: Optional[Text] = None,
         llm_id: Text = "669a63646eb56306647e1091",
         tools: List[Union[Tool, Model]] = [],
         api_key: Text = config.TEAM_API_KEY,
@@ -58,14 +58,14 @@ def create(
         """Create a new agent in the platform.
 
         Warning:
-            The 'role' parameter was recently added and serves the same purpose as 'description' did previously: set the role of the agent as a system prompt.
+            The 'instructions' parameter was recently added and serves the same purpose as 'description' did previously: set the role of the agent as a system prompt.
             The 'description' parameter is still required and should be used to set a short summary of the agent's purpose.
-            For the next releases, the 'role' parameter will be required.
+            For the next releases, the 'instructions' parameter will be required.
 
         Args:
             name (Text): name of the agent
             description (Text): description of the agent role.
-            role (Text): role of the agent.
+            instructions (Text): role of the agent.
             llm_id (Text, optional): aiXplain ID of the large language model to be used as agent. Defaults to "669a63646eb56306647e1091" (GPT-4o mini).
             tools (List[Union[Tool, Model]], optional): list of tool for the agent. Defaults to [].
             api_key (Text, optional): team/user API key. Defaults to config.TEAM_API_KEY.
@@ -76,9 +76,9 @@ def create(
             Agent: created Agent
         """
         warnings.warn(
-            "The 'role' parameter was recently added and serves the same purpose as 'description' did previously: set the role of the agent as a system prompt. "
+            "The 'instructions' parameter was recently added and serves the same purpose as 'description' did previously: set the role of the agent as a system prompt. "
             "The 'description' parameter is still required and should be used to set a short summary of the agent's purpose. "
-            "For the next releases, the 'role' parameter will be required.",
+            "For the next releases, the 'instructions' parameter will be required.",
             UserWarning,
         )
         from aixplain.factories.agent_factory.utils import build_agent
@@ -113,7 +113,7 @@ def create(
                 for tool in tools
             ],
             "description": description,
-            "role": role or description,
+            "role": instructions or description,
             "supplier": supplier,
             "version": version,
             "llmId": llm_id,
 
@@ -54,7 +54,7 @@ def build_agent(payload: Dict, api_key: Text = config.TEAM_API_KEY) -> Agent:
         name=payload.get("name", ""),
         tools=tools,
         description=payload.get("description", ""),
-        role=payload.get("role", ""),
+        instructions=payload.get("role", ""),
         supplier=payload.get("teamId", None),
         version=payload.get("version", None),
         cost=payload.get("cost", None),
 
@@ -29,6 +29,7 @@
 from aixplain.utils.file_utils import upload_data
 from typing import Any, Dict, Text, Union, Optional, List
 
+
 MB_1 = 1048576
 MB_25 = 26214400
 MB_50 = 52428800
@@ -94,10 +95,10 @@ def check_storage_type(cls, input_link: Any) -> StorageType:
         if os.path.exists(input_link) is True and os.path.isfile(input_link) is True:
             return StorageType.FILE
         elif (
-            input_link.startswith("s3://")
-            or input_link.startswith("http://")
-            or input_link.startswith("https://")
-            or validators.url(input_link)
+            input_link.startswith("s3://")  # noqa
+            or input_link.startswith("http://")  # noqa
+            or input_link.startswith("https://")  # noqa
+            or validators.url(input_link)  # noqa
         ):
             return StorageType.URL
         else:
 
@@ -167,8 +167,8 @@ def get_model_from_ids(model_ids: List[str], api_key: Optional[str] = None) -> L
     resp = None
     try:
         url = urljoin(config.BACKEND_URL, f"sdk/models?ids={','.join(model_ids)}")
-
-        headers = {"Authorization": f"Token {config.TEAM_API_KEY}", "Content-Type": "application/json"}
+        api_key = config.TEAM_API_KEY if api_key is None else api_key
+        headers = {"Authorization": f"Token {api_key}", "Content-Type": "application/json"}
         logging.info(f"Start service for GET Model  - {url} - {headers}")
         r = _request_with_retry("get", url, headers=headers)
         resp = r.json()
 
@@ -53,6 +53,7 @@ class Agent(Model):
         name (Text): Name of the Agent
         tools (List[Union[Tool, Model]]): List of tools that the Agent uses.
         description (Text, optional): description of the Agent. Defaults to "".
+        instructions (Text): instructions of the Agent.
         llm_id (Text): large language model. Defaults to GPT-4o (6646261c6eb563165658bbb1).
         supplier (Text): Supplier of the Agent.
         version (Text): Version of the Agent.
@@ -66,7 +67,7 @@ def __init__(
         id: Text,
         name: Text,
         description: Text,
-        role: Text,
+        instructions: Text,
         tools: List[Union[Tool, Model]] = [],
         llm_id: Text = "6646261c6eb563165658bbb1",
         api_key: Optional[Text] = config.TEAM_API_KEY,
@@ -83,7 +84,7 @@ def __init__(
             id (Text): ID of the Agent
             name (Text): Name of the Agent
             description (Text): description of the Agent.
-            role (Text): role of the Agent.
+            instructions (Text): role of the Agent.
             tools (List[Union[Tool, Model]]): List of tools that the Agent uses.
             llm_id (Text, optional): large language model. Defaults to GPT-4o (6646261c6eb563165658bbb1).
             supplier (Text): Supplier of the Agent.
@@ -93,7 +94,7 @@ def __init__(
             cost (Dict, optional): model price. Defaults to None.
         """
         super().__init__(id, name, description, api_key, supplier, version, cost=cost)
-        self.role = role
+        self.instructions = instructions
         self.additional_info = additional_info
         self.tools = tools
         for i, _ in enumerate(tools):
@@ -318,7 +319,7 @@ def to_dict(self) -> Dict:
             "name": self.name,
             "assets": [tool.to_dict() for tool in self.tools],
             "description": self.description,
-            "role": self.role,
+            "role": self.instructions,
             "supplier": self.supplier.value["code"] if isinstance(self.supplier, Supplier) else self.supplier,
             "version": self.version,
             "llmId": self.llm_id,
 
@@ -23,6 +23,7 @@
 
 from typing import Text, Union, Callable
 from aixplain.modules.agent.tool import Tool
+import logging
 
 
 class CustomPythonCodeTool(Tool):
@@ -42,9 +43,13 @@ def to_dict(self):
         }
 
     def validate(self):
-        from aixplain.modules.model.utils import parse_code
+        from aixplain.modules.model.utils import parse_code_decorated
 
-        self.code, _, description, name = parse_code(self.code)
+        if not str(self.code).startswith("s3://"):
+            self.code, _, description, name = parse_code_decorated(self.code)
+        else:
+            logging.info("Utility Model Already Exists, skipping code validation")
+            return
 
         # Set description from parsed code if not already set
         if not self.description or self.description.strip() == "":
 
@@ -225,6 +225,7 @@ def update(self):
                 stacklevel=2,
             )
 
+            
         self.validate()
         url = urljoin(self.backend_url, f"sdk/utilities/{self.id}")
         headers = {"x-api-key": f"{self.api_key}", "Content-Type": "application/json"}
 
@@ -79,17 +79,13 @@ def populate_asset(self):
 
         if self.function:
             if self.asset.function.value != self.function:
-                raise ValueError(f"Function {self.function} is not supported by asset {self.asset_id}")
-
-            # Despite function field has been set, we should still dynamically
-            # populate parameters for Utility functions
-            if self.function == Function.UTILITIES:
-                self._auto_populate_params()
-
+                raise ValueError(
+                    f"Function {self.function} is not supported by asset {self.asset_id}"
+                )
         else:
             self.function = self.asset.function.value
-            self._auto_populate_params()
 
+        self._auto_populate_params()
         self._auto_set_params()
 
     def _auto_populate_params(self):
@@ -108,18 +104,29 @@ def _auto_populate_params(self):
                 )
         else:
             for item in spec["params"]:
-                self.inputs.create_param(
+                if item["code"] not in self.inputs:
+                    self.inputs.create_param(
+                        code=item["code"],
+                        data_type=item["dataType"],
+                        is_required=item["required"],
+                    )
+
+            if self.asset.model_params:
+                for code, param in self.asset.model_params.parameters.items():
+                    if code not in self.inputs:
+                        self.inputs.create_param(
+                            code=code,
+                            is_required=param.required,
+                            value=param.value,
+                        )
+
+        for item in spec["output"]:
+            if item["code"] not in self.outputs:
+                self.outputs.create_param(
                     code=item["code"],
                     data_type=item["dataType"],
-                    is_required=item["required"],
                 )
 
-        for item in spec["output"]:
-            self.outputs.create_param(
-                code=item["code"],
-                data_type=item["dataType"],
-            )
-
     def _auto_set_params(self):
         for k, v in self.asset.additional_info["parameters"].items():
             if k not in self.inputs:
@@ -236,7 +243,12 @@ class Output(Node[OutputInputs, OutputOutputs]):
     inputs_class: Type[TI] = OutputInputs
     outputs_class: Type[TO] = OutputOutputs
 
-    def __init__(self, data_types: Optional[List[DataType]] = None, pipeline: "DesignerPipeline" = None, **kwargs):
+    def __init__(
+        self,
+        data_types: Optional[List[DataType]] = None,
+        pipeline: "DesignerPipeline" = None,
+        **kwargs
+    ):
         super().__init__(pipeline=pipeline, **kwargs)
         self.data_types = data_types or []
 
@@ -297,7 +309,14 @@ class Route(Serializable):
     operation: Operation
     type: RouteType
 
-    def __init__(self, value: DataType, path: List[Union[Node, int]], operation: Operation, type: RouteType, **kwargs):
+    def __init__(
+        self,
+        value: DataType,
+        path: List[Union[Node, int]],
+        operation: Operation,
+        type: RouteType,
+        **kwargs
+    ):
         """
         Post init method to convert the nodes to node numbers if they are
         nodes.
@@ -312,7 +331,9 @@ def __init__(self, value: DataType, path: List[Union[Node, int]], operation: Ope
         #     raise ValueError("Path is not valid, should be a list of nodes")
 
         # convert nodes to node numbers if they are nodes
-        self.path = [node.number if isinstance(node, Node) else node for node in self.path]
+        self.path = [
+            node.number if isinstance(node, Node) else node for node in self.path
+        ]
 
     def serialize(self) -> dict:
         return {
@@ -350,7 +371,9 @@ class Router(Node[RouterInputs, RouterOutputs], LinkableMixin):
     inputs_class: Type[TI] = RouterInputs
     outputs_class: Type[TO] = RouterOutputs
 
-    def __init__(self, routes: List[Route], pipeline: "DesignerPipeline" = None, **kwargs):
+    def __init__(
+        self, routes: List[Route], pipeline: "DesignerPipeline" = None, **kwargs
+    ):
         super().__init__(pipeline=pipeline, **kwargs)
         self.routes = routes
 
@@ -389,7 +412,9 @@ class Decision(Node[DecisionInputs, DecisionOutputs], LinkableMixin):
     inputs_class: Type[TI] = DecisionInputs
     outputs_class: Type[TO] = DecisionOutputs
 
-    def __init__(self, routes: List[Route], pipeline: "DesignerPipeline" = None, **kwargs):
+    def __init__(
+        self, routes: List[Route], pipeline: "DesignerPipeline" = None, **kwargs
+    ):
         super().__init__(pipeline=pipeline, **kwargs)
         self.routes = routes
 
 
@@ -146,14 +146,16 @@ def upload_data(
         bucket_name = re.findall(r"https://(.*?).s3.amazonaws.com", presigned_url)[0]
         s3_link = f"s3://{bucket_name}/{path}"
         return s3_link
-    except Exception as e:
+    except Exception:
         if nattempts > 0:
             return upload_data(file_name, content_type, content_encoding, nattempts - 1)
         else:
             raise Exception("File Uploading Error: Failure on Uploading to S3.")
 
 
-def s3_to_csv(s3_url: Text, aws_credentials: Optional[Dict[Text, Text]] = {"AWS_ACCESS_KEY_ID": None, "AWS_SECRET_ACCESS_KEY": None}) -> Text:
+def s3_to_csv(
+    s3_url: Text, aws_credentials: Optional[Dict[Text, Text]] = {"AWS_ACCESS_KEY_ID": None, "AWS_SECRET_ACCESS_KEY": None}
+) -> Text:
     """Convert s3 url to a csv file and download the file in `download_path`
 
     Args:
@@ -179,11 +181,11 @@ def s3_to_csv(s3_url: Text, aws_credentials: Optional[Dict[Text, Text]] = {"AWS_
         aws_secret_access_key = aws_credentials.get("AWS_SECRET_ACCESS_KEY") or os.getenv("AWS_SECRET_ACCESS_KEY")
         s3 = boto3.client("s3", aws_access_key_id=aws_access_key_id, aws_secret_access_key=aws_secret_access_key)
         response = s3.list_objects_v2(Bucket=bucket_name, Prefix=prefix)
-    except NoCredentialsError as e:
+    except NoCredentialsError:
         raise Exception(
             "to use the s3 bucket option you need to set the right AWS credentials [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY]"
         )
-    except Exception as e:
+    except Exception:
         raise Exception("the bucket you are trying to use does not exist")
 
     try:
@@ -222,10 +224,10 @@ def s3_to_csv(s3_url: Text, aws_credentials: Optional[Dict[Text, Text]] = {"AWS_
                     main_file_name = Path(data[first_key][i]).stem
                     for val in data.values():
                         if Path(val[i]).stem != main_file_name:
-                            raise Exception(f"all the files in different directories should have the same prefix")
+                            raise Exception("all the files in different directories should have the same prefix")
 
         elif prefix == "":
-            raise Exception(f"ERROR the files can't be at the root of the bucket ")
+            raise Exception("ERROR the files can't be at the root of the bucket ")
         else:
             data = {prefix: [f"s3://{bucket_name}/{file}" for file in files]}
 
 
@@ -79,7 +79,7 @@ def test_end2end(run_input_map, delete_agents_and_team_agents, AgentFactory):
     agent = AgentFactory.create(
         name=run_input_map["agent_name"],
         description=run_input_map["agent_name"],
-        role=run_input_map["agent_name"],
+        instructions=run_input_map["agent_name"],
         llm_id=run_input_map["llm_id"],
         tools=tools,
     )
@@ -112,7 +112,7 @@ def test_python_interpreter_tool(delete_agents_and_team_agents, AgentFactory):
     agent = AgentFactory.create(
         name="Python Developer",
         description="A Python developer agent. If you get an error from a tool, try to fix it.",
-        role="A Python developer agent. If you get an error from a tool, try to fix it.",
+        instructions="A Python developer agent. If you get an error from a tool, try to fix it.",
         tools=[tool],
     )
     assert agent is not None
@@ -140,7 +140,7 @@ def test_custom_code_tool(delete_agents_and_team_agents, AgentFactory):
     agent = AgentFactory.create(
         name="Add Numbers Agent",
         description="Add two numbers. Do not directly answer. Use the tool to add the numbers.",
-        role="Add two numbers. Do not directly answer. Use the tool to add the numbers.",
+        instructions="Add two numbers. Do not directly answer. Use the tool to add the numbers.",
         tools=[tool],
     )
     assert agent is not None
@@ -183,7 +183,7 @@ def test_update_draft_agent(run_input_map, delete_agents_and_team_agents, AgentF
     agent = AgentFactory.create(
         name=run_input_map["agent_name"],
         description=run_input_map["agent_name"],
-        role=run_input_map["agent_name"],
+        instructions=run_input_map["agent_name"],
         llm_id=run_input_map["llm_id"],
         tools=tools,
     )
@@ -205,7 +205,7 @@ def test_fail_non_existent_llm(delete_agents_and_team_agents, AgentFactory):
         AgentFactory.create(
             name="Test Agent",
             description="Test description",
-            role="Test Agent Role",
+            instructions="Test Agent Role",
             llm_id="non_existent_llm",
             tools=[AgentFactory.create_model_tool(function=Function.TRANSLATION)],
         )
@@ -218,7 +218,7 @@ def test_delete_agent_in_use(delete_agents_and_team_agents, AgentFactory):
     agent = AgentFactory.create(
         name="Test Agent",
         description="Test description",
-        role="Test Agent Role",
+        instructions="Test Agent Role",
         tools=[AgentFactory.create_model_tool(function=Function.TRANSLATION)],
     )
     TeamAgentFactory.create(
@@ -240,7 +240,7 @@ def test_update_tools_of_agent(run_input_map, delete_agents_and_team_agents, Age
     agent = AgentFactory.create(
         name=run_input_map["agent_name"],
         description=run_input_map["agent_name"],
-        role=run_input_map["agent_name"],
+        instructions=run_input_map["agent_name"],
         llm_id=run_input_map["llm_id"],
     )
     assert agent is not None
Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@ def update(self):`
`225`	`225`	`stacklevel=2,`
`226`	`226`	`)`
`227`	`227`
	`228`	`+`
`228`	`229`	`self.validate()`
`229`	`230`	`url = urljoin(self.backend_url, f"sdk/utilities/{self.id}")`
`230`	`231`	`headers = {"x-api-key": f"{self.api_key}", "Content-Type": "application/json"}`