From f81dcfd179413377d4e965cfc5ef2e2d44167455 Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Fri, 20 Sep 2024 18:33:03 -0700 Subject: [PATCH] minor method spec update --- backend/danswer/configs/app_configs.py | 2 +- backend/danswer/tools/custom/custom_tool.py | 1 + backend/danswer/tools/custom/openapi_parsing.py | 3 +++ deployment/docker_compose/docker-compose.dev.yml | 2 +- deployment/docker_compose/docker-compose.gpu-dev.yml | 2 +- deployment/docker_compose/docker-compose.search-testing.yml | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/backend/danswer/configs/app_configs.py b/backend/danswer/configs/app_configs.py index 2dbe596b6..fe262c1f6 100644 --- a/backend/danswer/configs/app_configs.py +++ b/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 diff --git a/backend/danswer/tools/custom/custom_tool.py b/backend/danswer/tools/custom/custom_tool.py index 3d36d7bb0..c7b183bab 100644 --- a/backend/danswer/tools/custom/custom_tool.py +++ b/backend/danswer/tools/custom/custom_tool.py @@ -204,6 +204,7 @@ def build_custom_tools_from_openapi_schema_and_headers( url = openapi_to_url(openapi_schema) method_specs = openapi_to_method_specs(openapi_schema) + return [ CustomTool(method_spec, url, custom_headers) for method_spec in method_specs ] diff --git a/backend/danswer/tools/custom/openapi_parsing.py b/backend/danswer/tools/custom/openapi_parsing.py index b40ea170c..91b954740 100644 --- a/backend/danswer/tools/custom/openapi_parsing.py +++ b/backend/danswer/tools/custom/openapi_parsing.py @@ -16,6 +16,7 @@ class MethodSpec(BaseModel): summary: str path: str method: str + body_schema: dict[str, Any] = {} spec: dict[str, Any] def get_request_body_schema(self) -> dict[str, Any]: @@ -87,6 +88,8 @@ class MethodSpec(BaseModel): tool_definition["function"]["parameters"]["properties"].update( {param["name"]: param["schema"] for param in path_param_schemas} ) + print(tool_definition) + print("") return tool_definition def validate_spec(self) -> None: diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml index 5893fc296..0b58c5f5b 100644 --- a/deployment/docker_compose/docker-compose.dev.yml +++ b/deployment/docker_compose/docker-compose.dev.yml @@ -293,7 +293,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5432:5432" + - "5433:5432" volumes: - db_volume:/var/lib/postgresql/data diff --git a/deployment/docker_compose/docker-compose.gpu-dev.yml b/deployment/docker_compose/docker-compose.gpu-dev.yml index bc8bf10df..9063a23bb 100644 --- a/deployment/docker_compose/docker-compose.gpu-dev.yml +++ b/deployment/docker_compose/docker-compose.gpu-dev.yml @@ -303,7 +303,7 @@ services: - POSTGRES_USER=${POSTGRES_USER:-postgres} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password} ports: - - "5432:5432" + - "5433:5432" volumes: - db_volume:/var/lib/postgresql/data diff --git a/deployment/docker_compose/docker-compose.search-testing.yml b/deployment/docker_compose/docker-compose.search-testing.yml index a64b30f09..36b093fba 100644 --- a/deployment/docker_compose/docker-compose.search-testing.yml +++ b/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