Skip to content

Commit 3d65655

Browse files
cooktheryancooktheryan
committed
Merge branch 'main' of github.com:redhat-et/llama-stack-on-ocp into github_actions
2 parents 77e2af3 + f1bb09d commit 3d65655

38 files changed

Lines changed: 7302 additions & 59 deletions

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
path = submodule
33
[submodule "mcp-servers/ansible/submodule/mcp"]
44
path = mcp-servers/ansible/submodule/mcp
5-
url = https://github.com/cooktheryan/mcp
5+
url = https://github.com/suppathak/mcp

‎LICENSE‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2024 Red Hat, Inc.
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ build_ui:
88
podman build -t streamlit_client:latest --platform="linux/amd64" -f app/src/build/Containerfile .
99

1010
run_ui:
11-
podman run -it -p 8501:8501 streamlit_client:latest
11+
podman run -it -p 8501:8501 --env LLAMA_STACK_ENDPOINT=$(LLAMA_STACK_ENDPOINT) streamlit_client:latest
12+
1213
run_mcp:
1314
python build_mcp/mcp_tools.py
1415

@@ -17,5 +18,4 @@ run_mcp_container:
1718

1819
setup_local:
1920
ollama run llama3.2:3b-instruct-fp16 --keepalive 160m &
20-
podman run -it -p 8321:8321 -v ~/.llama:/root/.llama localhost/distribution-ollama:0.1.7 --port 8321 --env INFERENCE_MODEL="meta-llama/Llama-3.2-3B-Instruct" --env OLLAMA_URL=http://host.containers.internal:11434
21-
21+
podman run -it -p 8321:8321 -v ~/.llama:/root/.llama localhost/distribution-ollama:0.1.7 --port 8321 --env INFERENCE_MODEL="meta-llama/Llama-3.2-3B-Instruct" --env OLLAMA_URL=http://host.containers.internal:11434

‎README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
11
# Llama Stack on OCP
2+
3+
## Requirements
4+
The following scenario requires at minimum the following:
5+
6+
* OpenShift Cluster 4.17+
7+
* 8 GPUs free (A100 or H100)
8+
9+
## Deploy
10+
A `kustomization.yaml` file exists to launch all required Kubernetes objects for the scenarios defined in the repository. To create run the following.
11+
12+
```
13+
oc create project llama-serve
14+
oc apply -k kustomization.yaml
15+
```

‎app/src/build/Containerfile‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
# More info on playground configuration can be found here:
2+
# https://llama-stack.readthedocs.io/en/latest/playground
3+
14
FROM registry.access.redhat.com/ubi9/python-311:latest
25
WORKDIR /app
3-
RUN pip install --upgrade pip
4-
RUN pip install --no-cache-dir --upgrade streamlit
5-
COPY app/src/streamlit_app.py .
6+
RUN git clone --depth 1 --branch playground https://github.com/MichaelClifford/llama-stack.git
7+
RUN pip install --upgrade pip && \
8+
pip install /app/llama-stack && \
9+
pip install -r /app/llama-stack/llama_stack/distribution/ui/requirements.txt
610
EXPOSE 8501
7-
ENTRYPOINT [ "streamlit", "run", "streamlit_app.py" ]
11+
12+
ENTRYPOINT ["streamlit", "run", "/app/llama-stack/llama_stack/distribution/ui/app.py", "--server.port=8501", "--server.address=0.0.0.0"]

‎app/src/streamlit_app.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import streamlit as st
2-
from llama_stack_client.lib.agents.agent import Agent
3-
from llama_stack_client import LlamaStackClient, APIConnectionError
2+
from llama_stack_client import LlamaStackClient, Agent, APIConnectionError
43
from dotenv import load_dotenv
54
import os
65
import uuid
@@ -46,7 +45,7 @@ def reset_agent():
4645

4746
active_tool_list = []
4847
for toolgroup_id in toolgroup_selection:
49-
active_tool_list.extend([t.identifier for t in client.tools.list(toolgroup_id=toolgroup_id)])
48+
active_tool_list.extend([f"{toolgroup_id[5:]}:{t.identifier}" for t in client.tools.list(toolgroup_id=toolgroup_id)])
5049

5150
st.markdown(f"Active Tools: 🛠 {len(active_tool_list)}")
5251
st.json(active_tool_list)

‎kubernetes/kustomization.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
namespace: llama-serve
4+
resources:
5+
# llama-serve resources
6+
- llama-serve/granite-8b/chat-template.yaml
7+
- llama-serve/granite-8b/route.yaml
8+
- llama-serve/granite-8b/service.yaml
9+
- llama-serve/granite-8b/vllm.yaml
10+
- llama-serve/llama3.1-70b/chat-template.yaml
11+
- llama-serve/llama3.1-70b/route.yaml
12+
- llama-serve/llama3.1-70b/service.yaml
13+
- llama-serve/llama3.1-70b/vllm.yaml
14+
- llama-serve/llama3.2-3b/chat-template.yaml
15+
- llama-serve/llama3.2-3b/route.yaml
16+
- llama-serve/llama3.2-3b/service.yaml
17+
- llama-serve/llama3.2-3b/vllm.yaml
18+
- llama-serve/watt-8b/chat-template.yaml
19+
- llama-serve/watt-8b/route.yaml
20+
- llama-serve/watt-8b/service.yaml
21+
- llama-serve/watt-8b/vllm.yaml
22+
23+
# llama-stack resources
24+
- llama-stack/configmap.yaml
25+
- llama-stack/deployment.yaml
26+
- llama-stack/pvc.yaml
27+
- llama-stack/route.yaml
28+
- llama-stack/service.yaml
29+
- llama-stack/template.yaml
30+
31+
# safety-model resources
32+
- safety-model/svc.yaml
33+
- safety-model/vllm.yaml
34+
35+
# streamlit-client resources
36+
- streamlit-client/deployment.yaml
37+
- streamlit-client/route.yaml
38+
- streamlit-client/service.yaml
39+
- streamlit-client/serviceacount.yaml
40+
41+
# mcp-servers resources
42+
- mcp-servers/ansible-mcp
43+
- mcp-servers/custom-mcp
44+
- mcp-servers/github-mcp
45+
- mcp-servers/openshift-mcp

‎kubernetes/llama-serve/granite-8b/chat-template.yaml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
kind: ConfigMap
12
apiVersion: v1
23
metadata:
34
name: granite-8b-template
@@ -40,8 +41,4 @@ data:
4041
{%- if loop.last and add_generation_prompt %}
4142
{{- '<|start_of_role|>assistant<|end_of_role|>' }}
4243
{%- endif %}
43-
{%- endfor %}
44-
kind: ConfigMap
45-
metadata:
46-
creationTimestamp: null
47-
name: granite-chat
44+
{%- endfor %}

‎kubernetes/llama-serve/llama3.1-70b/vllm.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ spec:
1515
labels:
1616
app: llama31-70b
1717
spec:
18-
nodeSelector:
19-
kubernetes.io/hostname: wrk-5
2018
volumes:
2119
- name: hf-cache
2220
emptyDir: {}
@@ -65,7 +63,7 @@ spec:
6563
- --gpu-memory-utilization
6664
- "0.95" # Prevent OOM errors
6765
- --quantization
68-
- "fp8"
66+
- "fp8"
6967
- --max-num-batched-tokens
7068
- "4096" # Control memory usage
7169
- --enable-auto-tool-choice # Keeping your tool settings
@@ -76,17 +74,14 @@ spec:
7674
- --port
7775
- "8000"
7876
- --swap-space
79-
- "32"
77+
- "32"
8078
restartPolicy: Always
8179
terminationGracePeriodSeconds: 30
8280
dnsPolicy: ClusterFirst
83-
nodeSelector:
84-
kubernetes.io/hostname: wrk-5
8581
securityContext: {}
8682
schedulerName: default-scheduler
8783
strategy:
8884
type: RollingUpdate
8985
rollingUpdate:
9086
maxUnavailable: 25%
9187
maxSurge: 25%
92-

‎kubernetes/llama-serve/watt-8b/vllm.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
app: watt-8b
77
spec:
8-
replicas: 1
8+
replicas: 0
99
selector:
1010
matchLabels:
1111
app: watt-8b
@@ -70,13 +70,10 @@ spec:
7070
restartPolicy: Always
7171
terminationGracePeriodSeconds: 30
7272
dnsPolicy: ClusterFirst
73-
nodeSelector:
74-
kubernetes.io/hostname: wrk-5
7573
securityContext: {}
7674
schedulerName: default-scheduler
7775
strategy:
7876
type: RollingUpdate
7977
rollingUpdate:
8078
maxUnavailable: 25%
8179
maxSurge: 25%
82-

0 commit comments

Comments
 (0)