feat: Misc improvements to types and stdlib in jinja (#788)

Closes #723 Signed-off-by: Diwank Singh Tomer <[email protected]>  ---- > [!IMPORTANT] > This PR updates type definitions, modifies default values, and enhances Jinja environment setup for improved functionality and maintainability. > > - **Behavior**: > - Changed default value of `inherit_tools` to `false` in `CreateTaskRequest`, `PatchTaskRequest`, and `UpdateTaskRequest` in `Tasks.py` and `Tools.py`. > - Added `label` field to various workflow step models in `Tasks.py` for step referencing. > - Updated `id` type from `UUID` to `string` in `ToolRefById` and `ToolResponse` in `Tools.py`. > - **Jinja Environment**: > - Consolidated Jinja environment globals setup in `template.py` using `constants`, `stdlib`, and `ALLOWED_FUNCTIONS`. > - **Misc**: > - Added `schema_` field to `ApiCallDef` in `Tools.py` for response schema definition. > - Updated `litellm` version in `pyproject.toml` to `^1.51.2`. > - Marked a test as skipped in `test_docs_routes.py` due to random CI failures. > > <sup>This description was created by </sup>[<img alt="Ellipsis" src="https://img.shields.io/badge/Ellipsis-blue?color=175173">](https://www.ellipsis.dev?ref=julep-ai%2Fjulep&utm_source=github&utm_medium=referral)<sup> for 1b0f870. It will automatically update as commits are pushed.</sup>  Signed-off-by: Diwank Singh Tomer <[email protected]>
julep-ai · Oct 31, 2024 · 2b635cf · 2b635cf
1 parent b63327b
commit 2b635cf
Show file tree

Hide file tree

Showing 14 changed files with 541 additions and 257 deletions.
diff --git a/agents-api/agents_api/activities/task_steps/prompt_step.py b/agents-api/agents_api/activities/task_steps/prompt_step.py
@@ -23,24 +23,23 @@
 COMPUTER_USE_BETA_FLAG = "computer-use-2024-10-22"
 
 
-# FIXME: This shouldn't be here.
 def format_agent_tool(tool: Tool) -> dict:
     if tool.type == "function":
         return {
             "type": "function",
             "function": {
                 "name": tool.name,
                 "description": tool.description,
-                "parameters": tool.parameters,
+                "parameters": tool.function.parameters,
             },
         }
     elif tool.type == "computer_20241022":
         return {
             "type": tool.type,
             "name": tool.name,
-            "display_width_px": tool.spec["display_width_px"],
-            "display_height_px": tool.spec["display_height_px"],
-            "display_number": tool.spec["display_number"],
+            "display_width_px": tool.computer_20241022.display_width_px,
+            "display_height_px": tool.computer_20241022.display_height_px,
+            "display_number": tool.computer_20241022.display_number,
         }
     elif tool.type == "bash_20241022":
         return {

diff --git a/agents-api/agents_api/activities/utils.py b/agents-api/agents_api/activities/utils.py
@@ -50,6 +50,8 @@
     "search_regex": lambda pattern, string: re2.search(pattern, string),
     "load_json": json.loads,
     "load_yaml": yaml.load,
+    "dump_json": json.dumps,
+    "dump_yaml": yaml.dump,
     "match_regex": lambda pattern, string: bool(re2.fullmatch(pattern, string)),
 }
 
@@ -203,6 +205,9 @@ class stdlib_statistics:
 
 constants = {
     "NEWLINE": "\n",
+    "true": True,
+    "false": False,
+    "null": None,
 }
 
 

diff --git a/agents-api/agents_api/autogen/Tasks.py b/agents-api/agents_api/autogen/Tasks.py
@@ -142,9 +142,9 @@ class CreateTaskRequest(BaseModel):
     """
     Tools defined specifically for this task not included in the Agent itself.
     """
-    inherit_tools: StrictBool = True
+    inherit_tools: StrictBool = False
     """
-    Whether to inherit tools from the parent agent or not. Defaults to true.
+    Whether to inherit tools from the parent agent or not. Defaults to false.
     """
     metadata: dict[str, Any] | None = None
 
@@ -159,6 +159,10 @@ class ErrorWorkflowStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     error: str
     """
     The error message
@@ -175,6 +179,10 @@ class EvaluateStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     evaluate: dict[str, str]
     """
     The expression to evaluate
@@ -239,6 +247,10 @@ class ForeachStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     foreach: ForeachDo
     """
     The steps to run for each iteration
@@ -249,6 +261,10 @@ class ForeachStepUpdateItem(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
     )
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     kind_: str | None = None
     """
     Discriminator property for BaseWorkflowStep.
@@ -269,6 +285,10 @@ class GetStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     get: str
     """
     The key to get
@@ -285,6 +305,10 @@ class IfElseWorkflowStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     if_: Annotated[str, Field(alias="if")]
     """
     The condition to evaluate
@@ -329,6 +353,10 @@ class IfElseWorkflowStepUpdateItem(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
     )
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     kind_: str | None = None
     """
     Discriminator property for BaseWorkflowStep.
@@ -401,6 +429,10 @@ class LogStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     log: str
     """
     The value to log
@@ -417,6 +449,10 @@ class Main(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     over: str
     """
     The variable to iterate over
@@ -453,6 +489,10 @@ class MainModel(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
     )
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     kind_: str | None = None
     """
     Discriminator property for BaseWorkflowStep.
@@ -499,6 +539,10 @@ class ParallelStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     parallel: Annotated[
         list[
             EvaluateStep
@@ -520,6 +564,10 @@ class ParallelStepUpdateItem(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
     )
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     kind_: str | None = None
     """
     Discriminator property for BaseWorkflowStep.
@@ -583,9 +631,9 @@ class PatchTaskRequest(BaseModel):
     """
     Tools defined specifically for this task not included in the Agent itself.
     """
-    inherit_tools: StrictBool = True
+    inherit_tools: StrictBool = False
     """
-    Whether to inherit tools from the parent agent or not. Defaults to true.
+    Whether to inherit tools from the parent agent or not. Defaults to false.
     """
     metadata: dict[str, Any] | None = None
 
@@ -630,6 +678,10 @@ class PromptStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     prompt: list[PromptItem] | str
     """
     The prompt to run
@@ -666,6 +718,10 @@ class PromptStepUpdateItem(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
     )
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     kind_: str | None = None
     """
     Discriminator property for BaseWorkflowStep.
@@ -712,6 +768,10 @@ class ReturnStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     return_: Annotated[dict[str, str], Field(alias="return")]
     """
     The value to return
@@ -728,6 +788,10 @@ class SetStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     set: dict[str, str]
     """
     The value to set
@@ -766,6 +830,10 @@ class SleepStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     sleep: SleepFor
     """
     The duration to sleep for (max 31 days)
@@ -782,6 +850,10 @@ class SwitchStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     switch: Annotated[list[CaseThen], Field(min_length=1)]
     """
     The cond tree
@@ -792,6 +864,10 @@ class SwitchStepUpdateItem(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
     )
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     kind_: str | None = None
     """
     Discriminator property for BaseWorkflowStep.
@@ -844,9 +920,9 @@ class Task(BaseModel):
     """
     Tools defined specifically for this task not included in the Agent itself.
     """
-    inherit_tools: StrictBool = True
+    inherit_tools: StrictBool = False
     """
-    Whether to inherit tools from the parent agent or not. Defaults to true.
+    Whether to inherit tools from the parent agent or not. Defaults to false.
     """
     id: Annotated[UUID, Field(json_schema_extra={"readOnly": True})]
     created_at: Annotated[AwareDatetime, Field(json_schema_extra={"readOnly": True})]
@@ -882,6 +958,10 @@ class ToolCallStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     tool: Annotated[str, Field(max_length=40, pattern="^[^\\W0-9]\\w*$")]
     """
     The tool to run
@@ -911,7 +991,7 @@ class ToolRefById(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
     )
-    id: UUID | None = None
+    id: str | None = None
 
 
 class ToolRefByName(BaseModel):
@@ -979,9 +1059,9 @@ class UpdateTaskRequest(BaseModel):
     """
     Tools defined specifically for this task not included in the Agent itself.
     """
-    inherit_tools: StrictBool = True
+    inherit_tools: StrictBool = False
     """
-    Whether to inherit tools from the parent agent or not. Defaults to true.
+    Whether to inherit tools from the parent agent or not. Defaults to false.
     """
     metadata: dict[str, Any] | None = None
 
@@ -1006,6 +1086,10 @@ class WaitForInputStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     wait_for_input: WaitForInputInfo
     """
     Any additional info or data
@@ -1022,6 +1106,10 @@ class YieldStep(BaseModel):
     """
     The kind of step
     """
+    label: str | None = None
+    """
+    The label of this step for referencing it from other steps
+    """
     workflow: str
     """
     The subworkflow to run.

diff --git a/agents-api/agents_api/autogen/Tools.py b/agents-api/agents_api/autogen/Tools.py
@@ -35,6 +35,10 @@ class ApiCallDef(BaseModel):
     """
     The URL to call
     """
+    schema_: Annotated[dict[str, Any] | None, Field(alias="schema")] = None
+    """
+    The schema of the response
+    """
     headers: dict[str, str] | None = None
     """
     The headers to send with the request
@@ -98,6 +102,10 @@ class ApiCallDefUpdate(BaseModel):
     """
     The URL to call
     """
+    schema_: Annotated[dict[str, Any] | None, Field(alias="schema")] = None
+    """
+    The schema of the response
+    """
     headers: dict[str, str] | None = None
     """
     The headers to send with the request
@@ -1477,7 +1485,7 @@ class ToolResponse(BaseModel):
     model_config = ConfigDict(
         populate_by_name=True,
     )
-    id: UUID
+    id: str
     output: dict[str, Any]
     """
     The output of the tool