flock-core 0.5.0b23__py3-none-any.whl → 0.5.0b25__py3-none-any.whl

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.0b23.dist-info → flock_core-0.5.0b25.dist-info}/METADATA

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

{flock_core-0.5.0b23.dist-info → flock_core-0.5.0b25.dist-info}/RECORD

@@ -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.0b23.dist-info/METADATA,sha256=9lh5J5Bmb_61gf5EjRQKRWP7RwEEDOONsswFCMi8s04,9997
-flock_core-0.5.0b23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.5.0b23.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.5.0b23.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.5.0b23.dist-info/RECORD,,
+flock_core-0.5.0b25.dist-info/METADATA,sha256=OK1IlaUsnVvLIeIBbjn3lGPnCRUl6TTnjJQJ1-1Yu9M,9997
+flock_core-0.5.0b25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.5.0b25.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.5.0b25.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.5.0b25.dist-info/RECORD,,