squash

backend/danswer/configs/app_configs.py

@@ -135,7 +135,7 @@ POSTGRES_PASSWORD = urllib.parse.quote_plus(
     os.environ.get("POSTGRES_PASSWORD") or "password"
 )
 POSTGRES_HOST = os.environ.get("POSTGRES_HOST") or "localhost"
-POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5432"
+POSTGRES_PORT = os.environ.get("POSTGRES_PORT") or "5433"
 POSTGRES_DB = os.environ.get("POSTGRES_DB") or "postgres"
 
 # defaults to False

backend/danswer/db/llm.py

@@ -13,6 +13,8 @@ from danswer.server.manage.embedding.models import CloudEmbeddingProvider
 from danswer.server.manage.embedding.models import CloudEmbeddingProviderCreationRequest
 from danswer.server.manage.llm.models import FullLLMProvider
 from danswer.server.manage.llm.models import FullLLMProviderSnapshot
+from danswer.server.manage.llm.models import LLMProviderCreationRequest
+from danswer.server.manage.llm.models import LLMProviderUpdateRequest
 from danswer.server.manage.llm.models import LLMProviderUpsertRequest
 from shared_configs.enums import EmbeddingProvider
 
@@ -60,6 +62,38 @@ def upsert_cloud_embedding_provider(
     return CloudEmbeddingProvider.from_request(existing_provider)
 
 
+def update_llm_provider(
+    llm_provider_update: LLMProviderUpdateRequest,
+    db_session: Session,
+) -> FullLLMProviderSnapshot:
+    existing_llm_provider = db_session.scalar(
+        select(LLMProviderModel).where(
+            LLMProviderModel.name == llm_provider_update.name
+        )
+    )
+    # if llm_provider_update.api_key_set:
+
+    if not existing_llm_provider:
+        raise ValueError(
+            f"LLM Provider with name {llm_provider_update.name} does not exist"
+        )
+    return FullLLMProviderSnapshot.from_full_llm_provider(
+        FullLLMProvider.from_model(existing_llm_provider)
+    )
+
+
+def create_llm_provider(
+    llm_provider_creation: LLMProviderCreationRequest,
+    db_session: Session,
+) -> FullLLMProviderSnapshot:
+    new_llm_provider = LLMProviderModel(name=llm_provider_creation.name)
+    db_session.add(new_llm_provider)
+    db_session.commit()
+    return FullLLMProviderSnapshot.from_full_llm_provider(
+        FullLLMProvider.from_model(new_llm_provider)
+    )
+
+
 def upsert_llm_provider(
     llm_provider: LLMProviderUpsertRequest,
     db_session: Session,

backend/danswer/server/manage/llm/models.py

@@ -73,11 +73,11 @@ class LLMProviderUpsertRequest(LLMProvider):
     model_names: list[str] | None = None
 
 
-class LLMProviderCreationRequest(LLMProvider):
+class LLMProviderUpdateRequest(LLMProvider):
     api_key_set: bool
 
 
-class LLMProviderUpdateRequest(LLMProvider):
+class LLMProviderCreationRequest(LLMProvider):
     pass
 
 

deployment/docker_compose/docker-compose.dev.yml

@@ -292,7 +292,7 @@ services:
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
     ports:
-      - "5432:5432"
+      - "5433:5432"
     volumes:
       - db_volume:/var/lib/postgresql/data
 

deployment/docker_compose/docker-compose.gpu-dev.yml

@@ -302,7 +302,7 @@ services:
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
     ports:
-      - "5432:5432"
+      - "5433:5432"
     volumes:
       - db_volume:/var/lib/postgresql/data
 

deployment/docker_compose/docker-compose.search-testing.yml

@@ -154,7 +154,7 @@ services:
       - POSTGRES_USER=${POSTGRES_USER:-postgres}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
     ports:
-      - "5432"
+      - "5433"
     volumes:
       - db_volume:/var/lib/postgresql/data