Merge pull request #615 from deeppavlov/refactor/deepy-llm

change openai llm
deeppavlov · Jul 16, 2024 · 855ccb2 · 855ccb2
2 parents 016aedc + 2f84ffb
commit 855ccb2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/annotators/spacy_annotator/requirements.txt b/annotators/spacy_annotator/requirements.txt
@@ -3,7 +3,8 @@ itsdangerous==2.0.1
 gunicorn==20.0.4
 sentry-sdk==0.13.4
 requests==2.22.0
-spacy==3.2.0
+numpy==1.24.2
+spacy==3.5.1
 typer==0.4.1
 click<=8.0.4
 jinja2<=3.0.3

diff --git a/assistant_dists/deepy_assistant/dev.yml b/assistant_dists/deepy_assistant/dev.yml
@@ -23,7 +23,7 @@ services:
       - "./common:/src/common"
     ports:
       - 8135:8135
-  openai-api-davinci3:
+  openai-api-openai-api-chatgpt:
     volumes:
       - "./services/openai_api_lm:/src"
       - "./common:/src/common"

diff --git a/assistant_dists/deepy_assistant/docker-compose.override.yml b/assistant_dists/deepy_assistant/docker-compose.override.yml
@@ -2,7 +2,7 @@ services:
   agent:
     command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.pipeline_config=assistant_dists/deepy_assistant/pipeline_conf.json'
     environment:
-      WAIT_HOSTS: "ranking-based-response-selector:8002, sentence-ranker:8128, prompt-selector:8135, openai-api-davinci3:8131,
+      WAIT_HOSTS: "ranking-based-response-selector:8002, sentence-ranker:8128, prompt-selector:8135, openai-api-chatgpt:8131,
         dff-deepy-prompted-skill:8152"
       WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000}
       HIGH_PRIORITY_INTENTS: 1
@@ -75,13 +75,13 @@ services:
         reservations:
           memory: 3G
 
-  openai-api-davinci3:
+  openai-api-chatgpt:
     env_file: [ .env ]
     build:
       args:
         SERVICE_PORT: 8131
-        SERVICE_NAME: openai_api_davinci3
-        PRETRAINED_MODEL_NAME_OR_PATH: text-davinci-003
+        SERVICE_NAME: openai_api_chatgpt
+        PRETRAINED_MODEL_NAME_OR_PATH: gpt-3.5-turbo
       context: .
       dockerfile: ./services/openai_api_lm/Dockerfile
     command: flask run -h 0.0.0.0 -p 8131
@@ -102,8 +102,8 @@ services:
         SERVICE_PORT: 8152
         SERVICE_NAME: dff_deepy_prompted_skill
         PROMPT_FILE: common/prompts/deepy.json
-        GENERATIVE_SERVICE_URL: http://openai-api-davinci3:8131/respond
-        GENERATIVE_SERVICE_CONFIG: openai-text-davinci-003-long.json
+        GENERATIVE_SERVICE_URL: http://openai-api-chatgpt:8131/respond
+        GENERATIVE_SERVICE_CONFIG: openai-chatgpt.json
         GENERATIVE_TIMEOUT: 120
         N_UTTERANCES_CONTEXT: 7
         ENVVARS_TO_SEND: OPENAI_API_KEY,OPENAI_ORGANIZATION

diff --git a/skills/dff_template_prompted_skill/service_configs/dff-deepy-prompted-skill/environment.yml b/skills/dff_template_prompted_skill/service_configs/dff-deepy-prompted-skill/environment.yml
@@ -1,8 +1,8 @@
 SERVICE_PORT: 8152
 SERVICE_NAME: dff_deepy_prompted_skill
 PROMPT_FILE: common/prompts/deepy.json
-GENERATIVE_SERVICE_URL: http://openai-api-davinci3:8131/respond
-GENERATIVE_SERVICE_CONFIG: openai-text-davinci-003-long.json
+GENERATIVE_SERVICE_URL: http://openai-api-chatgpt:8131/respond
+GENERATIVE_SERVICE_CONFIG: openai-chatgpt.json
 GENERATIVE_TIMEOUT: 120
 N_UTTERANCES_CONTEXT: 7
 ENVVARS_TO_SEND: OPENAI_API_KEY,OPENAI_ORGANIZATION
diff --git a/skills/dff_template_prompted_skill/service_configs/dff-deepy-prompted-skill/service.yml b/skills/dff_template_prompted_skill/service_configs/dff-deepy-prompted-skill/service.yml
@@ -10,8 +10,8 @@ compose:
       SERVICE_PORT: 8152
       SERVICE_NAME: dff_deepy_prompted_skill
       PROMPT_FILE: common/prompts/deepy.json
-      GENERATIVE_SERVICE_URL: http://openai-api-davinci3:8131/respond
-      GENERATIVE_SERVICE_CONFIG: openai-text-davinci-003-long.json
+      GENERATIVE_SERVICE_URL: http://openai-api-chatgpt:8131/respond
+      GENERATIVE_SERVICE_CONFIG: openai-chatgpt.json
       GENERATIVE_TIMEOUT: 120
       N_UTTERANCES_CONTEXT: 7
       ENVVARS_TO_SEND: OPENAI_API_KEY,OPENAI_ORGANIZATION