From 559852941741ea1f867d422d652255b589c0bdff Mon Sep 17 00:00:00 2001 From: "Dilyara Zharikova (Baymurzina)" Date: Fri, 21 Apr 2023 15:57:38 +0300 Subject: [PATCH] fix: no spelling for prompted dists (#400) --- assistant_dists/ai_faq_assistant/dev.yml | 5 ----- .../docker-compose.override.yml | 19 +------------------ .../ai_faq_assistant/pipeline_conf.json | 19 ------------------- assistant_dists/ai_faq_assistant/proxy.yml | 9 --------- .../da_costa_clothes_assistant/dev.yml | 5 ----- .../docker-compose.override.yml | 19 +------------------ .../pipeline_conf.json | 19 ------------------- .../da_costa_clothes_assistant/proxy.yml | 9 --------- .../deeppavlov_assistant/pipeline_conf.json | 1 - .../dream_persona_openai_prompted/dev.yml | 5 ----- .../docker-compose.override.yml | 19 +------------------ .../pipeline_conf.json | 19 ------------------- .../dream_persona_openai_prompted/proxy.yml | 9 --------- .../dream_persona_prompted/dev.yml | 5 ----- .../docker-compose.override.yml | 19 +------------------ .../dream_persona_prompted/pipeline_conf.json | 19 ------------------- .../pipeline_conf.json | 2 -- .../empathetic_marketing_assistant/dev.yml | 5 ----- .../docker-compose.override.yml | 19 +------------------ .../pipeline_conf.json | 19 ------------------- .../empathetic_marketing_assistant/proxy.yml | 9 --------- assistant_dists/fairytale_assistant/dev.yml | 5 ----- .../docker-compose.override.yml | 19 +------------------ .../fairytale_assistant/pipeline_conf.json | 19 ------------------- assistant_dists/fairytale_assistant/proxy.yml | 9 --------- assistant_dists/nutrition_assistant/dev.yml | 5 ----- .../docker-compose.override.yml | 19 +------------------ .../nutrition_assistant/pipeline_conf.json | 19 ------------------- assistant_dists/nutrition_assistant/proxy.yml | 9 --------- .../rhodes_coaching_assistant/dev.yml | 5 ----- .../docker-compose.override.yml | 19 +------------------ .../pipeline_conf.json | 19 ------------------- .../rhodes_coaching_assistant/proxy.yml | 9 --------- .../universal_prompted_assistant/dev.yml | 5 ----- .../docker-compose.override.yml | 19 +------------------ .../pipeline_conf.json | 18 ------------------ 36 files changed, 9 insertions(+), 443 deletions(-) diff --git a/assistant_dists/ai_faq_assistant/dev.yml b/assistant_dists/ai_faq_assistant/dev.yml index 3f2d83c304..72cf200379 100644 --- a/assistant_dists/ai_faq_assistant/dev.yml +++ b/assistant_dists/ai_faq_assistant/dev.yml @@ -22,11 +22,6 @@ services: - "./common:/src/common" ports: - 8018:8018 - spelling-preprocessing: - volumes: - - "./annotators/spelling_preprocessing:/src" - ports: - - 8074:8074 combined-classification: volumes: - "./common:/src/common" diff --git a/assistant_dists/ai_faq_assistant/docker-compose.override.yml b/assistant_dists/ai_faq_assistant/docker-compose.override.yml index dbff8b7a5e..8cd7f7c978 100644 --- a/assistant_dists/ai_faq_assistant/docker-compose.override.yml +++ b/assistant_dists/ai_faq_assistant/docker-compose.override.yml @@ -3,7 +3,7 @@ services: command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.pipeline_config=assistant_dists/ai_faq_assistant/pipeline_conf.json' environment: WAIT_HOSTS: "sentseg:8011, no-restrictions-selector:8009, badlisted-words:8018, combined-classification:8087, - spelling-preprocessing:8074, sentence-ranker:8128, prompt-selector:8135, transformers-lm-oasst12b:8158, + sentence-ranker:8128, prompt-selector:8135, transformers-lm-oasst12b:8158, dff-ai-faq-prompted-skill:8143" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} @@ -90,23 +90,6 @@ services: reservations: memory: 256M - spelling-preprocessing: - env_file: [ .env ] - build: - args: - SERVICE_PORT: 8074 - SERVICE_NAME: spelling_preprocessing - context: ./annotators/spelling_preprocessing/ - command: flask run -h 0.0.0.0 -p 8074 - environment: - - FLASK_APP=server - deploy: - resources: - limits: - memory: 100M - reservations: - memory: 100M - prompt-selector: env_file: [ .env ] build: diff --git a/assistant_dists/ai_faq_assistant/pipeline_conf.json b/assistant_dists/ai_faq_assistant/pipeline_conf.json index f03887b434..ce4b5a91e9 100644 --- a/assistant_dists/ai_faq_assistant/pipeline_conf.json +++ b/assistant_dists/ai_faq_assistant/pipeline_conf.json @@ -95,22 +95,6 @@ } }, "annotators": { - "spelling_preprocessing": { - "connector": { - "protocol": "http", - "timeout": 1.0, - "url": "http://spelling-preprocessing:8074/respond" - }, - "dialog_formatter": "state_formatters.dp_formatters:last_utt_dialog", - "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", - "state_manager_method": "add_annotation_and_reset_human_attributes_for_first_turn", - "is_enabled": true, - "source": { - "directory": "annotators/spelling_preprocessing", - "container": "spelling-preprocessing", - "endpoint": "respond" - } - }, "sentseg": { "connector": { "protocol": "http", @@ -120,7 +104,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -139,7 +122,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -158,7 +140,6 @@ "dialog_formatter": "state_formatters.dp_formatters:context_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, diff --git a/assistant_dists/ai_faq_assistant/proxy.yml b/assistant_dists/ai_faq_assistant/proxy.yml index ae1896400e..3245e34158 100644 --- a/assistant_dists/ai_faq_assistant/proxy.yml +++ b/assistant_dists/ai_faq_assistant/proxy.yml @@ -18,15 +18,6 @@ services: - PROXY_PASS=dream.deeppavlov.ai:8018 - PORT=8018 - spelling-preprocessing: - command: ["nginx", "-g", "daemon off;"] - build: - context: dp/proxy/ - dockerfile: Dockerfile - environment: - - PROXY_PASS=dream.deeppavlov.ai:8074 - - PORT=8074 - combined-classification: command: ["nginx", "-g", "daemon off;"] build: diff --git a/assistant_dists/da_costa_clothes_assistant/dev.yml b/assistant_dists/da_costa_clothes_assistant/dev.yml index 8b2b3c1807..5515d1836c 100644 --- a/assistant_dists/da_costa_clothes_assistant/dev.yml +++ b/assistant_dists/da_costa_clothes_assistant/dev.yml @@ -22,11 +22,6 @@ services: - "./common:/src/common" ports: - 8018:8018 - spelling-preprocessing: - volumes: - - "./annotators/spelling_preprocessing:/src" - ports: - - 8074:8074 combined-classification: volumes: - "./common:/src/common" diff --git a/assistant_dists/da_costa_clothes_assistant/docker-compose.override.yml b/assistant_dists/da_costa_clothes_assistant/docker-compose.override.yml index 0e662ce499..15932e3073 100644 --- a/assistant_dists/da_costa_clothes_assistant/docker-compose.override.yml +++ b/assistant_dists/da_costa_clothes_assistant/docker-compose.override.yml @@ -3,7 +3,7 @@ services: command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.pipeline_config=assistant_dists/da_costa_clothes_assistant/pipeline_conf.json' environment: WAIT_HOSTS: "sentseg:8011, no-restrictions-selector:8009, badlisted-words:8018, combined-classification:8087, - spelling-preprocessing:8074, sentence-ranker:8128, prompt-selector:8135, transformers-lm-oasst12b:8158, + sentence-ranker:8128, prompt-selector:8135, transformers-lm-oasst12b:8158, dff-da-costa-clothes-prompted-skill:8144" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} @@ -90,23 +90,6 @@ services: reservations: memory: 256M - spelling-preprocessing: - env_file: [ .env ] - build: - args: - SERVICE_PORT: 8074 - SERVICE_NAME: spelling_preprocessing - context: ./annotators/spelling_preprocessing/ - command: flask run -h 0.0.0.0 -p 8074 - environment: - - FLASK_APP=server - deploy: - resources: - limits: - memory: 100M - reservations: - memory: 100M - prompt-selector: env_file: [ .env ] build: diff --git a/assistant_dists/da_costa_clothes_assistant/pipeline_conf.json b/assistant_dists/da_costa_clothes_assistant/pipeline_conf.json index 33f6a77059..5a91f53ad7 100644 --- a/assistant_dists/da_costa_clothes_assistant/pipeline_conf.json +++ b/assistant_dists/da_costa_clothes_assistant/pipeline_conf.json @@ -95,22 +95,6 @@ } }, "annotators": { - "spelling_preprocessing": { - "connector": { - "protocol": "http", - "timeout": 1.0, - "url": "http://spelling-preprocessing:8074/respond" - }, - "dialog_formatter": "state_formatters.dp_formatters:last_utt_dialog", - "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", - "state_manager_method": "add_annotation_and_reset_human_attributes_for_first_turn", - "is_enabled": true, - "source": { - "directory": "annotators/spelling_preprocessing", - "container": "spelling-preprocessing", - "endpoint": "respond" - } - }, "sentseg": { "connector": { "protocol": "http", @@ -120,7 +104,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -139,7 +122,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -158,7 +140,6 @@ "dialog_formatter": "state_formatters.dp_formatters:context_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, diff --git a/assistant_dists/da_costa_clothes_assistant/proxy.yml b/assistant_dists/da_costa_clothes_assistant/proxy.yml index ae1896400e..3245e34158 100644 --- a/assistant_dists/da_costa_clothes_assistant/proxy.yml +++ b/assistant_dists/da_costa_clothes_assistant/proxy.yml @@ -18,15 +18,6 @@ services: - PROXY_PASS=dream.deeppavlov.ai:8018 - PORT=8018 - spelling-preprocessing: - command: ["nginx", "-g", "daemon off;"] - build: - context: dp/proxy/ - dockerfile: Dockerfile - environment: - - PROXY_PASS=dream.deeppavlov.ai:8074 - - PORT=8074 - combined-classification: command: ["nginx", "-g", "daemon off;"] build: diff --git a/assistant_dists/deeppavlov_assistant/pipeline_conf.json b/assistant_dists/deeppavlov_assistant/pipeline_conf.json index e7f31317a7..55cd139471 100644 --- a/assistant_dists/deeppavlov_assistant/pipeline_conf.json +++ b/assistant_dists/deeppavlov_assistant/pipeline_conf.json @@ -64,7 +64,6 @@ "dialog_formatter": "state_formatters.dp_formatters:context_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, diff --git a/assistant_dists/dream_persona_openai_prompted/dev.yml b/assistant_dists/dream_persona_openai_prompted/dev.yml index 1994afd121..5e19a6ebe8 100644 --- a/assistant_dists/dream_persona_openai_prompted/dev.yml +++ b/assistant_dists/dream_persona_openai_prompted/dev.yml @@ -22,11 +22,6 @@ services: - "./common:/src/common" ports: - 8018:8018 - spelling-preprocessing: - volumes: - - "./annotators/spelling_preprocessing:/src" - ports: - - 8074:8074 combined-classification: volumes: - "./common:/src/common" diff --git a/assistant_dists/dream_persona_openai_prompted/docker-compose.override.yml b/assistant_dists/dream_persona_openai_prompted/docker-compose.override.yml index 6c71ecdd49..b337cb34fe 100644 --- a/assistant_dists/dream_persona_openai_prompted/docker-compose.override.yml +++ b/assistant_dists/dream_persona_openai_prompted/docker-compose.override.yml @@ -3,7 +3,7 @@ services: command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.pipeline_config=assistant_dists/dream_persona_openai_prompted/pipeline_conf.json' environment: WAIT_HOSTS: "sentseg:8011, convers-evaluation-no-scripts-selector:8009, badlisted-words:8018, combined-classification:8087, - spelling-preprocessing:8074, sentence-ranker:8128, prompt-selector:8135, openai-api-davinci3:8131, + sentence-ranker:8128, prompt-selector:8135, openai-api-davinci3:8131, dff-dream-persona-davinci3-prompted-skill:8137" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} @@ -90,23 +90,6 @@ services: reservations: memory: 256M - spelling-preprocessing: - env_file: [ .env ] - build: - args: - SERVICE_PORT: 8074 - SERVICE_NAME: spelling_preprocessing - context: ./annotators/spelling_preprocessing/ - command: flask run -h 0.0.0.0 -p 8074 - environment: - - FLASK_APP=server - deploy: - resources: - limits: - memory: 100M - reservations: - memory: 100M - prompt-selector: env_file: [ .env ] build: diff --git a/assistant_dists/dream_persona_openai_prompted/pipeline_conf.json b/assistant_dists/dream_persona_openai_prompted/pipeline_conf.json index e74e06bfa3..4c50270199 100644 --- a/assistant_dists/dream_persona_openai_prompted/pipeline_conf.json +++ b/assistant_dists/dream_persona_openai_prompted/pipeline_conf.json @@ -95,22 +95,6 @@ } }, "annotators": { - "spelling_preprocessing": { - "connector": { - "protocol": "http", - "timeout": 1.0, - "url": "http://spelling-preprocessing:8074/respond" - }, - "dialog_formatter": "state_formatters.dp_formatters:last_utt_dialog", - "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", - "state_manager_method": "add_annotation_and_reset_human_attributes_for_first_turn", - "is_enabled": true, - "source": { - "directory": "annotators/spelling_preprocessing", - "container": "spelling-preprocessing", - "endpoint": "respond" - } - }, "sentseg": { "connector": { "protocol": "http", @@ -120,7 +104,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -139,7 +122,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -158,7 +140,6 @@ "dialog_formatter": "state_formatters.dp_formatters:context_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, diff --git a/assistant_dists/dream_persona_openai_prompted/proxy.yml b/assistant_dists/dream_persona_openai_prompted/proxy.yml index 70915cacf2..bc85e57080 100644 --- a/assistant_dists/dream_persona_openai_prompted/proxy.yml +++ b/assistant_dists/dream_persona_openai_prompted/proxy.yml @@ -18,15 +18,6 @@ services: - PROXY_PASS=dream.deeppavlov.ai:8018 - PORT=8018 - spelling-preprocessing: - command: ["nginx", "-g", "daemon off;"] - build: - context: dp/proxy/ - dockerfile: Dockerfile - environment: - - PROXY_PASS=dream.deeppavlov.ai:8074 - - PORT=8074 - combined-classification: command: ["nginx", "-g", "daemon off;"] build: diff --git a/assistant_dists/dream_persona_prompted/dev.yml b/assistant_dists/dream_persona_prompted/dev.yml index 2269b598e8..21332c6442 100644 --- a/assistant_dists/dream_persona_prompted/dev.yml +++ b/assistant_dists/dream_persona_prompted/dev.yml @@ -22,11 +22,6 @@ services: - "./common:/src/common" ports: - 8018:8018 - spelling-preprocessing: - volumes: - - "./annotators/spelling_preprocessing:/src" - ports: - - 8074:8074 combined-classification: volumes: - "./common:/src/common" diff --git a/assistant_dists/dream_persona_prompted/docker-compose.override.yml b/assistant_dists/dream_persona_prompted/docker-compose.override.yml index c9bc3cfe97..cf99ce4c85 100644 --- a/assistant_dists/dream_persona_prompted/docker-compose.override.yml +++ b/assistant_dists/dream_persona_prompted/docker-compose.override.yml @@ -3,7 +3,7 @@ services: command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.pipeline_config=assistant_dists/dream_persona_prompted/pipeline_conf.json' environment: WAIT_HOSTS: "sentseg:8011, convers-evaluation-no-scripts-selector:8009, badlisted-words:8018, combined-classification:8087, - spelling-preprocessing:8074, sentence-ranker:8128, prompt-selector:8135, transformers-lm-gptj:8130, + sentence-ranker:8128, prompt-selector:8135, transformers-lm-gptj:8130, dff-dream-persona-gpt-j-prompted-skill:8134" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} @@ -90,23 +90,6 @@ services: reservations: memory: 256M - spelling-preprocessing: - env_file: [ .env ] - build: - args: - SERVICE_PORT: 8074 - SERVICE_NAME: spelling_preprocessing - context: ./annotators/spelling_preprocessing/ - command: flask run -h 0.0.0.0 -p 8074 - environment: - - FLASK_APP=server - deploy: - resources: - limits: - memory: 100M - reservations: - memory: 100M - prompt-selector: env_file: [ .env ] build: diff --git a/assistant_dists/dream_persona_prompted/pipeline_conf.json b/assistant_dists/dream_persona_prompted/pipeline_conf.json index 02cd5a454d..e351a38b49 100644 --- a/assistant_dists/dream_persona_prompted/pipeline_conf.json +++ b/assistant_dists/dream_persona_prompted/pipeline_conf.json @@ -58,22 +58,6 @@ } }, "annotators": { - "spelling_preprocessing": { - "connector": { - "protocol": "http", - "timeout": 1.0, - "url": "http://spelling-preprocessing:8074/respond" - }, - "dialog_formatter": "state_formatters.dp_formatters:last_utt_dialog", - "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", - "state_manager_method": "add_annotation_and_reset_human_attributes_for_first_turn", - "is_enabled": true, - "source": { - "directory": "annotators/spelling_preprocessing", - "container": "spelling-preprocessing", - "endpoint": "respond" - } - }, "sentseg": { "connector": { "protocol": "http", @@ -83,7 +67,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -102,7 +85,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -121,7 +103,6 @@ "dialog_formatter": "state_formatters.dp_formatters:context_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, diff --git a/assistant_dists/dream_persona_rullama_prompted/pipeline_conf.json b/assistant_dists/dream_persona_rullama_prompted/pipeline_conf.json index 190ca311c6..424ab2ff57 100644 --- a/assistant_dists/dream_persona_rullama_prompted/pipeline_conf.json +++ b/assistant_dists/dream_persona_rullama_prompted/pipeline_conf.json @@ -60,7 +60,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_and_tokenized_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing", "annotators.spacy_annotator" ], "state_manager_method": "add_annotation", @@ -80,7 +79,6 @@ "dialog_formatter": "state_formatters.dp_formatters:context_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, diff --git a/assistant_dists/empathetic_marketing_assistant/dev.yml b/assistant_dists/empathetic_marketing_assistant/dev.yml index 16986d502e..f28059d91e 100644 --- a/assistant_dists/empathetic_marketing_assistant/dev.yml +++ b/assistant_dists/empathetic_marketing_assistant/dev.yml @@ -22,11 +22,6 @@ services: - "./common:/src/common" ports: - 8018:8018 - spelling-preprocessing: - volumes: - - "./annotators/spelling_preprocessing:/src" - ports: - - 8074:8074 combined-classification: volumes: - "./common:/src/common" diff --git a/assistant_dists/empathetic_marketing_assistant/docker-compose.override.yml b/assistant_dists/empathetic_marketing_assistant/docker-compose.override.yml index 0be59eff5b..244db666aa 100644 --- a/assistant_dists/empathetic_marketing_assistant/docker-compose.override.yml +++ b/assistant_dists/empathetic_marketing_assistant/docker-compose.override.yml @@ -3,7 +3,7 @@ services: command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.pipeline_config=assistant_dists/empathetic_marketing_assistant/pipeline_conf.json' environment: WAIT_HOSTS: "sentseg:8011, no-restrictions-selector:8009, badlisted-words:8018, combined-classification:8087, - spelling-preprocessing:8074, sentence-ranker:8128, prompt-selector:8135, transformers-lm-gptj:8130, + sentence-ranker:8128, prompt-selector:8135, transformers-lm-gptj:8130, dff-empathetic-marketing-prompted-skill:8138" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} @@ -90,23 +90,6 @@ services: reservations: memory: 256M - spelling-preprocessing: - env_file: [ .env ] - build: - args: - SERVICE_PORT: 8074 - SERVICE_NAME: spelling_preprocessing - context: ./annotators/spelling_preprocessing/ - command: flask run -h 0.0.0.0 -p 8074 - environment: - - FLASK_APP=server - deploy: - resources: - limits: - memory: 100M - reservations: - memory: 100M - prompt-selector: env_file: [ .env ] build: diff --git a/assistant_dists/empathetic_marketing_assistant/pipeline_conf.json b/assistant_dists/empathetic_marketing_assistant/pipeline_conf.json index 9f6f14b5c7..7801c0acce 100644 --- a/assistant_dists/empathetic_marketing_assistant/pipeline_conf.json +++ b/assistant_dists/empathetic_marketing_assistant/pipeline_conf.json @@ -95,22 +95,6 @@ } }, "annotators": { - "spelling_preprocessing": { - "connector": { - "protocol": "http", - "timeout": 1.0, - "url": "http://spelling-preprocessing:8074/respond" - }, - "dialog_formatter": "state_formatters.dp_formatters:last_utt_dialog", - "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", - "state_manager_method": "add_annotation_and_reset_human_attributes_for_first_turn", - "is_enabled": true, - "source": { - "directory": "annotators/spelling_preprocessing", - "container": "spelling-preprocessing", - "endpoint": "respond" - } - }, "sentseg": { "connector": { "protocol": "http", @@ -120,7 +104,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -139,7 +122,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -158,7 +140,6 @@ "dialog_formatter": "state_formatters.dp_formatters:context_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, diff --git a/assistant_dists/empathetic_marketing_assistant/proxy.yml b/assistant_dists/empathetic_marketing_assistant/proxy.yml index a8fec31cd2..dd6f5e3d4d 100644 --- a/assistant_dists/empathetic_marketing_assistant/proxy.yml +++ b/assistant_dists/empathetic_marketing_assistant/proxy.yml @@ -18,15 +18,6 @@ services: - PROXY_PASS=dream.deeppavlov.ai:8018 - PORT=8018 - spelling-preprocessing: - command: ["nginx", "-g", "daemon off;"] - build: - context: dp/proxy/ - dockerfile: Dockerfile - environment: - - PROXY_PASS=dream.deeppavlov.ai:8074 - - PORT=8074 - combined-classification: command: ["nginx", "-g", "daemon off;"] build: diff --git a/assistant_dists/fairytale_assistant/dev.yml b/assistant_dists/fairytale_assistant/dev.yml index 61ff96f0cc..061529a4b0 100644 --- a/assistant_dists/fairytale_assistant/dev.yml +++ b/assistant_dists/fairytale_assistant/dev.yml @@ -22,11 +22,6 @@ services: - "./common:/src/common" ports: - 8018:8018 - spelling-preprocessing: - volumes: - - "./annotators/spelling_preprocessing:/src" - ports: - - 8074:8074 combined-classification: volumes: - "./common:/src/common" diff --git a/assistant_dists/fairytale_assistant/docker-compose.override.yml b/assistant_dists/fairytale_assistant/docker-compose.override.yml index 0202e3dead..3c3dcbffd2 100644 --- a/assistant_dists/fairytale_assistant/docker-compose.override.yml +++ b/assistant_dists/fairytale_assistant/docker-compose.override.yml @@ -3,7 +3,7 @@ services: command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.pipeline_config=assistant_dists/fairytale_assistant/pipeline_conf.json' environment: WAIT_HOSTS: "sentseg:8011, no-restrictions-selector:8009, badlisted-words:8018, combined-classification:8087, - spelling-preprocessing:8074, sentence-ranker:8128, prompt-selector:8135, openai-api-chatgpt:8145, + sentence-ranker:8128, prompt-selector:8135, openai-api-chatgpt:8145, dff-fairytale-prompted-skill:8139" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} @@ -90,23 +90,6 @@ services: reservations: memory: 256M - spelling-preprocessing: - env_file: [ .env ] - build: - args: - SERVICE_PORT: 8074 - SERVICE_NAME: spelling_preprocessing - context: ./annotators/spelling_preprocessing/ - command: flask run -h 0.0.0.0 -p 8074 - environment: - - FLASK_APP=server - deploy: - resources: - limits: - memory: 100M - reservations: - memory: 100M - prompt-selector: env_file: [ .env ] build: diff --git a/assistant_dists/fairytale_assistant/pipeline_conf.json b/assistant_dists/fairytale_assistant/pipeline_conf.json index 557ac0085e..737a4b61da 100644 --- a/assistant_dists/fairytale_assistant/pipeline_conf.json +++ b/assistant_dists/fairytale_assistant/pipeline_conf.json @@ -95,22 +95,6 @@ } }, "annotators": { - "spelling_preprocessing": { - "connector": { - "protocol": "http", - "timeout": 1.0, - "url": "http://spelling-preprocessing:8074/respond" - }, - "dialog_formatter": "state_formatters.dp_formatters:last_utt_dialog", - "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", - "state_manager_method": "add_annotation_and_reset_human_attributes_for_first_turn", - "is_enabled": true, - "source": { - "directory": "annotators/spelling_preprocessing", - "container": "spelling-preprocessing", - "endpoint": "respond" - } - }, "sentseg": { "connector": { "protocol": "http", @@ -120,7 +104,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -139,7 +122,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -158,7 +140,6 @@ "dialog_formatter": "state_formatters.dp_formatters:context_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, diff --git a/assistant_dists/fairytale_assistant/proxy.yml b/assistant_dists/fairytale_assistant/proxy.yml index 70915cacf2..bc85e57080 100644 --- a/assistant_dists/fairytale_assistant/proxy.yml +++ b/assistant_dists/fairytale_assistant/proxy.yml @@ -18,15 +18,6 @@ services: - PROXY_PASS=dream.deeppavlov.ai:8018 - PORT=8018 - spelling-preprocessing: - command: ["nginx", "-g", "daemon off;"] - build: - context: dp/proxy/ - dockerfile: Dockerfile - environment: - - PROXY_PASS=dream.deeppavlov.ai:8074 - - PORT=8074 - combined-classification: command: ["nginx", "-g", "daemon off;"] build: diff --git a/assistant_dists/nutrition_assistant/dev.yml b/assistant_dists/nutrition_assistant/dev.yml index d12241c249..3ec5688216 100644 --- a/assistant_dists/nutrition_assistant/dev.yml +++ b/assistant_dists/nutrition_assistant/dev.yml @@ -22,11 +22,6 @@ services: - "./common:/src/common" ports: - 8018:8018 - spelling-preprocessing: - volumes: - - "./annotators/spelling_preprocessing:/src" - ports: - - 8074:8074 combined-classification: volumes: - "./common:/src/common" diff --git a/assistant_dists/nutrition_assistant/docker-compose.override.yml b/assistant_dists/nutrition_assistant/docker-compose.override.yml index ee4e1a61df..9d055e5139 100644 --- a/assistant_dists/nutrition_assistant/docker-compose.override.yml +++ b/assistant_dists/nutrition_assistant/docker-compose.override.yml @@ -3,7 +3,7 @@ services: command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.pipeline_config=assistant_dists/nutrition_assistant/pipeline_conf.json' environment: WAIT_HOSTS: "sentseg:8011, no-restrictions-selector:8009, badlisted-words:8018, combined-classification:8087, - spelling-preprocessing:8074, sentence-ranker:8128, prompt-selector:8135, transformers-lm-oasst12b:8158, + sentence-ranker:8128, prompt-selector:8135, transformers-lm-oasst12b:8158, dff-nutrition-prompted-skill:8141" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} @@ -90,23 +90,6 @@ services: reservations: memory: 256M - spelling-preprocessing: - env_file: [ .env ] - build: - args: - SERVICE_PORT: 8074 - SERVICE_NAME: spelling_preprocessing - context: ./annotators/spelling_preprocessing/ - command: flask run -h 0.0.0.0 -p 8074 - environment: - - FLASK_APP=server - deploy: - resources: - limits: - memory: 100M - reservations: - memory: 100M - prompt-selector: env_file: [ .env ] build: diff --git a/assistant_dists/nutrition_assistant/pipeline_conf.json b/assistant_dists/nutrition_assistant/pipeline_conf.json index a71fb88ad9..134cfd8d51 100644 --- a/assistant_dists/nutrition_assistant/pipeline_conf.json +++ b/assistant_dists/nutrition_assistant/pipeline_conf.json @@ -95,22 +95,6 @@ } }, "annotators": { - "spelling_preprocessing": { - "connector": { - "protocol": "http", - "timeout": 1.0, - "url": "http://spelling-preprocessing:8074/respond" - }, - "dialog_formatter": "state_formatters.dp_formatters:last_utt_dialog", - "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", - "state_manager_method": "add_annotation_and_reset_human_attributes_for_first_turn", - "is_enabled": true, - "source": { - "directory": "annotators/spelling_preprocessing", - "container": "spelling-preprocessing", - "endpoint": "respond" - } - }, "sentseg": { "connector": { "protocol": "http", @@ -120,7 +104,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -139,7 +122,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -158,7 +140,6 @@ "dialog_formatter": "state_formatters.dp_formatters:context_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, diff --git a/assistant_dists/nutrition_assistant/proxy.yml b/assistant_dists/nutrition_assistant/proxy.yml index ae1896400e..3245e34158 100644 --- a/assistant_dists/nutrition_assistant/proxy.yml +++ b/assistant_dists/nutrition_assistant/proxy.yml @@ -18,15 +18,6 @@ services: - PROXY_PASS=dream.deeppavlov.ai:8018 - PORT=8018 - spelling-preprocessing: - command: ["nginx", "-g", "daemon off;"] - build: - context: dp/proxy/ - dockerfile: Dockerfile - environment: - - PROXY_PASS=dream.deeppavlov.ai:8074 - - PORT=8074 - combined-classification: command: ["nginx", "-g", "daemon off;"] build: diff --git a/assistant_dists/rhodes_coaching_assistant/dev.yml b/assistant_dists/rhodes_coaching_assistant/dev.yml index 84541110e4..0e8c4bb0bb 100644 --- a/assistant_dists/rhodes_coaching_assistant/dev.yml +++ b/assistant_dists/rhodes_coaching_assistant/dev.yml @@ -22,11 +22,6 @@ services: - "./common:/src/common" ports: - 8018:8018 - spelling-preprocessing: - volumes: - - "./annotators/spelling_preprocessing:/src" - ports: - - 8074:8074 combined-classification: volumes: - "./common:/src/common" diff --git a/assistant_dists/rhodes_coaching_assistant/docker-compose.override.yml b/assistant_dists/rhodes_coaching_assistant/docker-compose.override.yml index fa1c862762..d0ba0bde39 100644 --- a/assistant_dists/rhodes_coaching_assistant/docker-compose.override.yml +++ b/assistant_dists/rhodes_coaching_assistant/docker-compose.override.yml @@ -3,7 +3,7 @@ services: command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.pipeline_config=assistant_dists/rhodes_coaching_assistant/pipeline_conf.json' environment: WAIT_HOSTS: "sentseg:8011, no-restrictions-selector:8009, badlisted-words:8018, combined-classification:8087, - spelling-preprocessing:8074, sentence-ranker:8128, prompt-selector:8135, openai-api-davinci3:8131, + sentence-ranker:8128, prompt-selector:8135, openai-api-davinci3:8131, dff-rhodes-coaching-prompted-skill:8142" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} @@ -90,23 +90,6 @@ services: reservations: memory: 256M - spelling-preprocessing: - env_file: [ .env ] - build: - args: - SERVICE_PORT: 8074 - SERVICE_NAME: spelling_preprocessing - context: ./annotators/spelling_preprocessing/ - command: flask run -h 0.0.0.0 -p 8074 - environment: - - FLASK_APP=server - deploy: - resources: - limits: - memory: 100M - reservations: - memory: 100M - prompt-selector: env_file: [ .env ] build: diff --git a/assistant_dists/rhodes_coaching_assistant/pipeline_conf.json b/assistant_dists/rhodes_coaching_assistant/pipeline_conf.json index bbd0f0596b..1b53d7f204 100644 --- a/assistant_dists/rhodes_coaching_assistant/pipeline_conf.json +++ b/assistant_dists/rhodes_coaching_assistant/pipeline_conf.json @@ -95,22 +95,6 @@ } }, "annotators": { - "spelling_preprocessing": { - "connector": { - "protocol": "http", - "timeout": 1.0, - "url": "http://spelling-preprocessing:8074/respond" - }, - "dialog_formatter": "state_formatters.dp_formatters:last_utt_dialog", - "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", - "state_manager_method": "add_annotation_and_reset_human_attributes_for_first_turn", - "is_enabled": true, - "source": { - "directory": "annotators/spelling_preprocessing", - "container": "spelling-preprocessing", - "endpoint": "respond" - } - }, "sentseg": { "connector": { "protocol": "http", @@ -120,7 +104,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -139,7 +122,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -158,7 +140,6 @@ "dialog_formatter": "state_formatters.dp_formatters:context_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, diff --git a/assistant_dists/rhodes_coaching_assistant/proxy.yml b/assistant_dists/rhodes_coaching_assistant/proxy.yml index 70915cacf2..bc85e57080 100644 --- a/assistant_dists/rhodes_coaching_assistant/proxy.yml +++ b/assistant_dists/rhodes_coaching_assistant/proxy.yml @@ -18,15 +18,6 @@ services: - PROXY_PASS=dream.deeppavlov.ai:8018 - PORT=8018 - spelling-preprocessing: - command: ["nginx", "-g", "daemon off;"] - build: - context: dp/proxy/ - dockerfile: Dockerfile - environment: - - PROXY_PASS=dream.deeppavlov.ai:8074 - - PORT=8074 - combined-classification: command: ["nginx", "-g", "daemon off;"] build: diff --git a/assistant_dists/universal_prompted_assistant/dev.yml b/assistant_dists/universal_prompted_assistant/dev.yml index 7463221b96..24031872f2 100644 --- a/assistant_dists/universal_prompted_assistant/dev.yml +++ b/assistant_dists/universal_prompted_assistant/dev.yml @@ -22,11 +22,6 @@ services: - "./common:/src/common" ports: - 8018:8018 - spelling-preprocessing: - volumes: - - "./annotators/spelling_preprocessing:/src" - ports: - - 8074:8074 combined-classification: volumes: - "./common:/src/common" diff --git a/assistant_dists/universal_prompted_assistant/docker-compose.override.yml b/assistant_dists/universal_prompted_assistant/docker-compose.override.yml index 4773cf165d..c5576ab847 100644 --- a/assistant_dists/universal_prompted_assistant/docker-compose.override.yml +++ b/assistant_dists/universal_prompted_assistant/docker-compose.override.yml @@ -3,7 +3,7 @@ services: command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.pipeline_config=assistant_dists/universal_prompted_assistant/pipeline_conf.json' environment: WAIT_HOSTS: "sentseg:8011, no-restrictions-selector:8009, badlisted-words:8018, combined-classification:8087, - spelling-preprocessing:8074, sentence-ranker:8128, + sentence-ranker:8128, transformers-lm-gptj:8130, transformers-lm-oasst12b:8158, openai-api-chatgpt:8145, openai-api-davinci3:8131, dff-universal-prompted-skill:8147" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} @@ -91,23 +91,6 @@ services: reservations: memory: 256M - spelling-preprocessing: - env_file: [ .env ] - build: - args: - SERVICE_PORT: 8074 - SERVICE_NAME: spelling_preprocessing - context: ./annotators/spelling_preprocessing/ - command: flask run -h 0.0.0.0 -p 8074 - environment: - - FLASK_APP=server - deploy: - resources: - limits: - memory: 100M - reservations: - memory: 100M - sentence-ranker: env_file: [ .env ] build: diff --git a/assistant_dists/universal_prompted_assistant/pipeline_conf.json b/assistant_dists/universal_prompted_assistant/pipeline_conf.json index 17b6274ed7..ee1eb9d900 100644 --- a/assistant_dists/universal_prompted_assistant/pipeline_conf.json +++ b/assistant_dists/universal_prompted_assistant/pipeline_conf.json @@ -95,22 +95,6 @@ } }, "annotators": { - "spelling_preprocessing": { - "connector": { - "protocol": "http", - "timeout": 1.0, - "url": "http://spelling-preprocessing:8074/respond" - }, - "dialog_formatter": "state_formatters.dp_formatters:last_utt_dialog", - "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", - "state_manager_method": "add_annotation_and_reset_human_attributes_for_first_turn", - "is_enabled": true, - "source": { - "directory": "annotators/spelling_preprocessing", - "container": "spelling-preprocessing", - "endpoint": "respond" - } - }, "sentseg": { "connector": { "protocol": "http", @@ -120,7 +104,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true, @@ -139,7 +122,6 @@ "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", "previous_services": [ - "annotators.spelling_preprocessing" ], "state_manager_method": "add_annotation", "is_enabled": true,