flock-core 0.4.520__py3-none-any.whl → 0.5.0b2__py3-none-any.whl

flock/workflow/activities_unified.py

@@ -0,0 +1,230 @@
+"""Unified Temporal activities for running a chain of agents with the new component architecture."""
+
+from datetime import datetime
+
+from opentelemetry import trace
+from temporalio import activity
+
+from flock.core.context.context import FlockContext
+from flock.core.context.context_vars import FLOCK_CURRENT_AGENT, FLOCK_MODEL
+from flock.core.flock_agent_unified import FlockAgentUnified
+from flock.core.registry import get_registry
+# HandOffRequest removed - using agent.next_agent directly
+from flock.core.logging.logging import get_logger
+from flock.core.util.input_resolver import resolve_inputs
+
+logger = get_logger("activities.unified")
+tracer = trace.get_tracer(__name__)
+
+
+@activity.defn
+async def run_agent_unified(context: FlockContext) -> dict:
+    """Runs a chain of agents using the unified component architecture.
+
+    Key changes from original:
+    - Uses FlockAgentUnified with components list
+    - Routing decisions come from agent.next_handoff (set during evaluation)
+    - Simplified workflow - no separate routing step
+    
+    The context contains state, history, and agent definitions.
+    After each agent run, its output is merged into the context.
+    """
+    # Start a top-level span for the entire run_agent activity.
+    with tracer.start_as_current_span("run_agent_unified") as span:
+        registry = get_registry()
+
+        previous_agent_name = ""
+        if isinstance(context, dict):
+            context = FlockContext.from_dict(context)
+        current_agent_name = context.get_variable(FLOCK_CURRENT_AGENT)
+        span.set_attribute("initial.agent", current_agent_name)
+        logger.info("Starting unified agent chain", initial_agent=current_agent_name)
+
+        agent = registry.get_agent(current_agent_name)
+        if not agent:
+            logger.error("Agent not found", agent=current_agent_name)
+            span.record_exception(
+                Exception(f"Agent '{current_agent_name}' not found")
+            )
+            return {"error": f"Agent '{current_agent_name}' not found."}
+
+        # Set model if not configured
+        if agent.model is None:
+            model = context.get_variable(FLOCK_MODEL)
+            if hasattr(agent, 'evaluator') and agent.evaluator and hasattr(agent.evaluator, 'config'):
+                agent.evaluator.config.model = model
+            agent.model = model
+            
+        agent.resolve_callables(context=context)
+
+        # Loop over agents in the chain.
+        while agent:
+            # Create a nested span for this iteration.
+            with tracer.start_as_current_span("agent_iteration_unified") as iter_span:
+                iter_span.set_attribute("agent.name", agent.name)
+                agent.context = context
+                
+                # Resolve inputs for the agent.
+                agent_inputs = resolve_inputs(
+                    agent.input, context, previous_agent_name
+                )
+                iter_span.add_event(
+                    "resolved inputs", attributes={"inputs": str(agent_inputs)}
+                )
+
+                # Execute the agent with its own span.
+                # NOTE: In unified architecture, routing happens DURING execution
+                with tracer.start_as_current_span("execute_agent_unified") as exec_span:
+                    logger.info("Executing unified agent", agent=agent.name)
+                    try:
+                        # This will set agent.next_handoff during evaluation
+                        result = await agent.run_async(agent_inputs)
+                        exec_span.set_attribute("result", str(result))
+                        logger.debug(
+                            "Unified agent execution completed", agent=agent.name
+                        )
+                    except Exception as e:
+                        logger.error(
+                            "Unified agent execution failed",
+                            agent=agent.name,
+                            error=str(e),
+                        )
+                        exec_span.record_exception(e)
+                        raise
+
+                # Get routing decision from agent.next_handoff (set during evaluation)
+                handoff_data = agent.next_handoff
+                
+                if handoff_data is None:
+                    # No routing component or router decided to end workflow
+                    logger.info(
+                        "No handoff data found, completing chain",
+                        agent=agent.name,
+                    )
+                    context.record(
+                        agent.name,
+                        result,
+                        timestamp=datetime.now().isoformat(),
+                        hand_off=None,
+                        called_from=previous_agent_name,
+                    )
+                    iter_span.add_event("chain completed - no handoff")
+                    return result
+
+                # Process the handoff data
+                logger.info(
+                    f"Processing handoff to: {handoff_data.next_agent}",
+                    agent=agent.name,
+                )
+
+                # Handle callable handoff functions (if still needed for backward compatibility)
+                if callable(handoff_data):
+                    logger.debug("Executing handoff function", agent=agent.name)
+                    try:
+                        handoff_data = handoff_data(context, result)
+                        if isinstance(handoff_data.next_agent, FlockAgentUnified):
+                            handoff_data.next_agent = handoff_data.next_agent.name
+                    except Exception as e:
+                        logger.error(
+                            "Handoff function error",
+                            agent=agent.name,
+                            error=str(e),
+                        )
+                        iter_span.record_exception(e)
+                        return {"error": f"Handoff function error: {e}"}
+                elif isinstance(handoff_data.next_agent, FlockAgentUnified):
+                    handoff_data.next_agent = handoff_data.next_agent.name
+
+                # Check if we should end the workflow
+                if not handoff_data.next_agent:
+                    logger.info(
+                        "Router found no suitable next agent",
+                        agent=agent.name,
+                    )
+                    context.record(
+                        agent.name,
+                        result,
+                        timestamp=datetime.now().isoformat(),
+                        hand_off=None,
+                        called_from=previous_agent_name,
+                    )
+                    logger.info("Completing chain", agent=agent.name)
+                    iter_span.add_event("chain completed - no next agent")
+                    return result
+
+                # Record the agent run in the context.
+                context.record(
+                    agent.name,
+                    result,
+                    timestamp=datetime.now().isoformat(),
+                    hand_off=handoff_data.model_dump(),
+                    called_from=previous_agent_name,
+                )
+                previous_agent_name = agent.name
+                previous_agent_output = agent.output
+                
+                if handoff_data.override_context:
+                    context.update(handoff_data.override_context)
+
+                # Prepare the next agent.
+                try:
+                    agent = registry.get_agent(handoff_data.next_agent)
+                    if not agent:
+                        logger.error(
+                            "Next agent not found",
+                            agent=handoff_data.next_agent,
+                        )
+                        iter_span.record_exception(
+                            Exception(
+                                f"Next agent '{handoff_data.next_agent}' not found"
+                            )
+                        )
+                        return {
+                            "error": f"Next agent '{handoff_data.next_agent}' not found."
+                        }
+
+                    # Apply handoff modifications to the next agent
+                    if handoff_data.output_to_input_merge_strategy == "add":
+                        agent.input = previous_agent_output + ", " + agent.input
+
+                    if handoff_data.add_input_fields:
+                        for field in handoff_data.add_input_fields:
+                            agent.input = field + ", " + agent.input
+
+                    if handoff_data.add_output_fields:
+                        for field in handoff_data.add_output_fields:
+                            agent.output = field + ", " + agent.output
+
+                    if handoff_data.add_description:
+                        if agent.description:
+                            agent.description = (
+                                agent.description
+                                + "\n"
+                                + handoff_data.add_description
+                            )
+                        else:
+                            agent.description = handoff_data.add_description
+
+                    agent.resolve_callables(context=context)
+                    context.set_variable(FLOCK_CURRENT_AGENT, agent.name)
+
+                    logger.info("Handing off to next agent", next=agent.name)
+                    iter_span.set_attribute("next.agent", agent.name)
+                    
+                except Exception as e:
+                    logger.error("Error during handoff", error=str(e))
+                    iter_span.record_exception(e)
+                    return {"error": f"Error during handoff: {e}"}
+
+        # If the loop exits unexpectedly, return the initial input.
+        return context.get_variable("init_input")
+
+
+# Backward compatibility wrapper
+@activity.defn  
+async def run_agent(context: FlockContext) -> dict:
+    """Backward compatibility wrapper for run_agent_unified."""
+    logger.warning(
+        "Using backward compatibility wrapper. Consider migrating to run_agent_unified."
+    )
+    return await run_agent_unified(context)

flock/workflow/agent_execution_activity.py

@@ -12,8 +12,8 @@ from temporalio import activity
 from flock.core.context.context import FlockContext
 from flock.core.context.context_vars import FLOCK_MODEL
 from flock.core.flock_agent import FlockAgent  # Import concrete class if needed
-from flock.core.flock_registry import get_registry
-from flock.core.flock_router import HandOffRequest
+from flock.core.registry import get_registry
+# HandOffRequest removed - using agent.next_agent directly
 from flock.core.logging.logging import get_logger
 from flock.core.util.input_resolver import resolve_inputs
 
@@ -133,22 +133,22 @@ async def determine_next_agent(
                 f"Agent '{current_agent_name}' not found for routing."
             )
 
-        if not agent.handoff_router:
+        if not agent.router:
             logger.info(
-                "No handoff router defined for agent", agent=current_agent_name
+                "No router defined for agent", agent=current_agent_name
             )
             span.add_event("no_router")
             return None  # Indicate no handoff
 
         logger.debug(
-            f"Using router {agent.handoff_router.__class__.__name__}",
+            f"Using router {agent.router.__class__.__name__}",
             agent=agent.name,
         )
         try:
             # Execute the routing logic
             handoff_data: (
                 HandOffRequest | Callable
-            ) = await agent.handoff_router.route(agent, result, context)
+            ) = await agent.router.route(agent, result, context)
 
             # Handle callable handoff functions - This is complex in distributed systems.
             # Consider if this pattern should be supported or if routing should always

flock/workflow/flock_workflow.py

@@ -7,7 +7,7 @@ from temporalio import workflow
 with workflow.unsafe.imports_passed_through():
     from flock.core.context.context import AgentDefinition, FlockContext
     from flock.core.context.context_vars import FLOCK_CURRENT_AGENT
-    from flock.core.flock_router import HandOffRequest
+    # HandOffRequest removed - using agent.next_agent directly
     from flock.core.logging.logging import get_logger
     from flock.workflow.agent_execution_activity import (
         determine_next_agent,

{flock_core-0.4.520.dist-info → flock_core-0.5.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.4.520
+Version: 0.5.0b2
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE
@@ -45,7 +45,7 @@ Requires-Dist: temporalio>=1.9.0
 Requires-Dist: thefuzz>=0.22.1
 Requires-Dist: tiktoken>=0.8.0
 Requires-Dist: toml>=0.10.2
-Requires-Dist: tqdm>=4.60.1
+Requires-Dist: tqdm>=4.67.1
 Requires-Dist: uvicorn>=0.34.0
 Requires-Dist: wd-di>=0.2.14
 Requires-Dist: websockets>=15.0.1

{flock_core-0.4.520.dist-info → flock_core-0.5.0b2.dist-info}/RECORD

@@ -17,7 +17,7 @@ flock/cli/load_examples.py,sha256=DkeLUlrb7rGx3nZ04aADU9HXXu5mZTf_DBwT0xhzIv4,7
 flock/cli/load_flock.py,sha256=sfZ9B9aiyC5TCEbn1xR5Yd5SoaVji6MBNYzXlWOpoZ4,7111
 flock/cli/load_release_notes.py,sha256=bkMIjjQFfOngXkDCh2kB404lQYIToeR91LodzI2IUWM,555
 flock/cli/loaded_flock_cli.py,sha256=lGZ9Y2O16v4OEr0dxvPQA8HqreB_bP25C9teg4ViSsA,8202
-flock/cli/manage_agents.py,sha256=cWEHNPDaEAOYaxFhGbt1jmWvIhxmUNjZ24lMP8gH2y8,13506
+flock/cli/manage_agents.py,sha256=ZNmG_J31BwfgQgTYB4bCW6_d4vXB4wbI_21BVnCwrSE,13504
 flock/cli/registry_management.py,sha256=mAHy3wT97YgODR0gVOkTXDqR5NIPzM-E-z9dEtw9-tw,29790
 flock/cli/runner.py,sha256=TgiuhRLkpa6dn3C-3eCmWx-bWUlTjaH0sD7Y-O7MrYM,1122
 flock/cli/settings.py,sha256=Z_TXBzCYlCmSaKrJ_CQCdYy-Cj29gpI4kbC_2KzoKqg,27025
@@ -25,16 +25,30 @@ flock/cli/utils.py,sha256=JJrvM-1D2tbWkicrtkhOgRqVqYb0MdA2XtHYGOYuPRw,4644
 flock/cli/view_results.py,sha256=dOzK0O1FHSIDERnx48y-2Xke9BkOHS7pcOhs64AyIg0,781
 flock/cli/yaml_editor.py,sha256=K3N0bh61G1TSDAZDnurqW9e_-hO6CtSQKXQqlDhCjVo,12527
 flock/cli/assets/release_notes.md,sha256=bqnk50jxM3w5uY44Dc7MkdT8XmRREFxrVBAG9XCOSSU,4896
-flock/core/__init__.py,sha256=juwyNr3QqKXUS5-E3hlMYRhgqHgQBqgtP12OF3tUCAI,1249
-flock/core/flock.py,sha256=iR4i0_z0w2ns_iHbP7FqN--7wlsPIWch1H-BVecPs_I,38205
-flock/core/flock_agent.py,sha256=Hl6TONSiJi2I-N_49-1hkW2q_hyPXMebMr-5oZLI-PY,48842
-flock/core/flock_evaluator.py,sha256=TPy6u6XX3cqkY1r9NW1w2lTwCMNW7pxhFYKLefnEbXg,1820
-flock/core/flock_factory.py,sha256=siCShld0mHPzjsw2_TUhg_nesMYhocJympt1M8ch6p8,18724
-flock/core/flock_module.py,sha256=ObILimpVaPnaaqYvcBYJJ20lQzfrjgTdADplaNRjHU0,7448
-flock/core/flock_registry.py,sha256=KzdFfc3QC-Dk42G24hdf6Prp3HvGj9ymXR3TTBe-T-A,27161
-flock/core/flock_router.py,sha256=1OAXDsdaIIFApEfo6SRfFEDoTuGt3Si7n2MXiySEfis,2644
+flock/components/__init__.py,sha256=ZyTU6-haElMddsgCiL426z9qw2W9AnuFKvKkP3FuVSQ,954
+flock/components/evaluation/__init__.py,sha256=_M3UlRFeNN90fEny6byt5VdLDE5o5khbd0EPT0o9S9k,303
+flock/components/evaluation/declarative_evaluation_component.py,sha256=7VBHRtdcT1FiW6dS8jb1XfraeFmYboKI6PB91WBpIy0,7891
+flock/components/routing/__init__.py,sha256=BH_pFm9T6bUuf8HH4byDJ0dO0fzEVHv9m-ghUdDVdm0,542
+flock/components/routing/conditional_routing_component.py,sha256=Vgx8Cuxxo2LWTWwC_xFsH4-YL3Q9zZ8NaAUFiPbIvjc,21434
+flock/components/routing/default_routing_component.py,sha256=17NZWW0pPMvpOSBvWtkbzouThK1iV_-EgOKaf53AygU,3383
+flock/components/routing/llm_routing_component.py,sha256=patgtmpuF_5RB3FGxGEmXmzAtXffV04fLGon2ZHMRds,7741
+flock/components/utility/__init__.py,sha256=JRj932upddjzZMWs1avOupEFr_GZNu21ac66Rhw_XgY,532
+flock/components/utility/memory_utility_component.py,sha256=3BAH9fcRImwTng9gqn5fRK_OsYUGCkUahkQW2W5ZyFw,20116
+flock/components/utility/metrics_utility_component.py,sha256=SLWjfArtqo6AKeGvkSy_CSHF2fAJLfROQnZA55Bc24Q,24489
+flock/components/utility/output_utility_component.py,sha256=7y6NMjuhUaThqxl0aey2OIw1qkTvfgJPUQNlOrAlKk4,7563
+flock/core/__init__.py,sha256=wYwEurRjtIO5dRhURQlbuFQt-MQ0B3h-FTix0W2oU5g,1070
+flock/core/flock.py,sha256=93vajoVVpJqVP-_8rECIUo76gyBWhaKndIe31PYRTlM,23222
+flock/core/flock_agent.py,sha256=Z_nQ-DgqrTp_oZcuYvh_7tn463emkBTM3Qpjdn79W64,11286
+flock/core/flock_factory.py,sha256=evVKrtLmxLXkhiy-fkAfYDz3Vuv9Dz3ioifzi4Svwy0,19843
+flock/core/flock_registry.py.backup,sha256=f6aapcp1HBzcUjUpTubn7mIdedPdJdup94sa1mX7yj0,26619
 flock/core/flock_scheduler.py,sha256=fu99UXMhs8qkbTLi1q1h4-mR4TxmsyA156EGXuXZ3-Q,8772
 flock/core/flock_server_manager.py,sha256=YU6HOcg_IBXtnkbTIBNBONh3MZkvIjdKWHaiSOo16sE,4555
+flock/core/agent/__init__.py,sha256=l32KFMJnC_gidMXpAXK8-OX228bWOhNc8OY_NzXm59Q,515
+flock/core/agent/flock_agent_components.py,sha256=EflYAN25Uft22HL6uaWRAQbEEg1xfSbWxcqZir0lgtQ,4630
+flock/core/agent/flock_agent_execution.py,sha256=pdOddBGv8y1P89Ix8XFWa1eW9i3bWjOYiQQxeY2K0yo,4217
+flock/core/agent/flock_agent_integration.py,sha256=dazL9BQhuQEy-w74Tah4xLDOzMiD7JhzJIO_iKcA4Wg,5846
+flock/core/agent/flock_agent_lifecycle.py,sha256=msGKSNVRwV70_UvKBFLpdnLkTfvTu5FKJIMVZQC59NE,7292
+flock/core/agent/flock_agent_serialization.py,sha256=fPjFuorJtQVd6abzq2l6W3vUrxtD6DlLNvtrd4Ha9CI,16751
 flock/core/api/__init__.py,sha256=KdzUwBOwhxqqy7lAMLpysKL5GvpIiwOy6CxXELZVWaY,186
 flock/core/api/custom_endpoint.py,sha256=Mbk2owdcXVATaT5FtEWXFzllgursozcmqP8ouG5btc0,1305
 flock/core/api/endpoints.py,sha256=YoqnGscF02OxGXrvOxkn-9hnCwcZD9Vx6YkeHoC8pSk,12187
@@ -43,20 +57,25 @@ flock/core/api/models.py,sha256=seqKuzhbN37nCNO7KrcJjI2mWuwiOKCLFcJcTPvTtag,3422
 flock/core/api/run_store.py,sha256=bFodJvVyWogzoezVy0cOoWWU3MdEBXf_6_5sBqCRWps,9227
 flock/core/api/runner.py,sha256=3izg6cVk1RoR1hDIDwMAO1gi3lnLcp8DPv7AnJBYx6A,1443
 flock/core/api/service.py,sha256=HRHs4xt-bGeSm5hdN92H1vWQtLzqZalhZxIh6iwww8Y,11381
-flock/core/config/flock_agent_config.py,sha256=XP96-Ceh4CfVsHFHXT-YxyRnX_URvabz1xlwdHkD8go,282
+flock/core/component/__init__.py,sha256=ZIGygRCsgsYmBtkFKwqZ6NO05wJH1b1wUL__f7tC-pg,490
+flock/core/component/agent_component_base.py,sha256=u3Sztd9J5Q-MoeuPs-d9s66mhJuXfTv2JSjsXeGuimc,10660
+flock/core/component/evaluation_component_base.py,sha256=BW-glQNnRqdEs5-lUpGPjsug9ejWQZ_FE59y9R5Iq2s,2024
+flock/core/component/routing_component_base.py,sha256=BQ_5zCBNrMfeFytDIs0cwyxIcFNjzV5upLUCMf1WxYI,2686
+flock/core/component/utility_component_base.py,sha256=o-1BIiFeGkvu-e12DBj9JKQVZrfrjY2iS60HWK4zwXM,2330
+flock/core/config/flock_agent_config.py,sha256=5Y9vJKYEkhtjU6I-bJAJBh0eLDYjGdPar_sJ9wMP65A,2132
 flock/core/config/scheduled_agent_config.py,sha256=3okCjpggJSKkc1Dp8ZJuQP010tQvN3dk8n_llbTc5aE,1506
 flock/core/context/context.py,sha256=zdQuB1YWPJmQVv_2_sm1HK7FSnusa3Jl-83PcTuaLUk,7791
 flock/core/context/context_manager.py,sha256=FANSWa6DEhdhtZ7t_9Gza0v80UdpoDOhHbfVOccmjkA,1181
 flock/core/context/context_vars.py,sha256=ASPA29hpENWub4mgRoG62FtTVakCHQZfn6IhJQKe3C8,347
-flock/core/evaluation/utils.py,sha256=S5M0uTFcClphZsR5EylEzrRNK-1434yImiGYL4pR_5o,15380
+flock/core/evaluation/utils.py,sha256=pz62Jr04C3OWRtjSzbv1BqOh2jGlVbmvGWNFVwfzumY,15365
 flock/core/execution/batch_executor.py,sha256=mHwCI-DHqApCv_EVCN0ZOUd-LCQLjREpxKbAUPC0pcY,15266
-flock/core/execution/evaluation_executor.py,sha256=D9EO0sU-2qWj3vomjmUUi-DOtHNJNFRf30kGDHuzREE,17702
+flock/core/execution/evaluation_executor.py,sha256=NZceKhuvTPiLl2wfOYYvEO9VVeSwgg36VxOpR2UV-34,17687
 flock/core/execution/local_executor.py,sha256=rnIQvaJOs6zZORUcR3vvyS6LPREDJTjaygl_Db0M8ao,952
 flock/core/execution/opik_executor.py,sha256=tl2Ti9NM_9WtcjXvJ0c7up-syRNq_OsLmiuYWqkGV4k,3325
 flock/core/execution/temporal_executor.py,sha256=dHcb0xuzPFWU_wbwTgI7glLNyyppei93Txs2sapjhaw,6283
 flock/core/interpreter/python_interpreter.py,sha256=4-wRsxC6-gToEdRr_pp-n2idWwe_Y2zN0o3TbzUPhy0,26632
 flock/core/logging/__init__.py,sha256=xn5fC-8IgsdIv0ywe_cICK1KVhTrVD8t-jYORg0ETUA,155
-flock/core/logging/logging.py,sha256=VyBsin-3q8UQ0DY-K72t8FtrGJQbUwIfzxaC7rIWMvQ,19820
+flock/core/logging/logging.py,sha256=y-V4XPxiwtWCjiAN_YoIRAUP1ialMSH_kT_TYircGjQ,19870
 flock/core/logging/telemetry.py,sha256=Trssqx02SBovTL843YwY3L-ZGj3KvcfMHLMU7Syk8L0,6561
 flock/core/logging/trace_and_logged.py,sha256=5vNrK1kxuPMoPJ0-QjQg-EDJL1oiEzvU6UNi6X8FiMs,2117
 flock/core/logging/formatters/enum_builder.py,sha256=LgEYXUv84wK5vwHflZ5h8HBGgvLH3sByvUQe8tZiyY0,981
@@ -68,7 +87,7 @@ flock/core/logging/telemetry_exporter/base_exporter.py,sha256=rQJJzS6q9n2aojoSqw
 flock/core/logging/telemetry_exporter/file_exporter.py,sha256=nKAjJSZtA7FqHSTuTiFtYYepaxOq7l1rDvs8U8rSBlA,3023
 flock/core/logging/telemetry_exporter/sqlite_exporter.py,sha256=CDsiMb9QcqeXelZ6ZqPSS56ovMPGqOu6whzBZRK__Vg,3498
 flock/core/mcp/__init__.py,sha256=g3hzM_9ntsr-Af9dE9cCZEjQ9YX2jk7-Jm-0JcHSk1A,25
-flock/core/mcp/flock_mcp_server.py,sha256=WgvQDMq5qFj-PzuTXght0uFsztodYEkcIUXQ5TC4Q4M,25852
+flock/core/mcp/flock_mcp_server.py,sha256=OctEfFkwN0xgFfMJKD408KsNwMAuqEEy2M5g7rUVgs4,26408
 flock/core/mcp/flock_mcp_tool_base.py,sha256=ZY6bUJEW3FY0Q5W5vNW0F8RqIovzKZU-X0JrVmK0TuA,6804
 flock/core/mcp/mcp_client.py,sha256=Nf-fC5EtX2egeoqgDx02EIWlwEd6aaNuT1n2DEbnvg0,25934
 flock/core/mcp/mcp_client_manager.py,sha256=hn97F9xEpYNbs02ruEbrtQo4PYD7TNKQAC0AwuAh6xw,8061
@@ -80,27 +99,38 @@ flock/core/mcp/types/handlers.py,sha256=VEpOx5ShvlvOEvgo2Fs5rql-x0obVQYgEpcb8FBr
 flock/core/mcp/types/types.py,sha256=2amE-oastGe1GGVI4gbH2ltCX7QvYnJebSArATvttUU,11410
 flock/core/mcp/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/core/mcp/util/helpers.py,sha256=Xlf4iKW_lZxsVMTRoOnV29JsJfAppfmEJrb6sIcoCH4,636
-flock/core/mixin/dspy_integration.py,sha256=rsZ9bkCKlT3jJRncnwwngTtffKcF2WloFvSleaZ0QRk,17746
+flock/core/mixin/dspy_integration.py,sha256=jS_hJvDK3YReyI5Y9tmNQQrVdW1t1zFtnDqjRVQovPo,17720
 flock/core/mixin/prompt_parser.py,sha256=eOqI-FK3y17gVqpc_y5GF-WmK1Jv8mFlkZxTcgweoxI,5121
+flock/core/orchestration/__init__.py,sha256=lu6VgCpza0c34lDVhTdtFBY9gCuXx-sdadGqxLlfHuQ,543
+flock/core/orchestration/flock_batch_processor.py,sha256=2vqSOHd-Zk871UTai3jGXvITgcwSowaCNjvDkSWbkLg,3357
+flock/core/orchestration/flock_evaluator.py,sha256=_Ctub0P5VOnePpaPQgb7Qw-gvJerns8uO8u2QVOyGYA,4082
+flock/core/orchestration/flock_execution.py,sha256=-ffSPnaW4EPiMXNciJDnFGyDQTy7Pen-6ylvEV_Ip7U,11485
+flock/core/orchestration/flock_initialization.py,sha256=IHPUItTtzHGJUwIVOF1NOXg_ymhdDN5iSYmL7o3I2HQ,4575
+flock/core/orchestration/flock_server_manager.py,sha256=hKlL1-XJJJzN9_OEsNFpXrKps8CQOroJzOQGeue8JXU,2579
+flock/core/orchestration/flock_web_server.py,sha256=uLTKW2pLf4vW3MqhrA2bl3K69zHRqRqcx6vkFZHRi70,3827
+flock/core/registry/__init__.py,sha256=rVXiqfnZjiL7ja9tgEyN96WNsYHT9g003PLi65XXmtw,1312
+flock/core/registry/agent_registry.py,sha256=GTRiziP70jT05--_Vn1-hBi4oM2QU7FG5wzbvesExWQ,2681
+flock/core/registry/callable_registry.py,sha256=BpQZJ6VjUOrFqFGMg3EPkHsIigGDO8DIT9zzlpNlorc,6761
+flock/core/registry/component_discovery.py,sha256=8xN00U044sSMRDRav0cGiKOv1yHK327buSiragjVWKo,6627
+flock/core/registry/component_registry.py,sha256=hZF-xNPbPutlxesoXQbPW5BSmssSrcCar7olZvs6DeA,2617
+flock/core/registry/config_mapping.py,sha256=ShSQd9QqNb2hiASsW_6h27aex23G75X2OzYy9SY-uxs,2392
+flock/core/registry/decorators.py,sha256=nKLVHafnH4GQaMW6cRomJpzlAmIhYQfxs5VhtfBizXc,3765
+flock/core/registry/registry_hub.py,sha256=9_1_UeR7p85wIfN1Qt5PQi9DSgH4DMRH1q_XhpLr07M,8046
+flock/core/registry/server_registry.py,sha256=QnjlW68OOQ9VX01jC9ZGASK8J_xCxf6r_wZL3hiz2HU,2127
+flock/core/registry/type_registry.py,sha256=h1DVQH8gWS6u2Lc2MmpzcfXlbhP7U2mZrMIdHrAhq6U,3109
 flock/core/serialization/__init__.py,sha256=CML7fPgG6p4c0CDBlJ_uwV1aZZhJKK9uy3IoIHfO87w,431
 flock/core/serialization/callable_registry.py,sha256=sUZECTZWsM3fJ8FDRQ-FgLNW9hF26nY17AD6fJKADMc,1419
-flock/core/serialization/flock_serializer.py,sha256=mpBHGPlYrm6QOchOnw8v4l10unb4TXqO9_G60yMutEs,35461
+flock/core/serialization/flock_serializer.py,sha256=yHxZfzj2NhuHcjWHGO17MKbktfXtLV2qKr-LBro2C9M,35430
 flock/core/serialization/json_encoder.py,sha256=gAKj2zU_8wQiNvdkby2hksSA4fbPNwTjup_yz1Le1Vw,1229
 flock/core/serialization/secure_serializer.py,sha256=n5-zRvvXddgJv1FFHsaQ2wuYdL3WUSGPvG_LGaffEJo,6144
 flock/core/serialization/serializable.py,sha256=qlv8TsTqRuklXiNuCMrvro5VKz764xC2i3FlgLJSkdk,12129
-flock/core/serialization/serialization_utils.py,sha256=AHRf90trgnj2Q6aaGaq5eja5PRcuJANUsp2wafGUeig,15257
+flock/core/serialization/serialization_utils.py,sha256=_TvGJw5zLP-asJxtAGJ65nqWNlLSEzeCSe2N-4JAST8,15283
 flock/core/util/cli_helper.py,sha256=9MiAw8y0IRlWKF7lRYViRFzSwbWSeiiLv0usyhn8XlU,49966
 flock/core/util/file_path_utils.py,sha256=Odf7uU32C-x1KNighbNERSiMtkzW4h8laABIoFK7A5M,6246
 flock/core/util/hydrator.py,sha256=ARg4ufXNlfAESDaxPeU8j6TOJ2ywzfl00KAIfVHGIxo,10699
-flock/core/util/input_resolver.py,sha256=QE3EjP7xTRNHuH6o77O3YhlhiCWOcnDg8cnSXzngKnM,4704
+flock/core/util/input_resolver.py,sha256=XNQlx0zRyAIkeVY4SSpfDnpyGQThsEwp3aj_ylv1hjo,5765
 flock/core/util/loader.py,sha256=j3q2qem5bFMP2SmMuYjb-ISxsNGNZd1baQmpvAnRUUk,2244
 flock/core/util/splitter.py,sha256=rDLnZX158PWkmW8vi2UfMLAMRXcHQFUIydAABd-lDGw,7154
-flock/evaluators/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/evaluators/declarative/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/evaluators/declarative/declarative_evaluator.py,sha256=tulTpUOXhF-wMe5a9ULpsCiS1o2Z-DOXOUTqOSzVYqI,7397
-flock/evaluators/memory/memory_evaluator.py,sha256=ySwz7kcc8suXMJ7gKNSWThW8iOMlE8lUcUzEAHvv8rw,3559
-flock/evaluators/test/test_case_evaluator.py,sha256=3Emcoty0LOLLBIuPGxSpKphuZC9Fu1DTr1vbGg-hd0Q,1233
-flock/evaluators/zep/zep_evaluator.py,sha256=6_5vTdU0yJAH8I8w3-MPXiAZx6iUPhAVCsHjrHzkPLM,2058
 flock/mcp/servers/sse/__init__.py,sha256=r6YtleRSOMJqKhTtKQeFKd3QDaUJVz9R1BGJgOm_PF8,51
 flock/mcp/servers/sse/flock_sse_server.py,sha256=YesBrgdbxOsZO6Lgm8EQ8SsDDqhQGkTUPcEuLcqy89A,4980
 flock/mcp/servers/stdio/__init__.py,sha256=36QMguWwHCklLbISNNe1m2cq-y9klAWRf_QnuYpD2aY,53
@@ -109,40 +139,8 @@ flock/mcp/servers/streamable_http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 flock/mcp/servers/streamable_http/flock_streamable_http_server.py,sha256=3bKxx5zBkVXZIvD9qz31oL1ucsMeEO4kdOpv4S558zo,5818
 flock/mcp/servers/websockets/__init__.py,sha256=KeNgNQRdeCQ9xgpaHB1I0-HyYeBhkifAuZPTIA8eDqM,47
 flock/mcp/servers/websockets/flock_websocket_server.py,sha256=ntDLKMM20xTGd7k2TbNEK3ToJAF14oyW6vwofNzvqtM,4324
-flock/modules/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/modules/assertion/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/modules/assertion/assertion_module.py,sha256=2p9mIj8yBXRGgfe5pUWYXcLT86Ny13KyWHpRhe0Ehtg,12877
-flock/modules/callback/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/modules/callback/callback_module.py,sha256=FnTYQeL828uQgYlpgGUnwCz0OzW_DKdOnQ3nwQCcu5o,2956
-flock/modules/enterprise_memory/README.md,sha256=8xKfUi0mjX8tfVe77E3n9IoM97OuhlaCc1QE7PHSF1s,3111
-flock/modules/enterprise_memory/enterprise_memory_module.py,sha256=XieINLCdRIiybhwmNY1_elIf7uyIut-Pas8Pz6PKR-c,21304
-flock/modules/mem0/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/modules/mem0/mem0_module.py,sha256=EoQcD6OgxLuv1AxdLh76XNXZ_4f9zGPRd9LMCPBfgzk,4818
-flock/modules/mem0_async/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/modules/mem0_async/async_mem0_module.py,sha256=F7RRzKgiOo1iySckTVVzOnqnv8epitVJjwalFWUFjzY,4936
-flock/modules/memory/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/modules/memory/memory_module.py,sha256=RhkiBOB0eOkiLZb3hV2meFUZ95euYoAKUxKkfBaq1V4,15922
-flock/modules/memory/memory_parser.py,sha256=FLH7GL8XThvHiCMfX3eQH7Sz-f62fzhAUmO6_gaDI7U,4372
-flock/modules/memory/memory_storage.py,sha256=CNcLDMmvv0x7Z3YMKr6VveS_VCa7rKPw8l2d-XgqokA,27246
-flock/modules/output/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/modules/output/output_module.py,sha256=gEn1_khPAJp-hqU6Rxdv1sQz0jTLVSzYJvNbK1uVNCY,7402
-flock/modules/performance/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/modules/performance/metrics_module.py,sha256=O-FI6h8kbsrXDLoGYMWYT1Vgbp2S5-U4TMXzBHUfcDU,23987
-flock/modules/zep/__init__.py,sha256=Y0cEkx0dujRmy--TDpKoTqFSLzbyFz8BwEOv8kdSUhg,22
-flock/modules/zep/zep_module.py,sha256=gJXOqdoWIXcWOyzJoyqykgq5gU-Y2Dze3tLuQM_tMQc,6572
-flock/platform/docker_tools.py,sha256=fpA7-6rJBjPOUBLdQP4ny2QPgJ_042nmqRn5GtKnoYw,1445
+flock/platform/docker_tools.py,sha256=2QFZtYhPKJsPgCVrQIANrCcQjHDMyBHGDikV4xPYSao,1463
 flock/platform/jaeger_install.py,sha256=MyOMJQx4TQSMYvdUJxfiGSo3YCtsfkbNXcAcQ9bjETA,2898
-flock/routers/__init__.py,sha256=w9uL34Auuo26-q_EGlE8Z9iHsw6S8qutTAH_ZI7pn7M,39
-flock/routers/agent/__init__.py,sha256=0ZOYpR8BMnR5iCGfcUiv99g7aT_g13xvm2Shl-XzybY,65
-flock/routers/agent/agent_router.py,sha256=d4rberqXguJFmDB_hLTaeaDP_rOvCnVQufPELA-pD6M,8327
-flock/routers/agent/handoff_agent.py,sha256=p-0XEPXIyv1T3DGAhhXg2SYXmrwEaJ5pnuLgRSvbiZg,1903
-flock/routers/conditional/conditional_router.py,sha256=_ETx3GhuS3uYqNz6AYWO0JIPov02l1WqxI7Xq-qyMTY,21261
-flock/routers/default/__init__.py,sha256=DOatGX_aE2DWvf55a0Tv7qDK05QFD-hL3sm7g58hmLU,61
-flock/routers/default/default_router.py,sha256=RgJm6RcS8ah1S49mM9TccfJpenQ0SzzbPCX0K8ZtnHs,2384
-flock/routers/feedback/feedback_router.py,sha256=RODEmPrrNZ-ODdZ0mGfmO8auEnH6KvHN3f5rmFGeq1M,4947
-flock/routers/list_generator/list_generator_router.py,sha256=mofBBZFSfqek_uiYbiC-6avdfhTF8Q8tyEVka1xxALs,7741
-flock/routers/llm/__init__.py,sha256=OV89ebq8RPWZwCJTS2_P46Q0yKD_03rwq_fBOsETd08,63
-flock/routers/llm/llm_router.py,sha256=F2GAKaiJxWCdtvI1G9vLkoLaY6kR_DgJYoRLenVN9FI,12335
 flock/themes/3024-day.toml,sha256=uOVHqEzSyHx0WlUk3D0lne4RBsNBAPCTy3C58yU7kEY,667
 flock/themes/3024-night.toml,sha256=qsXUwd6ZYz6J-R129_Ao2TKlvvK60svhZJJjB5c8Tfo,1667
 flock/themes/aardvark-blue.toml,sha256=5ZgsxP3pWLPN3yJ2Wd9ErCo7fy_VJpIfje4kriDKlqo,1667
@@ -484,9 +482,9 @@ flock/tools/azure_tools.py,sha256=OTJsb0B4l70GcD1W3ZMDHWd3X8nEnszhhz2sllD2z9E,30
 flock/tools/code_tools.py,sha256=xLpuFl84y_GVzmIBe4qrr7h9wI3yWpM-M21GgEUjSjE,5247
 flock/tools/file_tools.py,sha256=VYjT942NqDMTnizHiF41O4Af6ySseSvahRNVVrGMXl8,4850
 flock/tools/github_tools.py,sha256=HH47-4K3HL6tRJhZhUttWDo2aloP9Hs12wRC_f_-Vkc,5329
-flock/tools/markdown_tools.py,sha256=94fjGAJ5DEutoioD0ke-YRbxF6IWJQKuPVBLkNqdBo4,6345
+flock/tools/markdown_tools.py,sha256=1EZuYyt8LiuEgROfXqW_VQWQ8cxyko4yMP9nrx3CBds,6324
 flock/tools/system_tools.py,sha256=IUB8MiSxtQH5ZfTGOck3vl4TKva8m1lfU4-W5D5b-4w,202
-flock/tools/text_tools.py,sha256=mMQ8tkyYDxIorqqzl9ccGyWYjrSynYiYFIeP9qypfdg,22491
+flock/tools/text_tools.py,sha256=_FLubHtH4x2-Wn4_SRMV3vYuBls8KCFNuCxqlgfptRM,22470
 flock/tools/web_tools.py,sha256=Wl3qO5lKq4PYtmYahgeFGBQ8tDC0uKY4k9A1Zn-MqFw,2588
 flock/tools/zendesk_tools.py,sha256=e7KMfHVl7wGbstwdz9CvoChyuoZfpS9n4TEtvrxawgI,5162
 flock/webapp/__init__.py,sha256=YtRbbyciN3Z2oMB9fdXZuvM3e49R8m2mY5qHLDoapRA,37
@@ -495,7 +493,7 @@ flock/webapp/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 flock/webapp/app/chat.py,sha256=d5a_mr3H2nuWNFSpSlI_HyqX-J_4krndd4A-8S25EKM,28679
 flock/webapp/app/config.py,sha256=lqmneujnNZk-EFJV5cWpvxkqisxH3T3zT_YOI0JYThE,4809
 flock/webapp/app/dependencies.py,sha256=JUcwY1N6SZplU141lMN2wk9dOC9er5HCedrKTJN9wJk,5533
-flock/webapp/app/main.py,sha256=J3NiwW4fFTrp_YKa-HFXs3gLtLC6qu9LjIb_i-jJHMk,58426
+flock/webapp/app/main.py,sha256=GSCx_trZGSma11BiDCLrdm_zU1VIsIUDbOZuQD1wbMk,58671
 flock/webapp/app/middleware.py,sha256=5gkM-gqD7C6-JrsoTB1_UWpf05JI1N8KIWajn60QZk0,5721
 flock/webapp/app/models_ui.py,sha256=vrEBLbhEp6FziAgBSFOLT1M7ckwadsTdT7qus5_NduE,329
 flock/webapp/app/theme_mapper.py,sha256=QzWwLWpED78oYp3FjZ9zxv1KxCyj43m8MZ0fhfzz37w,34302
@@ -556,14 +554,15 @@ flock/webapp/templates/partials/_sidebar.html,sha256=yfhEcF3xKI5j1c3iq46mU8mmPvg
 flock/webapp/templates/partials/_structured_data_view.html,sha256=TEaXcMGba9ruxEc_MLxygIO1qWcuSTo1FnosFtGSKWI,2101
 flock/webapp/templates/partials/_theme_preview.html,sha256=THeMYTXzgzHJxzWqaTtUhmJyBZT3saLRAa6wzZa4qnk,1347
 flock/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flock/workflow/activities.py,sha256=fyvefDOWZhhj5gCYIHR9Aqm2DbE6XI6-sXESFnnYRuc,9911
+flock/workflow/activities.py,sha256=q358l0p0zQ8KIdcq_AkcuZ0SX9h5PytV_HmEMd8tzEU,8613
+flock/workflow/activities_unified.py,sha256=kbb_X1p68YJElqM-SIxSekruvHbmdQ-oWvJlJboNReo,10171
 flock/workflow/agent_activities.py,sha256=NhBZscflEf2IMfSRa_pBM_TRP7uVEF_O0ROvWZ33eDc,963
-flock/workflow/agent_execution_activity.py,sha256=Gy6FtuVAjf0NiUXmC3syS2eJpNQF4R3pmwMq47NYW3U,9462
-flock/workflow/flock_workflow.py,sha256=iSUF_soFvWar0ffpkzE4irkDZRx0p4HnwmEBi_Ne2sY,9666
+flock/workflow/agent_execution_activity.py,sha256=CzTkbjGqrPoAbldaQOS_doesosDK9mT04M8cbtvP5ps,9432
+flock/workflow/flock_workflow.py,sha256=ZhAF82ewNRY2vvDjNpXT1D9lCVQsLOSMTaZVzdcogJc,9674
 flock/workflow/temporal_config.py,sha256=3_8O7SDEjMsSMXsWJBfnb6XTp0TFaz39uyzSlMTSF_I,3988
 flock/workflow/temporal_setup.py,sha256=YIHnSBntzOchHfMSh8hoLeNXrz3B1UbR14YrR6soM7A,1606
-flock_core-0.4.520.dist-info/METADATA,sha256=0dDV8IbiheDnn0O-Tm6c0poo7h7kAq7U4vMzcrRk8dc,22786
-flock_core-0.4.520.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.520.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.520.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.520.dist-info/RECORD,,
+flock_core-0.5.0b2.dist-info/METADATA,sha256=iCBqog-kUvzyq94ZlHmJSaWdTHNYc71rSqQ2m03ppbQ,22786
+flock_core-0.5.0b2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.5.0b2.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.5.0b2.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.5.0b2.dist-info/RECORD,,

flock/core/flock_evaluator.py

@@ -1,60 +0,0 @@
-"""Base classes and implementations for Flock evaluators."""
-
-from abc import ABC, abstractmethod
-from typing import Any, TypeVar
-
-from pydantic import BaseModel, Field, create_model
-
-T = TypeVar("T", bound="FlockEvaluatorConfig")
-
-
-class FlockEvaluatorConfig(BaseModel):
-    """Base configuration class for Flock modules.
-
-    This class serves as the base for all module-specific configurations.
-    Each module should define its own config class inheriting from this one.
-
-    Example:
-        class MemoryModuleConfig(FlockModuleConfig):
-            file_path: str = Field(default="memory.json")
-            save_after_update: bool = Field(default=True)
-    """
-
-    model: str = Field(
-        default="", description="The model to use for evaluation"
-    )
-
-    @classmethod
-    def with_fields(cls: type[T], **field_definitions) -> type[T]:
-        """Create a new config class with additional fields."""
-        return create_model(
-            f"Dynamic{cls.__name__}", __base__=cls, **field_definitions
-        )
-
-
-class FlockEvaluator(ABC, BaseModel):
-    """Base class for all evaluators in Flock.
-
-    An evaluator is responsible for taking inputs and producing outputs using
-    some evaluation strategy (e.g., DSPy, natural language, etc.).
-    """
-
-    name: str = Field(..., description="Unique identifier for this evaluator")
-    config: FlockEvaluatorConfig = Field(
-        default_factory=FlockEvaluatorConfig,
-        description="Evaluator configuration",
-    )
-
-    def __init__(self, **data):
-        super().__init__(**data)
-
-    @abstractmethod
-    async def evaluate(
-        self,
-        agent: Any,
-        inputs: dict[str, Any],
-        tools: list[Any],
-        mcp_tools: list[Any] | None = None,
-    ) -> dict[str, Any]:
-        """Evaluate inputs to produce outputs."""
-        pass