Merge branch 'main' into features/PRTL-3960

Dockerfile.langflow

@@ -7,7 +7,7 @@ ENV RUSTFLAGS="--cfg reqwest_unstable"
 
 # Accept build arguments for git repository and branch
 ARG GIT_REPO=https://github.com/langflow-ai/langflow.git
-ARG GIT_BRANCH=main
+ARG GIT_BRANCH=load_flows_autologin_false
 
 WORKDIR /app
 

docker-compose.yml

@@ -72,7 +72,7 @@ services:
     volumes:
       - ./documents:/app/documents:Z
       - ./keys:/app/keys:Z
-      - ./flows:/app/flows:Z
+      - ./flows:/app/flows:z
     gpus: all
 
   openrag-frontend:
@@ -90,7 +90,7 @@ services:
 
   langflow:
     volumes:
-      - ./flows:/app/flows:Z
+      - ./flows:/app/flows:z
     image: phact/openrag-langflow:${LANGFLOW_VERSION:-latest}
     container_name: langflow
     ports:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "openrag"
-version = "0.1.12"
+version = "0.1.13"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"

src/services/auth_service.py

@@ -292,12 +292,21 @@ class AuthService:
                 token_data["access_token"]
             )
 
-            # Best-effort: update Langflow MCP servers to include user's JWT header
+            # Best-effort: update Langflow MCP servers to include user's JWT and owner headers
             try:
                 if self.langflow_mcp_service and isinstance(jwt_token, str) and jwt_token.strip():
+                    global_vars = {"JWT": jwt_token}
+                    if user_info:
+                        if user_info.get("id"):
+                            global_vars["OWNER"] = user_info.get("id")
+                        if user_info.get("name"):
+                            global_vars["OWNER_NAME"] = user_info.get("name")
+                        if user_info.get("email"):
+                            global_vars["OWNER_EMAIL"] = user_info.get("email")
+
                     # Run in background to avoid delaying login flow
                     task = asyncio.create_task(
-                        self.langflow_mcp_service.update_mcp_servers_with_jwt(jwt_token)
+                        self.langflow_mcp_service.update_mcp_servers_with_global_vars(global_vars)
                     )
                     # Keep reference until done to avoid premature GC
                     self._background_tasks.add(task)

src/services/langflow_mcp_service.py

@@ -78,6 +78,134 @@ class LangflowMCPService:
             ])
 
         return updated_args
+    
+    def _upsert_global_var_headers_in_args(self, args: List[str], global_vars: Dict[str, str]) -> List[str]:
+        """Ensure args contains header triplets for X-Langflow-Global-Var-{key} with the provided global variables.
+
+        Args are expected in the pattern: [..., "--headers", key, value, ...].
+        If a header exists, update its value; otherwise append the triplet at the end.
+        """
+        if not isinstance(args, list):
+            updated_args = ["mcp-proxy"]
+        else:
+            updated_args = list(args)
+
+        for var_key, var_value in global_vars.items():
+            header_name = f"X-Langflow-Global-Var-{var_key}"
+            
+            i = 0
+            found_index = -1
+            while i < len(updated_args):
+                token = updated_args[i]
+                if token == "--headers" and i + 2 < len(updated_args):
+                    header_key = updated_args[i + 1]
+                    if isinstance(header_key, str) and header_key.lower() == header_name.lower():
+                        found_index = i
+                        break
+                    i += 3
+                    continue
+                i += 1
+
+            if found_index >= 0:
+                # Replace existing value at found_index + 2
+                if found_index + 2 < len(updated_args):
+                    updated_args[found_index + 2] = var_value
+                else:
+                    # Malformed existing header triplet; make sure to append a value
+                    updated_args.append(var_value)
+            else:
+                updated_args.extend([
+                    "--headers",
+                    header_name,
+                    var_value,
+                ])
+
+        return updated_args
+
+    async def patch_mcp_server_args_with_global_vars(self, server_name: str, global_vars: Dict[str, Any]) -> bool:
+        """Patch a single MCP server to include/update multiple X-Langflow-Global-Var-* headers in args.
+
+        Only non-empty values are applied. Keys are uppercased to match existing conventions (e.g., JWT).
+        """
+        try:
+            if not isinstance(global_vars, dict) or not global_vars:
+                return True  # Nothing to do
+
+            # Sanitize and normalize keys/values
+            sanitized: Dict[str, str] = {}
+            for k, v in global_vars.items():
+                if v is None:
+                    continue
+                v_str = str(v).strip()
+                if not v_str:
+                    continue
+                sanitized[k.upper()] = v_str
+
+            if not sanitized:
+                return True
+
+            current = await self.get_mcp_server(server_name)
+            command = current.get("command")
+            args = current.get("args", [])
+            updated_args = self._upsert_global_var_headers_in_args(args, sanitized)
+
+            payload = {"command": command, "args": updated_args}
+            response = await clients.langflow_request(
+                method="PATCH",
+                endpoint=f"/api/v2/mcp/servers/{server_name}",
+                json=payload,
+            )
+            if response.status_code in (200, 201):
+                logger.info(
+                    "Patched MCP server with global-var headers",
+                    server_name=server_name,
+                    applied_keys=list(sanitized.keys()),
+                    args_len=len(updated_args),
+                )
+                return True
+            else:
+                logger.warning(
+                    "Failed to patch MCP server with global vars",
+                    server_name=server_name,
+                    status_code=response.status_code,
+                    body=response.text,
+                )
+                return False
+        except Exception as e:
+            logger.error(
+                "Exception while patching MCP server with global vars",
+                server_name=server_name,
+                error=str(e),
+            )
+            return False
+
+    async def update_mcp_servers_with_global_vars(self, global_vars: Dict[str, Any]) -> Dict[str, Any]:
+        """Fetch all MCP servers and ensure each includes provided global-var headers in args.
+
+        Returns a summary dict with counts.
+        """
+        servers = await self.list_mcp_servers()
+        if not servers:
+            return {"updated": 0, "failed": 0, "total": 0}
+
+        updated = 0
+        failed = 0
+        for server in servers:
+            name = server.get("name") or server.get("server") or server.get("id")
+            if not name:
+                continue
+            ok = await self.patch_mcp_server_args_with_global_vars(name, global_vars)
+            if ok:
+                updated += 1
+            else:
+                failed += 1
+
+        summary = {"updated": updated, "failed": failed, "total": len(servers)}
+        if failed == 0:
+            logger.info("MCP servers updated with global-var headers", **summary)
+        else:
+            logger.warning("MCP servers update (global vars) had failures", **summary)
+        return summary
 
     async def patch_mcp_server_args_with_jwt(self, server_name: str, jwt_token: str) -> bool:
         """Patch a single MCP server to include/update the JWT header in args."""

uv.lock

@@ -1,5 +1,5 @@
 version = 1
-revision = 2
+revision = 3
 requires-python = ">=3.13"
 resolution-markers = [
     "sys_platform == 'darwin'",
@@ -2282,7 +2282,7 @@ wheels = [
 
 [[package]]
 name = "openrag"
-version = "0.1.11"
+version = "0.1.13"
 source = { editable = "." }
 dependencies = [
     { name = "agentd" },