flock-core 0.4.0b40__py3-none-any.whl → 0.4.0b43__py3-none-any.whl

flock/core/api/custom_endpoint.py

@@ -27,6 +27,8 @@ class FlockEndpoint(BaseModel):
     # Optional schema models
     request_model: type[BaseModel] | None = None
     response_model: type[BaseModel] | None = None
+    # Query-string parameters as a Pydantic model (treated as Depends())
+    query_model: type[BaseModel] | None = None
 
     # OpenAPI / Swagger metadata
     summary: str | None = None
@@ -34,6 +36,9 @@ class FlockEndpoint(BaseModel):
     name: str | None = None  # Route name in FastAPI
     include_in_schema: bool = True
 
+    # FastAPI dependency injections (e.g. security)
+    dependencies: list[Any] | None = None
+
     model_config = {
         "arbitrary_types_allowed": True,
         "validate_default": True,

flock/core/api/main.py

@@ -133,65 +133,82 @@ class FlockAPI:
         if self.custom_endpoints:
             import inspect
 
-            from fastapi import Request
+            from fastapi import Body, Depends, Request
 
             # Register any endpoints collected during __init__ (self.custom_endpoints)
             if self.custom_endpoints:
-                from fastapi import Body
-
-                def _create_handler_factory(callback: Callable[..., Any], req_model: type[BaseModel] | None):
-
+                def _create_handler_factory(callback: Callable[..., Any], req_model: type[BaseModel] | None, query_model: type[BaseModel] | None):
+                    async def _invoke(request: Request, body, query):
+                        payload: dict[str, Any] = {"flock": self.flock}
+                        if request:
+                            payload.update(request.path_params)
+                            if query is None:
+                                payload["query"] = dict(request.query_params)
+                            else:
+                                payload["query"] = query
+                        else:
+                            payload["query"] = query or {}
+                        if body is not None:
+                            payload["body"] = body
+                        elif request and request.method in {"POST", "PUT", "PATCH"} and req_model is None:
+                            try:
+                                payload["body"] = await request.json()
+                            except Exception:
+                                payload["body"] = await request.body()
+
+                        sig = inspect.signature(callback)
+                        filtered_kwargs = {k: v for k, v in payload.items() if k in sig.parameters}
+                        if inspect.iscoroutinefunction(callback):
+                            return await callback(**filtered_kwargs)
+                        return callback(**filtered_kwargs)
+
+                    # Dynamically build wrapper with appropriate signature so FastAPI can document it
+                    params: list[str] = []
                     if req_model is not None:
-
-                        async def _route_handler(body: req_model = Body(...), request: Request = None):  # type: ignore[arg-type,valid-type]
-                            payload: dict[str, Any] = {
-                                "body": body,
-                                "query": dict(request.query_params) if request else {},
-                                "flock": self.flock,
-                                **(request.path_params if request else {}),
-                            }
-
-                            sig = inspect.signature(callback)
-                            filtered_kwargs = {k: v for k, v in payload.items() if k in sig.parameters}
-
-                            if inspect.iscoroutinefunction(callback):
-                                return await callback(**filtered_kwargs)
-                            return callback(**filtered_kwargs)
+                        params.append("body")
+                    if query_model is not None:
+                        params.append("query")
+
+                    # Build wrapper function based on which params are present
+                    if req_model and query_model:
+                        async def _route_handler(
+                            request: Request,
+                            body: req_model = Body(...),  # type: ignore[arg-type,valid-type]
+                            query: query_model = Depends(),  # type: ignore[arg-type,valid-type]
+                        ):
+                            return await _invoke(request, body, query)
+
+                    elif req_model and not query_model:
+                        async def _route_handler(
+                            request: Request,
+                            body: req_model = Body(...),  # type: ignore[arg-type,valid-type]
+                        ):
+                            return await _invoke(request, body, None)
+
+                    elif query_model and not req_model:
+                        async def _route_handler(
+                            request: Request,
+                            query: query_model = Depends(),  # type: ignore[arg-type,valid-type]
+                        ):
+                            return await _invoke(request, None, query)
 
                     else:
-
                         async def _route_handler(request: Request):
-                            payload: dict[str, Any] = {
-                                "query": dict(request.query_params),
-                                "flock": self.flock,
-                                **request.path_params,
-                            }
-
-                            if request.method in {"POST", "PUT", "PATCH"}:
-                                try:
-                                    payload["body"] = await request.json()
-                                except Exception:
-                                    payload["body"] = await request.body()
-
-                            sig = inspect.signature(callback)
-                            filtered_kwargs = {k: v for k, v in payload.items() if k in sig.parameters}
-
-                            if inspect.iscoroutinefunction(callback):
-                                return await callback(**filtered_kwargs)
-                            return callback(**filtered_kwargs)
+                            return await _invoke(request, None, None)
 
                     return _route_handler
 
                 for ep in self.custom_endpoints:
                     self.app.add_api_route(
                         ep.path,
-                        _create_handler_factory(ep.callback, ep.request_model),
+                        _create_handler_factory(ep.callback, ep.request_model, ep.query_model),
                         methods=ep.methods or ["GET"],
                         name=ep.name or f"custom:{ep.path}",
                         include_in_schema=ep.include_in_schema,
                         response_model=ep.response_model,
                         summary=ep.summary,
                         description=ep.description,
+                        dependencies=ep.dependencies,
                     )
 
     # --- Core Execution Helper Methods ---

flock/core/flock.py

@@ -710,6 +710,7 @@ class Flock(BaseModel, Serializable):
                     port=port,
                     server_name=server_name,
                     theme_name=ui_theme,
+                    custom_endpoints=custom_endpoints,
                 )
             except ImportError:
                 # Log error - cannot start integrated UI

flock/webapp/run.py

@@ -1,10 +1,13 @@
 import os  # For environment variable
 import sys
+from collections.abc import Callable, Sequence
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 import uvicorn
 
+from flock.core.api.custom_endpoint import FlockEndpoint
+
 if TYPE_CHECKING:
     from flock.core import Flock
 
@@ -17,6 +20,7 @@ def start_integrated_server(
     port: int,
     server_name: str,  # Currently unused as UI sets its own title
     theme_name: str | None = None,
+    custom_endpoints: Sequence[FlockEndpoint] | dict[tuple[str, list[str] | None], Callable[..., Any]] | None = None,
 ):
     """Starts the webapp, preloads flock & theme, includes API routes (TODO)."""
     print(
@@ -29,6 +33,10 @@ def start_integrated_server(
             sys.path.insert(0, str(src_dir))
 
         # Import necessary webapp components *after* path setup
+        from flock.core.api.endpoints import (
+            create_api_router,  # Need to adapt this later
+        )
+        from flock.core.api.main import FlockAPI
         from flock.core.api.run_store import (
             RunStore,  # Needed for API routes later
         )
@@ -40,7 +48,6 @@ def start_integrated_server(
         from flock.webapp.app.services.flock_service import (
             set_current_flock_instance_programmatically,
         )
-        # from flock.core.api.endpoints import create_api_router # Need to adapt this later
 
         # 1. Set Theme (use provided or default)
         set_current_theme_name(
@@ -55,11 +62,9 @@ def start_integrated_server(
         )
         print(f"Flock '{flock_instance.name}' preloaded.")
 
-        # 3. TODO: Adapt and Include API Routes
-        # run_store = RunStore()
-        # api_router = create_api_router(flock_instance, run_store) # Assuming refactored signature
-        # webapp_fastapi_app.include_router(api_router, prefix="/api")
-        # print("API routes included.")
+        flock_api = FlockAPI(flock_instance, custom_endpoints)
+        webapp_fastapi_app.include_router(flock_api.app.router, prefix="/api")
+        print("API routes included.")
 
         # 4. Run Uvicorn - STILL PASSING INSTANCE here because we need to modify it (add routes)
         #    and set state BEFORE running. Reload won't work well here.

{flock_core-0.4.0b40.dist-info → flock_core-0.4.0b43.dist-info}/METADATA

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

{flock_core-0.4.0b40.dist-info → flock_core-0.4.0b43.dist-info}/RECORD

@@ -19,7 +19,7 @@ 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=p7lmQULRu9ejIAELfanZiyMhW0CougIPvyFHW2nqBFQ,847
-flock/core/flock.py,sha256=WzLA7-xoAUq7Yn_ioieQIsk6CG_VvvDPeq_S6FWNgOY,30424
+flock/core/flock.py,sha256=hO4s-dgXbX9sT0T9E8uosyraTNJbg5jPmzmTPTWGw-k,30479
 flock/core/flock_agent.py,sha256=JTqaGD_OnZSd3bVU989WMsK1rAT6UGn-JYrPxFV15EE,39576
 flock/core/flock_evaluator.py,sha256=dOXZeDOGZcAmJ9ahqq_2bdGUU1VOXY4skmwTVpAjiVw,1685
 flock/core/flock_factory.py,sha256=_4zsjkEmJnCR7IvJ3SUHnDbX6c7Tt3E4P5ohxwKvE6w,3173
@@ -27,9 +27,9 @@ flock/core/flock_module.py,sha256=UCK6TFe4viXs596zeng0GD3gln4ZNGu_gCWkXIIMREg,30
 flock/core/flock_registry.py,sha256=aC-RK0js676DQkjXmNuYHuD5t6GmFhpQoCKaO3i7xFg,24920
 flock/core/flock_router.py,sha256=1OAXDsdaIIFApEfo6SRfFEDoTuGt3Si7n2MXiySEfis,2644
 flock/core/api/__init__.py,sha256=OKlhzDWZJfA6ddBwxQUmATY0TSzESsH032u00iVGvdA,228
-flock/core/api/custom_endpoint.py,sha256=nCm8lhvq1OOVlHB5f1DD1Pgm5U-PgggPlYjlMRK4nPc,1090
+flock/core/api/custom_endpoint.py,sha256=Mbk2owdcXVATaT5FtEWXFzllgursozcmqP8ouG5btc0,1305
 flock/core/api/endpoints.py,sha256=qQnJmtcYGkjdKtLllVpyJVjc-iZrvu5EEeVIryyt4tc,12987
-flock/core/api/main.py,sha256=f7uZkl8wIOLSoaIztdRG40LqmmRQSdIe-WxXsZx4Q-U,28681
+flock/core/api/main.py,sha256=d7JQLsi2xMpT1yjuU26uU0apNh7YOdvwt04AuEmQSQM,29831
 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
@@ -440,7 +440,7 @@ flock/themes/zenburned.toml,sha256=UEmquBbcAO3Zj652XKUwCsNoC2iQSlIh-q5c6DH-7Kc,1
 flock/themes/zenwritten-dark.toml,sha256=To5l6520_3UqAGiEumpzGWsHhXxqu9ThrMildXKgIO0,1669
 flock/themes/zenwritten-light.toml,sha256=G1iEheCPfBNsMTGaVpEVpDzYBHA_T-MV27rolUYolmE,1666
 flock/webapp/__init__.py,sha256=YtRbbyciN3Z2oMB9fdXZuvM3e49R8m2mY5qHLDoapRA,37
-flock/webapp/run.py,sha256=DGXcZ9APSE9ae0r7t2DhVKsKdIx1kGZrhzzXFZmHqYc,4944
+flock/webapp/run.py,sha256=nr73BOhZpYwzV44N1gyTI9OpZ0eEO1qvrboT78cK0xY,5133
 flock/webapp/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/webapp/app/config.py,sha256=t4-4OCa_tqktkJLQgVbAmwFA7MoyahFE1IEDItsqqpY,4155
 flock/webapp/app/main.py,sha256=xCk2zhSAlgd2YmVT8Sfw-kwq9dnTBMtRybJpz__cCQw,42975
@@ -495,8 +495,8 @@ flock/workflow/agent_execution_activity.py,sha256=Gy6FtuVAjf0NiUXmC3syS2eJpNQF4R
 flock/workflow/flock_workflow.py,sha256=iSUF_soFvWar0ffpkzE4irkDZRx0p4HnwmEBi_Ne2sY,9666
 flock/workflow/temporal_config.py,sha256=3_8O7SDEjMsSMXsWJBfnb6XTp0TFaz39uyzSlMTSF_I,3988
 flock/workflow/temporal_setup.py,sha256=YIHnSBntzOchHfMSh8hoLeNXrz3B1UbR14YrR6soM7A,1606
-flock_core-0.4.0b40.dist-info/METADATA,sha256=W-nPONRJfGIBfsyt2hEPqtLqu6mxQto7fP1IYuw1oH8,17125
-flock_core-0.4.0b40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.0b40.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.0b40.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.0b40.dist-info/RECORD,,
+flock_core-0.4.0b43.dist-info/METADATA,sha256=9V2dw83Zii9udURZd6uTcqSS2vsDJOQdwuSu62ia21s,17125
+flock_core-0.4.0b43.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.0b43.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.0b43.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.0b43.dist-info/RECORD,,