From ea61aa7136ad84974e108479c8f0436103bb9ecd Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Fri, 3 Oct 2025 17:29:28 -0300 Subject: [PATCH] added url ingest id to everything --- .env.example | 1 + docker-compose-cpu.yml | 1 + docker-compose.yml | 1 + src/config/settings.py | 1 + src/services/flows_service.py | 16 +++++++++++++++- src/tui/_assets/docker-compose-cpu.yml | 1 + src/tui/_assets/docker-compose.yml | 1 + src/tui/managers/env_manager.py | 3 +++ 8 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index ee2a838c..8d412670 100644 --- a/.env.example +++ b/.env.example @@ -8,6 +8,7 @@ LANGFLOW_SECRET_KEY= # flow ids for chat and ingestion flows LANGFLOW_CHAT_FLOW_ID=1098eea1-6649-4e1d-aed1-b77249fb8dd0 LANGFLOW_INGEST_FLOW_ID=5488df7c-b93f-4f87-a446-b67028bc0813 +LANGFLOW_URL_INGEST_FLOW_ID=72c3d17c-2dac-4a73-b48a-6518473d7830 # Ingest flow using docling # LANGFLOW_INGEST_FLOW_ID=1402618b-e6d1-4ff2-9a11-d6ce71186915 NUDGES_FLOW_ID=ebc01d31-1976-46ce-a385-b0240327226c diff --git a/docker-compose-cpu.yml b/docker-compose-cpu.yml index d0de6ce9..242caa89 100644 --- a/docker-compose-cpu.yml +++ b/docker-compose-cpu.yml @@ -55,6 +55,7 @@ services: - LANGFLOW_SUPERUSER_PASSWORD=${LANGFLOW_SUPERUSER_PASSWORD} - LANGFLOW_CHAT_FLOW_ID=${LANGFLOW_CHAT_FLOW_ID} - LANGFLOW_INGEST_FLOW_ID=${LANGFLOW_INGEST_FLOW_ID} + - LANGFLOW_URL_INGEST_FLOW_ID=${LANGFLOW_URL_INGEST_FLOW_ID} - DISABLE_INGEST_WITH_LANGFLOW=${DISABLE_INGEST_WITH_LANGFLOW:-false} - NUDGES_FLOW_ID=${NUDGES_FLOW_ID} - OPENSEARCH_PORT=9200 diff --git a/docker-compose.yml b/docker-compose.yml index be31fb71..246959a7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,6 +54,7 @@ services: - LANGFLOW_SUPERUSER_PASSWORD=${LANGFLOW_SUPERUSER_PASSWORD} - LANGFLOW_CHAT_FLOW_ID=${LANGFLOW_CHAT_FLOW_ID} - LANGFLOW_INGEST_FLOW_ID=${LANGFLOW_INGEST_FLOW_ID} + - LANGFLOW_URL_INGEST_FLOW_ID=${LANGFLOW_URL_INGEST_FLOW_ID} - DISABLE_INGEST_WITH_LANGFLOW=${DISABLE_INGEST_WITH_LANGFLOW:-false} - NUDGES_FLOW_ID=${NUDGES_FLOW_ID} - OPENSEARCH_PORT=9200 diff --git a/src/config/settings.py b/src/config/settings.py index 27ea9502..6f55520d 100644 --- a/src/config/settings.py +++ b/src/config/settings.py @@ -34,6 +34,7 @@ _legacy_flow_id = os.getenv("FLOW_ID") LANGFLOW_CHAT_FLOW_ID = os.getenv("LANGFLOW_CHAT_FLOW_ID") or _legacy_flow_id LANGFLOW_INGEST_FLOW_ID = os.getenv("LANGFLOW_INGEST_FLOW_ID") +LANGFLOW_URL_INGEST_FLOW_ID = os.getenv("LANGFLOW_URL_INGEST_FLOW_ID") NUDGES_FLOW_ID = os.getenv("NUDGES_FLOW_ID") if _legacy_flow_id and not os.getenv("LANGFLOW_CHAT_FLOW_ID"): diff --git a/src/services/flows_service.py b/src/services/flows_service.py index 999d9930..429eabe7 100644 --- a/src/services/flows_service.py +++ b/src/services/flows_service.py @@ -1,5 +1,6 @@ from config.settings import ( DISABLE_INGEST_WITH_LANGFLOW, + LANGFLOW_URL_INGEST_FLOW_ID, NUDGES_FLOW_ID, LANGFLOW_URL, LANGFLOW_CHAT_FLOW_ID, @@ -116,9 +117,11 @@ class FlowsService: flow_id = LANGFLOW_CHAT_FLOW_ID elif flow_type == "ingest": flow_id = LANGFLOW_INGEST_FLOW_ID + elif flow_type == "url_ingest": + flow_id = LANGFLOW_URL_INGEST_FLOW_ID else: raise ValueError( - "flow_type must be either 'nudges', 'retrieval', or 'ingest'" + "flow_type must be either 'nudges', 'retrieval', 'ingest', or 'url_ingest'" ) if not flow_id: @@ -291,6 +294,13 @@ class FlowsService: "llm_name": None, # Ingestion flow might not have LLM "llm_text_name": None, }, + { + "name": "url_ingest", + "flow_id": LANGFLOW_URL_INGEST_FLOW_ID, + "embedding_name": OPENAI_EMBEDDING_COMPONENT_DISPLAY_NAME, + "llm_name": None, + "llm_text_name": None, + }, ] results = [] @@ -716,6 +726,10 @@ class FlowsService: "name": "ingest", "flow_id": LANGFLOW_INGEST_FLOW_ID, }, + { + "name": "url_ingest", + "flow_id": LANGFLOW_URL_INGEST_FLOW_ID, + }, ] # Determine target component IDs based on provider diff --git a/src/tui/_assets/docker-compose-cpu.yml b/src/tui/_assets/docker-compose-cpu.yml index d0de6ce9..242caa89 100644 --- a/src/tui/_assets/docker-compose-cpu.yml +++ b/src/tui/_assets/docker-compose-cpu.yml @@ -55,6 +55,7 @@ services: - LANGFLOW_SUPERUSER_PASSWORD=${LANGFLOW_SUPERUSER_PASSWORD} - LANGFLOW_CHAT_FLOW_ID=${LANGFLOW_CHAT_FLOW_ID} - LANGFLOW_INGEST_FLOW_ID=${LANGFLOW_INGEST_FLOW_ID} + - LANGFLOW_URL_INGEST_FLOW_ID=${LANGFLOW_URL_INGEST_FLOW_ID} - DISABLE_INGEST_WITH_LANGFLOW=${DISABLE_INGEST_WITH_LANGFLOW:-false} - NUDGES_FLOW_ID=${NUDGES_FLOW_ID} - OPENSEARCH_PORT=9200 diff --git a/src/tui/_assets/docker-compose.yml b/src/tui/_assets/docker-compose.yml index bd81e0ab..8b5ddb74 100644 --- a/src/tui/_assets/docker-compose.yml +++ b/src/tui/_assets/docker-compose.yml @@ -54,6 +54,7 @@ services: - LANGFLOW_SUPERUSER_PASSWORD=${LANGFLOW_SUPERUSER_PASSWORD} - LANGFLOW_CHAT_FLOW_ID=${LANGFLOW_CHAT_FLOW_ID} - LANGFLOW_INGEST_FLOW_ID=${LANGFLOW_INGEST_FLOW_ID} + - LANGFLOW_URL_INGEST_FLOW_ID=${LANGFLOW_URL_INGEST_FLOW_ID} - DISABLE_INGEST_WITH_LANGFLOW=${DISABLE_INGEST_WITH_LANGFLOW:-false} - NUDGES_FLOW_ID=${NUDGES_FLOW_ID} - OPENSEARCH_PORT=9200 diff --git a/src/tui/managers/env_manager.py b/src/tui/managers/env_manager.py index 9954b463..9510fb70 100644 --- a/src/tui/managers/env_manager.py +++ b/src/tui/managers/env_manager.py @@ -33,6 +33,7 @@ class EnvConfig: langflow_superuser_password: str = "" langflow_chat_flow_id: str = "1098eea1-6649-4e1d-aed1-b77249fb8dd0" langflow_ingest_flow_id: str = "5488df7c-b93f-4f87-a446-b67028bc0813" + langflow_url_ingest_flow_id: str = "72c3d17c-2dac-4a73-b48a-6518473d7830" # OAuth settings google_oauth_client_id: str = "" @@ -114,6 +115,7 @@ class EnvManager: "LANGFLOW_SUPERUSER_PASSWORD": "langflow_superuser_password", "LANGFLOW_CHAT_FLOW_ID": "langflow_chat_flow_id", "LANGFLOW_INGEST_FLOW_ID": "langflow_ingest_flow_id", + "LANGFLOW_URL_INGEST_FLOW_ID": "langflow_url_ingest_flow_id", "NUDGES_FLOW_ID": "nudges_flow_id", "GOOGLE_OAUTH_CLIENT_ID": "google_oauth_client_id", "GOOGLE_OAUTH_CLIENT_SECRET": "google_oauth_client_secret", @@ -255,6 +257,7 @@ class EnvManager: f.write( f"LANGFLOW_INGEST_FLOW_ID={self._quote_env_value(self.config.langflow_ingest_flow_id)}\n" ) + f.write(f"LANGFLOW_URL_INGEST_FLOW_ID={self._quote_env_value(self.config.langflow_url_ingest_flow_id)}\n") f.write(f"NUDGES_FLOW_ID={self._quote_env_value(self.config.nudges_flow_id)}\n") f.write(f"OPENSEARCH_PASSWORD={self._quote_env_value(self.config.opensearch_password)}\n") f.write(f"OPENAI_API_KEY={self._quote_env_value(self.config.openai_api_key)}\n")