Skip to content

OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.

Python

fix: removed node ID tweaks in favor of display name tweaks (#2211)

Lucas Oliveira43f29dcc2b5b
diff --git a/src/api/langflow_files.py b/src/api/langflow_files.py
index 6950fb287..876eaf881 100644
--- a/src/api/langflow_files.py
+++ b/src/api/langflow_files.py
@@ -85,25 +85,8 @@ async def run_ingestion(
filename = os.path.basename(file_path)
file_tuples.append((filename, b"", "application/octet-stream"))
- tweaks = body.tweaks or {}
settings = body.settings or {}
-
- # Convert UI settings to component tweaks
- if settings:
- logger.debug("Applying ingestion settings", settings=settings)
- if settings.get("chunkSize") or settings.get("chunkOverlap") or settings.get("separator"):
- if "SplitText-PC36h" not in tweaks:
- tweaks["SplitText-PC36h"] = {}
- if settings.get("chunkSize"):
- tweaks["SplitText-PC36h"]["chunk_size"] = settings["chunkSize"]
- if settings.get("chunkOverlap"):
- tweaks["SplitText-PC36h"]["chunk_overlap"] = settings["chunkOverlap"]
- if settings.get("separator"):
- tweaks["SplitText-PC36h"]["separator"] = settings["separator"]
- if settings.get("embeddingModel"):
- if "OpenAIEmbeddings-joRJ6" not in tweaks:
- tweaks["OpenAIEmbeddings-joRJ6"] = {}
- tweaks["OpenAIEmbeddings-joRJ6"]["model"] = settings["embeddingModel"]
+ tweaks = langflow_file_service.merge_ui_ingest_settings_into_tweaks(body.tweaks or {}, settings)
jwt_token = user.jwt_token
@@ -123,6 +106,7 @@ async def run_ingestion(
owner_name=user.name,
owner_email=user.email,
connector_type="local",
+ selected_embedding_model=settings.get("embeddingModel"),
)
return JSONResponse(result)
except Exception as e:
diff --git a/src/api/settings/endpoints.py b/src/api/settings/endpoints.py
index f6ebe7c6c..5ba92a83b 100644
--- a/src/api/settings/endpoints.py
+++ b/src/api/settings/endpoints.py
@@ -185,8 +185,11 @@ async def get_settings(
for node in flow_data["data"]["nodes"]:
node_template = node.get("data", {}).get("node", {}).get("template", {})
- # Split Text component (SplitText-QIKhg)
- if node.get("id") == "SplitText-QIKhg":
+ # Split Text component
+ if (
+ node.get("data", {}).get("node", {}).get("display_name")
+ == "Split Text"
+ ):
if node_template.get("chunk_size", {}).get("value"):
ingestion_defaults["chunkSize"] = node_template["chunk_size"][
"value"
@@ -200,13 +203,6 @@ async def get_settings(
"value"
]
- # OpenAI Embeddings component (OpenAIEmbeddings-joRJ6)
- elif node.get("id") == "OpenAIEmbeddings-joRJ6":
- if node_template.get("model", {}).get("value"):
- ingestion_defaults["embeddingModel"] = node_template["model"][
- "value"
- ]
-
ingestion_defaults_obj = IngestionDefaultsConfig(**ingestion_defaults)
except Exception as e:
diff --git a/src/config/settings.py b/src/config/settings.py
index e27d7bc67..ac241dc30 100644
--- a/src/config/settings.py
+++ b/src/config/settings.py
@@ -103,6 +103,8 @@ LANGFLOW_INGEST_FLOW_ID = (
LANGFLOW_URL_INGEST_FLOW_ID = (
os.getenv("LANGFLOW_URL_INGEST_FLOW_ID") or "72c3d17c-2dac-4a73-b48a-6518473d7830"
)
+DEFAULT_CHUNK_SIZE = 1000
+DEFAULT_CHUNK_OVERLAP = 200
OPENRAG_BACKEND_PORT = get_env_int("OPENRAG_BACKEND_PORT", 8000)
OPENRAG_BACKEND_INTERNAL_URL = os.getenv(
"OPENRAG_BACKEND_INTERNAL_URL",
diff --git a/src/services/langflow_file_service.py b/src/services/langflow_file_service.py
index 4e821f50c..528100f0a 100644
--- a/src/services/langflow_file_service.py
+++ b/src/services/langflow_file_service.py
@@ -70,7 +70,7 @@ class LangflowFileService:
"""Merge UI ingest dict (camelCase) into Langflow run ``tweaks``.
- ``chunkSize`` / ``chunkOverlap`` / ``separator`` update the flow's
- ``SplitText-QIKhg`` node when any of those keys are present.
+ ``Split Text`` node when any of those keys are present.
- ``embeddingModel`` is intentionally not mapped to a component tweak.
The embedding model should be supplied via
``run_ingestion_flow(..., selected_embedding_model=...)`` so Langflow
@@ -78,18 +78,46 @@ class LangflowFileService:
provider-specific component ids.
"""
final_tweaks = dict(tweaks) if tweaks else {}
+
+ from config.settings import DEFAULT_CHUNK_OVERLAP, DEFAULT_CHUNK_SIZE, get_openrag_config
+
+ config = get_openrag_config()
+
+ # Build and merge Docling Serve tweaks
+ from services.docling_service import get_docling_preset_configs
+
+ preset_config = get_docling_preset_configs(
+ table_structure=config.knowledge.table_structure,
+ ocr=config.knowledge.ocr,
+ picture_descriptions=config.knowledge.picture_descriptions,
+ )
+ if "Docling Serve" not in final_tweaks:
+ final_tweaks["Docling Serve"] = {}
+ if "docling_serve_opts" not in final_tweaks["Docling Serve"]:
+ final_tweaks["Docling Serve"]["docling_serve_opts"] = preset_config
+
+ # Merge in default Split Text tweaks
+ if "Split Text" not in final_tweaks:
+ final_tweaks["Split Text"] = {}
+ if "chunk_size" not in final_tweaks["Split Text"]:
+ final_tweaks["Split Text"]["chunk_size"] = getattr(
+ config.knowledge, "chunk_size", DEFAULT_CHUNK_SIZE
+ )
+ if "chunk_overlap" not in final_tweaks["Split Text"]:
+ final_tweaks["Split Text"]["chunk_overlap"] = getattr(
+ config.knowledge, "chunk_overlap", DEFAULT_CHUNK_OVERLAP
+ )
+
if not settings:
return final_tweaks
if settings.get("chunkSize") or settings.get("chunkOverlap") or settings.get("separator"):
- if "SplitText-QIKhg" not in final_tweaks:
- final_tweaks["SplitText-QIKhg"] = {}
if settings.get("chunkSize"):
- final_tweaks["SplitText-QIKhg"]["chunk_size"] = settings["chunkSize"]
+ final_tweaks["Split Text"]["chunk_size"] = settings["chunkSize"]
if settings.get("chunkOverlap"):
- final_tweaks["SplitText-QIKhg"]["chunk_overlap"] = settings["chunkOverlap"]
+ final_tweaks["Split Text"]["chunk_overlap"] = settings["chunkOverlap"]
if settings.get("separator"):
- final_tweaks["SplitText-QIKhg"]["separator"] = settings["separator"]
+ final_tweaks["Split Text"]["separator"] = settings["separator"]
return final_tweaks
@@ -402,21 +430,15 @@ class LangflowFileService:
if not tweaks:
tweaks = {}
+ from config.settings import get_openrag_config
+
+ config = get_openrag_config()
+
# Pass files via tweaks to File component (File-PSU37 from the flow)
if file_paths:
- tweaks["DoclingRemote-Dp3PX"] = {"path": file_paths}
-
- # Pass metadata via tweaks to OpenSearch component
- metadata_tweaks = []
- if owner:
- metadata_tweaks.append({"key": "owner", "value": owner})
- if owner_name:
- metadata_tweaks.append({"key": "owner_name", "value": owner_name})
- if owner_email:
- metadata_tweaks.append({"key": "owner_email", "value": owner_email})
- if connector_type:
- metadata_tweaks.append({"key": "connector_type", "value": connector_type})
- logger.info(f"[LF] Metadata tweaks {metadata_tweaks}")
+ if "Docling Serve" not in tweaks:
+ tweaks["Docling Serve"] = {}
+ tweaks["Docling Serve"]["path"] = file_paths
if session_id:
payload["session_id"] = session_id
@@ -447,22 +469,23 @@ class LangflowFileService:
)
# Get the current embedding model and provider credentials from config
- from config.settings import get_openrag_config
+ from config.settings import DEFAULT_CHUNK_OVERLAP, DEFAULT_CHUNK_SIZE
from utils.langflow_headers import (
add_provider_credentials_to_headers,
build_model_provider_headers,
)
- config = get_openrag_config()
embedding_model = config.knowledge.embedding_model
if selected_embedding_model:
embedding_model = selected_embedding_model
- split_tweaks = tweaks.get("SplitText-QIKhg", {}) if isinstance(tweaks, dict) else {}
- default_chunk_size = getattr(config.knowledge, "chunk_size", 1000)
- default_chunk_overlap = getattr(config.knowledge, "chunk_overlap", 200)
- chunk_size = split_tweaks.get("chunk_size", default_chunk_size)
- chunk_overlap = split_tweaks.get("chunk_overlap", default_chunk_overlap)
+ split_tweaks = tweaks.get("Split Text", {}) if isinstance(tweaks, dict) else {}
+ chunk_size = split_tweaks.get(
+ "chunk_size", getattr(config.knowledge, "chunk_size", DEFAULT_CHUNK_SIZE)
+ )
+ chunk_overlap = split_tweaks.get(
+ "chunk_overlap", getattr(config.knowledge, "chunk_overlap", DEFAULT_CHUNK_OVERLAP)
+ )
headers = {
"X-Langflow-Global-Var-JWT": str(jwt_token or ""),
@@ -635,7 +658,7 @@ class LangflowFileService:
if not tweaks:
tweaks = {}
- from config.settings import get_openrag_config
+ from config.settings import DEFAULT_CHUNK_OVERLAP, DEFAULT_CHUNK_SIZE, get_openrag_config
from utils.langflow_headers import (
add_provider_credentials_to_headers,
build_model_provider_headers,
@@ -644,9 +667,9 @@ class LangflowFileService:
config = get_openrag_config()
embedding_model = config.knowledge.embedding_model
resolved_document_id = hash_id(io.BytesIO(docs_url.encode("utf-8")))
- split_tweaks = tweaks.get("SplitText-QIKhg", {}) if isinstance(tweaks, dict) else {}
- default_chunk_size = getattr(config.knowledge, "chunk_size", 1000)
- default_chunk_overlap = getattr(config.knowledge, "chunk_overlap", 200)
+ split_tweaks = tweaks.get("Split Text", {}) if isinstance(tweaks, dict) else {}
+ default_chunk_size = getattr(config.knowledge, "chunk_size", DEFAULT_CHUNK_SIZE)
+ default_chunk_overlap = getattr(config.knowledge, "chunk_overlap", DEFAULT_CHUNK_OVERLAP)
chunk_size = split_tweaks.get("chunk_size", default_chunk_size)
chunk_overlap = split_tweaks.get("chunk_overlap", default_chunk_overlap)
headers = {
diff --git a/tests/unit/test_langflow_file_service_merge_tweaks.py b/tests/unit/test_langflow_file_service_merge_tweaks.py
index bf5c2e321..1a5d04985 100644
--- a/tests/unit/test_langflow_file_service_merge_tweaks.py
+++ b/tests/unit/test_langflow_file_service_merge_tweaks.py
@@ -6,13 +6,15 @@ from src.services.langflow_file_service import LangflowFileService
def test_merge_no_settings_returns_tweaks_copy():
base = {"OtherNode": {"x": 1}}
out = LangflowFileService.merge_ui_ingest_settings_into_tweaks(base, None)
- assert out == base
- assert out is not base
+ assert out["OtherNode"] == {"x": 1}
+ assert "Docling Serve" in out
+ assert "Split Text" in out
def test_merge_empty_settings_returns_tweaks_only():
out = LangflowFileService.merge_ui_ingest_settings_into_tweaks(None, {})
- assert out == {}
+ assert "Docling Serve" in out
+ assert "Split Text" in out
def test_merge_chunk_fields_populate_split_text():
@@ -20,7 +22,7 @@ def test_merge_chunk_fields_populate_split_text():
None,
{"chunkSize": 512, "chunkOverlap": 64, "separator": "\n\n"},
)
- assert out["SplitText-QIKhg"] == {
+ assert out["Split Text"] == {
"chunk_size": 512,
"chunk_overlap": 64,
"separator": "\n\n",
@@ -32,15 +34,16 @@ def test_merge_chunk_partial_only_sets_provided_keys():
None,
{"chunkSize": 1000},
)
- assert out["SplitText-QIKhg"] == {"chunk_size": 1000}
+ assert out["Split Text"]["chunk_size"] == 1000
+ assert out["Split Text"]["chunk_overlap"] == 200
def test_merge_preserves_and_extends_existing_split_text():
out = LangflowFileService.merge_ui_ingest_settings_into_tweaks(
- {"SplitText-QIKhg": {"chunk_size": 100, "existing": "keep"}},
+ {"Split Text": {"chunk_size": 100, "existing": "keep"}},
{"chunkOverlap": 20},
)
- assert out["SplitText-QIKhg"] == {
+ assert out["Split Text"] == {
"chunk_size": 100,
"existing": "keep",
"chunk_overlap": 20,
@@ -52,7 +55,9 @@ def test_merge_embedding_model_is_ignored_in_tweaks():
None,
{"embeddingModel": "text-embedding-3-large"},
)
- assert out == {}
+ assert "OpenAIEmbeddings-joRJ6" not in out
+ assert "Docling Serve" in out
+ assert "Split Text" in out
def test_connector_style_settings_without_embedding_only_split_text():
@@ -65,4 +70,5 @@ def test_connector_style_settings_without_embedding_only_split_text():
}
out = LangflowFileService.merge_ui_ingest_settings_into_tweaks({}, settings)
assert "OpenAIEmbeddings-joRJ6" not in out
- assert out["SplitText-QIKhg"]["chunk_size"] == 800
+ assert out["Split Text"]["chunk_size"] == 800
+ assert out["Split Text"]["chunk_overlap"] == 100