From 42a198f96a261d06fb298106954024641bafac08 Mon Sep 17 00:00:00 2001 From: Edwin Jose Date: Mon, 6 Oct 2025 16:24:15 -0400 Subject: [PATCH] Add CONNECTOR_TYPE_URL env and flow support Introduces the CONNECTOR_TYPE_URL environment variable to docker-compose files and assets, updates the OpenRAG URL ingestion flow to use it, and ensures it is set in the auth service global variables. This enables explicit configuration and handling of URL-based connectors in the OpenRAG system. --- docker-compose-cpu.yml | 1 + docker-compose.yml | 10 +++++----- flows/openrag_url_mcp.json | 23 ++++++++++++++--------- src/services/auth_service.py | 1 + src/tui/_assets/docker-compose-cpu.yml | 1 + src/tui/_assets/docker-compose.yml | 1 + 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/docker-compose-cpu.yml b/docker-compose-cpu.yml index 570bc3b8..937826a6 100644 --- a/docker-compose-cpu.yml +++ b/docker-compose-cpu.yml @@ -108,6 +108,7 @@ services: - OWNER_NAME=None - OWNER_EMAIL=None - CONNECTOR_TYPE=system + - CONNECTOR_TYPE_URL=url - OPENRAG-QUERY-FILTER="{}" - OPENSEARCH_PASSWORD=${OPENSEARCH_PASSWORD} - FILENAME=None diff --git a/docker-compose.yml b/docker-compose.yml index b97f7cca..6a4a41b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: # build: # context: . # dockerfile: Dockerfile.backend - # container_name: openrag-backend + container_name: openrag-backend depends_on: - langflow environment: @@ -78,10 +78,9 @@ services: openrag-frontend: image: phact/openrag-frontend:${OPENRAG_VERSION:-latest} - # build: - # context: . - # dockerfile: Dockerfile.frontend - #dockerfile: Dockerfile.frontend + build: + context: . + dockerfile: Dockerfile.frontend container_name: openrag-frontend depends_on: - openrag-backend @@ -109,6 +108,7 @@ services: - OWNER_NAME=None - OWNER_EMAIL=None - CONNECTOR_TYPE=system + - CONNECTOR_TYPE_URL=url - OPENRAG-QUERY-FILTER="{}" - FILENAME=None - MIMETYPE=None diff --git a/flows/openrag_url_mcp.json b/flows/openrag_url_mcp.json index 69dbc85d..9cab0fed 100644 --- a/flows/openrag_url_mcp.json +++ b/flows/openrag_url_mcp.json @@ -232,6 +232,7 @@ }, { "animated": false, + "className": "", "data": { "sourceHandle": { "dataType": "EmbeddingModel", @@ -733,6 +734,10 @@ { "key": "owner_email", "value": "OWNER_EMAIL" + }, + { + "key": "connector_type", + "value": "CONNECTOR_TYPE_URL" } ] }, @@ -1808,7 +1813,7 @@ ], "frozen": false, "icon": "table", - "last_updated": "2025-10-03T20:31:36.023Z", + "last_updated": "2025-10-06T17:46:55.068Z", "legacy": false, "lf_version": "1.6.0", "metadata": { @@ -2224,7 +2229,7 @@ ], "frozen": false, "icon": "table", - "last_updated": "2025-10-03T20:31:36.025Z", + "last_updated": "2025-10-06T17:46:55.069Z", "legacy": false, "lf_version": "1.6.0", "metadata": { @@ -2897,7 +2902,7 @@ ], "frozen": false, "icon": "table", - "last_updated": "2025-10-03T20:31:36.026Z", + "last_updated": "2025-10-06T17:46:55.069Z", "legacy": false, "metadata": { "code_hash": "b4d6b19b6eef", @@ -3310,7 +3315,7 @@ ], "frozen": false, "icon": "binary", - "last_updated": "2025-10-03T20:31:47.177Z", + "last_updated": "2025-10-06T17:46:54.996Z", "legacy": false, "metadata": { "code_hash": "8607e963fdef", @@ -3595,17 +3600,17 @@ } ], "viewport": { - "x": -407.1633937626607, - "y": -577.5291936220412, - "zoom": 0.5347553210574026 + "x": -538.2311610019549, + "y": -337.3313239657308, + "zoom": 0.45546556043892106 } }, "description": "This flow is to ingest the URL to open search.", "endpoint_name": null, - "mcp_enabled": true, "id": "72c3d17c-2dac-4a73-b48a-6518473d7830", + "mcp_enabled": true, "is_component": false, - "last_tested_version": "1.6.0", + "last_tested_version": "1.6.3.dev1", "name": "OpenSearch URL Ingestion Flow", "tags": [ "openai", diff --git a/src/services/auth_service.py b/src/services/auth_service.py index 6b19f77a..ab33f035 100644 --- a/src/services/auth_service.py +++ b/src/services/auth_service.py @@ -296,6 +296,7 @@ class AuthService: try: if self.langflow_mcp_service and isinstance(jwt_token, str) and jwt_token.strip(): global_vars = {"JWT": jwt_token} + global_vars["CONNECTOR_TYPE_URL"] = "url" if user_info: if user_info.get("id"): global_vars["OWNER"] = user_info.get("id") diff --git a/src/tui/_assets/docker-compose-cpu.yml b/src/tui/_assets/docker-compose-cpu.yml index 1086737b..4a1125f8 100644 --- a/src/tui/_assets/docker-compose-cpu.yml +++ b/src/tui/_assets/docker-compose-cpu.yml @@ -105,6 +105,7 @@ services: - OWNER_NAME=None - OWNER_EMAIL=None - CONNECTOR_TYPE=system + - CONNECTOR_TYPE_URL=url - OPENRAG-QUERY-FILTER="{}" - OPENSEARCH_PASSWORD=${OPENSEARCH_PASSWORD} - FILENAME=None diff --git a/src/tui/_assets/docker-compose.yml b/src/tui/_assets/docker-compose.yml index 32b72c65..6cac6506 100644 --- a/src/tui/_assets/docker-compose.yml +++ b/src/tui/_assets/docker-compose.yml @@ -105,6 +105,7 @@ services: - OWNER_NAME=None - OWNER_EMAIL=None - CONNECTOR_TYPE=system + - CONNECTOR_TYPE_URL=url - OPENRAG-QUERY-FILTER="{}" - OPENSEARCH_PASSWORD=${OPENSEARCH_PASSWORD} - FILENAME=None