cr

docker-compose.yml

@@ -32,6 +32,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
+      secrets:
+        - id_ed25519
     healthcheck:
       test: wget --no-verbose --tries=1 http://0.0.0.0:8001/ || exit 1
       interval: 30s
@@ -58,6 +60,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
+      secrets:
+        - id_ed25519
     healthcheck:
       test: wget --no-verbose --tries=1 http://0.0.0.0:8002/is_worker_running || exit 1
       interval: 30s
@@ -84,6 +88,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
+      secrets:
+        - id_ed25519
     healthcheck:
       test: wget --no-verbose --tries=1 http://0.0.0.0:8003/is_worker_running || exit 1
       interval: 30s
@@ -110,6 +116,8 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
+      secrets:
+        - id_ed25519
     healthcheck:
       test: wget --no-verbose --tries=1 http://0.0.0.0:8004/is_worker_running || exit 1
       interval: 30s
@@ -118,3 +126,6 @@ services:
       timeout: 10s
 volumes:
   rabbitmq:
+secrets:
+  id_ed25519:
+    file: ~/.ssh/id_ed25519

pyproject.toml

@@ -18,7 +18,7 @@ streamlit = "^1.36.0"
 llama-index-readers-file = "^0.1.30"
 llama-index-embeddings-openai = "^0.1.11"
 llama-index-program-openai = "^0.1.7"
-llama-agents = {version = "^0.0.12", extras = ["rabbitmq"]}
+llama-agents = {git = "[email protected]:run-llama/llama-agents.git", rev = "nerdai-fix-pipeline-orchestrator", extras = ["rabbitmq"]}
 snowflake-sqlalchemy = "^1.6.1"
 
 [tool.poetry.group.dev.dependencies]

snowflake_cybersyn_demo/agent_services/funny_agent.py

@@ -43,7 +43,7 @@ def get_the_secret_fact() -> str:
 agent_server = AgentService(
     agent=agent,
     message_queue=message_queue,
-    description="Cannot get timeseries data of specified good, but can handle all other queries.",
+    description="Do not select for any queries regarding timeseries data. Can be used for everything but that.",
     service_name="funny_agent",
     host=funny_agent_host,
     port=int(funny_agent_port) if funny_agent_port else None,

snowflake_cybersyn_demo/core_services/control_plane.py

@@ -2,6 +2,7 @@
 
 import uvicorn
 from llama_agents import ControlPlaneServer, PipelineOrchestrator
+from llama_agents.orchestrators.router import RouterOrchestrator
 from llama_agents.message_queues.rabbitmq import RabbitMQMessageQueue
 from llama_index.core.query_pipeline import QueryPipeline, RouterComponent
 from llama_index.core.selectors import PydanticSingleSelector
@@ -40,24 +41,19 @@
         time_series_getter_agent_component,
     ],
 )
+timeseries_pipeline_orchestrator = PipelineOrchestrator(timeseries_task_pipeline)
 timeseries_task_pipeline_desc = (
     "Only used for getting timeseries data from the database."
 )
 
-pipeline = QueryPipeline(
-    chain=[
-        RouterComponent(
-            selector=PydanticSingleSelector.from_defaults(llm=OpenAI()),
-            choices=[
-                funny_agent_server.description,
-                timeseries_task_pipeline_desc,
-            ],
-            components=[funny_agent_component, timeseries_task_pipeline],
-        )
-    ]
-)
+general_pipeline = QueryPipeline(chain=[funny_agent_component])
+general_pipeline_orchestrator = PipelineOrchestrator(general_pipeline)
 
-pipeline_orchestrator = PipelineOrchestrator(pipeline)
+pipeline_orchestrator = RouterOrchestrator(
+    selector=PydanticSingleSelector.from_defaults(llm=OpenAI()),
+    orchestrators=[timeseries_pipeline_orchestrator, general_pipeline_orchestrator],
+    choices=[timeseries_task_pipeline_desc, funny_agent_server.description],
+)
 
 # setup control plane
 control_plane = ControlPlaneServer(