Skip to content

Commit 2341e55

Browse files
committed
chore: update user IDs in Dockerfiles and deployment configurations; enhance document management support in README
2 parents 4111fc9 + 5d453c5 commit 2341e55

12 files changed

Lines changed: 88 additions & 124 deletions

File tree

.github/workflows/semantic-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
build-args: "dev=0"
102102
- name: mcp-server
103103
dockerfile: services/mcp-server/Dockerfile
104-
image: rag-mcp
104+
image: mcp-server
105105
build-args: "dev=0"
106106
- name: frontend
107107
dockerfile: services/frontend/apps/chat-app/Dockerfile

README.md

Lines changed: 1 addition & 1 deletion
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

infrastructure/rag/templates/admin-backend/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
app: {{ .Values.adminBackend.name }}
1414
spec:
1515
securityContext:
16-
runAsUser: 65532
16+
runAsUser: 10001
1717
runAsNonRoot: true
1818
volumes:
1919
- name: config-volume

infrastructure/rag/templates/backend/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
app: {{ .Values.backend.name }}
1414
spec:
1515
securityContext:
16-
runAsUser: 65532
16+
runAsUser: 10001
1717
runAsNonRoot: true
1818
volumes:
1919
- name: config-volume

infrastructure/rag/templates/extractor/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
app: {{ .Values.extractor.name }}
1414
spec:
1515
securityContext:
16-
runAsUser: 65532
16+
runAsUser: 10001
1717
runAsNonRoot: true
1818
volumes:
1919
- name: config-volume

infrastructure/rag/values.yaml

Lines changed: 65 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
global:
2+
security:
3+
# -- Allow insecure images to use bitnami legacy repository. Can be set to false if secure images are being used (Paid).
4+
allowInsecureImages: true
5+
16
features:
27
ollama:
38
enabled: false
@@ -445,44 +450,39 @@ shared:
445450

446451

447452
langfuse:
448-
# Core Langfuse Configuration
449-
langfuse:
450-
# Used to hash API keys
451-
salt:
452-
value: "changeme"
453-
454-
# Authentication settings
455-
features:
456-
telemetryEnabled: true
457-
signUpDisabled: false
458-
459-
# Image configuration
453+
minio:
460454
image:
461-
tag: "3.88.1"
462-
pullPolicy: Always
463-
464-
# Web deployment configuration
465-
web:
455+
repository: bitnamilegacy/minio
456+
deploy: false
457+
valkey:
458+
image:
459+
repository: bitnamilegacy/valkey
460+
deploy: false #<--- keydb is used instead of valkey
461+
image:
462+
repository: ghcr.io/langfuse/langfuse
463+
pullPolicy: Always
464+
tag: "3.27.2"
465+
postgresql:
466+
image:
467+
repository: bitnamilegacy/postgresql
468+
deploy: true
469+
auth:
470+
username: postgres
471+
password: postgres
472+
database: langfuse
473+
clickhouse:
474+
image:
475+
repository: bitnamilegacy/clickhouse
476+
zookeeper:
466477
image:
467-
repository: langfuse/langfuse
468-
tag: "3.88.1"
469-
pullPolicy: Always
478+
repository: bitnamilegacy/zookeeper
470479

471-
# Worker deployment configuration
472-
worker:
473-
image:
474-
repository: langfuse/langfuse-worker
475-
tag: "3.88.1"
476-
pullPolicy: Always
477-
port: 3030
478480

479-
# NextAuth configuration
481+
langfuse:
480482
nextauth:
481483
url: http://localhost:3000
482-
secret:
483-
value: "changeme"
484-
485-
# Additional environment variables (only for init values)
484+
secret: changeme
485+
salt: changeme
486486
additionalEnv:
487487
- name: LANGFUSE_INIT_ORG_ID
488488
value: ""
@@ -498,8 +498,33 @@ langfuse:
498498
value: ""
499499
- name: LANGFUSE_INIT_USER_PASSWORD
500500
value: ""
501-
502-
# Additional init containers
501+
# REDIS
502+
- name: "REDIS_CONNECTION_STRING"
503+
value: "redis://rag-keydb:6379"
504+
# CLICKHOUSE
505+
- name: "CLICKHOUSE_MIGRATION_URL"
506+
value: "clickhouse://rag-clickhouse:9000"
507+
- name: "CLICKHOUSE_URL"
508+
value: "http://rag-clickhouse:8123"
509+
- name: "CLICKHOUSE_USER"
510+
value: "default"
511+
- name: "CLICKHOUSE_PASSWORD"
512+
value: "changeme"
513+
# S3 / MinIO
514+
- name: "LANGFUSE_S3_EVENT_UPLOAD_ENABLED"
515+
value: "true"
516+
- name: "LANGFUSE_S3_EVENT_UPLOAD_BUCKET"
517+
value: "langfuse"
518+
- name: "LANGFUSE_S3_EVENT_UPLOAD_REGION"
519+
value: "auto"
520+
- name: "LANGFUSE_S3_EVENT_UPLOAD_ACCESS_KEY_ID"
521+
value: "admin"
522+
- name: "LANGFUSE_S3_EVENT_UPLOAD_SECRET_ACCESS_KEY"
523+
value: "adminpassword"
524+
- name: "LANGFUSE_S3_EVENT_UPLOAD_ENDPOINT"
525+
value: "http://rag-minio:9000"
526+
- name: "LANGFUSE_S3_EVENT_UPLOAD_FORCE_PATH_STYLE"
527+
value: "true"
503528
extraInitContainers:
504529
- name: wait-for-postgres
505530
image: busybox
@@ -514,78 +539,9 @@ langfuse:
514539
# Define a reasonable timeout in case PostgreSQL fails to come up
515540
timeoutSeconds: 300
516541

517-
# PostgreSQL Configuration (use external PostgreSQL)
518-
postgresql:
519-
deploy: true
520-
host: "rag-postgresql"
521-
port: 5432
522-
auth:
523-
username: postgres
524-
password: postgres
525-
database: langfuse
526-
527-
# Redis Configuration (external KeyDB)
528-
redis:
529-
deploy: false
530-
host: "rag-keydb"
531-
port: 6379
532-
auth:
533-
username: "default"
534-
password: ""
535-
536-
# ClickHouse Configuration (external ClickHouse)
537-
clickhouse:
538-
deploy: true
539-
host: "rag-clickhouse"
540-
httpPort: 8123
541-
nativePort: 9000
542-
auth:
543-
username: "default"
544-
password: "changeme"
545-
migration:
546-
url: "clickhouse://rag-clickhouse:9000"
547-
ssl: false
548-
autoMigrate: true
549-
resources:
550-
limits:
551-
cpu: "2"
552-
memory: "8Gi"
553-
requests:
554-
cpu: "2"
555-
memory: "4Gi"
556-
557-
zookeeper:
558-
resources:
559-
limits:
560-
cpu: "2"
561-
memory: "2Gi"
562-
requests:
563-
cpu: "1"
564-
memory: "1Gi"
565-
566-
# S3/MinIO Configuration (external MinIO)
567-
minio:
568-
deploy: false
569-
bucket: "langfuse"
570-
region: "auto"
571-
endpoint: "http://rag-minio:9000"
572-
forcePathStyle: true
573-
accessKeyId:
574-
value: "admin"
575-
secretAccessKey:
576-
value: "adminpassword"
577-
eventUpload:
578-
enabled: true
579-
bucket: "langfuse"
580-
region: "auto"
581-
endpoint: "http://rag-minio:9000"
582-
forcePathStyle: true
583-
accessKeyId:
584-
value: "admin"
585-
secretAccessKey:
586-
value: "adminpassword"
587-
588542
minio:
543+
image:
544+
repository: bitnamilegacy/minio
589545
auth:
590546
## @param auth.rootUser MinIO&reg; root username
591547
##
@@ -602,6 +558,10 @@ minio:
602558
enabled: false
603559
mode: standalone
604560

561+
562+
563+
564+
605565
ollama:
606566
image:
607567
tag: 0.5.1
@@ -617,8 +577,3 @@ ollama:
617577
qdrant:
618578
image:
619579
tag: v1.14.1
620-
621-
keydb:
622-
multiMaster: "no"
623-
activeReplicas: "no"
624-
nodes: 1

libs/admin-api-lib/src/admin_api_lib/dependency_container.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,15 @@ class DependencyContainer(DeclarativeContainer):
147147
summary_enhancer = List(
148148
Singleton(PageSummaryEnhancer, traced_summarizer, chunker_settings),
149149
)
150-
information_enhancer = Singleton(
150+
untraced_information_enhancer = Singleton(
151151
GeneralEnhancer,
152152
summary_enhancer,
153153
)
154+
information_enhancer = Singleton(
155+
LangfuseTracedRunnable,
156+
inner_chain=untraced_information_enhancer,
157+
settings=langfuse_settings,
158+
)
154159

155160
document_deleter = Singleton(
156161
DefaultDocumentDeleter, rag_api=rag_api, file_service=file_service, key_value_store=key_value_store

libs/extractor-api-lib/src/extractor_api_lib/impl/extractors/confluence_extractor.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""Module for the DefaultConfluenceExtractor class."""
22

3+
import logging
34
from langchain_community.document_loaders import ConfluenceLoader
45

56
from extractor_api_lib.impl.types.extractor_types import ExtractorTypes
@@ -10,6 +11,8 @@
1011
ConfluenceLangchainDocument2InformationPiece,
1112
)
1213

14+
logger = logging.getLogger(__name__)
15+
1316

1417
class ConfluenceExtractor(InformationExtractor):
1518
"""Implementation of the InformationExtractor interface for confluence."""
@@ -54,12 +57,13 @@ async def aextract_content(
5457
confluence_loader_parameters = {
5558
x.key: int(x.value) if x.value.isdigit() else x.value for x in extraction_parameters.kwargs
5659
}
57-
if (
58-
not confluence_loader_parameters.get("max_pages")
59-
or confluence_loader_parameters.get("max_pages") == "undefined"
60+
if not confluence_loader_parameters.get("max_pages") or isinstance(
61+
confluence_loader_parameters.get("max_pages"), str
6062
):
63+
logging.warning(
64+
"max_pages parameter is not set or invalid discarding it. ConfluenceLoader will use default value."
65+
)
6166
confluence_loader_parameters.pop("max_pages")
62-
6367
# Drop the document_name parameter as it is not used by the ConfluenceLoader
6468
if "document_name" in confluence_loader_parameters:
6569
confluence_loader_parameters.pop("document_name", None)

services/admin-backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN poetry config virtualenvs.create false && \
2929
FROM --platform=linux/amd64 python:3.13-bookworm
3030
ARG dev=0
3131

32-
RUN adduser --disabled-password --gecos "" --uid 65532 nonroot
32+
RUN adduser --disabled-password --gecos "" --uid 10001 nonroot
3333

3434
ENV POETRY_VIRTUALENVS_PATH=/app/services/admin-backend/.venv
3535
COPY --from=build --chown=nonroot:nonroot ${POETRY_VIRTUALENVS_PATH} ${POETRY_VIRTUALENVS_PATH}

services/document-extractor/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN poetry config virtualenvs.create false &&\
3333
FROM --platform=linux/amd64 python:3.13-bookworm
3434
ARG dev=0
3535

36-
RUN adduser --disabled-password --gecos "" --uid 65532 nonroot
36+
RUN adduser --disabled-password --gecos "" --uid 10001 nonroot
3737

3838
ENV POETRY_VIRTUALENVS_PATH=/app/services/document-extractor/.venv
3939
COPY --from=build --chown=nonroot:nonroot ${POETRY_VIRTUALENVS_PATH} ${POETRY_VIRTUALENVS_PATH}

0 commit comments

Comments
 (0)