Skip to content

Commit 01ec7c2

Browse files
authored
IaC and Renaming (#138)
* Github Rename * Update Terraform * Tags Workflow * Documentation * Fix for settings patching * Updated Settings Tests * Got OCI? * Build Helm Chart
1 parent 497c3e4 commit 01ec7c2

Some content is hidden

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

91 files changed

+1976
-1306
lines changed

.github/workflows/documentation.yml

Lines changed: 19 additions & 5 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:
@@ -39,25 +40,31 @@ jobs:
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 \
5357
&& curl -L $(curl -s https://api.github.com/repos/McShelby/hugo-theme-relearn/releases/latest \
5458
| grep "tarball_url" | cut -d '"' -f 4) \
5559
| tar -xz -C docs/themes/relearn --strip-components=1 --exclude='*/exampleSite'
60+
5661
- name: Setup Pages
5762
id: pages
5863
uses: actions/configure-pages@v5
64+
5965
- name: Install Node.js dependencies
6066
run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
67+
6168
- name: Build with Hugo
6269
env:
6370
HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache
@@ -68,7 +75,14 @@ jobs:
6875
--gc \
6976
--minify \
7077
--source docs \
71-
--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+
7286
- name: Upload artifact
7387
uses: actions/upload-pages-artifact@v3
7488
with:

.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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
# Project/User Specific
44
##############################################################################
55
**/*.log
6+
**/*.zip
67
**/requirements.txt
7-
app/THIRD_PARTY_LICENSES.txt
8+
**/THIRD_PARTY_LICENSES.txt
89
sbin/**
910
**/*.bak
1011
**/tmp/**
1112
**/temp/**
1213
**/chatbot_graph.png
1314
**/*.sh
14-
!opentofu/templates/cloudinit-oke.sh
15+
!opentofu/**/cloudinit-oke.sh
1516
!src/entrypoint.sh
1617
!src/client/spring_ai/templates/env.sh
1718
tests/db_startup_temp/**
@@ -44,7 +45,8 @@ __pycache__/
4445
**/**.tfvars
4546
**/.terraform*
4647
**/terraform.tfstate*
47-
opentofu/**/examples/*.yaml
48+
opentofu/**/generated/*.*
49+
opentofu/**/generated/kubeconfig
4850

4951
##############################################################################
5052
# Helm
@@ -55,7 +57,7 @@ helm/values*.yaml
5557
##############################################################################
5658
# Random
5759
##############################################################################
58-
spring_ai/src/main/resources/data/explorer_settings.json
60+
spring_ai/src/main/resources/data/optimizer_settings.json
5961
spring_ai/target/**
6062
spring_ai/create_user.sql
6163
spring_ai/drop.sql

README.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Oracle AI Explorer for Apps
1+
# Oracle AI Optimizer and Toolkit
22

33
<!-- spell-checker:ignore streamlit, venv, setuptools -->
44

5-
🚧 The **AI Explorer** is currently in *Beta*
5+
🚧 The **AI Optimizer** is currently in *Beta*
66

77
## Description
88

9-
The **Oracle AI Explorer for Apps** (the **AI Explorer**) provides a streamlined environment where developers and data scientists can explore the potential of Generative Artificial Intelligence (GenAI) combined with Retrieval-Augmented Generation (RAG) capabilities. By integrating **Oracle Database 23ai** AI Vector Search, the Sandbox enables users to enhance existing Large Language Models (LLMs) through RAG.
9+
The **Oracle AI Optimizer and Toolkit** (the **AI Optimizer**) provides a streamlined environment where developers and data scientists can explore the potential of Generative Artificial Intelligence (GenAI) combined with Retrieval-Augmented Generation (RAG) capabilities. By integrating **Oracle Database 23ai** AI Vector Search, the Sandbox enables users to enhance existing Large Language Models (LLMs) through RAG.
1010

11-
## AI Explorer Features
11+
## AI Optimizer Features
1212

1313
- [Configuring Embedding and Chat Models](https://oracle-samples.github.io/ai-explorer/client/configuration/model_config)
1414
- [Splitting and Embedding Documentation](https://oracle-samples.github.io/ai-explorer/client/tools/split_embed)
@@ -18,7 +18,7 @@ The **Oracle AI Explorer for Apps** (the **AI Explorer**) provides a streamlined
1818

1919
## Getting Started
2020

21-
The **AI Explorer** is available to install in your own environment, which may be a developer's desktop, on-premises data center environment, or a cloud provider. It can be run either on bare-metal, within a container, or in a Kubernetes Cluster.
21+
The **AI Optimizer** is available to install in your own environment, which may be a developer's desktop, on-premises data center environment, or a cloud provider. It can be run either on bare-metal, within a container, or in a Kubernetes Cluster.
2222

2323
For more information, including more details on **Setup and Configuration** please visit the [documentation](https://oracle-samples.github.io/ai-explorer).
2424

@@ -61,7 +61,7 @@ To run the application on bare-metal; download the [source](https://github.com/o
6161

6262
1. Navigate to `http://localhost:8501`.
6363

64-
1. [Configure](https://oracle-samples.github.io/ai-explorer/client/configuration) the **Explorer**.
64+
1. [Configure](https://oracle-samples.github.io/ai-explorer/client/configuration) the **AI Optimizer**.
6565

6666
#### Container Installation
6767

@@ -73,18 +73,23 @@ To run the application in a container; download the [source](https://github.com/
7373

7474
```bash
7575
cd src/
76-
podman build -t ai-explorer-aio .
76+
podman build -t ai-optimizer-aio .
7777
```
7878

7979
1. Start the Container:
8080

8181
```bash
82-
podman run -p 8501:8501 -it --rm ai-explorer-aio
82+
podman run -p 8501:8501 -it --rm ai-optimizer-aio
8383
```
8484

8585
1. Navigate to `http://localhost:8501`.
8686

87-
1. [Configure](https://oracle-samples.github.io/ai-explorer/client/configuration/index.html) the **Explorer**.
87+
1. [Configure](https://oracle-samples.github.io/ai-explorer/client/configuration/index.html) the **AI Optimizer**.
88+
89+
##### Got OCI?
90+
The **AI Optimizer** can be deployed with an Oracle Autonomous Database 23ai using infrastructure as code. Deploy the **AI Optimizer** in Oracle Cloud Infrastructure using OCI Resource Manager:
91+
92+
[![Deploy to Oracle Cloud][magic_button]][magic_arch_stack]
8893

8994
## Contributing
9095

@@ -100,3 +105,7 @@ Copyright (c) 2024 Oracle and/or its affiliates.
100105
Released under the Universal Permissive License v1.0 as shown at [https://oss.oracle.com/licenses/upl/](https://oss.oracle.com/licenses/upl/)
101106

102107
See [LICENSE](./LICENSE.txt) for more details.
108+
109+
110+
[magic_button]: https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg
111+
[magic_arch_stack]: https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-samples/ai-explorer/releases/latest/download/ai-optimizer-stack.zip

docs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Oracle AI Explorer for Apps - Documentation
1+
# Oracle AI Optimizer & Toolkit - Documentation
22

33
## Description
44

5-
This directory contains the documentation for the the [**Oracle AI Explorer for Apps**](https://github.com/oracle-samples/ai-explorer).
5+
This directory contains the documentation for the the [**Oracle AI Optimizer & Toolkit**](https://github.com/oracle-samples/ai-explorer).
66

77
## Getting Started - Documentation
88

9-
The **Oracle AI Explorer for Apps** documentation is powered by [Hugo](https://gohugo.io/) using the [Relearn](https://github.com/McShelby/hugo-theme-relearn) theme.
9+
The **Oracle AI Optimizer & Toolkit** documentation is powered by [Hugo](https://gohugo.io/) using the [Relearn](https://github.com/McShelby/hugo-theme-relearn) theme.
1010

1111
To contribute to the documentation, install [Hugo](https://gohugo.io/installation/). Installation instructions vary per Operating System.
1212

docs/assets/css/theme-docs-dark.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,8 @@ div.box, div.box code .copy-to-clipboard {
5555
#R-body img[src$='#floatright'] {
5656
float:right;
5757
margin-left: 1em;
58+
}
59+
60+
#R-logo .powered-by {
61+
font-family: "MontserratAlt1-Light",sans-serif
5862
}

docs/assets/css/theme-docs-light.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,8 @@ div.box, div.box code .copy-to-clipboard {
5555
#R-body img[src$='#floatright'] {
5656
float:right;
5757
margin-left: 1em;
58+
}
59+
60+
#R-logo .powered-by {
61+
font-family: "MontserratAlt1-Light",sans-serif
5862
}

docs/content/_index.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title = " "
33
menus = 'main'
44
archetype = "home"
5-
description = 'Oracle AI Explorer for Apps'
6-
keywords = 'oracle explorer microservices development genai rag'
5+
description = './oai-explorer/docs'
6+
keywords = 'oracle optimizer toolkit microservices development genai rag'
77
+++
88

99
<!--
@@ -34,8 +34,8 @@ The {{< short_app_ref >}} streamlines the entire workflow from prototyping to pr
3434
The {{< short_app_ref >}} is available to install in your own environment, which may be a developer's desktop, on-premises data center environment, or a cloud provider. It can be run either on bare-metal, within a container, or in a Kubernetes Cluster.
3535

3636
{{% notice style="code" title="Prefer a Step-by-Step?" icon="circle-info" %}}
37-
<!-- Hard-coding AI Explorer to avoid unsafe HTML, this is an exception -->
38-
The [Walkthrough](walkthrough) is a great way to familiarize yourself with the **AI Explorer** and its features in a development environment.
37+
<!-- Hard-coding AI Optimizer to avoid unsafe HTML, this is an exception -->
38+
The [Walkthrough](walkthrough) is a great way to familiarize yourself with the **AI Optimizer** and its features in a development environment.
3939
{{% /notice %}}
4040

4141
## Prerequisites
@@ -88,17 +88,17 @@ To run the application in a container; download the [source]({{ .Site.Params.Git
8888

8989
1. Build the image.
9090

91-
From inside the `src/` directory, build the *ai-explorer-aio* image:
91+
From inside the `src/` directory, build the *ai-optimizer-aio* image:
9292

9393
```bash
9494
cd src/
95-
podman build -t ai-explorer-aio .
95+
podman build -t ai-optimizer-aio .
9696
```
9797

9898
1. Start the Container:
9999

100100
```bash
101-
podman run -p 8501:8501 -it --rm ai-explorer-aio
101+
podman run -p 8501:8501 -it --rm ai-optimizer-aio
102102
```
103103

104104
1. Navigate to `http://localhost:8501`.
-2.88 KB
Loading

0 commit comments

Comments
 (0)