Merge pull request #401 from deeppavlov/dev

Release v0.19.1
deeppavlov · Apr 21, 2023 · 7c0dbf9 · 7c0dbf9
2 parents ab851f9 + 5598529
commit 7c0dbf9
Show file tree

Hide file tree

Showing 36 changed files with 9 additions and 443 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: