Skip to content

Commit 9b9024b

Browse files
committed
merge: main
2 parents 866e4e8 + 61856f0 commit 9b9024b

109 files changed

Lines changed: 6258 additions & 3765 deletions

File tree

Some content is hidden

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

.devcontainer/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
44
ARG USER=vscode
55

66
RUN DEBIAN_FRONTEND=noninteractive \
7-
&& apt-get update \
7+
&& apt-get update \
88
&& apt-get install -y build-essential --no-install-recommends make \
99
ca-certificates \
1010
git \
@@ -27,7 +27,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
2727
# Python and poetry installation
2828
USER $USER
2929
ARG HOME="/home/$USER"
30-
ARG PYTHON_VERSION=3.11
30+
ARG PYTHON_VERSION=3.13
3131

3232
ENV PYENV_ROOT="${HOME}/.pyenv"
3333
ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${HOME}/.local/bin:$PATH"
@@ -40,4 +40,4 @@ RUN echo "done 0" \
4040
&& pyenv global ${PYTHON_VERSION} \
4141
&& echo "done 3" \
4242
&& curl -sSL https://install.python-poetry.org | python3 - \
43-
&& poetry config virtualenvs.in-project true
43+
&& poetry config virtualenvs.in-project true

.github/workflows/lint-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
workflow_dispatch:
88

99
env:
10-
NODE_VERSION: '18'
11-
PYTHON_VERSION: '3.11'
10+
NODE_VERSION: '24'
11+
PYTHON_VERSION: '3.13'
1212

1313
jobs:
1414
changes:

.github/workflows/renovate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Checkout
2929
uses: actions/checkout@v4
3030
- name: Self-hosted Renovate
31-
uses: renovatebot/github-action@v43.0.5
31+
uses: renovatebot/github-action@v43.0.8
3232
with:
3333
configurationFile: .github/renovate.json
3434
token: ${{ secrets.RENOVATE_TOKEN }}

.github/workflows/semantic-release.yml

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: setup-node
3232
uses: actions/setup-node@v4
3333
with:
34-
node-version: "22.17.1"
34+
node-version: "22.18.0"
3535

3636
- name: create-archives
3737
run: |
@@ -79,46 +79,6 @@ jobs:
7979
echo "ℹ️ No new release published"
8080
fi
8181
82-
- name: update-helm-values
83-
if: steps.semantic-release.outputs.new-release-published == 'true'
84-
run: |
85-
echo "🔍 Debug: new-release-published = ${{ steps.semantic-release.outputs.new-release-published }}"
86-
echo "🔍 Debug: new-release-version = ${{ steps.semantic-release.outputs.new-release-version }}"
87-
88-
NEW_VERSION="${{ steps.semantic-release.outputs.new-release-version }}"
89-
VALUES_FILE="infrastructure/rag/values.yaml"
90-
91-
# Update Helm values using Python script
92-
pip install ruamel.yaml
93-
python3 tools/update-helm-values.py "$NEW_VERSION"
94-
95-
# Show git diff for verification
96-
if ! git diff --quiet "$VALUES_FILE"; then
97-
echo "Changes made to values.yaml:"
98-
git diff "$VALUES_FILE"
99-
else
100-
echo "⚠️ No changes detected in values.yaml"
101-
fi
102-
103-
- name: commit-helm-changes
104-
if: steps.semantic-release.outputs.new-release-published == 'true'
105-
run: |
106-
# Check if there are changes to commit
107-
if ! git diff --quiet infrastructure/rag/values.yaml; then
108-
echo "📝 Committing Helm values changes..."
109-
git config --local user.email "action@github.com"
110-
git config --local user.name "GitHub Action"
111-
git add infrastructure/rag/values.yaml
112-
113-
# Create a new commit for the Helm changes (don't amend since semantic-release already pushed)
114-
git commit -m "chore: update helm chart image tags to v${{ steps.semantic-release.outputs.new-release-version }}"
115-
git push
116-
117-
echo "✅ Helm chart changes committed and pushed"
118-
else
119-
echo "ℹ️ No Helm chart changes to commit"
120-
fi
121-
12282
build-and-push-images:
12383
name: build-and-push-images
12484
runs-on: ubuntu-latest
@@ -141,7 +101,7 @@ jobs:
141101
build-args: "dev=0"
142102
- name: mcp-server
143103
dockerfile: services/mcp-server/Dockerfile
144-
image: rag-mcp
104+
image: mcp-server
145105
build-args: "dev=0"
146106
- name: frontend
147107
dockerfile: services/frontend/apps/chat-app/Dockerfile
@@ -194,4 +154,3 @@ jobs:
194154
echo "- frontend" >> $GITHUB_STEP_SUMMARY
195155
echo "- admin-frontend" >> $GITHUB_STEP_SUMMARY
196156
echo "**Registry:** ghcr.io/${{ github.repository_owner }}/rag-template" >> $GITHUB_STEP_SUMMARY
197-
echo "**Helm chart updated:** infrastructure/rag/values.yaml" >> $GITHUB_STEP_SUMMARY

.vscode/tasks.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "frontend-admin-lint",
6+
"type": "shell",
7+
"command": "npm run -w services/frontend eslint",
8+
"problemMatcher": [
9+
"$eslint-stylish"
10+
],
11+
"group": "build"
12+
}
13+
]
14+
}

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ IMAGE_TAG?=v1.0.0
2222
REGISTRY?=
2323

2424
build_and_push:
25-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/rag-backend:$(IMAGE_TAG) -f services/rag-backend/Dockerfile --push .
26-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-backend:$(IMAGE_TAG) -f services/admin-backend/Dockerfile --push .
27-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/document-extractor:$(IMAGE_TAG) -f services/document-extractor/Dockerfile --push .
28-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/frontend:$(IMAGE_TAG) -f services/frontend/apps/chat-app/Dockerfile --push .
29-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-frontend:$(IMAGE_TAG) -f services/frontend/apps/admin-app/Dockerfile --push .
30-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/mcp-server:$(IMAGE_TAG) -f services/mcp-server/Dockerfile --push .
25+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/rag-backend:$(IMAGE_TAG) -t $(REGISTRY)/rag-backend:latest -f services/rag-backend/Dockerfile --push .
26+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-backend:$(IMAGE_TAG) -t $(REGISTRY)/admin-backend:latest -f services/admin-backend/Dockerfile --push .
27+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/document-extractor:$(IMAGE_TAG) -t $(REGISTRY)/document-extractor:latest -f services/document-extractor/Dockerfile --push .
28+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/frontend:$(IMAGE_TAG) -t $(REGISTRY)/frontend:latest -f services/frontend/apps/chat-app/Dockerfile --push .
29+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-frontend:$(IMAGE_TAG) -t $(REGISTRY)/admin-frontend:latest -f services/frontend/apps/admin-app/Dockerfile --push .
30+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/mcp-server:$(IMAGE_TAG) -t $(REGISTRY)/mcp-server:latest -f services/mcp-server/Dockerfile --push .

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Welcome to the STACKIT RAG Template! This is a basic example of how to use the R
77

88
## Features 🚀
99

10-
**Document Management**: Supports PDFs, DOCX, PPTX, XML, and Confluence documents.
10+
**Document Management**: Supports PDFs, DOCX, PPTX, XML, EPUB documents and websource via confluence as well as sitemaps.
1111

1212
**AI Integration**: Multiple LLM and embedder providers for flexibility.
1313

@@ -38,7 +38,7 @@ The template supports multiple LLM (Large Language Model) providers, such as STA
3838

3939

4040
## 1. Getting Started
41-
A [`Tiltfile`](./Tiltfile) is provided to get you started :rocket:. If Tilt is new for you, and you want to learn more about it, please take a look at the [Tilt guides](https://docs.tilt.dev/tiltfile_authoring).
41+
A [`Tiltfile`](./Tiltfile) is provided to get you started :rocket:. If Tilt is new for you, and you want to learn more about it, please take a look at the [Tilt guides](https://docs.tilt.dev/tiltfile_authoring.html).
4242

4343
### 1.1 Components
4444

@@ -108,7 +108,7 @@ The frontend provides user-friendly interfaces for both chat and document manage
108108
- **Chat App**: Interface for interacting with the RAG system
109109
- **Admin App**: Interface for managing documents and system configuration
110110

111-
For further information, please consult the [Frontend README](./services/frontend/README.md).
111+
For further information, please consult the [Frontend README](./services/frontend/README.md). For branding, theming, and logo configuration, see the [UI Customization Guide](./docs/UI_Customization.md).
112112

113113
#### 1.1.6 Infrastructure
114114

0 commit comments

Comments
 (0)