fix(agents-api): Fix failing tests

Signed-off-by: Diwank Singh Tomer <[email protected]>

agents-api/agents_api/common/protocol/tasks.py

@@ -307,7 +307,9 @@ def spec_to_task_data(spec: dict) -> dict:
     workflows_dict = {workflow["name"]: workflow["steps"] for workflow in workflows}
 
     tools = spec.pop("tools", [])
-    tools = [{tool["type"]: tool.pop("spec"), **tool} for tool in tools]
+    tools = [
+        {tool["type"]: tool.pop("spec"), **tool} for tool in tools if tool is not None
+    ]
 
     return {
         "id": task_id,

agents-api/agents_api/queries/executions/get_temporal_workflow_data.py

@@ -4,7 +4,6 @@
 import asyncpg
 from beartype import beartype
 from fastapi import HTTPException
-from sqlglot import parse_one
 
 from ..utils import (
     partialclass,

agents-api/agents_api/queries/executions/prepare_execution_input.py

@@ -25,7 +25,7 @@
     ) a
 ) AS agent,
 (
-    SELECT jsonb_agg(r) AS tools FROM (
+    SELECT COALESCE(jsonb_agg(r), '[]'::jsonb) AS tools FROM (
         SELECT * FROM tools
         WHERE
             developer_id = $1 AND 
@@ -72,7 +72,9 @@
             **d["agent"],
         },
         "agent_tools": [
-            {tool["type"]: tool.pop("spec"), **tool} for tool in d["tools"]
+            {tool["type"]: tool.pop("spec"), **tool}
+            for tool in d["tools"]
+            if tool is not None
         ],
         "arguments": d["execution"]["input"],
         "execution": {

agents-api/agents_api/queries/tasks/get_task.py

@@ -23,12 +23,12 @@
         ) FILTER (WHERE w.name IS NOT NULL),
         '[]'::jsonb
     ) as workflows,
-    jsonb_agg(tl) as tools
+    COALESCE(jsonb_agg(tl), '[]'::jsonb) as tools
 FROM 
     tasks t
-INNER JOIN 
+LEFT JOIN 
     workflows w ON t.developer_id = w.developer_id AND t.task_id = w.task_id AND t.version = w.version
-INNER JOIN
+LEFT JOIN
     tools tl ON t.developer_id = tl.developer_id AND t.task_id = tl.task_id
 WHERE 
     t.developer_id = $1 AND t.task_id = $2

agents-api/agents_api/queries/tools/get_tool_args_from_metadata.py

@@ -2,15 +2,14 @@
 from uuid import UUID
 
 from beartype import beartype
-from sqlglot import parse_one
 
 from ..utils import (
     pg_query,
     wrap_in_class,
 )
 
 # Define the raw SQL query for getting tool args from metadata
-tools_args_for_task_query = parse_one("""
+tools_args_for_task_query = """
 SELECT COALESCE(agents_md || tasks_md, agents_md, tasks_md, '{}') as values FROM (
     SELECT
         CASE WHEN $3 = 'x-integrations-args' then metadata->'x-integrations-args'
@@ -28,10 +27,11 @@
         WHEN $3 = 'x-api_call-setup' then metadata->'x-api_call-setup' END AS tasks_md
     FROM tasks
     WHERE task_id = $2 AND developer_id = $4 LIMIT 1
-) AS tasks_md""").sql(pretty=True)
+) AS tasks_md"""
 
 # Define the raw SQL query for getting tool args from metadata for a session
-tool_args_for_session_query = parse_one("""SELECT COALESCE(agents_md || sessions_md, agents_md, sessions_md, '{}') as values FROM (
+tool_args_for_session_query = """
+SELECT COALESCE(agents_md || sessions_md, agents_md, sessions_md, '{}') as values FROM (
     SELECT
         CASE WHEN $3 = 'x-integrations-args' then metadata->'x-integrations-args'
         WHEN $3 = 'x-api_call-args' then metadata->'x-api_call-args'
@@ -48,7 +48,7 @@
         WHEN $3 = 'x-api_call-setup' then metadata->'x-api_call-setup' END AS tasks_md
     FROM sessions
     WHERE session_id = $2 AND developer_id = $4 LIMIT 1
-) AS sessions_md""").sql(pretty=True)
+) AS sessions_md"""
 
 
 # @rewrap_exceptions(

agents-api/tests/fixtures.py

@@ -329,7 +329,7 @@ async def test_execution_started(
 async def test_transition(
     dsn=pg_dsn,
     developer_id=test_developer_id,
-    execution=test_execution,
+    execution=test_execution_started,
 ):
     pool = await create_db_pool(dsn=dsn)
     transition = await create_execution_transition(

agents-api/tests/test_task_routes.py

@@ -3,15 +3,16 @@
 from uuid_extensions import uuid7
 from ward import test
 
-from tests.fixtures import (
+from .fixtures import (
     client,
     make_request,
     test_agent,
-    # test_execution,
+    test_execution,
+    test_transition,
     test_task,
 )
 
-from .fixtures import test_execution, test_transition
+from .utils import patch_testing_temporal
 
 
 @test("route: unauthorized should fail")
@@ -60,43 +61,43 @@ def _(make_request=make_request, agent=test_agent):
     assert response.status_code == 201
 
 
-# @test("route: create task execution")
-# async def _(make_request=make_request, task=test_task):
-#     data = dict(
-#         input={},
-#         metadata={},
-#     )
+@test("route: create task execution")
+async def _(make_request=make_request, task=test_task):
+    data = dict(
+        input={},
+        metadata={},
+    )
 
-#     async with patch_testing_temporal():
-#         response = make_request(
-#             method="POST",
-#             url=f"/tasks/{str(task.id)}/executions",
-#             json=data,
-#         )
+    async with patch_testing_temporal():
+        response = make_request(
+            method="POST",
+            url=f"/tasks/{str(task.id)}/executions",
+            json=data,
+        )
 
-#     assert response.status_code == 201
+    assert response.status_code == 201
 
 
-# @test("route: get execution not exists")
-# def _(make_request=make_request):
-#     execution_id = str(uuid7())
+@test("route: get execution not exists")
+def _(make_request=make_request):
+    execution_id = str(uuid7())
 
-#     response = make_request(
-#         method="GET",
-#         url=f"/executions/{execution_id}",
-#     )
+    response = make_request(
+        method="GET",
+        url=f"/executions/{execution_id}",
+    )
 
-#     assert response.status_code == 404
+    assert response.status_code == 404
 
 
-# @test("route: get execution exists")
-# def _(make_request=make_request, execution=test_execution):
-#     response = make_request(
-#         method="GET",
-#         url=f"/executions/{str(execution.id)}",
-#     )
+@test("route: get execution exists")
+def _(make_request=make_request, execution=test_execution):
+    response = make_request(
+        method="GET",
+        url=f"/executions/{str(execution.id)}",
+    )
 
-#     assert response.status_code == 200
+    assert response.status_code == 200
 
 
 @test("route: get task not exists")