jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: Ollama Model Component build config updates and formats info to prevent issues in DSLF. (#5978)

Browse source 
* Update ollama.py

* update ib build config

* [autofix.ci] apply automated fixes

* improves stability of build config.

* [autofix.ci] apply automated fixes

* Update ollama.py

* test: update ChatOllamaComponent test to validate Ollama URL handling

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Gabriel Luiz Freitas Almeida <gabriel@langflow.org>
This commit is contained in:
Edwin Jose 2025-01-28 17:38:08 -05:00 • committed by GitHub
commit b2ef231cd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/backend/base/langflow/components/models/ollama.py
View file

@ -23,7 +23,7 @@ class ChatOllamaComponent(LCModelComponent):
MessageTextInput( MessageTextInput(
name="base_url", name="base_url",
display_name="Base URL", display_name="Base URL",
info="Endpoint of the Ollama API. Defaults to 'http://localhost:11434' if not specified.", info="Endpoint of the Ollama API.",
value="", value="",
), ),
DropdownInput( DropdownInput(
@ -114,9 +114,6 @@ class ChatOllamaComponent(LCModelComponent):
MessageTextInput( MessageTextInput(
name="system", display_name="System", info="System to use for generating text.", advanced=True name="system", display_name="System", info="System to use for generating text.", advanced=True
), ),
MessageTextInput(
name="template", display_name="Template", info="Template to use for generating text.", advanced=True
),
BoolInput( BoolInput(
name="tool_model_enabled", name="tool_model_enabled",
display_name="Tool Model Enabled", display_name="Tool Model Enabled",
@ -124,6 +121,9 @@ class ChatOllamaComponent(LCModelComponent):
value=True, value=True,
real_time_refresh=True, real_time_refresh=True,
), ),
MessageTextInput(
name="template", display_name="Template", info="Template to use for generating text.", advanced=True
),
*LCModelComponent._base_inputs, *LCModelComponent._base_inputs,
] ]
@ -160,12 +160,12 @@ class ChatOllamaComponent(LCModelComponent):
"temperature": self.temperature or None, "temperature": self.temperature or None,
"stop": self.stop_tokens.split(",") if self.stop_tokens else None, "stop": self.stop_tokens.split(",") if self.stop_tokens else None,
"system": self.system, "system": self.system,
"template": self.template,
"tfs_z": self.tfs_z or None, "tfs_z": self.tfs_z or None,
"timeout": self.timeout or None, "timeout": self.timeout or None,
"top_k": self.top_k or None, "top_k": self.top_k or None,
"top_p": self.top_p or None, "top_p": self.top_p or None,
"verbose": self.verbose, "verbose": self.verbose,
"template": self.template,
} }
# Remove parameters with None values # Remove parameters with None values
@ -185,7 +185,7 @@ class ChatOllamaComponent(LCModelComponent):
async def is_valid_ollama_url(self, url: str) -> bool: async def is_valid_ollama_url(self, url: str) -> bool:
try: try:
async with httpx.AsyncClient() as client: async with httpx.AsyncClient() as client:
return (await client.get(f"{url}/api/tags")).status_code == HTTP_STATUS_OK return (await client.get(urljoin(url, "api/tags"))).status_code == HTTP_STATUS_OK
except httpx.RequestError: except httpx.RequestError:
return False return False
@ -208,14 +208,20 @@ class ChatOllamaComponent(LCModelComponent):
build_config["mirostat_eta"]["value"] = 0.1 build_config["mirostat_eta"]["value"] = 0.1
build_config["mirostat_tau"]["value"] = 5 build_config["mirostat_tau"]["value"] = 5
if field_name in {"base_url", "model_name"} and not await self.is_valid_ollama_url(field_value): if field_name in {"base_url", "model_name"} and not await self.is_valid_ollama_url(
build_config["base_url"].get("value", "")
):
# Check if any URL in the list is valid # Check if any URL in the list is valid
valid_url = "" valid_url = ""
for url in URL_LIST: for url in URL_LIST:
if await self.is_valid_ollama_url(url): if await self.is_valid_ollama_url(url):
valid_url = url valid_url = url
break break
build_config["base_url"]["value"] = valid_url if valid_url != "":
build_config["base_url"]["value"] = valid_url
else:
msg = "No valid Ollama URL found."
raise ValueError(msg)
if field_name in {"model_name", "base_url", "tool_model_enabled"}: if field_name in {"model_name", "base_url", "tool_model_enabled"}:
if await self.is_valid_ollama_url(self.base_url): if await self.is_valid_ollama_url(self.base_url):
tool_model_enabled = build_config["tool_model_enabled"].get("value", False) or self.tool_model_enabled tool_model_enabled = build_config["tool_model_enabled"].get("value", False) or self.tool_model_enabled
@ -241,7 +247,7 @@ class ChatOllamaComponent(LCModelComponent):
async def get_model(self, base_url_value: str, tool_model_enabled: bool | None = None) -> list[str]: async def get_model(self, base_url_value: str, tool_model_enabled: bool | None = None) -> list[str]:
try: try:
url = urljoin(base_url_value, "/api/tags") url = urljoin(base_url_value, "api/tags")
async with httpx.AsyncClient() as client: async with httpx.AsyncClient() as client:
response = await client.get(url) response = await client.get(url)
response.raise_for_status() response.raise_for_status()

5
src/backend/tests/unit/components/models/test_chatollama_component.py
View file

@ -88,9 +88,8 @@ async def test_update_build_config_model_name(mock_get, component):
field_value = None field_value = None
field_name = "model_name" field_name = "model_name"
updated_config = await component.update_build_config(build_config, field_value, field_name) with pytest.raises(ValueError, match="No valid Ollama URL found"):
await component.update_build_config(build_config, field_value, field_name)
assert updated_config["model_name"]["options"] == []
async def test_update_build_config_keep_alive(component): async def test_update_build_config_keep_alive(component):