added seperate db for langfuse

Author: nuwangeek

DSL/Liquibase/langfuse-init/init-langfuse.sql

@@ -0,0 +1,4 @@
+SELECT 'CREATE DATABASE langfuse'
+WHERE NOT EXISTS (
+    SELECT FROM pg_catalog.pg_database WHERE datname = 'langfuse-db'
+)\gexec

docker-compose-ec2.yml

@@ -103,11 +103,11 @@ services:
     container_name: resql
     image: resql
     depends_on:
-      rag_search_db:
+      rag-search-db:
         condition: service_started
     environment:
       - sqlms.datasources.[0].name=byk
-      - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://rag_search_db:5432/rag-search #For LocalDb Use
+      - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://rag-search-db:5432/rag-search #For LocalDb Use
       # sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.13:5435/byk?sslmode=require
       - sqlms.datasources.[0].username=postgres
       - sqlms.datasources.[0].password=dbadmin
@@ -301,7 +301,7 @@ services:
     image: docker.io/langfuse/langfuse-worker:3
     restart: always
     depends_on: &langfuse-depends-on
-      rag_search_db:
+      rag-search-db:
         condition: service_healthy
       minio:
         condition: service_healthy
@@ -368,7 +368,7 @@ services:
     restart: always
     depends_on:
       - langfuse-worker
-      - rag_search_db
+      - rag-search-db
     ports:
       - 3005:3000
     env_file:
@@ -462,8 +462,8 @@ services:
     networks:
       - bykstack
 
-  rag_search_db:
-    container_name: rag_search_db
+  rag-search-db:
+    container_name: rag-search-db
     image: postgres:14.1
     restart: always
     healthcheck:

docker-compose-test.yml

@@ -2,9 +2,9 @@ services:
   # === Core Infrastructure ===
 
   # Shared PostgreSQL database (used by both application and Langfuse)
-  rag_search_db:
+  rag-search-db:
     image: postgres:14.1
-    container_name: rag_search_db
+    container_name: rag-search-db
     restart: always
     environment:
       POSTGRES_USER: postgres
@@ -89,11 +89,11 @@ services:
     container_name: resql
     image: ghcr.io/buerokratt/resql:v1.3.6
     depends_on:
-      rag_search_db:
+      rag-search-db:
         condition: service_started
     environment:
       - sqlms.datasources.[0].name=byk
-      - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://rag_search_db:5432/rag-search #For LocalDb Use
+      - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://rag-search-db:5432/rag-search #For LocalDb Use
       # sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.13:5435/byk?sslmode=require
       - sqlms.datasources.[0].username=postgres
       - sqlms.datasources.[0].password=dbadmin
@@ -222,15 +222,15 @@ services:
     container_name: langfuse-worker
     restart: always
     depends_on:
-      - rag_search_db
+      - rag-search-db
       - minio
       - redis
       - clickhouse
     ports:
       - "127.0.0.1:3030:3030"
     environment:
       # Database
-      DATABASE_URL: postgresql://postgres:dbadmin@rag_search_db:5432/rag-search
+      DATABASE_URL: postgresql://postgres:dbadmin@rag-search-db:5432/rag-search
 
       # Auth & Security (TEST VALUES ONLY - NOT FOR PRODUCTION)
       # gitleaks:allow - These are test-only hex strings
@@ -279,13 +279,13 @@ services:
     restart: always
     depends_on:
       - langfuse-worker
-      - rag_search_db
+      - rag-search-db
       - clickhouse
     ports:
       - "3000:3000"
     environment:
       # Database
-      DATABASE_URL: postgresql://postgres:dbadmin@rag_search_db:5432/rag-search
+      DATABASE_URL: postgresql://postgres:dbadmin@rag-search-db:5432/rag-search
 
       # Auth & Security (TEST VALUES ONLY - NOT FOR PRODUCTION)
       # gitleaks:allow - These are test-only hex strings

docker-compose.yml

@@ -103,11 +103,11 @@ services:
     container_name: resql
     image: resql
     depends_on:
-      rag_search_db:
+      rag-search-db:
         condition: service_started
     environment:
       - sqlms.datasources.[0].name=byk
-      - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://rag_search_db:5432/rag-search #For LocalDb Use
+      - sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://rag-search-db:5432/rag-search #For LocalDb Use
       # sqlms.datasources.[0].jdbcUrl=jdbc:postgresql://171.22.247.13:5435/byk?sslmode=require
       - sqlms.datasources.[0].username=postgres
       - sqlms.datasources.[0].password=dbadmin
@@ -249,7 +249,7 @@ services:
     image: docker.io/langfuse/langfuse-worker:3
     restart: always
     depends_on: &langfuse-depends-on
-      rag_search_db:
+      rag-search-db:
         condition: service_healthy
       minio:
         condition: service_healthy
@@ -316,7 +316,7 @@ services:
     restart: always
     depends_on:
       - langfuse-worker
-      - rag_search_db
+      - rag-search-db
     ports:
       - 3005:3000
     env_file:
@@ -410,8 +410,8 @@ services:
     networks:
       - bykstack
 
-  rag_search_db:
-    container_name: rag_search_db
+  rag-search-db:
+    container_name: rag-search-db
     image: postgres:14.1
     restart: always
     healthcheck:
@@ -429,6 +429,7 @@ services:
       - 5436:5432
     volumes:
       - rag-search-db:/var/lib/postgresql/data
+      - ./DSL/Liquibase/langfuse-init/init-langfuse.sql:/docker-entrypoint-initdb.d/init-langfuse.sql:ro
     networks:
       - bykstack
 

env.example

@@ -18,7 +18,7 @@ POSTGRES_USER=postgres
 POSTGRES_PASSWORD=dbadmin
 POSTGRES_DB=rag-search-langfuse
 NEXTAUTH_URL=http://localhost:3005
-DATABASE_URL=postgresql://postgres:dbadmin@rag_search_db:5432/rag-search
+DATABASE_URL=postgresql://postgres:dbadmin@rag-search-db:5432/rag-search
 SALT=changeme
 ENCRYPTION_KEY=changeme
 NEXTAUTH_SECRET=changeme

migrate.sh

@@ -12,4 +12,4 @@ INI_FILE="constants.ini"
 DB_PASSWORD=$(get_ini_value "$INI_FILE" "DB_PASSWORD")
 
 
-docker run --rm --network bykstack -v `pwd`/DSL/Liquibase/changelog:/liquibase/changelog -v `pwd`/DSL/Liquibase/master.yml:/liquibase/master.yml -v `pwd`/DSL/Liquibase/data:/liquibase/data liquibase/liquibase:4.33 --defaultsFile=/liquibase/changelog/liquibase.properties --changelog-file=master.yml --url=jdbc:postgresql://rag_search_db:5432/rag-search?user=postgres --password=$DB_PASSWORD update
+docker run --rm --network bykstack -v `pwd`/DSL/Liquibase/changelog:/liquibase/changelog -v `pwd`/DSL/Liquibase/master.yml:/liquibase/master.yml -v `pwd`/DSL/Liquibase/data:/liquibase/data liquibase/liquibase:4.33 --defaultsFile=/liquibase/changelog/liquibase.properties --changelog-file=master.yml --url=jdbc:postgresql://rag-search-db:5432/rag-search?user=postgres --password=$DB_PASSWORD update

tests/integration_tests/conftest.py

@@ -491,7 +491,7 @@ def _run_database_migration(self) -> None:
                     "liquibase/liquibase:4.33",
                     "--defaultsFile=/liquibase/changelog/liquibase.properties",
                     "--changelog-file=master.yml",
-                    "--url=jdbc:postgresql://rag_search_db:5432/rag-search?user=postgres",
+                    "--url=jdbc:postgresql://rag-search-db:5432/rag-search?user=postgres",
                     "--password=dbadmin",
                     "update",
                 ],
@@ -541,7 +541,7 @@ def _run_database_migration(self) -> None:
                     "liquibase/liquibase:4.33",
                     "--defaultsFile=/liquibase/changelog/liquibase.properties",
                     "--changelog-file=master.yml",
-                    "--url=jdbc:postgresql://rag_search_db:5432/rag-search?user=postgres",
+                    "--url=jdbc:postgresql://rag-search-db:5432/rag-search?user=postgres",
                     "--password=dbadmin",
                     "update",
                 ],