fix: update env of studio backend (#1163)

Author: NiklasKoehneckeAA

.github/workflows/sdk-tests.yml

@@ -142,7 +142,8 @@ jobs:
         ports:
           - "8000:8000"
         env:
-          DATABASE_URL: "postgres:5432"
+          POSTGRES_HOST: "postgres"
+          POSTGRES_PORT: "5432"
           POSTGRES_DB: "il_sdk"
           POSTGRES_USER: "il_sdk"
           POSTGRES_PASSWORD: "test"
@@ -189,7 +190,8 @@ jobs:
           ARGILLA_API_KEY: "argilla.apikey"
           CLIENT_URL: ${{ secrets.CLIENT_URL }}
           STUDIO_URL: "http://localhost:8000/"
-          POSTGRES_HOST: "localhost:5433"
+          POSTGRES_HOST: "localhost"
+          POSTGRES_PORT: "5433"
           POSTGRES_DB: "il_sdk"
           POSTGRES_USER: "il_sdk"
           POSTGRES_PASSWORD: "test"
@@ -228,7 +230,8 @@ jobs:
         ports:
           - "8001:8000"
         env:
-          DATABASE_URL: "postgres:5432"
+          POSTGRES_HOST: "postgres"
+          POSTGRES_PORT: "5432"
           POSTGRES_DB: "il_sdk"
           POSTGRES_USER: "il_sdk"
           POSTGRES_PASSWORD: "test"

CHANGELOG.md

@@ -17,7 +17,7 @@
 ...
 
 ### Breaking Changes
-...
+ - The env variable `POSTGRES_HOST` is split into `POSTGRES_HOST` and `POSTGRES_PORT`. This affects all classes interacting with Studio and the `InstructionFinetuningDataRepository`.
 
 ## 8.0.0
 

docker-compose.yaml

@@ -70,11 +70,12 @@ services:
         restart: true
     env_file: ".env" # mainly for AA-TOKEN, DB User/PW
     environment:
-      DATABASE_URL: postgres:5432
+      POSTGRES_HOST: postgres
       AUTHORIZATION_SERVICE_URL: "none"
       API_SCHEDULER_URL: "https://api.aleph-alpha.com"
   postgres:
     image: postgres:15
     ports:
-      - "5433:5432"
+      - ${POSTGRES_PORT}:${POSTGRES_PORT}
     env_file: ".env"
+    command: -p ${POSTGRES_PORT}

env.sample

@@ -7,7 +7,8 @@ TRACE_VIEWER_URL="http://localhost:3000"
 STUDIO_URL="http://localhost:8000"
 
 # DB Variables
-POSTGRES_HOST="localhost:5433"
+POSTGRES_HOST=localhost
+POSTGRES_PORT=5434
 POSTGRES_DB=il_sdk
 POSTGRES_USER=il_sdk
 POSTGRES_PASSWORD=test

tests/learning/conftest.py

@@ -47,8 +47,10 @@ def postgres_instruction_finetuning_data_repository() -> (
     db_user = os.getenv("POSTGRES_USER")
     db_pw = os.getenv("POSTGRES_PASSWORD")
     db_host = os.getenv("POSTGRES_HOST")
+    db_port = os.getenv("POSTGRES_PORT")
+
     db_name = os.getenv("POSTGRES_DB")
-    db_url = f"postgresql://{db_user}:{db_pw}@{db_host}/{db_name}"
+    db_url = f"postgresql://{db_user}:{db_pw}@{db_host}:{db_port}/{db_name}"
 
     return PostgresInstructionFinetuningDataRepository(db_url)