Skip to content

Commit cf622fa

Browse files
committed
TEMP update chatbot
1 parent 4185610 commit cf622fa

16 files changed

+29
-31
lines changed

all.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
spec:
77
targets:
88
- ./templates/codegen/template.yaml
9-
- ./templates/chatbot/template.yaml
9+
- ./templates/chatbot2/template.yaml
1010
- ./templates/audio-to-text/template.yaml
1111
- ./templates/object-detection/template.yaml
1212
- ./templates/rag/template.yaml
File renamed without changes.

templates/chatbot/template.yaml templates/chatbot2/template.yaml

+28-30
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: scaffolder.backstage.io/v1beta3
22
# https://backstage.io/docs/features/software-catalog/descriptor-format#kind-template
33
kind: Template
44
metadata:
5-
name: chatbot
6-
title: Chatbot Application
5+
name: chatbot2
6+
title: Chatbot Application 2
77
description: Build your own Large language model (LLM)-enabled chat application. Pick from the model servers available or bring your own.
88
tags: ["ai", "llamacpp", "vllm", "python"]
99
spec:
@@ -40,14 +40,14 @@ spec:
4040
title: Model Server
4141
description: |
4242
llama.cpp: A Python binding of LLM inference in C/C++ with minimal setup. | [Learn more](https://github.com/containers/ai-lab-recipes/tree/main/model_servers/llamacpp_python)
43-
43+
4444
vLLM: A high throughput, memory efficient inference and serving engine with GPU support for LLMs in OpenShift. If you choose vLLM, ensure that your cluster has Nvidia GPU supported (with compute capability 7.0 or higher). Also, it should have enough CPU & memory resources for the model you would like to work with. | [Learn more](https://github.com/rh-aiservices-bu/llm-on-openshift/tree/main/llm-servers/vllm/gpu)
4545
default: llama.cpp
4646
type: string
4747
enum:
4848
- vLLM
4949
- llama.cpp
50-
# SED_LLM_SERVER_END
50+
# SED_LLM_SERVER_END
5151
- Existing model server
5252
dependencies:
5353
modelServer:
@@ -59,7 +59,7 @@ spec:
5959
# SED_LLM_SERVER_END
6060
properties:
6161
modelServer:
62-
const: Existing model server
62+
const: Existing model server
6363
modelEndpoint:
6464
title: Model Server Endpoint
6565
type: string
@@ -150,7 +150,7 @@ spec:
150150
- githubServer
151151
properties:
152152
hostType:
153-
const: GitHub
153+
const: GitHub
154154
githubServer:
155155
title: Repository Server
156156
type: string
@@ -160,7 +160,7 @@ spec:
160160
- gitlabServer
161161
properties:
162162
hostType:
163-
const: GitLab
163+
const: GitLab
164164
gitlabServer:
165165
title: Repository Server
166166
type: string
@@ -222,7 +222,7 @@ spec:
222222
appPort: 8501
223223
appRunCommand: "streamlit run chatbot_ui.py"
224224
modelServiceContainer: quay.io/ai-lab/llamacpp_python:latest
225-
modelServicePort: 8001
225+
modelServicePort: 8001
226226
# Renders all the template variables into the files and directory names and content, and places the result in the workspace.
227227
- id: fetch-skeleton
228228
name: Fetch Skeleton
@@ -233,14 +233,14 @@ spec:
233233
values:
234234
name: ${{ parameters.name }}
235235
namespace: ${{ parameters.namespace }}
236-
description: Secure Supply Chain Example for Chatbot Application
236+
description: Secure Supply Chain Example for Chatbot Application
237237
dockerfile: Containerfile
238238
buildContext: .
239239
gitopsSecretName: ${{ 'gitops-auth-secret' if parameters.hostType === 'GitHub' else 'gitlab-auth-secret' }}
240-
image: '${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}'
240+
image: "${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}"
241241
tags: '["ai", "llamacpp", "vllm", "python"]'
242-
owner: ${{ parameters.owner }}
243-
repoSlug: '${{ parameters.imageOrg }}/${{ parameters.imageName }}'
242+
owner: ${{ parameters.owner }}
243+
repoSlug: "${{ parameters.imageOrg }}/${{ parameters.imageName }}"
244244
defaultBranch: ${{ parameters.branch }}
245245
- id: fetch-github-action
246246
name: Fetch GitHub Action
@@ -256,7 +256,7 @@ spec:
256256
if: ${{ parameters.hostType === 'GitHub' }}
257257
input:
258258
sourcePath: source
259-
allowedHosts: [ '${{ parameters.githubServer}}' ]
259+
allowedHosts: ["${{ parameters.githubServer}}"]
260260
description: This is ${{ parameters.name }}
261261
repoUrl: ${{ parameters.githubServer }}?owner=${{ parameters.repoOwner }}&repo=${{ parameters.repoName }}
262262
defaultBranch: ${{ parameters.branch }}
@@ -273,7 +273,7 @@ spec:
273273
if: ${{ parameters.hostType === 'GitLab' }}
274274
input:
275275
sourcePath: source
276-
allowedHosts: [ '${{ parameters.gitlabServer }}' ]
276+
allowedHosts: ["${{ parameters.gitlabServer }}"]
277277
description: This is ${{ parameters.name }}
278278
repoUrl: ${{ parameters.gitlabServer }}?owner=${{ parameters.repoOwner }}&repo=${{ parameters.repoName }}
279279
defaultBranch: ${{ parameters.branch }}
@@ -296,11 +296,11 @@ spec:
296296
# example: github.com?owner=<owner>&repo=<srcRepo>, the gitops repo name will be <srcRepo>-gitops
297297
repoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops
298298
srcRepoURL: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}
299-
argoComponentOverlays: './components/${{ parameters.name }}/overlays'
300-
owner: ${{ parameters.owner }}
299+
argoComponentOverlays: "./components/${{ parameters.name }}/overlays"
300+
owner: ${{ parameters.owner }}
301301
image: quay.io/redhat-appstudio/dance-bootstrap-app:latest # bootstrap app image as placeholder
302302
# actual src image, should be used by tekton PR pipeline to update the image in gitops repo
303-
srcImage: '${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}'
303+
srcImage: "${{ parameters.imageRegistry }}/${{ parameters.imageOrg }}/${{ parameters.imageName }}"
304304
argoNS: ai-rhdh
305305
argoProject: default
306306
secretRef: ${{ parameters.hostType === 'GitLab' }}
@@ -344,9 +344,9 @@ spec:
344344
if: ${{ parameters.hostType === 'GitHub' }}
345345
input:
346346
sourcePath: gitops
347-
allowedHosts: ['${{ parameters.githubServer }}']
347+
allowedHosts: ["${{ parameters.githubServer }}"]
348348
description: This is GitOps repository for ${{ parameters.name }}
349-
repoUrl: ${{ parameters.githubServer }}?owner=${{ parameters.repoOwner }}&repo=${{ parameters.repoName }}-gitops
349+
repoUrl: ${{ parameters.githubServer }}?owner=${{ parameters.repoOwner }}&repo=${{ parameters.repoName }}-gitops
350350
defaultBranch: "main"
351351
protectDefaultBranch: false
352352
repoVisibility: "public"
@@ -357,29 +357,29 @@ spec:
357357
if: ${{ parameters.hostType === 'GitLab' }}
358358
input:
359359
sourcePath: gitops
360-
allowedHosts: ['${{ parameters.gitlabServer }}']
360+
allowedHosts: ["${{ parameters.gitlabServer }}"]
361361
description: This is GitOps repository for ${{ parameters.name }}
362-
repoUrl: ${{ parameters.gitlabServer }}?owner=${{ parameters.repoOwner }}&repo=${{ parameters.repoName }}-gitops
362+
repoUrl: ${{ parameters.gitlabServer }}?owner=${{ parameters.repoOwner }}&repo=${{ parameters.repoName }}-gitops
363363
defaultBranch: "main"
364364
protectDefaultBranch: false
365365
repoVisibility: "public"
366366
- id: wait-for-github-repository
367367
name: Waiting for Repository Availability
368-
action: 'debug:wait'
368+
action: "debug:wait"
369369
input:
370370
seconds: 3
371371
- id: register
372372
name: Register
373373
action: catalog:register
374374
input:
375375
repoContentsUrl: ${{ steps['publish-github'].output.repoContentsUrl if steps['publish-github'].output else steps['publish-gitlab'].output.repoContentsUrl }}
376-
catalogInfoPath: '/catalog-info.yaml'
376+
catalogInfoPath: "/catalog-info.yaml"
377377
- id: register-gitops
378378
name: Register Gitops
379379
action: catalog:register
380380
input:
381381
repoContentsUrl: ${{ steps['publish-github-gitops'].output.repoContentsUrl if steps['publish-github-gitops'].output else steps['publish-gitlab-gitops'].output.repoContentsUrl }}
382-
catalogInfoPath: '/catalog-info.yaml'
382+
catalogInfoPath: "/catalog-info.yaml"
383383
- id: create-argocd-resources
384384
name: Create ArgoCD Resources
385385
action: argocd:create-resources
@@ -389,7 +389,7 @@ spec:
389389
argoInstance: default
390390
namespace: ai-rhdh
391391
repoUrl: https://${{ parameters.githubServer if parameters.hostType === 'GitHub' else parameters.gitlabServer }}/${{ parameters.repoOwner }}/${{ parameters.repoName }}-gitops.git
392-
path: './app-of-apps'
392+
path: "./app-of-apps"
393393
# PR with empty commit
394394
- id: trigger-build-pr
395395
name: PR to Trigger Pipeline Build
@@ -412,10 +412,8 @@ spec:
412412
repoUrl: ${{ parameters.githubServer }}?owner=${{ parameters.repoOwner }}&repo=${{ parameters.repoName }}
413413
branchOrTagName: ${{ parameters.branch }}
414414
workflowId: automerge.yml
415-
workflowInputs: {
416-
pr_url: "${{ steps['trigger-build-pr'].output.remoteUrl }}"
417-
}
418-
415+
workflowInputs:
416+
{ pr_url: "${{ steps['trigger-build-pr'].output.remoteUrl }}" }
419417

420418
# Outputs are displayed to the user after a successful execution of the template.
421419
output:
@@ -429,4 +427,4 @@ spec:
429427
entityRef: ${{ steps['register'].output.entityRef }}
430428
- title: Open GitOps Resource in Catalog
431429
icon: catalog
432-
entityRef: ${{ steps['register-gitops'].output.entityRef }}
430+
entityRef: ${{ steps['register-gitops'].output.entityRef }}

0 commit comments

Comments
 (0)