gmakstutis/openrag
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into feat/provider-improvements

Browse source
This commit is contained in:
Cole Goldsmith 2025-11-19 14:23:48 -06:00 • committed by GitHub
commit b453d4c144
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 78 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docker-compose-cpu.yml
View file

@ -63,6 +63,11 @@ services:
- OPENSEARCH_USERNAME=admin
- OPENSEARCH_PASSWORD=${OPENSEARCH_PASSWORD}
- OPENAI_API_KEY=${OPENAI_API_KEY}
- ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
- WATSONX_API_KEY=${WATSONX_API_KEY}
- WATSONX_ENDPOINT=${WATSONX_ENDPOINT}
- WATSONX_PROJECT_ID=${WATSONX_PROJECT_ID}
- OLLAMA_ENDPOINT=${OLLAMA_ENDPOINT}
- GOOGLE_OAUTH_CLIENT_ID=${GOOGLE_OAUTH_CLIENT_ID}
- GOOGLE_OAUTH_CLIENT_SECRET=${GOOGLE_OAUTH_CLIENT_SECRET}
- MICROSOFT_GRAPH_OAUTH_CLIENT_ID=${MICROSOFT_GRAPH_OAUTH_CLIENT_ID}
@ -101,6 +106,11 @@ services:
environment:
- LANGFLOW_DEACTIVATE_TRACING=true
- OPENAI_API_KEY=${OPENAI_API_KEY}
- ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
- WATSONX_API_KEY=${WATSONX_API_KEY}
- WATSONX_ENDPOINT=${WATSONX_ENDPOINT}
- WATSONX_PROJECT_ID=${WATSONX_PROJECT_ID}
- OLLAMA_BASE_URL=${OLLAMA_ENDPOINT}
- LANGFLOW_LOAD_FLOWS_PATH=/app/flows
- LANGFLOW_SECRET_KEY=${LANGFLOW_SECRET_KEY}
- JWT=None

10
docker-compose.yml
View file

@ -62,6 +62,11 @@ services:
- OPENSEARCH_USERNAME=admin
- OPENSEARCH_PASSWORD=${OPENSEARCH_PASSWORD}
- OPENAI_API_KEY=${OPENAI_API_KEY}
- ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
- WATSONX_API_KEY=${WATSONX_API_KEY}
- WATSONX_ENDPOINT=${WATSONX_ENDPOINT}
- WATSONX_PROJECT_ID=${WATSONX_PROJECT_ID}
- OLLAMA_ENDPOINT=${OLLAMA_ENDPOINT}
- NVIDIA_DRIVER_CAPABILITIES=compute,utility
- NVIDIA_VISIBLE_DEVICES=all
- GOOGLE_OAUTH_CLIENT_ID=${GOOGLE_OAUTH_CLIENT_ID}
@ -103,6 +108,11 @@ services:
environment:
- LANGFLOW_DEACTIVATE_TRACING=true
- OPENAI_API_KEY=${OPENAI_API_KEY}
- ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
- WATSONX_API_KEY=${WATSONX_API_KEY}
- WATSONX_ENDPOINT=${WATSONX_ENDPOINT}
- WATSONX_PROJECT_ID=${WATSONX_PROJECT_ID}
- OLLAMA_BASE_URL=${OLLAMA_ENDPOINT}
- LANGFLOW_LOAD_FLOWS_PATH=/app/flows
- LANGFLOW_SECRET_KEY=${LANGFLOW_SECRET_KEY}
- JWT=None

4
flows/components/ollama_embedding.json
View file

@ -7,14 +7,14 @@
"tool_mode": false,
"trace_as_input": true,
"trace_as_metadata": true,
"load_from_db": true,
"load_from_db": false,
"list": false,
"list_add_label": "Add More",
"required": true,
"placeholder": "",
"show": true,
"name": "base_url",
"value": "OLLAMA_BASE_URL",
"value": "",
"display_name": "Ollama Base URL",
"advanced": false,
"input_types": ["Message"],

4
flows/components/ollama_llm.json
View file

@ -7,14 +7,14 @@
"tool_mode": false,
"trace_as_input": true,
"trace_as_metadata": true,
"load_from_db": true,
"load_from_db": false,
"list": false,
"list_add_label": "Add More",
"required": false,
"placeholder": "",
"show": true,
"name": "base_url",
"value": "OLLAMA_BASE_URL",
"value": "",
"display_name": "Base URL",
"advanced": false,
"input_types": ["Message"],

4
flows/components/ollama_llm_text.json
View file

@ -7,14 +7,14 @@
"tool_mode": false,
"trace_as_input": true,
"trace_as_metadata": true,
"load_from_db": true,
"load_from_db": false,
"list": false,
"list_add_label": "Add More",
"required": false,
"placeholder": "",
"show": true,
"name": "base_url",
"value": "OLLAMA_BASE_URL",
"value": "",
"display_name": "Base URL",
"advanced": false,
"input_types": ["Message"],

4
flows/openrag_nudges.json
View file

@ -2424,7 +2424,7 @@
],
"list": false,
"list_add_label": "Add More",
"load_from_db": true,
"load_from_db": false,
"name": "ollama_base_url",
"placeholder": "",
"real_time_refresh": true,
@ -2435,7 +2435,7 @@
"trace_as_input": true,
"trace_as_metadata": true,
"type": "str",
"value": "OLLAMA_BASE_URL"
"value": ""
},
"project_id": {
"_input_type": "StrInput",

59
src/services/flows_service.py
View file

@ -816,7 +816,7 @@ class FlowsService:
if not DISABLE_INGEST_WITH_LANGFLOW and embedding_model:
embedding_node, _ = self._find_node_in_flow(flow_data, display_name=OPENAI_EMBEDDING_COMPONENT_DISPLAY_NAME)
if embedding_node:
if self._update_component_fields(
if await self._update_component_fields(
embedding_node, provider, embedding_model, endpoint
):
updates_made.append(f"embedding model: {embedding_model}")
@ -825,14 +825,14 @@ class FlowsService:
if llm_model:
llm_node, _ = self._find_node_in_flow(flow_data, display_name=OPENAI_LLM_COMPONENT_DISPLAY_NAME)
if llm_node:
if self._update_component_fields(
if await self._update_component_fields(
llm_node, provider, llm_model, endpoint
):
updates_made.append(f"llm model: {llm_model}")
# Update LLM component (if exists in this flow)
agent_node, _ = self._find_node_in_flow(flow_data, display_name=AGENT_COMPONENT_DISPLAY_NAME)
if agent_node:
if self._update_component_fields(
if await self._update_component_fields(
agent_node, provider, llm_model, endpoint
):
updates_made.append(f"agent model: {llm_model}")
@ -865,7 +865,7 @@ class FlowsService:
"flow_id": flow_id,
}
def _update_component_fields(
async def _update_component_fields(
self,
component_node,
provider: str,
@ -881,13 +881,54 @@ class FlowsService:
updated = False
provider_name = "IBM watsonx.ai" if provider == "watsonx" else "Ollama" if provider == "ollama" else "Anthropic" if provider == "anthropic" else "OpenAI"
if "agent_llm" in template:
template["agent_llm"]["value"] = provider_name
updated = True
if "provider" in template:
template["provider"]["value"] = provider_name
field_name = "provider" if "provider" in template else "agent_llm"
# Update provider field and call custom_component/update endpoint
if field_name in template:
# First, update the provider value
template[field_name]["value"] = provider_name
# Call custom_component/update endpoint to get updated template
# Only call if code field exists (custom components should have code)
if "code" in template and "value" in template["code"]:
code_value = template["code"]["value"]
field_value = provider_name
try:
update_payload = {
"code": code_value,
"template": template,
"field": field_name,
"field_value": field_value,
"tool_mode": False,
}
response = await clients.langflow_request(
"POST", "/api/v1/custom_component/update", json=update_payload
)
if response.status_code == 200:
response_data = response.json()
# Update template with the new template from response.data
if "template" in response_data:
# Update the template in component_node
component_node["data"]["node"]["template"] = response_data["template"]
# Update local template reference
template = response_data["template"]
logger.info(f"Successfully updated template via custom_component/update for provider: {provider_name}")
else:
logger.warning("Response from custom_component/update missing 'data' field")
else:
logger.warning(
f"Failed to call custom_component/update: HTTP {response.status_code} - {response.text}"
)
except Exception as e:
logger.error(f"Error calling custom_component/update: {str(e)}")
# Continue with manual updates even if API call fails
updated = True
# Update model_name field (common to all providers)
if "model" in template: