flock-core 0.5.0b22__py3-none-any.whl → 0.5.0b24__py3-none-any.whl

flock/components/evaluation/declarative_evaluation_component.py

@@ -40,11 +40,13 @@ def _ensure_live_crop_above() -> None:
         return
 
     # Extend the accepted literal at runtime so type checks don't block the new option.
-    current_args = getattr(_lr.VerticalOverflowMethod, '__args__', ())
-    if 'crop_above' not in current_args:
-        _lr.VerticalOverflowMethod = _Literal['crop', 'crop_above', 'ellipsis', 'visible']  # type: ignore[assignment]
+    current_args = getattr(_lr.VerticalOverflowMethod, "__args__", ())
+    if "crop_above" not in current_args:
+        _lr.VerticalOverflowMethod = _Literal[
+            "crop", "crop_above", "ellipsis", "visible"
+        ]  # type: ignore[assignment]
 
-    if getattr(_lr.LiveRender.__rich_console__, '_flock_crop_above', False):
+    if getattr(_lr.LiveRender.__rich_console__, "_flock_crop_above", False):
         _live_patch_applied = True
         return
 
@@ -55,26 +57,28 @@ def _ensure_live_crop_above() -> None:
     def _patched_rich_console(self, console, options):
         renderable = self.renderable
         style = console.get_style(self.style)
-        lines = console.render_lines(renderable, options, style=style, pad=False)
+        lines = console.render_lines(
+            renderable, options, style=style, pad=False
+        )
         shape = Segment.get_shape(lines)
 
         _, height = shape
         max_height = options.size.height
         if height > max_height:
-            if self.vertical_overflow == 'crop':
-                lines = lines[: max_height]
+            if self.vertical_overflow == "crop":
+                lines = lines[:max_height]
                 shape = Segment.get_shape(lines)
-            elif self.vertical_overflow == 'crop_above':
+            elif self.vertical_overflow == "crop_above":
                 lines = lines[-max_height:]
                 shape = Segment.get_shape(lines)
-            elif self.vertical_overflow == 'ellipsis' and max_height > 0:
+            elif self.vertical_overflow == "ellipsis" and max_height > 0:
                 lines = lines[: (max_height - 1)]
                 overflow_text = Text(
-                    '...',
-                    overflow='crop',
-                    justify='center',
-                    end='',
-                    style='live.ellipsis',
+                    "...",
+                    overflow="crop",
+                    justify="center",
+                    end="",
+                    style="live.ellipsis",
                 )
                 lines.append(list(console.render(overflow_text)))
                 shape = Segment.get_shape(lines)
@@ -126,9 +130,13 @@ class DeclarativeEvaluationConfig(AgentComponentConfig):
         description="Extraction LM for TwoStepAdapter when adapter='two_step'",
     )
     stream_callbacks: list[Callable[..., Any] | Any] | None = None
-    stream_vertical_overflow: Literal["crop", "ellipsis", "crop_above", "visible"] = Field(
+    stream_vertical_overflow: Literal[
+        "crop", "ellipsis", "crop_above", "visible"
+    ] = Field(
         default="crop_above",
-        description=("Rich Live vertical overflow strategy; select how tall output is handled; 'crop_above' keeps the most recent rows visible."),
+        description=(
+            "Rich Live vertical overflow strategy; select how tall output is handled; 'crop_above' keeps the most recent rows visible."
+        ),
     )
     kwargs: dict[str, Any] = Field(default_factory=dict)
 
@@ -138,7 +146,7 @@ class DeclarativeEvaluationComponent(
     EvaluationComponent, DSPyIntegrationMixin, PromptParserMixin
 ):
     """Evaluation component that uses DSPy for generation.
-    
+
     This component provides the core intelligence for agents using DSPy's
     declarative programming model. It handles LLM interactions, tool usage,
     and prompt management through DSPy's framework.
@@ -156,7 +164,9 @@ class DeclarativeEvaluationComponent(
         super().__init__(**data)
 
     @override
-    def set_model(self, model: str, temperature: float = 1.0, max_tokens: int = 32000) -> None:
+    def set_model(
+        self, model: str, temperature: float = 1.0, max_tokens: int = 32000
+    ) -> None:
         """Set the model for the evaluation component."""
         self.config.model = model
         self.config.temperature = temperature
@@ -171,7 +181,9 @@ class DeclarativeEvaluationComponent(
         mcp_tools: list[Any] | None = None,
     ) -> dict[str, Any]:
         """Core evaluation logic using DSPy - migrated from DeclarativeEvaluator."""
-        logger.debug(f"Starting declarative evaluation for component '{self.name}'")
+        logger.debug(
+            f"Starting declarative evaluation for component '{self.name}'"
+        )
 
         # Prepare LM and optional adapter; keep settings changes scoped with dspy.context
         lm = dspy.LM(
@@ -190,17 +202,22 @@ class DeclarativeEvaluationComponent(
                 elif self.config.adapter == "xml":
                     adapter = dspy.XMLAdapter()
                 elif self.config.adapter == "two_step":
-                    extractor = dspy.LM(self.config.extraction_model or "openai/gpt-4o-mini")
+                    extractor = dspy.LM(
+                        self.config.extraction_model or "openai/gpt-4o-mini"
+                    )
                     adapter = dspy.TwoStepAdapter(extraction_model=extractor)
                 else:
                     # chat is default; leave adapter=None
                     adapter = None
             except Exception as e:
-                logger.warning(f"Failed to construct adapter '{self.config.adapter}': {e}. Proceeding without.")
+                logger.warning(
+                    f"Failed to construct adapter '{self.config.adapter}': {e}. Proceeding without."
+                )
 
         with dspy.context(lm=lm, adapter=adapter):
             try:
                 from rich.console import Console
+
                 console = Console()
 
                 # Create DSPy signature from agent definition
@@ -238,17 +255,23 @@ class DeclarativeEvaluationComponent(
 
             # Execute with streaming or non-streaming
             if self.config.stream:
-                return await self._execute_streaming(_dspy_signature, agent_task, inputs, agent, console)
+                return await self._execute_streaming(
+                    _dspy_signature, agent_task, inputs, agent, console
+                )
             else:
                 return await self._execute_standard(agent_task, inputs, agent)
 
-    async def _execute_streaming(self, signature, agent_task, inputs: dict[str, Any], agent: Any, console) -> dict[str, Any]:
+    async def _execute_streaming(
+        self, signature, agent_task, inputs: dict[str, Any], agent: Any, console
+    ) -> dict[str, Any]:
         """Execute DSPy program in streaming mode with rich table updates."""
         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.")
+            raise TypeError(
+                "DSPy task could not be created or is not callable."
+            )
 
         # Prepare stream listeners for any string output fields
         listeners = []
@@ -306,7 +329,7 @@ class DeclarativeEvaluationComponent(
             live_cm = Live(
                 initial_panel,
                 console=console,
-                refresh_per_second=400,
+                refresh_per_second=4,
                 transient=False,
                 vertical_overflow=overflow_mode,
             )
@@ -314,6 +337,7 @@ class DeclarativeEvaluationComponent(
         final_result: dict[str, Any] | None = None
 
         with live_cm as live:
+
             def _refresh_panel() -> None:
                 if formatter is None or live is None:
                     return
@@ -347,7 +371,9 @@ class DeclarativeEvaluationComponent(
                         except Exception as e:
                             logger.warning(f"Stream callback error: {e}")
                     token = getattr(value, "chunk", None)
-                    signature_field = getattr(value, "signature_field_name", None)
+                    signature_field = getattr(
+                        value, "signature_field_name", None
+                    )
                     if signature_field:
                         if signature_field not in display_data:
                             display_data[signature_field] = ""
@@ -385,7 +411,9 @@ class DeclarativeEvaluationComponent(
                                 ordered_final[key] = final_result[key]
                         for field_name in signature_order:
                             if field_name in final_result:
-                                ordered_final[field_name] = final_result[field_name]
+                                ordered_final[field_name] = final_result[
+                                    field_name
+                                ]
                         for key, val in final_result.items():
                             if key not in ordered_final:
                                 ordered_final[key] = val
@@ -410,14 +438,18 @@ class DeclarativeEvaluationComponent(
 
         return filtered_result
 
-    async def _execute_standard(self, agent_task, inputs: dict[str, Any], agent: Any) -> dict[str, Any]:
+    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)
-            result_dict, cost, lm_history = self._process_result(result_obj, inputs)
+            result_dict, cost, lm_history = self._process_result(
+                result_obj, inputs
+            )
             self._cost = cost
             self._lm_history = lm_history
             result_dict = self.filter_reasoning(

flock/core/mcp/flock_mcp_server.py

@@ -155,7 +155,11 @@ class FlockMCPServer(BaseModel, Serializable, ABC):
                     await self.post_init()
             if not self.config.allow_all_tools:
                 whitelist = self.config.feature_config.tool_whitelist
-                if whitelist is not None and len(whitelist) > 0 and name not in whitelist:
+                if (
+                    whitelist is not None
+                    and len(whitelist) > 0
+                    and name not in whitelist
+                ):
                     return None
             async with self.condition:
                 try:
@@ -267,6 +271,7 @@ class FlockMCPServer(BaseModel, Serializable, ABC):
                     error=str(module_error),
                 )
                 span.record_exception(module_error)
+            return additional_params
 
     async def pre_init(self) -> None:
         """Run pre-init hooks on modules."""
@@ -276,11 +281,15 @@ class FlockMCPServer(BaseModel, Serializable, ABC):
         with tracer.start_as_current_span("server.pre_init") as span:
             span.set_attribute("server.name", self.config.name)
             # run whitelist checks
-            whitelist = self.config.feature_config
-            if whitelist is not None and len(whitelist) > 0:
-                self.config.feature_config = False
-            else:
-                # if the whitelist is none..
+            feature_config = self.config.feature_config
+            whitelist = (
+                feature_config.tool_whitelist if feature_config else None
+            )
+            if whitelist:
+                # Enforce whitelist usage by disabling blanket tool access
+                self.config.allow_all_tools = False
+            elif whitelist is None:
+                # No whitelist configured; ensure defaults allow full access
                 self.config.allow_all_tools = True
             try:
                 for module in self.get_enabled_components():
@@ -449,7 +458,7 @@ class FlockMCPServer(BaseModel, Serializable, ABC):
                 span.record_exception(server_error)
 
     # --- Serialization Implementation ---
-    def to_dict(self, path_type: str = "relative") -> dict[str, Any]:
+    def to_dict(self, path_type: str = "relative") -> dict[str, Any]:  # noqa: C901 - TODO: refactor to simplify serialization logic
         """Convert instance to dictionary representation suitable for serialization."""
         from flock.core.registry import get_registry
 
@@ -469,7 +478,6 @@ class FlockMCPServer(BaseModel, Serializable, ABC):
         config_data = self.config.to_dict(path_type=path_type)
         data["config"] = config_data
 
-
         builtin_by_transport = {}
 
         try:
@@ -638,7 +646,13 @@ class FlockMCPServer(BaseModel, Serializable, ABC):
             data["config"] = config_object
 
         # now construct
-        server = real_cls(**{k: v for k, v in data.items() if k not in ["modules", "components"]})
+        server = real_cls(
+            **{
+                k: v
+                for k, v in data.items()
+                if k not in ["modules", "components"]
+            }
+        )
 
         # re-hydrate components (both legacy modules and new components)
         for cname, cdata in data.get("components", {}).items():
@@ -646,7 +660,9 @@ class FlockMCPServer(BaseModel, Serializable, ABC):
 
         # Handle legacy modules for backward compatibility during transition
         for mname, mdata in data.get("modules", {}).items():
-            logger.warning(f"Legacy module '{mname}' found during deserialization - consider migrating to unified components")
+            logger.warning(
+                f"Legacy module '{mname}' found during deserialization - consider migrating to unified components"
+            )
             # Skip legacy modules during migration
 
         # --- Separate Data ---

{flock_core-0.5.0b22.dist-info → flock_core-0.5.0b24.dist-info}/METADATA

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

{flock_core-0.5.0b22.dist-info → flock_core-0.5.0b24.dist-info}/RECORD

@@ -27,7 +27,7 @@ flock/cli/yaml_editor.py,sha256=K3N0bh61G1TSDAZDnurqW9e_-hO6CtSQKXQqlDhCjVo,1252
 flock/cli/assets/release_notes.md,sha256=bqnk50jxM3w5uY44Dc7MkdT8XmRREFxrVBAG9XCOSSU,4896
 flock/components/__init__.py,sha256=qDcaP0O7_b5RlUEXluqwskpKCkhM73kSMeNXReze63M,963
 flock/components/evaluation/__init__.py,sha256=_M3UlRFeNN90fEny6byt5VdLDE5o5khbd0EPT0o9S9k,303
-flock/components/evaluation/declarative_evaluation_component.py,sha256=a-RPCcpdXq66XFSPYite2OYwC_5Cnckf4VQK1ie1E-w,20269
+flock/components/evaluation/declarative_evaluation_component.py,sha256=SiW6NddBsNNLte3sPiqkLe-sPCH1ACCyximhZoUsvpY,20706
 flock/components/routing/__init__.py,sha256=BH_pFm9T6bUuf8HH4byDJ0dO0fzEVHv9m-ghUdDVdm0,542
 flock/components/routing/conditional_routing_component.py,sha256=WqZLMz-0Dhfb97xvttNrJCIVe6FNMLEQ2m4KQTDpIbI,21374
 flock/components/routing/default_routing_component.py,sha256=ZHt2Kjf-GHB5n7evU5NSGeQJ1Wuims5soeMswqaUb1E,3370
@@ -87,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=kyJevS2Mwysjhxpv0x689XICrgFrxeYPxQlwQTDcGX8,27374
+flock/core/mcp/flock_mcp_server.py,sha256=25TtkUrKhadIJY0Zw_P2Z9KwMaKPtsMXvJbAlfc5vBI,27877
 flock/core/mcp/flock_mcp_tool.py,sha256=eGwV8uo-AfvRjcrmOZCLvJAcgB3XKrvrQ7F6GZXF4nI,5494
 flock/core/mcp/mcp_client.py,sha256=JqY_sAYjWCDrIJDOxy-bMqhXjb7kTPHlqxth8SYKr7g,25893
 flock/core/mcp/mcp_client_manager.py,sha256=P-m3loDqPoH2UEW5VeNamgxtoPdZPiG4iPwZ4t28Ctw,8020
@@ -552,8 +552,8 @@ flock/workflow/agent_execution_activity.py,sha256=0exwmeWKYXXxdUqDf4YaUVpn0zl06S
 flock/workflow/flock_workflow.py,sha256=sKFsRIL_bDGonXSNhK1zwu6UechghC_PihJJMidI-VI,9139
 flock/workflow/temporal_config.py,sha256=3_8O7SDEjMsSMXsWJBfnb6XTp0TFaz39uyzSlMTSF_I,3988
 flock/workflow/temporal_setup.py,sha256=KR6MlWOrpMtv8NyhaIPAsfl4tjobt81OBByQvg8Kw-Y,1948
-flock_core-0.5.0b22.dist-info/METADATA,sha256=OQrcZ9gIQRqbbhfU0RSIbo7auCybTmemyee39C6XWHc,9997
-flock_core-0.5.0b22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.5.0b22.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.5.0b22.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.5.0b22.dist-info/RECORD,,
+flock_core-0.5.0b24.dist-info/METADATA,sha256=62TiPvh9bTahxJqqiq8PQRGWP1MkVirxCz3Yy_zzt0Y,9997
+flock_core-0.5.0b24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.5.0b24.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.5.0b24.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.5.0b24.dist-info/RECORD,,