flock-core 0.4.514__py3-none-any.whl → 0.4.516__py3-none-any.whl

flock/core/flock_factory.py

@@ -472,7 +472,6 @@ class FlockFactory:
         schedule_expression: str, # e.g., "every 1h", "0 0 * * *"
         description: str | Callable[..., str] | None = None,
         model: str | Callable[..., str] | None = None,
-        input: SignatureType = None, # Input might be implicit or none
         output: SignatureType = None, # Input might be implicit or none
         tools: list[Callable[..., Any] | Any] | None = None,
         servers: list[str | FlockMCPServerBase] | None = None,
@@ -496,7 +495,7 @@ class FlockFactory:
             name=name,
             description=description,
             model=model,
-            input=input + ", trigger_time: str | Time of scheduled execution",
+            input="trigger_time: str | Time of scheduled execution",
             output=output,
             tools=tools,
             servers=servers,

flock/tools/file_tools.py

@@ -23,10 +23,19 @@ def file_get_anything_as_markdown(url_or_file_path: str):
         )
 
 
+@traced_and_logged
+def file_append_to_file(content: str, filename: str):
+    try:
+        with open(filename, "a", encoding="utf-8") as f:
+            f.write(content)
+    except Exception:
+        raise
+
+
 @traced_and_logged
 def file_save_to_file(content: str, filename: str):
     try:
-        with open(filename, "w") as f:
+        with open(filename, "w", encoding="utf-8") as f:
             f.write(content)
     except Exception:
         raise

flock/webapp/app/main.py

@@ -27,6 +27,70 @@ from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 from pydantic import BaseModel
 
+# Custom middleware for handling proxy headers
+# from starlette.middleware.base import BaseHTTPMiddleware
+# from starlette.requests import Request as StarletteRequest
+from uvicorn.middleware.proxy_headers import ProxyHeadersMiddleware
+
+# class ProxyHeadersMiddleware(BaseHTTPMiddleware):
+#     """Middleware to handle proxy headers for HTTPS detection.
+#     This ensures url_for() generates HTTPS URLs when behind an HTTPS proxy.
+#     """
+#     async def dispatch(self, request: StarletteRequest, call_next):
+#         import logging
+#         logger = logging.getLogger(__name__)
+#         # Log original scheme and relevant headers for debugging
+#         original_scheme = request.scope.get("scheme", "unknown")
+#         logger.debug(f"Original scheme: {original_scheme}, URL: {request.url}")
+#         # Check for common proxy headers that indicate HTTPS
+#         forwarded_proto = request.headers.get("x-forwarded-proto")
+#         forwarded_scheme = request.headers.get("x-forwarded-scheme")
+#         cloudflare_proto = request.headers.get("cf-visitor")
+#         # Log proxy headers for debugging
+#         proxy_headers = {
+#             "x-forwarded-proto": forwarded_proto,
+#             "x-forwarded-scheme": forwarded_scheme,
+#             "cf-visitor": cloudflare_proto,
+#             "x-forwarded-for": request.headers.get("x-forwarded-for"),
+#             "host": request.headers.get("host")
+#         }
+#         logger.debug(f"Proxy headers: {proxy_headers}")
+#         scheme_updated = False
+#         # Handle X-Forwarded-Proto header
+#         if forwarded_proto:
+#             # Update the request scope to reflect the original protocol
+#             request.scope["scheme"] = forwarded_proto.lower()
+#             scheme_updated = True
+#             logger.debug(f"Updated scheme from X-Forwarded-Proto: {forwarded_proto}")
+#         # Handle X-Forwarded-Scheme header
+#         elif forwarded_scheme:
+#             request.scope["scheme"] = forwarded_scheme.lower()
+#             scheme_updated = True
+#             logger.debug(f"Updated scheme from X-Forwarded-Scheme: {forwarded_scheme}")
+#         # Handle Cloudflare's CF-Visitor header (JSON format)
+#         elif cloudflare_proto:
+#             try:
+#                 import json
+#                 visitor_info = json.loads(cloudflare_proto)
+#                 if visitor_info.get("scheme"):
+#                     request.scope["scheme"] = visitor_info["scheme"].lower()
+#                     scheme_updated = True
+#                     logger.debug(f"Updated scheme from CF-Visitor: {visitor_info['scheme']}")
+#             except (json.JSONDecodeError, KeyError) as e:
+#                 logger.warning(f"Failed to parse CF-Visitor header: {e}")
+#         if not scheme_updated:
+#             logger.debug("No proxy headers found, keeping original scheme")
+#         # Handle X-Forwarded-For for client IP (optional but good practice)
+#         forwarded_for = request.headers.get("x-forwarded-for")
+#         if forwarded_for:
+#             # Take the first IP in the chain (the original client)
+#             client_ip = forwarded_for.split(",")[0].strip()
+#             request.scope["client"] = (client_ip, request.scope.get("client", ["", 0])[1])
+#         # Log final scheme
+#         final_scheme = request.scope.get("scheme")
+#         logger.debug(f"Final scheme: {final_scheme}")
+#         response = await call_next(request)
+#         return response
 from flock.core.api.endpoints import create_api_router
 from flock.core.api.run_store import RunStore
 
@@ -293,7 +357,11 @@ async def lifespan(app: FastAPI):
 
 app = FastAPI(title="Flock Web UI & API", lifespan=lifespan, docs_url="/docs",
     openapi_url="/openapi.json", root_path=os.getenv("FLOCK_ROOT_PATH", ""))
-logger.info("FastAPI booting complete.")
+
+# Add middleware for handling proxy headers (HTTPS detection)
+app.add_middleware(ProxyHeadersMiddleware)
+logger.info("FastAPI booting complete with proxy headers middleware.")
+
 BASE_DIR = Path(__file__).resolve().parent.parent
 app.mount("/static", StaticFiles(directory=str(BASE_DIR / "static")), name="static")
 templates = Jinja2Templates(directory=str(BASE_DIR / "templates"))

{flock_core-0.4.514.dist-info → flock_core-0.4.516.dist-info}/METADATA

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

{flock_core-0.4.514.dist-info → flock_core-0.4.516.dist-info}/RECORD

@@ -29,7 +29,7 @@ flock/core/__init__.py,sha256=juwyNr3QqKXUS5-E3hlMYRhgqHgQBqgtP12OF3tUCAI,1249
 flock/core/flock.py,sha256=iR4i0_z0w2ns_iHbP7FqN--7wlsPIWch1H-BVecPs_I,38205
 flock/core/flock_agent.py,sha256=Hl6TONSiJi2I-N_49-1hkW2q_hyPXMebMr-5oZLI-PY,48842
 flock/core/flock_evaluator.py,sha256=TPy6u6XX3cqkY1r9NW1w2lTwCMNW7pxhFYKLefnEbXg,1820
-flock/core/flock_factory.py,sha256=L3EFEUKqQmyxM_q0mh23ikLHPexSkV4Q8ifxIBSGA6s,18805
+flock/core/flock_factory.py,sha256=siCShld0mHPzjsw2_TUhg_nesMYhocJympt1M8ch6p8,18724
 flock/core/flock_module.py,sha256=ObILimpVaPnaaqYvcBYJJ20lQzfrjgTdADplaNRjHU0,7448
 flock/core/flock_registry.py,sha256=KzdFfc3QC-Dk42G24hdf6Prp3HvGj9ymXR3TTBe-T-A,27161
 flock/core/flock_router.py,sha256=1OAXDsdaIIFApEfo6SRfFEDoTuGt3Si7n2MXiySEfis,2644
@@ -482,7 +482,7 @@ flock/themes/zenwritten-light.toml,sha256=G1iEheCPfBNsMTGaVpEVpDzYBHA_T-MV27rolU
 flock/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flock/tools/azure_tools.py,sha256=OTJsb0B4l70GcD1W3ZMDHWd3X8nEnszhhz2sllD2z9E,30187
 flock/tools/code_tools.py,sha256=xLpuFl84y_GVzmIBe4qrr7h9wI3yWpM-M21GgEUjSjE,5247
-flock/tools/file_tools.py,sha256=zbXo5SxyKYLvrE7k3vLF5tGxCeuaeJtCCdWQ1fXJMAA,4626
+flock/tools/file_tools.py,sha256=VYjT942NqDMTnizHiF41O4Af6ySseSvahRNVVrGMXl8,4850
 flock/tools/github_tools.py,sha256=HH47-4K3HL6tRJhZhUttWDo2aloP9Hs12wRC_f_-Vkc,5329
 flock/tools/markdown_tools.py,sha256=94fjGAJ5DEutoioD0ke-YRbxF6IWJQKuPVBLkNqdBo4,6345
 flock/tools/system_tools.py,sha256=IUB8MiSxtQH5ZfTGOck3vl4TKva8m1lfU4-W5D5b-4w,202
@@ -495,7 +495,7 @@ flock/webapp/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 flock/webapp/app/chat.py,sha256=d5a_mr3H2nuWNFSpSlI_HyqX-J_4krndd4A-8S25EKM,28679
 flock/webapp/app/config.py,sha256=lqmneujnNZk-EFJV5cWpvxkqisxH3T3zT_YOI0JYThE,4809
 flock/webapp/app/dependencies.py,sha256=JUcwY1N6SZplU141lMN2wk9dOC9er5HCedrKTJN9wJk,5533
-flock/webapp/app/main.py,sha256=54DHCA4jaOBrW3Lly0t-r_gSOEBj96G4Izt5pkbFZSw,57142
+flock/webapp/app/main.py,sha256=9wRxzahWhD8fFjByyvMhJOjsll7u4GnW2peGw2DXgPE,60727
 flock/webapp/app/models_ui.py,sha256=vrEBLbhEp6FziAgBSFOLT1M7ckwadsTdT7qus5_NduE,329
 flock/webapp/app/theme_mapper.py,sha256=QzWwLWpED78oYp3FjZ9zxv1KxCyj43m8MZ0fhfzz37w,34302
 flock/webapp/app/utils.py,sha256=RF8DMKKAj1XPmm4txUdo2OdswI1ATQ7cqUm6G9JFDzA,2942
@@ -561,8 +561,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.514.dist-info/METADATA,sha256=G-3HcIxeZRZ7rkKcqmlEcbeEyA04vcEqWk0Hbr8L7RE,22786
-flock_core-0.4.514.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flock_core-0.4.514.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
-flock_core-0.4.514.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
-flock_core-0.4.514.dist-info/RECORD,,
+flock_core-0.4.516.dist-info/METADATA,sha256=FsymlwNMAW5sjRvcs_PIRsIbL1w484HIeYIsMGrucx0,22786
+flock_core-0.4.516.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flock_core-0.4.516.dist-info/entry_points.txt,sha256=rWaS5KSpkTmWySURGFZk6PhbJ87TmvcFQDi2uzjlagQ,37
+flock_core-0.4.516.dist-info/licenses/LICENSE,sha256=iYEqWy0wjULzM9GAERaybP4LBiPeu7Z1NEliLUdJKSc,1072
+flock_core-0.4.516.dist-info/RECORD,,