flock-core 0.5.0b1__tar.gz → 0.5.0b3__tar.gz

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.5.0b1
+Version: 0.5.0b3
 Summary: Declarative LLM Orchestration at Scale
 Author-email: Andre Ratzenberger <andre.ratzenberger@whiteduck.de>
 License-File: LICENSE

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/legacy/flock_agent_original.py

@@ -11,7 +11,7 @@ from datetime import datetime
 from typing import TYPE_CHECKING, Any, TypeVar
 
 from flock.core.config.flock_agent_config import FlockAgentConfig
-from flock.core.mcp.flock_mcp_server import FlockMCPServerBase
+from flock.core.mcp.flock_mcp_server import FlockMCPServer
 from flock.core.serialization.json_encoder import FlockJSONEncoder
 from flock.workflow.temporal_config import TemporalActivityConfig
 
@@ -97,7 +97,7 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
             description="List of callable tools the agent can use. These must be registered.",
         )
     )
-    servers: list[str | FlockMCPServerBase] | None = Field(
+    servers: list[str | FlockMCPServer] | None = Field(
         default=None,
         description="List of MCP Servers the agent can use to enhance its capabilities. These must be registered.",
     )
@@ -151,7 +151,7 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
         input: SignatureType = None,
         output: SignatureType = None,
         tools: list[Callable[..., Any]] | None = None,
-        servers: list[str | FlockMCPServerBase] | None = None,
+        servers: list[str | FlockMCPServer] | None = None,
         evaluator: "FlockEvaluator | None" = None,
         handoff_router: "FlockRouter | None" = None,
         # Use dict for modules
@@ -364,9 +364,9 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
 
                     FlockRegistry = get_registry()  # Get the registry
                     for server in self.servers:
-                        registered_server: FlockMCPServerBase | None = None
+                        registered_server: FlockMCPServer | None = None
                         server_tools = []
-                        if isinstance(server, FlockMCPServerBase):
+                        if isinstance(server, FlockMCPServer):
                             # check if registered
                             server_name = server.config.name
                             registered_server = FlockRegistry.get_server(
@@ -825,7 +825,7 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
             )
             serialized_servers = []
             for server in self.servers:
-                if isinstance(server, FlockMCPServerBase):
+                if isinstance(server, FlockMCPServer):
                     serialized_servers.append(server.config.name)
                 else:
                     # Write it down as a list of server names.
@@ -1088,7 +1088,7 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
                 if isinstance(server_name, str):
                     # Case 1 (default behavior): A server name is passe.
                     agent.servers.append(server_name)
-                elif isinstance(server_name, FlockMCPServerBase):
+                elif isinstance(server_name, FlockMCPServer):
                     # Case 2 (highly unlikely): If someone somehow manages to pass
                     # an instance of a server during the deserialization step (however that might be achieved)
                     # check the registry, if the server is already registered, if not, register it

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/legacy/flock_agent_refactored_backup.py

@@ -20,7 +20,7 @@ from flock.core.context.context import FlockContext
 from flock.core.flock_evaluator import FlockEvaluator, FlockEvaluatorConfig
 from flock.core.flock_module import FlockModule, FlockModuleConfig
 from flock.core.flock_router import FlockRouter, FlockRouterConfig
-from flock.core.mcp.flock_mcp_server import FlockMCPServerBase
+from flock.core.mcp.flock_mcp_server import FlockMCPServer
 
 # Mixins and Serialization components
 from flock.core.mixin.dspy_integration import DSPyIntegrationMixin
@@ -82,7 +82,7 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
             description="List of callable tools the agent can use. These must be registered.",
         )
     )
-    servers: list[str | FlockMCPServerBase] | None = Field(
+    servers: list[str | FlockMCPServer] | None = Field(
         default=None,
         description="List of MCP Servers the agent can use to enhance its capabilities. These must be registered.",
     )
@@ -136,7 +136,7 @@ class FlockAgent(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
         input: SignatureType = None,
         output: SignatureType = None,
         tools: list[Callable[..., Any]] | None = None,
-        servers: list[str | FlockMCPServerBase] | None = None,
+        servers: list[str | FlockMCPServer] | None = None,
         evaluator: FlockEvaluator | None = None,
         handoff_router: FlockRouter | None = None,
         # Use dict for modules

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/legacy/flock_agent_unified.py

@@ -12,15 +12,15 @@ from flock.core.agent.flock_agent_execution import FlockAgentExecution
 from flock.core.agent.flock_agent_integration import FlockAgentIntegration
 from flock.core.agent.flock_agent_serialization import FlockAgentSerialization
 from flock.core.component.agent_component_base import AgentComponent
-from flock.core.component.evaluation_component_base import (
-    EvaluationComponentBase,
+from flock.core.component.evaluation_component import (
+    EvaluationComponent,
 )
-from flock.core.component.routing_component_base import RoutingModuleBase
+from flock.core.component.routing_component import RoutingModuleBase
 from flock.core.config.flock_agent_config import FlockAgentConfig
 from flock.core.context.context import FlockContext
 from flock.core.flock_router import HandOffRequest
 from flock.core.logging.logging import get_logger
-from flock.core.mcp.flock_mcp_server import FlockMCPServerBase
+from flock.core.mcp.flock_mcp_server import FlockMCPServer
 
 # Mixins and Serialization components
 from flock.core.mixin.dspy_integration import DSPyIntegrationMixin
@@ -80,7 +80,7 @@ class FlockAgentUnified(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
         default=None,
         description="List of callable tools the agent can use. These must be registered.",
     )
-    servers: list[str | FlockMCPServerBase] | None = Field(
+    servers: list[str | FlockMCPServer] | None = Field(
         default=None,
         description="List of MCP Servers the agent can use to enhance its capabilities.",
     )
@@ -132,7 +132,7 @@ class FlockAgentUnified(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
         input: SignatureType = None,
         output: SignatureType = None,
         tools: list[Callable[..., Any]] | None = None,
-        servers: list[str | FlockMCPServerBase] | None = None,
+        servers: list[str | FlockMCPServer] | None = None,
         components: list[AgentComponent] | None = None,
         write_to_file: bool = False,
         wait_for_input: bool = False,
@@ -163,10 +163,10 @@ class FlockAgentUnified(BaseModel, Serializable, DSPyIntegrationMixin, ABC):
     # These provide familiar access patterns while using the unified model
 
     @property
-    def evaluator(self) -> EvaluationComponentBase | None:
+    def evaluator(self) -> EvaluationComponent | None:
         """Get the primary evaluation component for this agent."""
         return next(
-            (c for c in self.components if isinstance(c, EvaluationComponentBase)),
+            (c for c in self.components if isinstance(c, EvaluationComponent)),
             None
         )
 

flock_core-0.5.0b1/src/flock/core/flock_registry.py.backup → flock_core-0.5.0b3/legacy/flock_registry.py

@@ -26,11 +26,11 @@ from typing import (  # Add TYPE_CHECKING
 from pydantic import BaseModel
 
 if TYPE_CHECKING:
+    from flock.core.component.agent_component_base import AgentComponent
     from flock.core.flock_agent import (
         FlockAgent,  # Import only for type checking
     )
-    from flock.core.mcp.flock_mcp_server import FlockMCPServerBase
-    from flock.core.component.agent_component_base import AgentComponent
+    from flock.core.mcp.flock_mcp_server import FlockMCPServer
 
     COMPONENT_BASE_TYPES = (AgentComponent,)
 
@@ -62,7 +62,7 @@ class FlockRegistry:
     _instance = None
 
     _agents: dict[str, FlockAgent]
-    _servers: dict[str, FlockMCPServerBase]
+    _servers: dict[str, FlockMCPServer]
     _callables: dict[str, Callable]
     _types: dict[str, type]
     _components: dict[str, type]  # For Module, Evaluator, Router classes
@@ -159,7 +159,7 @@ class FlockRegistry:
             return None
 
     # --- Server Registration ---
-    def register_server(self, server: FlockMCPServerBase) -> None:
+    def register_server(self, server: FlockMCPServer) -> None:
         """Registers a flock mcp server by its name."""
         if not hasattr(server.config, "name") or not server.config.name:
             logger.error(
@@ -176,7 +176,7 @@ class FlockRegistry:
         self._servers[server.config.name] = server
         logger.debug(f"Registered server: {server.config.name}")
 
-    def get_server(self, name: str) -> FlockMCPServerBase | None:
+    def get_server(self, name: str) -> FlockMCPServer | None:
         """Retrieves a registered FlockMCPServer instance by name."""
         server = self._servers.get(name)
         if not server:

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/legacy/modules/performance/metrics_module.py

@@ -15,7 +15,7 @@ from flock.core.context.context import FlockContext
 from flock.core.flock_agent import FlockAgent
 from flock.core.flock_module import FlockModule, FlockModuleConfig
 from flock.core.flock_registry import flock_component
-from flock.core.mcp.flock_mcp_server import FlockMCPServerBase
+from flock.core.mcp.flock_mcp_server import FlockMCPServer
 
 
 class MetricPoint(BaseModel):
@@ -525,7 +525,7 @@ class MetricsModule(FlockModule):
 
     # --- MCP Server Lifecycle Hooks ---
     async def on_server_error(
-        self, server: FlockMCPServerBase, error: Exception
+        self, server: FlockMCPServer, error: Exception
     ) -> None:
         """Record server error metrics."""
         self._record_metric(
@@ -537,7 +537,7 @@ class MetricsModule(FlockModule):
             },
         )
 
-    async def on_pre_server_init(self, server: FlockMCPServerBase):
+    async def on_pre_server_init(self, server: FlockMCPServer):
         """Initialize metrics collection for server."""
         self._server_start_time = time.time()
 
@@ -549,7 +549,7 @@ class MetricsModule(FlockModule):
                 {"server": server.config.name, "phase": "pre_init"},
             )
 
-    async def on_post_server_init(self, server: FlockMCPServerBase):
+    async def on_post_server_init(self, server: FlockMCPServer):
         """Collect metrics after server starts."""
         if self.config.collect_memory:
             checkpoint_memory = psutil.Process().memory_info().rss
@@ -559,7 +559,7 @@ class MetricsModule(FlockModule):
                 {"server": server.config.name, "phase": "post_init"},
             )
 
-    async def on_pre_server_terminate(self, server: FlockMCPServerBase):
+    async def on_pre_server_terminate(self, server: FlockMCPServer):
         """Collect metrics before server terminates."""
         if self.config.collect_memory:
             checkpoint_memory = psutil.Process().memory_info().rss
@@ -569,7 +569,7 @@ class MetricsModule(FlockModule):
                 {"server": server.config.name, "phase": "pre_terminate"},
             )
 
-    async def on_post_server_terminate(self, server: FlockMCPServerBase):
+    async def on_post_server_terminate(self, server: FlockMCPServer):
         """Collect metrics after server terminates.
 
         Clean up and final metric recording.
@@ -600,7 +600,7 @@ class MetricsModule(FlockModule):
                 json.dump(summary, f, indent=2)
 
     async def on_pre_mcp_call(
-        self, server: FlockMCPServerBase, arguments: Any | None = None
+        self, server: FlockMCPServer, arguments: Any | None = None
     ):
         """Record pre-call metrics."""
         if self.config.collect_cpu:
@@ -630,7 +630,7 @@ class MetricsModule(FlockModule):
             )
 
     async def on_post_mcp_call(
-        self, server: FlockMCPServerBase, result: Any | None = None
+        self, server: FlockMCPServer, result: Any | None = None
     ):
         """Record post-call metrics."""
         if self.config.collect_timing and self._server_start_time:
@@ -661,7 +661,7 @@ class MetricsModule(FlockModule):
             )
 
     async def on_connect(
-        self, server: FlockMCPServerBase, additional_params: dict[str, Any]
+        self, server: FlockMCPServer, additional_params: dict[str, Any]
     ) -> dict[str, Any]:
         """Collect metrics during connect."""
         # We should track the refresh rate for clients

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flock-core"
-version = "0.5.0b1"
+version = "0.5.0b3"
 description = "Declarative LLM Orchestration at Scale"
 readme = "README.md"
 authors = [

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/src/flock/cli/manage_agents.py

@@ -105,7 +105,7 @@ def _list_agents(flock: Flock):
         model = agent.model or flock.model or "Default"
 
         # Format description (truncate if too long)
-        description = agent.resolved_description
+        description = agent.description
         if description and len(description) > 30:
             description = description[:27] + "..."
         elif not description:
@@ -165,7 +165,7 @@ def _view_agent_details(agent: FlockAgent):
 
     basic_info.add_row("Name", agent.name)
     basic_info.add_row("Model", str(agent.model or "Default"))
-    basic_info.add_row("Description", agent.resolved_description if agent.resolved_description else "N/A")
+    basic_info.add_row("Description", agent.description if agent.description else "N/A")
     basic_info.add_row("Input", str(agent.input))
     basic_info.add_row("Output", str(agent.output))
     basic_info.add_row("Write to File", str(agent.config.write_to_file))
@@ -339,7 +339,7 @@ def _edit_agent(flock: Flock):
     console.print(f"\n[bold underline]Details for Agent: {agent.name}[/]")
     basic_info = Table(show_header=False, box=Box.ROUNDED, padding=(0, 2))
     basic_info.add_row("Name", agent.name)
-    description = agent.resolved_description
+    description = agent.description
     basic_info.add_row("Description", description if description else "N/A")
     basic_info.add_row("Model", agent.model or "Flock Default")
     basic_info.add_row("Input Signature", str(agent.input))

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/src/flock/components/evaluation/declarative_evaluation_component.py

@@ -12,12 +12,12 @@ with workflow.unsafe.imports_passed_through():
 from pydantic import Field, PrivateAttr
 
 from flock.core.component.agent_component_base import AgentComponentConfig
-from flock.core.component.evaluation_component_base import EvaluationComponentBase
+from flock.core.component.evaluation_component import EvaluationComponent
 from flock.core.context.context import FlockContext
-from flock.core.registry import flock_component
 from flock.core.logging.logging import get_logger
 from flock.core.mixin.dspy_integration import DSPyIntegrationMixin
 from flock.core.mixin.prompt_parser import PromptParserMixin
+from flock.core.registry import flock_component
 
 logger = get_logger("components.evaluation.declarative")
 
@@ -45,7 +45,7 @@ class DeclarativeEvaluationConfig(AgentComponentConfig):
 
 @flock_component(config_class=DeclarativeEvaluationConfig)
 class DeclarativeEvaluationComponent(
-    EvaluationComponentBase, DSPyIntegrationMixin, PromptParserMixin
+    EvaluationComponent, DSPyIntegrationMixin, PromptParserMixin
 ):
     """Evaluation component that uses DSPy for generation.
     
@@ -58,7 +58,7 @@ class DeclarativeEvaluationComponent(
         default_factory=DeclarativeEvaluationConfig,
         description="Evaluation configuration",
     )
-    
+
     _cost: float = PrivateAttr(default=0.0)
     _lm_history: list = PrivateAttr(default_factory=list)
 
@@ -75,7 +75,7 @@ class DeclarativeEvaluationComponent(
     ) -> dict[str, Any]:
         """Core evaluation logic using DSPy - migrated from DeclarativeEvaluator."""
         logger.debug(f"Starting declarative evaluation for component '{self.name}'")
-        
+
         # Setup DSPy context with LM (directly from original implementation)
         with dspy.context(
             lm=dspy.LM(
@@ -89,14 +89,14 @@ class DeclarativeEvaluationComponent(
             try:
                 from rich.console import Console
                 console = Console()
-                
+
                 # Create DSPy signature from agent definition
                 _dspy_signature = self.create_dspy_signature_class(
                     agent.name,
                     agent.description,
                     f"{agent.input} -> {agent.output}",
                 )
-                
+
                 # Get output field names for streaming
                 output_field_names = list(_dspy_signature.output_fields.keys())
                 if not output_field_names:
@@ -113,7 +113,7 @@ class DeclarativeEvaluationComponent(
                     mcp_tools=mcp_tools or [],
                     kwargs=self.config.kwargs,
                 )
-                
+
             except Exception as setup_error:
                 logger.error(
                     f"Error setting up DSPy task for agent '{agent.name}': {setup_error}",
@@ -132,7 +132,7 @@ class DeclarativeEvaluationComponent(
     async def _execute_streaming(self, agent_task, inputs: dict[str, Any], agent: Any, console) -> dict[str, Any]:
         """Execute DSPy program in streaming mode (from original implementation)."""
         logger.info(f"Evaluating agent '{agent.name}' with async streaming.")
-        
+
         if not callable(agent_task):
             logger.error("agent_task is not callable, cannot stream.")
             raise TypeError("DSPy task could not be created or is not callable.")
@@ -167,7 +167,7 @@ class DeclarativeEvaluationComponent(
     async def _execute_standard(self, agent_task, inputs: dict[str, Any], agent: Any) -> dict[str, Any]:
         """Execute DSPy program in standard mode (from original implementation)."""
         logger.info(f"Evaluating agent '{agent.name}' without streaming.")
-        
+
         try:
             # Ensure the call is awaited if the underlying task is async
             result_obj = await agent_task.acall(**inputs)

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/src/flock/components/routing/conditional_routing_component.py

@@ -8,11 +8,12 @@ from typing import TYPE_CHECKING, Any, Literal
 from pydantic import Field, model_validator
 
 from flock.core.component.agent_component_base import AgentComponentConfig
-from flock.core.component.routing_component_base import RoutingComponentBase
+from flock.core.component.routing_component import RoutingComponent
 from flock.core.context.context import FlockContext
-from flock.core.registry import flock_component, get_registry
+
 # HandOffRequest removed - using agent.next_agent directly
 from flock.core.logging.logging import get_logger
+from flock.core.registry import flock_component, get_registry
 
 if TYPE_CHECKING:
     from flock.core.flock_agent import FlockAgent
@@ -148,7 +149,7 @@ class ConditionalRoutingConfig(AgentComponentConfig):
 
 
 @flock_component(config_class=ConditionalRoutingConfig)
-class ConditionalRoutingComponent(RoutingComponentBase):
+class ConditionalRoutingComponent(RoutingComponent):
     """Routes workflow based on evaluating a condition against a value in the FlockContext.
     
     Supports various built-in checks (string, number, list, type, bool, existence)
@@ -436,7 +437,7 @@ class ConditionalRoutingComponent(RoutingComponentBase):
 
             next_agent = cfg.success_agent or None  # Stop chain if None
             logger.debug(f"Success route target: '{next_agent}'")
-            
+
             agent.next_agent = next_agent  # Set directly on agent
 
         else:
@@ -481,7 +482,7 @@ class ConditionalRoutingComponent(RoutingComponentBase):
                     logger.debug(
                         f"Failure route target (after retries): '{next_agent}'"
                     )
-                    
+
                     agent.next_agent = next_agent
             else:
                 # --- No Retry Logic ---
@@ -489,5 +490,5 @@ class ConditionalRoutingComponent(RoutingComponentBase):
                     cfg.failure_agent or None
                 )  # Use failure agent or stop
                 logger.debug(f"Failure route target (no retry): '{next_agent}'")
-                
+
                 agent.next_agent = next_agent

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/src/flock/components/routing/default_routing_component.py

@@ -7,10 +7,10 @@ from typing import TYPE_CHECKING, Any
 from pydantic import Field
 
 from flock.core.component.agent_component_base import AgentComponentConfig
-from flock.core.component.routing_component_base import RoutingComponentBase
+from flock.core.component.routing_component import RoutingComponent
 from flock.core.context.context import FlockContext
-from flock.core.registry import flock_component
 from flock.core.logging.logging import get_logger
+from flock.core.registry import flock_component
 
 if TYPE_CHECKING:
     from flock.core.flock_agent import FlockAgent
@@ -27,7 +27,7 @@ class DefaultRoutingConfig(AgentComponentConfig):
 
 
 @flock_component(config_class=DefaultRoutingConfig)
-class DefaultRoutingComponent(RoutingComponentBase):
+class DefaultRoutingComponent(RoutingComponent):
     """Default routing component implementation.
 
     This router simply uses the configured hand_off property to determine the next agent.

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/src/flock/components/routing/llm_routing_component.py

@@ -8,11 +8,12 @@ import litellm
 from pydantic import Field
 
 from flock.core.component.agent_component_base import AgentComponentConfig
-from flock.core.component.routing_component_base import RoutingComponentBase
+from flock.core.component.routing_component import RoutingComponent
 from flock.core.context.context import FlockContext
-from flock.core.registry import flock_component
+
 # HandOffRequest removed - using agent.next_agent directly
 from flock.core.logging.logging import get_logger
+from flock.core.registry import flock_component
 
 if TYPE_CHECKING:
     from flock.core.flock_agent import FlockAgent
@@ -53,7 +54,7 @@ If no agent is suitable, use "next_agent": "" to end the workflow.""",
 
 
 @flock_component(config_class=LLMRoutingConfig)
-class LLMRoutingComponent(RoutingComponentBase):
+class LLMRoutingComponent(RoutingComponent):
     """Router that uses an LLM to determine the next agent in a workflow.
     
     This component analyzes the current agent's output and uses an LLM to
@@ -79,7 +80,7 @@ class LLMRoutingComponent(RoutingComponentBase):
     ) -> list[str]:
         """Get list of available agent names except the current one."""
         available = []
-        for agent_name in agent_definitions.keys():
+        for agent_name in agent_definitions:
             if agent_name != current_agent_name:
                 available.append(agent_name)
         return available
@@ -91,17 +92,16 @@ class LLMRoutingComponent(RoutingComponentBase):
         available_agents: list[str],
     ) -> str:
         """Create the prompt for LLM agent selection."""
-        
         # Format available agents
         agents_list = []
         for agent_name in available_agents:
             agents_list.append(f"- {agent_name}")
-        
+
         available_agents_str = "\n".join(agents_list) if agents_list else "None available"
-        
-        # Format current output 
+
+        # Format current output
         current_output = json.dumps(result, indent=2) if result else "No output"
-        
+
         return self.config.prompt_template.format(
             current_agent_name=current_agent.name,
             current_output=current_output,
@@ -115,14 +115,13 @@ class LLMRoutingComponent(RoutingComponentBase):
         available_agents: list[str],
     ) -> tuple[str, float]:
         """Use an LLM to select the best next agent."""
-        
         if not available_agents:
             logger.warning("No available agents for LLM routing")
             return "", 0.0
 
         # Create the selection prompt
         prompt = self._create_selection_prompt(current_agent, result, available_agents)
-        
+
         try:
             # Call the LLM
             response = await litellm.acompletion(
@@ -133,30 +132,30 @@ class LLMRoutingComponent(RoutingComponentBase):
                 temperature=self.config.temperature,
                 max_tokens=self.config.max_tokens,
             )
-            
+
             response_content = response.choices[0].message.content.strip()
             logger.debug(f"LLM routing response: {response_content}")
-            
+
             # Parse the JSON response
             try:
                 routing_decision = json.loads(response_content)
                 next_agent = routing_decision.get("next_agent", "")
                 confidence = routing_decision.get("confidence", 0.0)
                 reasoning = routing_decision.get("reasoning", "No reasoning provided")
-                
+
                 logger.info(f"LLM routing decision: {next_agent} (confidence: {confidence}) - {reasoning}")
-                
+
                 # Validate the selected agent is available
                 if next_agent and next_agent not in available_agents and next_agent != "":
                     logger.warning(f"LLM selected unavailable agent '{next_agent}', ending workflow")
                     return "", 0.0
-                
+
                 return next_agent, confidence
-                
+
             except json.JSONDecodeError as e:
                 logger.error(f"Failed to parse LLM response as JSON: {e}")
                 return "", 0.0
-                
+
         except Exception as e:
             logger.error(f"Error calling LLM for routing: {e}")
             return "", 0.0
@@ -168,19 +167,18 @@ class LLMRoutingComponent(RoutingComponentBase):
         context: FlockContext | None = None,
     ) -> None:
         """Use LLM to determine the next agent based on current output."""
-        
         if not context:
             logger.warning("No context provided for LLM routing")
             return
 
         logger.info(f"LLM routing from agent '{agent.name}'")
-        
+
         # Get available agents from context
         agent_definitions = getattr(context, 'agent_definitions', {})
         available_agents = self._get_available_agents(agent_definitions, agent.name)
-        
+
         logger.debug(f"Available agents for LLM routing: {available_agents}")
-        
+
         if not available_agents:
             logger.warning("No available agents for LLM routing")
             return
@@ -189,20 +187,20 @@ class LLMRoutingComponent(RoutingComponentBase):
         next_agent_name, confidence = await self._select_next_agent(
             agent, result, available_agents
         )
-        
+
         logger.info(f"LLM routing result: {next_agent_name} (confidence: {confidence})")
-        
+
         # Check confidence threshold
         if not next_agent_name or confidence < self.config.confidence_threshold:
             logger.warning(
                 f"LLM routing confidence {confidence} below threshold {self.config.confidence_threshold}"
             )
             return
-        
+
         # Validate the selected agent exists
         if next_agent_name not in agent_definitions:
             logger.error(f"LLM selected non-existent agent '{next_agent_name}'")
             return
-        
+
         logger.info(f"Successfully routed to agent '{next_agent_name}' with confidence {confidence}")
         agent.next_agent = next_agent_name

{flock_core-0.5.0b1 → flock_core-0.5.0b3}/src/flock/components/utility/memory_utility_component.py

@@ -30,10 +30,10 @@ from flock.adapter.faiss_adapter import FAISSAdapter
 from flock.adapter.pinecone_adapter import PineconeAdapter
 from flock.adapter.vector_base import VectorAdapter
 from flock.core.component.agent_component_base import AgentComponentConfig
-from flock.core.component.utility_component_base import UtilityComponentBase
+from flock.core.component.utility_component import UtilityComponent
 from flock.core.context.context import FlockContext
-from flock.core.registry import flock_component
 from flock.core.logging.logging import get_logger
+from flock.core.registry import flock_component
 
 # Conditional import for MetricsUtilityComponent to avoid circular imports
 if TYPE_CHECKING:
@@ -423,7 +423,7 @@ class MemoryStore:
 
 
 @flock_component(config_class=MemoryUtilityConfig)
-class MemoryUtilityComponent(UtilityComponentBase):
+class MemoryUtilityComponent(UtilityComponent):
     """Enterprise-ready memory utility component using real datastores."""
 
     config: MemoryUtilityConfig = Field(