fix: fix db config as env vars

Author: SaboniAmine

.github/workflows/build_kotaemon_service.yaml

@@ -48,11 +48,12 @@ jobs:
       - name: Build and push Docker image
         run: |
           cd rag_system 
+          cat Dockerfile
           docker buildx build \
-          -platform=linux/amd64,linux/arm64,linux/armhf \
+          --platform=linux/amd64 \
           --push \
           -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
-          -f Dockerfile ./ --target prod-runtime
+          -f Dockerfile ./
       - name: Also create tagged image if tag exists on main branch
         if: startsWith(github.ref, 'refs/tags/')
         run: |

rag_system/Dockerfile

@@ -60,7 +60,6 @@ RUN --mount=type=ssh \
     uv pip install -e "pipeline_scripts" && \
     uv pip install -e "taxonomy" && \
     uv pip install boto3 && \
-    uv pip install "pdfservices-sdk@git+https://github.com/niallcm/pdfservices-python-sdk.git"
 
 
 # ===============================
@@ -73,50 +72,49 @@ RUN --mount=type=ssh \
     uv pip install "libs/kotaemon[adv]" && \
     uv pip install "libs/ktem" && \
     uv pip install "libs/pipelineblocks" && \
-    uv pip install boto3
-
-
+    uv pip install boto3 && \
+    uv pip install "pdfservices-sdk@git+https://github.com/niallcm/pdfservices-python-sdk.git@bump-and-unfreeze-requirements"
 
 # ===============================
 # Shared minimal runtime base
 # ===============================
-FROM ubuntu:22.04 AS runtime-base
-
-RUN apt-get update -qqy && \
-    apt-get install -y --no-install-recommends \
-        ssh \
-        git \
-        poppler-utils \
-        curl \
-        ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install uv
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh
-
-ENV PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    PYTHONIOENCODING=UTF-8 \
-    PATH="/root/.local/bin:/app/.venv/bin:$PATH"
-
-WORKDIR /app
-
-
-# ===============================
-# Final: dev-runtime
-# ===============================
-FROM runtime-base AS dev-runtime
-
-COPY --from=dev /app /app
-
-ENTRYPOINT ["/bin/sh", "-c", "tail -f /dev/null"]
-
-
-# ===============================
-# Final: prod-runtime
-# ===============================
-FROM runtime-base AS prod-runtime
-
-COPY --from=prod /app /app
-
-ENTRYPOINT ["sh", "/app/launch.sh"]
+# FROM ubuntu:22.04 AS runtime-base
+#
+# RUN apt-get update -qqy && \
+#     apt-get install -y --no-install-recommends \
+#         ssh \
+#         git \
+#         poppler-utils \
+#         curl \
+#         ca-certificates \
+#     && rm -rf /var/lib/apt/lists/*
+#
+# # Install uv
+# RUN curl -LsSf https://astral.sh/uv/install.sh | sh
+#
+# ENV PYTHONDONTWRITEBYTECODE=1 \
+#     PYTHONUNBUFFERED=1 \
+#     PYTHONIOENCODING=UTF-8 \
+#     PATH="/root/.local/bin:/app/.venv/bin:$PATH"
+#
+# WORKDIR /app
+#
+#
+# # ===============================
+# # Final: dev-runtime
+# # ===============================
+# FROM runtime-base AS dev-runtime
+#
+# COPY --from=dev /app /app
+#
+# ENTRYPOINT ["/bin/sh", "-c", "tail -f /dev/null"]
+#
+#
+# # ===============================
+# # Final: prod-runtime
+# # ===============================
+# FROM runtime-base AS prod-runtime
+#
+# COPY --from=prod /app /app
+#
+# ENTRYPOINT ["sh", "/app/launch.sh"]

rag_system/flowsettings.py

@@ -82,8 +82,8 @@
     config("KH_FEATURE_USER_MANAGEMENT_PASSWORD", default="admin")
 )
 KH_ENABLE_ALEMBIC = False
-KH_DATABASE = f"sqlite:///{KH_USER_DATA_DIR / 'sql.db'}"
-# KH_DATABASE = "postgresql://postgres:my_pass@postgres-db:5432/my_db"
+# KH_DATABASE = f"sqlite:///{KH_USER_DATA_DIR / 'sql.db'}"
+KH_DATABASE = os.getenv("PG_DATABASE_URL", None)
 
 KH_FILESTORAGE_PATH = str(KH_USER_DATA_DIR / "files")
 
@@ -103,13 +103,9 @@
     # "path": "s3://test-ecoskills/docstore/"
 }
 KH_VECTORSTORE = {
-    # "__type__": "kotaemon.storages.LanceDBVectorStore",
-    # "__type__": "kotaemon.storages.ChromaVectorStore",
-    # "__type__": "kotaemon.storages.MilvusVectorStore",
     "__type__": "kotaemon.storages.QdrantVectorStore",
-    "url": "116919ed-8e07-47f6-8f24-a22527d5d520.europe-west3-0.gcp.cloud.qdrant.io",
-    "api_key": "None"
-    # "path": str(KH_USER_DATA_DIR / "vectorstore"),
+    "url": os.getenv("VECTORSTORE_URL", ""),
+    "api_key": os.getenv("VECTOR_STORE_API_KEY", "")
 }
 KH_LLMS = {}
 KH_EMBEDDINGS = {}

rag_system/kotaemon/flowsettings.py

@@ -103,8 +103,8 @@
 }
 KH_VECTORSTORE = {
     "__type__": "kotaemon.storages.QdrantVectorStore",
-    "url": os.getenv("VECTOSTORE_URL", ""),
-    "api_key": os.getenv("API_KEY", "")
+    "url": os.getenv("VECTORSTORE_URL", ""),
+    "api_key": os.getenv("VECTOR_STORE_API_KEY", "")
 }
 KH_LLMS = {}
 KH_EMBEDDINGS = {}