Skip to content

Commit 1f5f869

Browse files
committed
Merge branch 'main' into docs
2 parents 55bb5a6 + f3e52ca commit 1f5f869

File tree

311 files changed

+19526
-7576
lines changed

Some content is hidden

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

311 files changed

+19526
-7576
lines changed

.github/workflows/documentation.yml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# Workflow for deploying static documentation
2-
name: Deploy Documentation to Pages
2+
name: Deploy Documentation/Helm to Pages
33

44
on:
55
push:
66
branches:
77
- main
8-
# Limit runs to only when docs change
8+
# Limit runs to only when docs/helm change
99
paths:
10-
- 'docs/**'
10+
- "docs/**"
11+
- "helm/**"
1112

1213
# Allows running this workflow manually
1314
workflow_dispatch:
@@ -34,28 +35,36 @@ jobs:
3435
build:
3536
runs-on: ubuntu-latest
3637
env:
37-
HUGO_VERSION: 0.134.1
38+
HUGO_VERSION: 0.145.0
3839
steps:
3940
- name: Install Hugo CLI
4041
run: |
4142
wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
42-
&& sudo dpkg -i ${{ runner.temp }}/hugo.deb
43+
&& sudo dpkg -i ${{ runner.temp }}/hugo.deb
44+
4345
- name: Install Dart Sass
4446
run: sudo snap install dart-sass
47+
4548
- name: Checkout
4649
uses: actions/checkout@v4
4750
with:
4851
submodules: recursive
4952
fetch-depth: 0
53+
5054
- name: Download Hugo Theme
5155
run: |
5256
mkdir -p docs/themes/relearn \
53-
&& wget -qO- $(curl -s https://api.github.com/repos/McShelby/hugo-theme-relearn/releases/latest | grep "tarball_url" | awk -F'"' '{print $4}') | tar --exclude='*/exampleSite' -xz -C docs/themes/relearn --strip-components=1
57+
&& curl -L $(curl -s https://api.github.com/repos/McShelby/hugo-theme-relearn/releases/latest \
58+
| grep "tarball_url" | cut -d '"' -f 4) \
59+
| tar -xz -C docs/themes/relearn --strip-components=1 --exclude='*/exampleSite'
60+
5461
- name: Setup Pages
5562
id: pages
5663
uses: actions/configure-pages@v5
64+
5765
- name: Install Node.js dependencies
5866
run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
67+
5968
- name: Build with Hugo
6069
env:
6170
HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache
@@ -66,7 +75,14 @@ jobs:
6675
--gc \
6776
--minify \
6877
--source docs \
69-
--baseURL "${{ steps.pages.outputs.base_url }}/"
78+
--baseURL "${{ steps.pages.outputs.base_url }}/"
79+
80+
- name: Package Helm chart
81+
run: |
82+
mkdir -p docs/public/helm
83+
helm package helm -d docs/public/helm
84+
helm repo index docs/public/helm --url "${{ steps.pages.outputs.base_url }}/helm"
85+
7086
- name: Upload artifact
7187
uses: actions/upload-pages-artifact@v3
7288
with:

.github/workflows/pytest.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Workflow for running tests on server code
2+
name: Test Suite
3+
4+
on:
5+
pull_request:
6+
types:
7+
- opened
8+
- synchronize
9+
- reopened
10+
- ready_for_review
11+
12+
# Allows running this workflow manually
13+
workflow_dispatch:
14+
15+
jobs:
16+
check:
17+
if: github.event.pull_request.draft == false
18+
runs-on: ubuntu-latest
19+
services:
20+
docker:
21+
image: docker:latest
22+
options: --privileged
23+
24+
steps:
25+
- uses: actions/checkout@v4
26+
with:
27+
fetch-depth: 2
28+
29+
- uses: docker/setup-buildx-action@v3
30+
with:
31+
version: latest
32+
33+
- uses: actions/setup-python@v5
34+
with:
35+
python-version: "3.11"
36+
37+
- name: Cache dependencies
38+
uses: actions/cache@v4
39+
with:
40+
path: |
41+
~/.cache/pip
42+
src/.tox
43+
key: ${{ runner.os }}-pip-${{ hashFiles('src/pyproject.toml') }}
44+
restore-keys: |
45+
${{ runner.os }}-pip-
46+
47+
- name: Install dependencies
48+
run: |
49+
cd src/
50+
python -m pip install --upgrade pip wheel setuptools
51+
pip install torch==2.7.0+cpu -f https://download.pytorch.org/whl/cpu/torch
52+
pip install -e ".[all-test]"
53+
54+
- name: Run All Tests
55+
run: pytest
56+
57+
# Block merging if the job fails
58+
permissions:
59+
pull-requests: write

.github/workflows/releases.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Build Release
2+
on:
3+
release:
4+
types: [published]
5+
6+
env:
7+
IAC: ${GITHUB_REPOSITORY#${GITHUB_REPOSITORY_OWNER}/}-stack.zip
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
packages: write
15+
id-token: write
16+
17+
steps:
18+
- name: Output Environment
19+
run: |
20+
echo "IaC: ${{ env.IAC }}"
21+
22+
- name: Validate Tag Name
23+
run: |
24+
if [[ ! $GITHUB_REF_NAME =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
25+
echo "Invalid tag name format. Must be in the format vMAJOR.MINOR.PATCH"
26+
exit 1
27+
fi
28+
29+
- name: Checkout repository
30+
uses: actions/checkout@v4
31+
32+
- name: Build and Push Infrastructure as Code
33+
run: |
34+
cd opentofu
35+
zip -r ${{ env.IAC }} . -x "terraform*" ".terraform*" "*/terraform*" "*/.terraform*" "generated/*"
36+
gh release upload ${{github.event.release.tag_name}} ${{ env.IAC }} --clobber
37+
env:
38+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39+
shell: bash

.gitignore

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,66 @@
1-
## Copyright (c) 2023, 2024, Oracle and/or its affiliates.
2-
## Licensed under the Universal Permissive License v1.0 as shown at http://oss.oracle.com/licenses/upl.
3-
##############################################################################
4-
# Developer Custom
5-
##############################################################################
6-
assets/docos/samples/oracle-ai-vector-search-users-guide-qa.jsonl
7-
assets/docos/oracle-ai-vector-search-users-guide.pdf
8-
1+
# spell-checker: disable
92
##############################################################################
103
# Project/User Specific
114
##############################################################################
5+
**/*.log
6+
**/*.zip
127
**/requirements.txt
13-
!app/requirements.txt
14-
app/THIRD_PARTY_LICENSES.txt
15-
rag/**
8+
**/THIRD_PARTY_LICENSES.txt
169
sbin/**
17-
helm/values.yaml
1810
**/*.bak
11+
**/tmp/**
12+
**/temp/**
13+
**/chatbot_graph.png
14+
**/*.sh
15+
!opentofu/**/cloudinit-oke.sh
16+
!src/entrypoint.sh
17+
!src/client/spring_ai/templates/env.sh
18+
tests/db_startup_temp/**
1919

2020
##############################################################################
21-
# Enviroment (PyVen, IDE, etc.)
21+
# Environment (PyVen, IDE, etc.)
2222
##############################################################################
2323
**/.venv
2424
**/.vscode
2525
**/.DS_Store
2626
**/*.swp
2727
**/.scannerwork
28+
**/.cursorignore
29+
**/tns_admin
2830
sonar-project.properties
2931

3032
##############################################################################
3133
# Python
3234
##############################################################################
3335
__pycache__/
36+
.pytest_cache
3437
*.py[cod]
3538
*$py.class
36-
spring_ai/src/main/resources/data/sandbox_settings.json
39+
*/*.egg-info
40+
**/build/
41+
42+
##############################################################################
43+
# IaC
44+
##############################################################################
45+
**/**.tfvars
46+
**/.terraform*
47+
**/terraform.tfstate*
48+
**/*.pem
49+
opentofu/**/generated/*.*
50+
opentofu/**/generated/kubeconfig
51+
52+
##############################################################################
53+
# Helm
54+
##############################################################################
55+
helm/values*.yaml
56+
!helm/values.yaml
57+
58+
##############################################################################
59+
# Random
60+
##############################################################################
61+
spring_ai/src/main/resources/data/optimizer_settings.json
3762
spring_ai/target/**
3863
spring_ai/create_user.sql
3964
spring_ai/drop.sql
40-
start.sh
41-
spring_ai/env.sh
42-
temp/rag_agent.ipynb
43-
temp/tools.ipynb
44-
temp/tools.py
45-
temp/json-dual.sql
46-
env.sh
65+
src/client/spring_ai/target/classes/*
66+
api_server_key

Dockerfile

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

0 commit comments

Comments
 (0)