flock-core 0.4.0b40__py3-none-any.whl → 0.4.0b42__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-0.4.0b40.dist-info → flock_core-0.4.0b42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flock-core
-Version: 0.4.0b40
+Version: 0.4.0b42
 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.0b42.dist-info}/RECORD

@@ -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
@@ -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.0b42.dist-info/METADATA,sha256=uKNHqJX2rGGs56oYa3iYkym2QpVCE0PT9D22am5OSa0,17125
+flock_core-0.4.0b42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.0b42.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.0b42.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.0b42.dist-info/RECORD,,