Skip to content

Commit 708b2c1

Browse files
iamemilioiamemilio
authored
Merge branch 'main' into responses_object
2 parents 80b82c0 + eed25fc commit 708b2c1

File tree

166 files changed

+6951
-816
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+6951
-816
lines changed

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ updates:
99
day: "saturday"
1010
commit-message:
1111
prefix: chore(github-deps)
12+
1213
- package-ecosystem: "uv"
1314
directory: "/"
1415
schedule:
@@ -19,3 +20,14 @@ updates:
1920
- python
2021
commit-message:
2122
prefix: chore(python-deps)
23+
24+
- package-ecosystem: npm
25+
directory: "/llama_stack/ui"
26+
schedule:
27+
interval: "weekly"
28+
day: "saturday"
29+
labels:
30+
- type/dependencies
31+
- javascript
32+
commit-message:
33+
prefix: chore(ui-deps)

‎.github/workflows/changelog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
pull-requests: write # for peter-evans/create-pull-request to create a PR
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121
with:
2222
ref: main
2323
fetch-depth: 0

‎.github/workflows/install-script-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
lint:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
19+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
2020
- name: Run ShellCheck on install.sh
2121
run: shellcheck scripts/install.sh
2222
smoke-test-on-dev:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
26+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2727

2828
- name: Install dependencies
2929
uses: ./.github/actions/setup-runner

‎.github/workflows/integration-auth-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- '.github/workflows/integration-auth-tests.yml' # This workflow
1919

2020
concurrency:
21-
group: ${{ github.workflow }}-${{ github.ref }}
21+
group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}
2222
cancel-in-progress: true
2323

2424
jobs:
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3535

3636
- name: Install dependencies
3737
uses: ./.github/actions/setup-runner

‎.github/workflows/integration-sql-store-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
- '.github/workflows/integration-sql-store-tests.yml' # This workflow
1717

1818
concurrency:
19-
group: ${{ github.workflow }}-${{ github.ref }}
19+
group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}
2020
cancel-in-progress: true
2121

2222
jobs:
@@ -44,7 +44,7 @@ jobs:
4444
4545
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
47+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4848

4949
- name: Install dependencies
5050
uses: ./.github/actions/setup-runner

‎.github/workflows/integration-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565

6666
steps:
6767
- name: Checkout repository
68-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
68+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6969

7070
- name: Setup test environment
7171
uses: ./.github/actions/setup-test-environment

‎.github/workflows/integration-vector-io-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
steps:
3535
- name: Checkout repository
36-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3737

3838
- name: Install dependencies
3939
uses: ./.github/actions/setup-runner

‎.github/workflows/pre-commit.yml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches: [main]
99

1010
concurrency:
11-
group: ${{ github.workflow }}-${{ github.ref }}
11+
group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}
1212
cancel-in-progress: true
1313

1414
jobs:
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
23+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2424
with:
2525
# For dependabot PRs, we need to checkout with a token that can push changes
2626
token: ${{ github.actor == 'dependabot[bot]' && secrets.GITHUB_TOKEN || github.token }}
@@ -36,20 +36,16 @@ jobs:
3636
**/requirements*.txt
3737
.pre-commit-config.yaml
3838
39-
# npm ci may fail -
40-
# npm error `npm ci` can only install packages when your package.json and package-lock.json or npm-shrinkwrap.json are in sync. Please update your lock file with `npm install` before continuing.
41-
# npm error Invalid: lock file's [email protected] does not satisfy [email protected]
42-
43-
# - name: Set up Node.js
44-
# uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
45-
# with:
46-
# node-version: '20'
47-
# cache: 'npm'
48-
# cache-dependency-path: 'llama_stack/ui/'
39+
- name: Set up Node.js
40+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
41+
with:
42+
node-version: '20'
43+
cache: 'npm'
44+
cache-dependency-path: 'llama_stack/ui/'
4945

50-
# - name: Install npm dependencies
51-
# run: npm ci
52-
# working-directory: llama_stack/ui
46+
- name: Install npm dependencies
47+
run: npm ci
48+
working-directory: llama_stack/ui
5349

5450
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
5551
continue-on-error: true

‎.github/workflows/providers-build.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
- 'pyproject.toml'
2727

2828
concurrency:
29-
group: ${{ github.workflow }}-${{ github.ref }}
29+
group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}
3030
cancel-in-progress: true
3131

3232
jobs:
@@ -36,7 +36,7 @@ jobs:
3636
distros: ${{ steps.set-matrix.outputs.distros }}
3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
39+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4040

4141
- name: Generate Distribution List
4242
id: set-matrix
@@ -55,7 +55,7 @@ jobs:
5555

5656
steps:
5757
- name: Checkout repository
58-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
58+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5959

6060
- name: Install dependencies
6161
uses: ./.github/actions/setup-runner
@@ -79,7 +79,7 @@ jobs:
7979
runs-on: ubuntu-latest
8080
steps:
8181
- name: Checkout repository
82-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
82+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
8383

8484
- name: Install dependencies
8585
uses: ./.github/actions/setup-runner
@@ -92,7 +92,7 @@ jobs:
9292
runs-on: ubuntu-latest
9393
steps:
9494
- name: Checkout repository
95-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
95+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9696

9797
- name: Install dependencies
9898
uses: ./.github/actions/setup-runner
@@ -106,6 +106,10 @@ jobs:
106106
- name: Inspect the container image entrypoint
107107
run: |
108108
IMAGE_ID=$(docker images --format "{{.Repository}}:{{.Tag}}" | head -n 1)
109+
if [ -z "$IMAGE_ID" ]; then
110+
echo "No image found"
111+
exit 1
112+
fi
109113
entrypoint=$(docker inspect --format '{{ .Config.Entrypoint }}' $IMAGE_ID)
110114
echo "Entrypoint: $entrypoint"
111115
if [ "$entrypoint" != "[python -m llama_stack.core.server.server /app/run.yaml]" ]; then
@@ -117,7 +121,7 @@ jobs:
117121
runs-on: ubuntu-latest
118122
steps:
119123
- name: Checkout repository
120-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
124+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
121125

122126
- name: Install dependencies
123127
uses: ./.github/actions/setup-runner
@@ -140,6 +144,10 @@ jobs:
140144
- name: Inspect UBI9 image
141145
run: |
142146
IMAGE_ID=$(docker images --format "{{.Repository}}:{{.Tag}}" | head -n 1)
147+
if [ -z "$IMAGE_ID" ]; then
148+
echo "No image found"
149+
exit 1
150+
fi
143151
entrypoint=$(docker inspect --format '{{ .Config.Entrypoint }}' $IMAGE_ID)
144152
echo "Entrypoint: $entrypoint"
145153
if [ "$entrypoint" != "[python -m llama_stack.core.server.server /app/run.yaml]" ]; then

‎.github/workflows/python-build-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2525

2626
- name: Install uv
27-
uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc # v6.4.3
27+
uses: astral-sh/setup-uv@4959332f0f014c5280e7eac8b70c90cb574c9f9b # v6.6.0
2828
with:
2929
python-version: ${{ matrix.python-version }}
3030
activate-environment: true

0 commit comments

Comments
 (0)