Skip to content

requirements: mark ollama as optional #1752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −10
Open

requirements: mark ollama as optional #1752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion ansible_ai_connect/ai/api/model_pipelines/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import logging

import ansible_ai_connect.ai.api.model_pipelines.dummy.configuration # noqa
import ansible_ai_connect.ai.api.model_pipelines.dummy.pipelines # noqa
import ansible_ai_connect.ai.api.model_pipelines.http.configuration # noqa
Expand All @@ -10,7 +12,6 @@
import ansible_ai_connect.ai.api.model_pipelines.nop.configuration # noqa
import ansible_ai_connect.ai.api.model_pipelines.nop.pipelines # noqa
import ansible_ai_connect.ai.api.model_pipelines.ollama.configuration # noqa
import ansible_ai_connect.ai.api.model_pipelines.ollama.pipelines # noqa
import ansible_ai_connect.ai.api.model_pipelines.wca.configuration_dummy # noqa
import ansible_ai_connect.ai.api.model_pipelines.wca.configuration_onprem # noqa
import ansible_ai_connect.ai.api.model_pipelines.wca.configuration_saas # noqa
Expand All @@ -19,4 +20,10 @@
import ansible_ai_connect.ai.api.model_pipelines.wca.pipelines_saas # noqa
from ansible_ai_connect.ai.api.model_pipelines.registry import set_defaults

logger = logging.getLogger(__name__)
try:
import ansible_ai_connect.ai.api.model_pipelines.ollama.pipelines # noqa
except ModuleNotFoundError:
logger.info("ollama support disabled because dependencies are missing")

set_defaults()
2 changes: 1 addition & 1 deletion ansible_ai_connect/ai/api/model_pipelines/registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def v_or_default(k, v):
defaults = REGISTRY["nop"]
if v is None:
logger.debug(
f"'{k.alias()}' is not available for provider '{pipeline_provider}',"
f"'{k}' is not available for provider '{pipeline_provider}',"
" failing back to 'nop'"
)
return defaults[k]
Expand Down
4 changes: 3 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ dependencies = [
'jwcrypto~=1.5.6',
'jinja2~=3.1.6',
'langchain~=0.3.10',
'langchain-ollama~=0.3.5',
'launchdarkly-server-sdk~=8.3.0',
'llama-stack-client>=0.2.12',
'protobuf~=5.29.5',
Expand Down Expand Up @@ -58,6 +57,9 @@ classifiers = [
"Programming Language :: Python :: 3",
]

[project.optional-dependencies]
ollama = ['langchain-ollama~=0.3.5']

[project.urls]
Homepage = "https://github.com/ansible/ansible-ai-connect-service"

Expand Down
3 changes: 0 additions & 3 deletions requirements-aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ langchain-core==0.3.69
# langchain
# langchain-ollama
# langchain-text-splitters
langchain-ollama==0.3.5
# via -r requirements.in
langchain-text-splitters==0.3.8
# via langchain
Expand Down Expand Up @@ -297,8 +296,6 @@ oauthlib==3.2.2
# social-auth-core
odfpy==1.4.1
# via tablib
ollama==0.5.1
# via langchain-ollama
openpyxl==3.1.2
# via tablib
orjson==3.10.1
Expand Down
3 changes: 0 additions & 3 deletions requirements-x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ langchain-core==0.3.69
# langchain
# langchain-ollama
# langchain-text-splitters
langchain-ollama==0.3.5
# via -r requirements.in
langchain-text-splitters==0.3.8
# via langchain
Expand Down Expand Up @@ -297,8 +296,6 @@ oauthlib==3.2.2
# social-auth-core
odfpy==1.4.1
# via tablib
ollama==0.5.1
# via langchain-ollama
openpyxl==3.1.2
# via tablib
orjson==3.10.1
Expand Down
1 change: 0 additions & 1 deletion requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jinja2==3.1.6
# remove this once ansible-risk-insight is updated
jsonpickle==3.3.0
langchain==0.3.26
langchain-ollama==0.3.5
launchdarkly-server-sdk==8.3.0
llama-stack-client>=0.2.12
protobuf==5.29.5
Expand Down
Loading