flock-core 0.5.0b14__py3-none-any.whl → 0.5.0b15__py3-none-any.whl

flock/__init__.py

@@ -5,7 +5,7 @@ import os
 import sys
 
 
-def main():
+def main():  # noqa: C901
     """Main function."""
     # Parse command line arguments
     parser = argparse.ArgumentParser(
@@ -103,7 +103,7 @@ def main():
     from rich.panel import Panel
 
     from flock.cli.config import init_config_file, load_config_file
-    from flock.cli.constants import (
+    from flock.cli.constants import (  # noqa: F401
         CLI_CFG_FILE,
         CLI_CREATE_AGENT,
         CLI_CREATE_FLOCK,

flock/config.py

@@ -1,3 +1,8 @@
+"""Global configuration for Flock.
+
+Reads environment via `decouple` and exposes constants used across the codebase.
+"""
+
 # flock/config.py
 import os
 

flock/core/__init__.py

@@ -1,48 +1,30 @@
-"""This module contains the core classes of the flock package."""
-
-from flock.core.component import (
-    AgentComponent,
-    AgentComponentConfig,
-    EvaluationComponent,
-    RoutingComponent,
-    UtilityComponent,
-)
-from flock.core.context.context import FlockContext
-from flock.core.flock import Flock
-from flock.core.flock_agent import FlockAgent
-from flock.core.flock_factory import FlockFactory
-from flock.core.mcp.flock_mcp_server import (
-    FlockMCPServer,
-)
-from flock.core.mcp.flock_mcp_tool import FlockMCPTool
-from flock.core.mcp.mcp_client import FlockMCPClient
-from flock.core.mcp.mcp_client_manager import FlockMCPClientManager
-from flock.core.registry import (
-    RegistryHub as FlockRegistry,  # Keep FlockRegistry name for API compatibility
-    flock_callable,
-    flock_component,
-    flock_tool,
-    flock_type,
-    get_registry,
-)
+"""Core package public API with lazy imports.
+
+This module exposes key symbols while avoiding heavy imports at package import time.
+Symbols are imported lazily on first access via ``__getattr__``.
+"""
+
+from __future__ import annotations
+
+from typing import Any
 
 __all__ = [
     "Flock",
     "FlockAgent",
     "FlockContext",
     "FlockFactory",
-        # Components
+    # Components
     "AgentComponent",
     "AgentComponentConfig",
     "EvaluationComponent",
     "RoutingComponent",
     "UtilityComponent",
-
+    # MCP
     "FlockMCPClient",
     "FlockMCPClientManager",
     "FlockMCPServer",
-    "FlockMCPServerConfig",
     "FlockMCPTool",
+    # Registry
     "FlockRegistry",
     "flock_callable",
     "flock_component",
@@ -50,3 +32,74 @@ __all__ = [
     "flock_type",
     "get_registry",
 ]
+
+
+def __getattr__(name: str) -> Any:  # pragma: no cover - thin loader
+    if name == "Flock":
+        from .flock import Flock
+
+        return Flock
+    if name == "FlockAgent":
+        from .flock_agent import FlockAgent
+
+        return FlockAgent
+    if name == "FlockContext":
+        from .context.context import FlockContext
+
+        return FlockContext
+    if name == "FlockFactory":
+        from .flock_factory import FlockFactory
+
+        return FlockFactory
+    if name in {"AgentComponent", "AgentComponentConfig", "EvaluationComponent", "RoutingComponent", "UtilityComponent"}:
+        from .component import (
+            AgentComponent,
+            AgentComponentConfig,
+            EvaluationComponent,
+            RoutingComponent,
+            UtilityComponent,
+        )
+
+        return {
+            "AgentComponent": AgentComponent,
+            "AgentComponentConfig": AgentComponentConfig,
+            "EvaluationComponent": EvaluationComponent,
+            "RoutingComponent": RoutingComponent,
+            "UtilityComponent": UtilityComponent,
+        }[name]
+    if name in {"FlockMCPClient", "FlockMCPClientManager", "FlockMCPServer", "FlockMCPTool"}:
+        if name == "FlockMCPClient":
+            from .mcp.mcp_client import FlockMCPClient
+
+            return FlockMCPClient
+        if name == "FlockMCPClientManager":
+            from .mcp.mcp_client_manager import FlockMCPClientManager
+
+            return FlockMCPClientManager
+        if name == "FlockMCPServer":
+            from .mcp.flock_mcp_server import FlockMCPServer
+
+            return FlockMCPServer
+        if name == "FlockMCPTool":
+            from .mcp.flock_mcp_tool import FlockMCPTool
+
+            return FlockMCPTool
+    if name in {"FlockRegistry", "flock_callable", "flock_component", "flock_tool", "flock_type", "get_registry"}:
+        from .registry import (
+            RegistryHub as FlockRegistry,
+            flock_callable,
+            flock_component,
+            flock_tool,
+            flock_type,
+            get_registry,
+        )
+
+        return {
+            "FlockRegistry": FlockRegistry,
+            "flock_callable": flock_callable,
+            "flock_component": flock_component,
+            "flock_tool": flock_tool,
+            "flock_type": flock_type,
+            "get_registry": get_registry,
+        }[name]
+    raise AttributeError(name)

flock/core/flock.py

@@ -19,8 +19,14 @@ from temporalio import workflow
 
 from flock.core.mcp.flock_mcp_server import FlockMCPServer
 
-with workflow.unsafe.imports_passed_through():
-    from datasets import Dataset  # type: ignore
+# Guard datasets import to avoid heavy side effects during tests (pyarrow extensions)
+from typing import Any as _Any
+try:
+    with workflow.unsafe.imports_passed_through():
+        from datasets import Dataset as _HF_Dataset  # type: ignore
+    Dataset = _HF_Dataset  # type: ignore
+except Exception:
+    Dataset = _Any  # type: ignore
 
 from opentelemetry import trace
 from pandas import DataFrame  # type: ignore

flock/core/logging/telemetry.py

@@ -2,6 +2,7 @@
 
 import sys
 
+import os
 from opentelemetry import trace
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
@@ -68,9 +69,31 @@ class TelemetryConfig:
         self.otlp_protocol = otlp_protocol
         self.otlp_endpoint = otlp_endpoint
         self.global_tracer = None
+        self._configured: bool = False
+
+    def _should_setup(self) -> bool:
+        # Respect explicit disable flag for tests and minimal setups
+        if os.environ.get("FLOCK_DISABLE_TELEMETRY_AUTOSETUP", "").lower() in {"1", "true", "yes", "on"}:
+            return False
+        try:
+            # If a provider is already installed (typically by user/tests), don't override it
+            from opentelemetry.sdk.trace import TracerProvider as SDKTracerProvider  # type: ignore
+
+            current = trace.get_tracer_provider()
+            if isinstance(current, SDKTracerProvider):
+                return False
+        except Exception:
+            # If SDK isn't available or introspection fails, fall back to enabling
+            pass
+        return True
 
     def setup_tracing(self):
         """Set up OpenTelemetry tracing with the specified exporters."""
+        if self._configured:
+            return
+        if not self._should_setup():
+            return
+
         # Create a Resource with the service name.
         resource = Resource(attributes={"service.name": self.service_name})
         provider = TracerProvider(resource=resource)
@@ -150,8 +173,9 @@ class TelemetryConfig:
         provider.add_span_processor(
             BaggageAttributeSpanProcessor(baggage_keys=["session_id", "run_id"])
         )
-        # self.global_tracer = trace.get_tracer("flock")
+        self.global_tracer = trace.get_tracer("flock")
         sys.excepthook = self.log_exception_to_otel
+        self._configured = True
 
     def log_exception_to_otel(self, exc_type, exc_value, exc_traceback):
         """Log unhandled exceptions to OpenTelemetry."""

flock/core/orchestration/__init__.py

@@ -1,16 +1,13 @@
 # src/flock/core/orchestration/__init__.py
-"""Orchestration components for Flock."""
+"""Orchestration package public API.
 
-from .flock_batch_processor import FlockBatchProcessor
-from .flock_evaluator import FlockEvaluator
-from .flock_execution import FlockExecution
-from .flock_initialization import FlockInitialization
-from .flock_server_manager import FlockServerManager
-from .flock_web_server import FlockWebServer
+Avoid importing submodules at package import time to prevent heavy side effects
+and keep tests fast and deterministic. Import modules directly where needed.
+"""
 
 __all__ = [
     "FlockExecution",
-    "FlockServerManager", 
+    "FlockServerManager",
     "FlockBatchProcessor",
     "FlockEvaluator",
     "FlockWebServer",

flock/di.py

@@ -1,30 +1,16 @@
-from __future__ import annotations
+"""Flock - Dependency-Injection helpers.
 
-"""Flock – Dependency-Injection helpers.
-
-This module provides a very small façade over the `wd.di` container so that
-other parts of the codebase do not need to know where the active container is
-stored.  The bootstrap code – usually located in the runner initialisation –
-should store the `ServiceProvider` instance (returned by ``ServiceCollection.
-build()``) on the `FlockContext` under the key ``di.container``.
-
-Example
--------
->>> from wd.di import ServiceCollection
->>> sc = ServiceCollection()
->>> sc.add_singleton(str, lambda _: "hello")
->>> container = sc.build()
->>> ctx = FlockContext()
->>> ctx.set_variable("di.container", container)
->>> from flock.di import get_current_container
->>> assert get_current_container(ctx).get_service(str) == "hello"
+This module provides a small facade over `wd.di` so other parts of the
+codebase do not need to know where the active container is stored.
 """
 
+from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:  # pragma: no cover
     from wd.di.container import (
-        ServiceProvider,  # noqa: F401 – import only for typing
+        ServiceProvider,  # noqa: F401 - import only for typing
     )
 
     from flock.core.context.context import FlockContext

flock/webapp/app/main.py

@@ -986,12 +986,18 @@ async def htmx_theme_preview(request: Request, theme: str = Query(None)):
         theme_path_candidate = resolved_themes_dir / theme_filename_to_load
         resolved_theme_path = theme_path_candidate.resolve()
 
-        if not str(resolved_theme_path).startswith(str(resolved_themes_dir)) or \
-           resolved_theme_path.name != theme_filename_to_load:
+        try:
+            resolved_theme_path.relative_to(resolved_themes_dir)
+        except ValueError:
             logger.warning(f"Invalid theme path access attempt for '{theme_name_for_display}'. "
                            f"Original input: '{chosen_theme_name_input}', Sanitized filename: '{theme_filename_to_load}', "
                            f"Attempted path: '{theme_path_candidate}', Resolved to: '{resolved_theme_path}'")
             return HTMLResponse(f"<p>Invalid theme name or path for '{theme_name_for_display}'.</p>", status_code=400)
+        if resolved_theme_path.name != theme_filename_to_load:
+            logger.warning(f"Invalid theme filename for '{theme_name_for_display}'. "
+                           f"Original input: '{chosen_theme_name_input}', Sanitized filename: '{theme_filename_to_load}', "
+                           f"Attempted path: '{theme_path_candidate}', Resolved to: '{resolved_theme_path}'")
+            return HTMLResponse(f"<p>Invalid theme name or path for '{theme_name_for_display}'.</p>", status_code=400)
 
         if not resolved_theme_path.is_file():
             logger.info(f"Theme preview: Theme file '{theme_filename_to_load}' not found at '{resolved_theme_path}'.")

{flock_core-0.5.0b14.dist-info → flock_core-0.5.0b15.dist-info}/METADATA

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

{flock_core-0.5.0b14.dist-info → flock_core-0.5.0b15.dist-info}/RECORD

@@ -1,6 +1,6 @@
-flock/__init__.py,sha256=jg2kcXIi1isxTtYdoQGgk0NYSA-BC0J6Xqy41viWpFg,7834
-flock/config.py,sha256=FJZaxSXYdIqCDyyTMAsXk4Ks1fwZywzBjh_XEg3zeOU,1930
-flock/di.py,sha256=47taQXcE2RSZ4yhqhQizJdPCdRcy4OvseuH9siVTx54,1384
+flock/__init__.py,sha256=aL5j5sn-hEvaETQooVkCPJyqKagIlOAaKZWV5xmjLQk,7862
+flock/config.py,sha256=Y_QaPGG2KQBAJMYJw4P5Qd21e3jPkpal-OTgOgJOtHk,2052
+flock/di.py,sha256=MX6I0IvAzq0-Jsbk-n_Pt3ZOAsmggUp6ctehepj9ZpY,795
 flock/adapter/__init__.py,sha256=TAHmnom6H2pbv-A0DbhqOSqnBi_egR8WvFGxfOlDPOM,345
 flock/adapter/azure_adapter.py,sha256=DuBlRHv-sACOZmbRaueR4edpJj6HvtKb6AhPgosEpnw,2092
 flock/adapter/chroma_adapter.py,sha256=4cFa0Cv3liT_tGYZpeioHN5CqfrJjzXPjEhICYt8So8,2269
@@ -36,8 +36,8 @@ flock/components/utility/__init__.py,sha256=JRj932upddjzZMWs1avOupEFr_GZNu21ac66
 flock/components/utility/memory_utility_component.py,sha256=4Vpt6_McEPpN5lNTcXmj7JeZTBOT6rHI0uQE2Qy-3Gc,20103
 flock/components/utility/metrics_utility_component.py,sha256=u3Bys0dP7FmTeyZOi4XdMhZHCRYc5miXXJ690-qS1Us,24440
 flock/components/utility/output_utility_component.py,sha256=c4K_PL3bGqdyy_v6dnOrmTqV-MkWKAB2w0HS8kzg82k,7613
-flock/core/__init__.py,sha256=ntCQ_wlgvRVNFph3drbFvyaqgtN30487V18YoJzcIFE,1332
-flock/core/flock.py,sha256=dN-asYsN2QOolZtYM5U8bRWEWkGckKRyhyy2n1xQ9b8,23148
+flock/core/__init__.py,sha256=CdHczlgrUYEJlKvErX3JbC9i7FAVX-SdwET4NEDfOfQ,3097
+flock/core/flock.py,sha256=wRycQlGeaq-Vd75mFpPe02qyWTOEyXthT873iBhA3TI,23388
 flock/core/flock_agent.py,sha256=5n4Khlyc-xRaV65JFnCavNXeUCXMuL3PNS9T1tsTl7U,12023
 flock/core/flock_factory.py,sha256=-a4buSge2cdp1FwTjer283wbamSEyLeUQs_-MeM-S2Y,20049
 flock/core/flock_scheduler.py,sha256=ng_s7gyijmc-AmYvBn5rtg61CSUZiIkXPRSlA1xO6VQ,8766
@@ -75,7 +75,7 @@ flock/core/execution/temporal_executor.py,sha256=dHcb0xuzPFWU_wbwTgI7glLNyyppei9
 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=y-V4XPxiwtWCjiAN_YoIRAUP1ialMSH_kT_TYircGjQ,19870
-flock/core/logging/telemetry.py,sha256=Trssqx02SBovTL843YwY3L-ZGj3KvcfMHLMU7Syk8L0,6561
+flock/core/logging/telemetry.py,sha256=5hz48PClJgB4l2eatS5eNR9Qswv3wYVVfl5ZWeJWm3E,7471
 flock/core/logging/trace_and_logged.py,sha256=5vNrK1kxuPMoPJ0-QjQg-EDJL1oiEzvU6UNi6X8FiMs,2117
 flock/core/logging/formatters/enum_builder.py,sha256=LgEYXUv84wK5vwHflZ5h8HBGgvLH3sByvUQe8tZiyY0,981
 flock/core/logging/formatters/theme_builder.py,sha256=Wnaal3HuUDA4HFg9tdql1BxYwK83ACOZBBQy-DXnxcA,17342
@@ -100,7 +100,7 @@ flock/core/mcp/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 flock/core/mcp/util/helpers.py,sha256=Xlf4iKW_lZxsVMTRoOnV29JsJfAppfmEJrb6sIcoCH4,636
 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/__init__.py,sha256=zS3gvSeuAxhmXER7uCKjZuKl_FIJm8F_onGCAy_8elw,403
 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=NNzihOCdHfSp1XWQa_yMKbrO4ah58Sk2c7TQviakdYg,11416
@@ -482,7 +482,7 @@ flock/webapp/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 flock/webapp/app/chat.py,sha256=SH5yUJKRysuK_v8VlYGsfBymPSIHKcBWsJUCL_O49Ck,30748
 flock/webapp/app/config.py,sha256=lqmneujnNZk-EFJV5cWpvxkqisxH3T3zT_YOI0JYThE,4809
 flock/webapp/app/dependencies.py,sha256=JUcwY1N6SZplU141lMN2wk9dOC9er5HCedrKTJN9wJk,5533
-flock/webapp/app/main.py,sha256=GSCx_trZGSma11BiDCLrdm_zU1VIsIUDbOZuQD1wbMk,58671
+flock/webapp/app/main.py,sha256=egLW53e-qCdI5WaYS_R5yCkO3NAAQ4UsWhNoySmiJf4,59133
 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
@@ -550,8 +550,8 @@ flock/workflow/agent_execution_activity.py,sha256=CzTkbjGqrPoAbldaQOS_doesosDK9m
 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.5.0b14.dist-info/METADATA,sha256=lgPu-j6u9envD7uigX2Yr1Ukw3LbqTod4NmHx5l3t0o,10026
-flock_core-0.5.0b14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.5.0b14.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.5.0b14.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.5.0b14.dist-info/RECORD,,
+flock_core-0.5.0b15.dist-info/METADATA,sha256=4gCI7ya_Gy5QeHKEDArbDyYDFLV2ksmJztbHR7C_q7g,10026
+flock_core-0.5.0b15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.5.0b15.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.5.0b15.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.5.0b15.dist-info/RECORD,,