quick update to some naming

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

@@ -12,6 +12,7 @@ from danswer.db.models import User__UserGroup
 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 LLMProviderUpsertRequest
 from shared_configs.enums import EmbeddingProvider
 
@@ -59,9 +60,12 @@ def upsert_cloud_embedding_provider(
     return CloudEmbeddingProvider.from_request(existing_provider)
 
 
+# from danswer.server.manage.llm.models import FullLLMProviderSnapshot
+
+
 def upsert_llm_provider(
     llm_provider: LLMProviderUpsertRequest, db_session: Session
-) -> FullLLMProvider:
+) -> FullLLMProviderSnapshot:
     existing_llm_provider = db_session.scalar(
         select(LLMProviderModel).where(LLMProviderModel.name == llm_provider.name)
     )
@@ -94,7 +98,9 @@ def upsert_llm_provider(
 
     db_session.commit()
 
-    return FullLLMProvider.from_model(existing_llm_provider)
+    return FullLLMProviderSnapshot.from_full_llm_provider(
+        FullLLMProvider.from_model(existing_llm_provider)
+    )
 
 
 def fetch_existing_embedding_providers(

backend/danswer/search/models.py

@@ -92,7 +92,7 @@ class SearchSettingsSnapshot(SavedSearchSettings):
     def from_saved_settings(
         cls, settings: SavedSearchSettings
     ) -> "SearchSettingsSnapshot":
-        data = settings.dict(exclude={"rerank_api_key"})
+        data = settings.dict(exclude={"rerank_api_key", "api_key"})
         data["rerank_api_key"] = obfuscate_api_key(settings.rerank_api_key)
         data["api_key"] = obfuscate_api_key(settings.api_key)
 

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

@@ -19,6 +19,7 @@ from danswer.llm.llm_provider_options import fetch_available_well_known_llms
 from danswer.llm.llm_provider_options import WellKnownLLMProviderDescriptor
 from danswer.llm.utils import test_llm
 from danswer.server.manage.llm.models import FullLLMProvider
+from danswer.server.manage.llm.models import FullLLMProviderSnapshot
 from danswer.server.manage.llm.models import LLMProviderDescriptor
 from danswer.server.manage.llm.models import LLMProviderUpsertRequest
 from danswer.server.manage.llm.models import TestLLMRequest
@@ -120,8 +121,10 @@ def put_llm_provider(
     llm_provider: LLMProviderUpsertRequest,
     _: User | None = Depends(current_admin_user),
     db_session: Session = Depends(get_session),
-) -> FullLLMProvider:
+) -> FullLLMProviderSnapshot:
-    return upsert_llm_provider(llm_provider=llm_provider, db_session=db_session)
+    return FullLLMProviderSnapshot.from_full_llm_provider(
+        upsert_llm_provider(llm_provider=llm_provider, db_session=db_session)
+    )
 
 
 @admin_router.delete("/provider/{provider_id}")

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

@@ -101,3 +101,13 @@ class FullLLMProvider(LLMProvider):
             is_public=llm_provider_model.is_public,
             groups=[group.id for group in llm_provider_model.groups],
         )
+
+
+class FullLLMProviderSnapshot(FullLLMProvider):
+    @classmethod
+    def from_full_llm_provider(
+        cls, settings: FullLLMProvider
+    ) -> "FullLLMProviderSnapshot":
+        data = settings.dict(exclude={"api_key"})
+        data["api_key"] = obfuscate_api_key(settings.api_key)
+        return cls(**data)

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