OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.
Python
fix: added langflow_opensearch_host as env variable (#1294)
Lucas Oliveira153a408d5697
diff --git a/.env.example b/.env.exampleindex 5a0af2f93..18d9e832d 100644--- a/.env.example+++ b/.env.example@@ -87,6 +87,9 @@ LANGFLOW_DATABASE_URL=sqlite:////app/langflow-data/langflow.db# OpenSearch ConnectionOPENSEARCH_HOST=opensearchOPENSEARCH_PORT=9200+# Optional: Use a different OpenSearch endpoint for Langflow+# LANGFLOW_OPENSEARCH_HOST=opensearch+# LANGFLOW_OPENSEARCH_PORT=9200OPENSEARCH_USERNAME=admin# OpenSearch index name for storing documentsdiff --git a/docker-compose.yml b/docker-compose.ymlindex f0bce2a0d..add0377ae 100644--- a/docker-compose.yml+++ b/docker-compose.yml@@ -65,6 +65,8 @@ services:- INGEST_SAMPLE_DATA=${INGEST_SAMPLE_DATA:-true}- NUDGES_FLOW_ID=${NUDGES_FLOW_ID}- OPENSEARCH_PORT=${OPENSEARCH_PORT:-9200}+ - LANGFLOW_OPENSEARCH_HOST=${LANGFLOW_OPENSEARCH_HOST:-${OPENSEARCH_HOST:-opensearch}}+ - LANGFLOW_OPENSEARCH_PORT=${LANGFLOW_OPENSEARCH_PORT:-${OPENSEARCH_PORT:-9200}}- OPENSEARCH_USERNAME=${OPENSEARCH_USERNAME:-admin}- OPENSEARCH_PASSWORD=${OPENSEARCH_PASSWORD}- OPENAI_API_KEY=${OPENAI_API_KEY}@@ -168,9 +170,9 @@ services:- ALLOWED_GROUPS=[]- OPENRAG-QUERY-FILTER="{}"- OPENSEARCH_PASSWORD=${OPENSEARCH_PASSWORD}- - OPENSEARCH_HOST=${OPENSEARCH_HOST:-opensearch}- - OPENSEARCH_PORT=${OPENSEARCH_PORT:-9200}- - OPENSEARCH_URL=https://${OPENSEARCH_HOST:-opensearch}:${OPENSEARCH_PORT:-9200}+ - OPENSEARCH_HOST=${LANGFLOW_OPENSEARCH_HOST:-${OPENSEARCH_HOST:-opensearch}}+ - OPENSEARCH_PORT=${LANGFLOW_OPENSEARCH_PORT:-${OPENSEARCH_PORT:-9200}}+ - OPENSEARCH_URL=https://${LANGFLOW_OPENSEARCH_HOST:-${OPENSEARCH_HOST:-opensearch}}:${LANGFLOW_OPENSEARCH_PORT:-${OPENSEARCH_PORT:-9200}}- OPENSEARCH_INDEX_NAME=${OPENSEARCH_INDEX_NAME:-documents}- DOCLING_SERVE_URL=${DOCLING_SERVE_URL:-http://host.docker.internal:5001}- FILENAME=Nonediff --git a/kubernetes/helm/openrag/templates/_helpers.tpl b/kubernetes/helm/openrag/templates/_helpers.tplindex 9e2c5f741..db61d3612 100644--- a/kubernetes/helm/openrag/templates/_helpers.tpl+++ b/kubernetes/helm/openrag/templates/_helpers.tpl@@ -155,11 +155,47 @@ Generate the Backend service URLhttp://{{ include "openrag.fullname" . }}-backend:{{ .Values.backend.service.port }}{{- end }}+{{/*+Generate the general OpenSearch Host+*/}}+{{- define "openrag.opensearch.host" -}}+{{- if .Values.global.opensearch.host -}}+{{- .Values.global.opensearch.host -}}+{{- else -}}+{{- printf "%s-opensearch.%s.svc.cluster.local" (include "openrag.fullname" .) .Release.Namespace -}}+{{- end -}}+{{- end -}}+{{/*Generate the OpenSearch URL*/}}{{- define "openrag.opensearch.url" -}}-{{ .Values.global.opensearch.scheme }}://{{ .Values.global.opensearch.host }}:{{ .Values.global.opensearch.port }}+{{ .Values.global.opensearch.scheme }}://{{ include "openrag.opensearch.host" . }}:{{ .Values.global.opensearch.port }}+{{- end }}++{{/*+Generate the Langflow-specific OpenSearch Host+*/}}+{{- define "openrag.langflow.opensearch.host" -}}+{{- if .Values.global.opensearch.langflowHost -}}+{{- .Values.global.opensearch.langflowHost -}}+{{- else -}}+{{- include "openrag.opensearch.host" . -}}+{{- end -}}+{{- end }}++{{/*+Generate the Langflow-specific OpenSearch Port+*/}}+{{- define "openrag.langflow.opensearch.port" -}}+{{- default .Values.global.opensearch.port .Values.global.opensearch.langflowPort }}+{{- end }}++{{/*+Generate the Langflow-specific OpenSearch URL+*/}}+{{- define "openrag.langflow.opensearch.url" -}}+{{ .Values.global.opensearch.scheme }}://{{ include "openrag.langflow.opensearch.host" . }}:{{ include "openrag.langflow.opensearch.port" . }}{{- end }}{{/*diff --git a/kubernetes/helm/openrag/templates/backend/backend-dotenv.yaml b/kubernetes/helm/openrag/templates/backend/backend-dotenv.yamlindex afa7aeacb..c6d96f741 100644--- a/kubernetes/helm/openrag/templates/backend/backend-dotenv.yaml+++ b/kubernetes/helm/openrag/templates/backend/backend-dotenv.yaml@@ -71,18 +71,16 @@ stringData:OPENSEARCH_PASSWORD={{ .Values.global.opensearch.password | quote }}{{- end }}OPENSEARCH_DATA_PATH=./opensearch-data- {{- if .Values.global.opensearch.host }}- OPENSEARCH_HOST={{ .Values.global.opensearch.host | quote }}- {{- end }}- {{- if .Values.global.opensearch.port }}+ OPENSEARCH_HOST={{ include "openrag.opensearch.host" . | quote }}OPENSEARCH_PORT={{ .Values.global.opensearch.port | quote }}- {{- end }}{{- if .Values.global.opensearch.username }}OPENSEARCH_USERNAME={{ .Values.global.opensearch.username | quote }}{{- end }}{{- if .Values.global.opensearch.indexName }}OPENSEARCH_INDEX_NAME={{ .Values.global.opensearch.indexName | quote }}{{- end }}+ LANGFLOW_OPENSEARCH_HOST={{ include "openrag.langflow.opensearch.host" . | quote }}+ LANGFLOW_OPENSEARCH_PORT={{ include "openrag.langflow.opensearch.port" . | quote }}# Google OAuth{{- if .Values.global.oauth.google.clientId }}diff --git a/kubernetes/helm/openrag/templates/backend/deployment.yaml b/kubernetes/helm/openrag/templates/backend/deployment.yamlindex d82ef9b00..7578590c5 100644--- a/kubernetes/helm/openrag/templates/backend/deployment.yaml+++ b/kubernetes/helm/openrag/templates/backend/deployment.yaml@@ -23,6 +23,7 @@ spec:checksum/config-flows: {{ include (print $.Template.BasePath "/configmaps/flow-ids-configmap.yaml") . | sha256sum }}checksum/config-app: {{ include (print $.Template.BasePath "/configmaps/app-config-configmap.yaml") . | sha256sum }}checksum/secret-backend: {{ include (print $.Template.BasePath "/secrets/backend-secret.yaml") . | sha256sum }}+ checksum/secret-dotenv: {{ include (print $.Template.BasePath "/templates/backend/backend-dotenv.yaml") . | sha256sum }}spec:serviceAccountName: {{ include "openrag.serviceAccountName" . }}{{- with .Values.podSecurityContext }}diff --git a/kubernetes/helm/openrag/templates/langflow/deployment.yaml b/kubernetes/helm/openrag/templates/langflow/deployment.yamlindex c355cc265..f0f32981c 100644--- a/kubernetes/helm/openrag/templates/langflow/deployment.yaml+++ b/kubernetes/helm/openrag/templates/langflow/deployment.yaml@@ -20,6 +20,7 @@ spec:annotations:checksum/secret: {{ include (print $.Template.BasePath "/secrets/langflow-secret.yaml") . | sha256sum }}checksum/config: {{ include (print $.Template.BasePath "/configmaps/flow-ids-configmap.yaml") . | sha256sum }}+ checksum/dotenv: {{ include (print $.Template.BasePath "/templates/langflow/langflow-dotenv.yaml") . | sha256sum }}spec:serviceAccountName: {{ include "openrag.serviceAccountName" . }}diff --git a/kubernetes/helm/openrag/templates/langflow/langflow-dotenv.yaml b/kubernetes/helm/openrag/templates/langflow/langflow-dotenv.yamlindex cc428daf7..7a2972b42 100644--- a/kubernetes/helm/openrag/templates/langflow/langflow-dotenv.yaml+++ b/kubernetes/helm/openrag/templates/langflow/langflow-dotenv.yaml@@ -104,9 +104,9 @@ stringData:{{- end }}# OpenSearch connection (for flows)- OPENSEARCH_HOST={{ .Values.global.opensearch.host | quote }}- OPENSEARCH_PORT={{ .Values.global.opensearch.port | quote }}- OPENSEARCH_URL={{ include "openrag.opensearch.url" . | quote }}+ OPENSEARCH_HOST={{ include "openrag.langflow.opensearch.host" . | quote }}+ OPENSEARCH_PORT={{ include "openrag.langflow.opensearch.port" . | quote }}+ OPENSEARCH_URL={{ include "openrag.langflow.opensearch.url" . | quote }}OPENSEARCH_INDEX_NAME={{ .Values.global.opensearch.indexName | quote }}{{- if .Values.global.opensearch.password }}OPENSEARCH_PASSWORD={{ .Values.global.opensearch.password | quote }}diff --git a/kubernetes/helm/openrag/values.yaml b/kubernetes/helm/openrag/values.yamlindex 5ace28a77..cdf0ace24 100644--- a/kubernetes/helm/openrag/values.yaml+++ b/kubernetes/helm/openrag/values.yaml@@ -20,8 +20,10 @@ global:# External OpenSearch SaaS connection (OpenSearch is NOT deployed by this chart)opensearch:- host: "opensearch-coordinating.opensearch.svc.cluster.local" # Required: OpenSearch SaaS endpoint (e.g., "my-cluster.us-east-1.es.amazonaws.com")+ # host: "opensearch-coordinating.opensearch.svc.cluster.local" # Required: OpenSearch SaaS endpoint (e.g., "my-cluster.us-east-1.es.amazonaws.com")port: 9200 # Default HTTPS port for managed OpenSearch+ langflowHost: "" # Optional: Langflow-specific OpenSearch host+ langflowPort: "" # Optional: Langflow-specific OpenSearch portscheme: "https" # https for production SaaSusername: "admin" # OpenSearch usernamepassword: "" # OpenSearch password (stored in secret)diff --git a/src/config/settings.py b/src/config/settings.pyindex 69b7ccbf8..3a8af891b 100644--- a/src/config/settings.py+++ b/src/config/settings.py@@ -21,6 +21,11 @@ logger = get_logger(__name__)# Environment variablesOPENSEARCH_HOST = os.getenv("OPENSEARCH_HOST", "localhost")OPENSEARCH_PORT = get_env_int("OPENSEARCH_PORT", 9200)++# Optional: Langflow-specific OpenSearch endpoint+LANGFLOW_OPENSEARCH_HOST = os.getenv("LANGFLOW_OPENSEARCH_HOST", OPENSEARCH_HOST)+LANGFLOW_OPENSEARCH_PORT = get_env_int("LANGFLOW_OPENSEARCH_PORT", OPENSEARCH_PORT)+OPENSEARCH_USERNAME = os.getenv("OPENSEARCH_USERNAME", "admin")OPENSEARCH_PASSWORD = os.getenv("OPENSEARCH_PASSWORD")LANGFLOW_URL = os.getenv("LANGFLOW_URL", "http://localhost:7860")diff --git a/src/utils/langflow_headers.py b/src/utils/langflow_headers.pyindex 8e310983c..bef62945b 100644--- a/src/utils/langflow_headers.py+++ b/src/utils/langflow_headers.py@@ -64,8 +64,8 @@ async def add_provider_credentials_to_headers(headers["X-LANGFLOW-GLOBAL-VAR-OLLAMA_BASE_URL"] = str(ollama_endpoint)# Inject OpenSearch URL so Langflow flows always use the correct endpoint- from config.settings import OPENSEARCH_HOST, OPENSEARCH_PORT- headers["X-LANGFLOW-GLOBAL-VAR-OPENSEARCH_URL"] = f"https://{OPENSEARCH_HOST}:{OPENSEARCH_PORT}"+ from config.settings import LANGFLOW_OPENSEARCH_HOST, LANGFLOW_OPENSEARCH_PORT+ headers["X-LANGFLOW-GLOBAL-VAR-OPENSEARCH_URL"] = f"https://{LANGFLOW_OPENSEARCH_HOST}:{LANGFLOW_OPENSEARCH_PORT}"# IBM mode: inject OpenSearch Basic credentials as separate global varsfrom config.settings import IBM_AUTH_ENABLED@@ -120,8 +120,8 @@ async def build_mcp_global_vars_from_config(global_vars["SELECTED_EMBEDDING_MODEL"] = config.knowledge.embedding_model# Inject OpenSearch URL so MCP servers always use the correct endpoint- from config.settings import OPENSEARCH_HOST, OPENSEARCH_PORT- global_vars["OPENSEARCH_URL"] = f"https://{OPENSEARCH_HOST}:{OPENSEARCH_PORT}"+ from config.settings import LANGFLOW_OPENSEARCH_HOST, LANGFLOW_OPENSEARCH_PORT+ global_vars["OPENSEARCH_URL"] = f"https://{LANGFLOW_OPENSEARCH_HOST}:{LANGFLOW_OPENSEARCH_PORT}"# IBM mode: inject OpenSearch Basic credentials as separate global varsfrom config.settings import IBM_AUTH_ENABLED