From 33d7527f367a1565043dc2633d803a15da9383ae Mon Sep 17 00:00:00 2001 From: Matthew Harris Date: Fri, 10 May 2024 13:21:54 -0400 Subject: [PATCH] Housekeeping --- .gitignore | 2 +- README.md | 2 +- .../prompts/azure_oai_sql_actions_in_python.jinja | 2 +- code-interpretor/Dockerfile | 2 +- deployment/deploy_azure.py | 2 +- deployment/docker-compose-azure.yml | 2 +- deployment/docker-compose-deploy.yml | 8 ++++---- docker-compose.yml | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 16f7a63b..933fd3fc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ tmp ingestion/api/hapi/* ingestion/api/hdx/* .vscode -code-interpretor/static/* +code-interpreter/static/* actions/actions_plugins/recipe-server/images __pycache__ ui/recipes_assistant_chat/datadb diff --git a/README.md b/README.md index aeac30d7..60a4195f 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ TODO: This will be automated, but for now ... 2. Select "Plugins' endpoint at top, then in the plugin box go to store and activate - Humanitariuan Data Assistant - Humanitarian Data Recipes - - Code sherpa, when asked enter URL http://code-interpretor:3333 + - Code sherpa, when asked enter URL http://code-interpreter:3333 3. Populate system prompts, see `./assistant/recipes_assistant/prompts`, build presets 2. Log in 3. `docker exec -it haa-ingestion /bin/bash` diff --git a/assistants/plugin_assistants/prompts/azure_oai_sql_actions_in_python.jinja b/assistants/plugin_assistants/prompts/azure_oai_sql_actions_in_python.jinja index e28979bf..8996b1ab 100644 --- a/assistants/plugin_assistants/prompts/azure_oai_sql_actions_in_python.jinja +++ b/assistants/plugin_assistants/prompts/azure_oai_sql_actions_in_python.jinja @@ -8,7 +8,7 @@ ALWAYS save image files code interpreter creates into directory './static/images ALWAYS save csv and excel files code interpreter creates into directory './static/files' -ALWAYS replace 'code-interpretor' in URLs with 'localhost' +ALWAYS replace 'code-interpreter' in URLs with 'localhost' Always adjust existing plots by regenerating Python code diff --git a/code-interpretor/Dockerfile b/code-interpretor/Dockerfile index dfa27ee3..e544b8c3 100644 --- a/code-interpretor/Dockerfile +++ b/code-interpretor/Dockerfile @@ -33,7 +33,7 @@ WORKDIR /app RUN git clone https://github.com/iamgreggarcia/codesherpa.git RUN mv codesherpa/* /app/ -COPY ./code-interpretor/pyproject.toml /app/ +COPY ./code-interpreter/pyproject.toml /app/ RUN rm ./poetry.lock RUN pip install --no-cache-dir poetry diff --git a/deployment/deploy_azure.py b/deployment/deploy_azure.py index 7aa8ee41..56331941 100644 --- a/deployment/deploy_azure.py +++ b/deployment/deploy_azure.py @@ -64,7 +64,7 @@ def deploy(): "actions", ], "busybox": [f"{container_registry}/{repo}", "init"], - "humanitarian_ai_assistant-code-interpretor": [ + "humanitarian_ai_assistant-code-interpreter": [ f"{container_registry}/{repo}", "code-interpreter", ], diff --git a/deployment/docker-compose-azure.yml b/deployment/docker-compose-azure.yml index b63cceb9..39d239b9 100644 --- a/deployment/docker-compose-azure.yml +++ b/deployment/docker-compose-azure.yml @@ -71,7 +71,7 @@ services: # user: "root" # depends_on: # - actions - code-interpretor: + code-interpreter: image: dkdsprototypesreg01.azurecr.io/humanitarian-ai-assistant:code-interpreter volumes: - ${WEBAPP_STORAGE_HOME}/shared-data:/app/static \ No newline at end of file diff --git a/deployment/docker-compose-deploy.yml b/deployment/docker-compose-deploy.yml index 61eabfa7..c9df0e30 100644 --- a/deployment/docker-compose-deploy.yml +++ b/deployment/docker-compose-deploy.yml @@ -179,17 +179,17 @@ services: # - type: bind # source: ./ingestion # target: /app - code-interpretor: + code-interpreter: #image: ghcr.io/iamgreggarcia/codesphera:latest platform: linux/amd64 - container_name: haa-code-interpretor + container_name: haa-code-interpreter build: context: . - dockerfile: ./code-interpretor/Dockerfile + dockerfile: ./code-interpreter/Dockerfile ports: - "3333:3333" #volumes: - # - ./code-interpretor/static:/app/static + # - ./code-interpreter/static:/app/static volumes: pgdata2: diff --git a/docker-compose.yml b/docker-compose.yml index 771e6e6e..c21228c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -166,12 +166,12 @@ services: - type: bind source: ./utils target: /app/utils - code-interpretor: + code-interpreter: # image: ghcr.io/iamgreggarcia/codesphera:latest - container_name: haa-code-interpretor + container_name: haa-code-interpreter build: context: . - dockerfile: ./code-interpretor/Dockerfile + dockerfile: ./code-interpreter/Dockerfile ports: - "3333:3333" volumes: