Skip to content

Commit b535695

Browse files
authored
feat: fully switch to external provider module method (#37)
# What does this PR do? delete `providers.d` and depend on `module` for build and run. also delete `external_provider_dir` from both build and run yaml. this forces `build.py` to only install uv pip install llama_stack_provider_lmeval==0.2.4 uv pip install llama_stack_provider_trustyai_fms==0.2.2 rather than also grabbing dependencies like `kubernetes` <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - Refactor - Consolidated provider configuration into the main distribution; removed use of an external providers directory and no longer populating a separate providers folder in builds. - Chores - Bundled safety provider pinned to 0.2.2 and evaluation provider pinned to 0.2.4 in the distribution runtime. - Removals - Removed standalone adapter registrations for the Trustyai LMEval and Trustyai FMS providers; provided via bundled modules. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents 80e4bf6 + 280f967 commit b535695

File tree

6 files changed

+4
-20
lines changed

6 files changed

+4
-20
lines changed

distribution/Containerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ RUN pip install \
4545
RUN pip install --extra-index-url https://download.pytorch.org/whl/cpu torch torchao>=0.12.0 torchvision
4646
RUN pip install --no-deps sentence-transformers
4747
RUN pip install --no-cache llama-stack==0.2.21
48-
RUN mkdir -p ${HOME}/.llama/providers.d ${HOME}/.cache
48+
RUN mkdir -p ${HOME}/.llama ${HOME}/.cache
4949
COPY distribution/run.yaml ${APP_ROOT}/run.yaml
50-
COPY distribution/providers.d/ ${HOME}/.llama/providers.d/
5150

5251
ENTRYPOINT ["python", "-m", "llama_stack.core.server.server", "/opt/app-root/run.yaml"]

distribution/Containerfile.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ WORKDIR /opt/app-root
44
RUN pip install sqlalchemy # somehow sqlalchemy[asyncio] is not sufficient
55
{dependencies}
66
RUN pip install --no-cache llama-stack==0.2.21
7-
RUN mkdir -p ${{HOME}}/.llama/providers.d ${{HOME}}/.cache
7+
RUN mkdir -p ${{HOME}}/.llama ${{HOME}}/.cache
88
COPY distribution/run.yaml ${{APP_ROOT}}/run.yaml
9-
COPY distribution/providers.d/ ${{HOME}}/.llama/providers.d/
109

1110
ENTRYPOINT ["python", "-m", "llama_stack.core.server.server", "/opt/app-root/run.yaml"]

distribution/build.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,3 @@ additional_pip_packages:
4242
- psycopg2-binary
4343
image_type: container
4444
image_name: llama-stack-rh
45-
external_providers_dir: distribution/providers.d

distribution/providers.d/remote/eval/trustyai_lmeval.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

distribution/providers.d/remote/safety/trustyai_fms.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

distribution/run.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ providers:
6868
safety:
6969
- provider_id: trustyai_fms
7070
provider_type: remote::trustyai_fms
71+
module: llama_stack_provider_trustyai_fms==0.2.2
7172
config:
7273
orchestrator_url: ${env.FMS_ORCHESTRATOR_URL:=}
7374
ssl_cert_path: ${env.FMS_SSL_CERT_PATH:=}
@@ -86,6 +87,7 @@ providers:
8687
eval:
8788
- provider_id: trustyai_lmeval
8889
provider_type: remote::trustyai_lmeval
90+
module: llama_stack_provider_lmeval==0.2.4
8991
config:
9092
use_k8s: ${env.TRUSTYAI_LMEVAL_USE_K8S:=true}
9193
base_url: ${env.VLLM_URL:=http://localhost:8000/v1}
@@ -177,4 +179,3 @@ tool_groups:
177179
provider_id: rag-runtime
178180
server:
179181
port: 8321
180-
external_providers_dir: /opt/app-root/src/.llama/providers.d

0 commit comments

Comments
 (0)