diff --git a/.env b/.env index e8b641b44c..b6e834e9b2 100644 --- a/.env +++ b/.env @@ -20,7 +20,7 @@ TEXT_QA_URL=http://text-qa:8078/model BADLIST_ANNOTATOR_URL=http://badlisted-words:8018/badlisted_words_batch COMET_ATOMIC_SERVICE_URL=http://comet-atomic:8053/comet COMET_CONCEPTNET_SERVICE_URL=http://comet-conceptnet:8065/comet -MASKED_LM_SERVICE_URL=http://masked-lm:8088/respond +MASKED_LM_SERVICE_URL=http://masked-lm:8102/respond DP_WIKIDATA_URL=http://wiki-parser:8077/model DP_ENTITY_LINKING_URL=http://entity-linking:8075/model KNOWLEDGE_GROUNDING_SERVICE_URL=http://knowledge-grounding:8083/respond @@ -28,7 +28,7 @@ WIKIDATA_DIALOGUE_SERVICE_URL=http://wikidata-dial-service:8092/model NEWS_API_ANNOTATOR_URL=http://news-api-annotator:8112/respond WIKI_FACTS_URL=http://wiki-facts:8116/respond FACT_RANDOM_SERVICE_URL=http://fact-random:8119/respond -INFILLING_SERVICE_URL=http://infilling:8122/respond +INFILLING_SERVICE_URL=http://infilling:8106/respond DIALOGPT_CONTINUE_SERVICE_URL=http://dialogpt:8125/continue PROMPT_STORYGPT_SERVICE_URL=http://prompt-storygpt:8127/respond STORYGPT_SERVICE_URL=http://storygpt:8126/respond diff --git a/MODELS.md b/MODELS.md index c544e2358e..8680d04e65 100644 --- a/MODELS.md +++ b/MODELS.md @@ -11,3 +11,4 @@ Here you may find a list of models that currently available for use in Generativ | Open-Assistant Pythia 12B | transformers-lm-oasst12b | [link](https://huggingface.co/OpenAssistant/pythia-12b-sft-v8-7k-steps) | yes | 12B | 26GB (half-precision) | 5,120 tokens | An open-source English-only instruction-based large language model which is NOT good at answering math and coding questions. NB: free of charge. This model is up and running on our servers and can be used for free. | | GPT-4 | openai-api-gpt4 | [link](https://platform.openai.com/docs/models/gpt-4) | no (paid access via API) | supposedly, 175B | - (cannot be run locally) | 8,192 tokens | A multilingual instruction-based large language model which is capable of code generation and other complex tasks. More capable than any GPT-3.5 model, able to do more complex tasks, and optimized for chat. NB: paid. You must provide your OpenAI API key to use the model. Your OpenAI account will be charged according to your usage. | | GPT-4 32K | openai-api-gpt4-32k | [link](https://platform.openai.com/docs/models/gpt-4) | no (paid access via API) | supposedly, 175B | - (cannot be run locally) | 32,768 tokens | A multilingual instruction-based large language model which is capable of code generation and other complex tasks. Same capabilities as the base gpt-4 mode but with 4x the context length. NB: paid. You must provide your OpenAI API key to use the model. Your OpenAI account will be charged according to your usage. | +| GPT-JT 6B | transformers-lm-gptjt | [link](https://huggingface.co/togethercomputer/GPT-JT-6B-v1) | yes | 6B | 26GB | 2,048 tokens | An open-source English-only large language model which was fine-tuned for instruction following but is NOT capable of code generation. NB: free of charge. This model is up and running on our servers and can be used for free. | diff --git a/README.md b/README.md index 57066a34ca..c914294d75 100644 --- a/README.md +++ b/README.md @@ -260,22 +260,24 @@ Dream Architecture is presented in the following image: | Wiki Facts | 1.7 GB RAM | model that extracts related facts from Wikipedia and WikiHow pages | ## Services -| Name | Requirements | Description | -|------------------------|-------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| DialoGPT | 1.2 GB RAM, 2.1 GB GPU | generative service based on Transformers generative model, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (for example, `microsoft/DialoGPT-small` with 0.2-0.5 sec on GPU) | -| DialoGPT Persona-based | 1.2 GB RAM, 2.1 GB GPU | generative service based on Transformers generative model, the model was pre-trained on the PersonaChat dataset to generate a response conditioned on a several sentences of the socialbot's persona | -| Image Captioning | 4 GB RAM, 5.4 GB GPU | creates text representation of a received image | -| Infilling | 1 GB RAM, 1.2 GB GPU | (turned off but the code is available) generative service based on Infilling model, for the given utterance returns utterance where `_` from original text is replaced with generated tokens | -| Knowledge Grounding | 2 GB RAM, 2.1 GB GPU | generative service based on BlenderBot architecture providing a response to the context taking into account an additional text paragraph | -| Masked LM | 1.1 GB RAM, 1 GB GPU | (turned off but the code is available) | -| Seq2seq Persona-based | 1.5 GB RAM, 1.5 GB GPU | generative service based on Transformers seq2seq model, the model was pre-trained on the PersonaChat dataset to generate a response conditioned on a several sentences of the socialbot's persona | -| Sentence Ranker | 1.2 GB RAM, 2.1 GB GPU | ranking model given as `PRETRAINED_MODEL_NAME_OR_PATH` which for a pair os sentences returns a float score of correspondence | -| StoryGPT | 2.6 GB RAM, 2.15 GB GPU | generative service based on fine-tuned GPT-2, for the given set of keywords returns a short story using the keywords | -| GPT-3.5 | 100 MB RAM | generative service based on OpenAI API service, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (in particular, in this service, `text-davinci-003` is used. | -| ChatGPT | 100 MB RAM | generative service based on OpenAI API service, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (in particular, in this service, `gpt-3.5-turbo` is used. | -| Prompt StoryGPT | 3 GB RAM, 4 GB GPU | generative service based on fine-tuned GPT-2, for the given topic represented by one noun returns short story on a given topic | -| GPT-J 6B | 1.5 GB RAM, 24.2 GB GPU | generative service based on Transformers generative model, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (in particular, in this service, [GPT-J model](https://huggingface.co/EleutherAI/gpt-j-6B) is used. | -| BLOOMZ 7B | 2.5 GB RAM, 29 GB GPU | generative service based on Transformers generative model, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (in particular, in this service, [BLOOMZ-7b1 model](https://huggingface.co/bigscience/bloomz-7b1) is used. | +| Name | Requirements | Description | +|------------------------|-------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| DialoGPT | 1.2 GB RAM, 2.1 GB GPU | generative service based on Transformers generative model, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (for example, `microsoft/DialoGPT-small` with 0.2-0.5 sec on GPU) | +| DialoGPT Persona-based | 1.2 GB RAM, 2.1 GB GPU | generative service based on Transformers generative model, the model was pre-trained on the PersonaChat dataset to generate a response conditioned on a several sentences of the socialbot's persona | +| Image Captioning | 4 GB RAM, 5.4 GB GPU | creates text representation of a received image | +| Infilling | 1 GB RAM, 1.2 GB GPU | (turned off but the code is available) generative service based on Infilling model, for the given utterance returns utterance where `_` from original text is replaced with generated tokens | +| Knowledge Grounding | 2 GB RAM, 2.1 GB GPU | generative service based on BlenderBot architecture providing a response to the context taking into account an additional text paragraph | +| Masked LM | 1.1 GB RAM, 1 GB GPU | (turned off but the code is available) | +| Seq2seq Persona-based | 1.5 GB RAM, 1.5 GB GPU | generative service based on Transformers seq2seq model, the model was pre-trained on the PersonaChat dataset to generate a response conditioned on a several sentences of the socialbot's persona | +| Sentence Ranker | 1.2 GB RAM, 2.1 GB GPU | ranking model given as `PRETRAINED_MODEL_NAME_OR_PATH` which for a pair os sentences returns a float score of correspondence | +| StoryGPT | 2.6 GB RAM, 2.15 GB GPU | generative service based on fine-tuned GPT-2, for the given set of keywords returns a short story using the keywords | +| GPT-3.5 | 100 MB RAM | generative service based on OpenAI API service, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (in particular, in this service, `text-davinci-003` is used. | +| ChatGPT | 100 MB RAM | generative service based on OpenAI API service, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (in particular, in this service, `gpt-3.5-turbo` is used. | +| Prompt StoryGPT | 3 GB RAM, 4 GB GPU | generative service based on fine-tuned GPT-2, for the given topic represented by one noun returns short story on a given topic | +| GPT-J 6B | 1.5 GB RAM, 24.2 GB GPU | generative service based on Transformers generative model, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (in particular, in this service, [GPT-J model](https://huggingface.co/EleutherAI/gpt-j-6B) is used. | +| BLOOMZ 7B | 2.5 GB RAM, 29 GB GPU | generative service based on Transformers generative model, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (in particular, in this service, [BLOOMZ-7b1 model](https://huggingface.co/bigscience/bloomz-7b1) is used. | +| GPT-JT 6B | 2.5 GB RAM, 25.1 GB GPU | generative service based on Transformers generative model, the model is set in docker compose argument `PRETRAINED_MODEL_NAME_OR_PATH` (in particular, in this service, [GPT-JT model](https://huggingface.co/togethercomputer/GPT-JT-6B-v1) is used. | + ## Skills | Name | Requirements | Description | diff --git a/annotators/fact_retrieval_rus/service_configs/fact-retrieval-ru/service.yml b/annotators/fact_retrieval_rus/service_configs/fact-retrieval-ru/service.yml index 539cdd7669..65f1c1a6a7 100644 --- a/annotators/fact_retrieval_rus/service_configs/fact-retrieval-ru/service.yml +++ b/annotators/fact_retrieval_rus/service_configs/fact-retrieval-ru/service.yml @@ -9,13 +9,13 @@ compose: CONFIG: fact_retrieval_rus.json COMMIT: c8264bf82eaa3ed138395ab68f71d47a4175f2fc TOP_N: 20 - SERVICE_PORT: 8130 + SERVICE_PORT: 8110 SRC_DIR: annotators/fact_retrieval_rus CUDA_VISIBLE_DEVICES: '0' FLASK_APP: server context: ./ dockerfile: annotators/fact_retrieval_rus/Dockerfile - command: flask run -h 0.0.0.0 -p 8130 + command: flask run -h 0.0.0.0 -p 8110 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server @@ -29,5 +29,5 @@ compose: - ./annotators/fact_retrieval_rus:/src - ~/.deeppavlov:/root/.deeppavlov ports: - - 8130:8130 + - 8110:8110 proxy: null diff --git a/annotators/spacy_annotator/requirements.txt b/annotators/spacy_annotator/requirements.txt index 601ea52468..1bae6e2960 100644 --- a/annotators/spacy_annotator/requirements.txt +++ b/annotators/spacy_annotator/requirements.txt @@ -7,4 +7,6 @@ spacy==3.2.0 typer==0.4.1 click<=8.0.4 jinja2<=3.0.3 -Werkzeug<=2.0.3 \ No newline at end of file +Werkzeug<=2.0.3 +typing-inspect==0.8.0 +typing_extensions==4.5.0 diff --git a/annotators/toxic_classification_ru/service_configs/toxic-classification-ru/service.yml b/annotators/toxic_classification_ru/service_configs/toxic-classification-ru/service.yml index ad295540e1..b1a089dabe 100644 --- a/annotators/toxic_classification_ru/service_configs/toxic-classification-ru/service.yml +++ b/annotators/toxic_classification_ru/service_configs/toxic-classification-ru/service.yml @@ -8,12 +8,12 @@ compose: build: context: ./annotators/toxic_classification_ru/ args: - SERVICE_PORT: 8126 + SERVICE_PORT: 8118 PRETRAINED_MODEL_NAME_OR_PATH: s-nlp/russian_toxicity_classifier LANGUAGE: RU CUDA_VISIBLE_DEVICES: '0' FLASK_APP: server - command: flask run -h 0.0.0.0 -p 8126 + command: flask run -h 0.0.0.0 -p 8118 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server @@ -27,5 +27,5 @@ compose: - ./annotators/toxic_classification_ru:/src - ~/.deeppavlov/cache:/root/.cache ports: - - 8126:8126 + - 8118:8118 proxy: null diff --git a/assistant_dists/dream/dev.yml b/assistant_dists/dream/dev.yml index 452f4e187c..5364ec9961 100644 --- a/assistant_dists/dream/dev.yml +++ b/assistant_dists/dream/dev.yml @@ -446,14 +446,14 @@ services: - "./services/infilling:/src" - "~/.deeppavlov:/root/.deeppavlov" ports: - - 8139:8139 + - 8106:8106 masked-lm: volumes: - "./services/masked_lm:/src" - "./common:/src/common" - "~/.deeppavlov/cache:/root/.cache" ports: - - 8141:8141 + - 8102:8102 dff-template-skill: volumes: - "./skills/dff_template_skill:/src" diff --git a/assistant_dists/dream/docker-compose.override.yml b/assistant_dists/dream/docker-compose.override.yml index 89e6fc34c1..12664f15a6 100644 --- a/assistant_dists/dream/docker-compose.override.yml +++ b/assistant_dists/dream/docker-compose.override.yml @@ -1355,9 +1355,9 @@ services: build: context: ./services/infilling/ args: - SERVICE_PORT: 8139 + SERVICE_PORT: 8106 SERVICE_NAME: infilling - command: flask run -h 0.0.0.0 -p 8139 + command: flask run -h 0.0.0.0 -p 8106 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server @@ -1373,10 +1373,10 @@ services: build: context: ./services/masked_lm/ args: - SERVICE_PORT: 8141 + SERVICE_PORT: 8102 SERVICE_NAME: masked_lm PRETRAINED_MODEL_NAME_OR_PATH: "bert-base-uncased" - command: flask run -h 0.0.0.0 -p 8141 + command: flask run -h 0.0.0.0 -p 8102 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server diff --git a/assistant_dists/dream_multimodal/dev.yml b/assistant_dists/dream_multimodal/dev.yml index 7b38867806..9697392b85 100644 --- a/assistant_dists/dream_multimodal/dev.yml +++ b/assistant_dists/dream_multimodal/dev.yml @@ -75,5 +75,5 @@ services: - "./skills/dff_image_skill:/src" - "./common:/src/common" ports: - - 8188:8188 + - 8124:8124 version: "3.7" diff --git a/assistant_dists/dream_multimodal/docker-compose.override.yml b/assistant_dists/dream_multimodal/docker-compose.override.yml index 3dcd4c7b8e..41ed039fdd 100644 --- a/assistant_dists/dream_multimodal/docker-compose.override.yml +++ b/assistant_dists/dream_multimodal/docker-compose.override.yml @@ -4,7 +4,7 @@ services: environment: WAIT_HOSTS: "dff-program-y-skill:8008, sentseg:8011, convers-evaluation-selector:8009, dff-intent-responder-skill:8012, intent-catcher:8014, badlisted-words:8018, - spelling-preprocessing:8074, dialogpt:8125, sentence-ranker:8128, image-captioning:8123, dff-image-skill:8188" + spelling-preprocessing:8074, dialogpt:8125, sentence-ranker:8128, image-captioning:8123, dff-image-skill:8124" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1200} HIGH_PRIORITY_INTENTS: 1 RESTRICTION_FOR_SENSITIVE_CASE: 1 @@ -216,12 +216,12 @@ services: env_file: [.env] build: args: - SERVICE_PORT: 8188 + SERVICE_PORT: 8124 SERVICE_NAME: dff_image_skill LANGUAGE: EN context: . dockerfile: ./skills/dff_image_skill/Dockerfile - command: gunicorn --workers=1 server:app -b 0.0.0.0:8188 --reload + command: gunicorn --workers=1 server:app -b 0.0.0.0:8124 --reload deploy: resources: limits: diff --git a/assistant_dists/dream_multimodal/pipeline_conf.json b/assistant_dists/dream_multimodal/pipeline_conf.json index 19dcfa47c6..dd121ae995 100644 --- a/assistant_dists/dream_multimodal/pipeline_conf.json +++ b/assistant_dists/dream_multimodal/pipeline_conf.json @@ -318,7 +318,7 @@ "connector": { "protocol": "http", "timeout": 2.0, - "url": "http://dff-image-skill:8188/respond" + "url": "http://dff-image-skill:8124/respond" }, "dialog_formatter": "state_formatters.dp_formatters:dff_image_skill_formatter", "response_formatter": "state_formatters.dp_formatters:skill_with_attributes_formatter_service", diff --git a/assistant_dists/dream_persona_prompted/README.md b/assistant_dists/dream_persona_prompted/README.md index af6fe2f388..123419e034 100644 --- a/assistant_dists/dream_persona_prompted/README.md +++ b/assistant_dists/dream_persona_prompted/README.md @@ -76,10 +76,10 @@ If one wants to create a new prompted distribution (distribution containing prom to an unused one. 3. Choose the generative service to be used. For that one needs to: 1. in `dream/assistant_dists/dream_custom_prompted/` folder in files `docker-compose.override.yml`, `dev.yml` - replace `transformers-lm-gptj` container description to a new one. + replace `transformers-lm-gptjt` container description to a new one. In particular, one may replace in `PRETRAINED_MODEL_NAME_OR_PATH` parameter - a utilized Language Model (LM) `GPT-J` with another one from `Transformers` library. - Please change a port (`8130` for `transformers-lm-gptj`) to unused ones. + a utilized Language Model (LM) `GPT-JT` with another one from `Transformers` library. + Please change a port (`8161` for `transformers-lm-gptjt`) to unused ones. 2. in all prompted skills' containers descriptions change `GENERATIVE_SERVICE_URL` to your generative model. Take into account that the service name is constructed as `http://:/`. 4. For each prompted skill, one needs to create an input state formatter. To do that, one needs to: @@ -99,7 +99,7 @@ If one wants to create a new prompted distribution (distribution containing prom "connector": { "protocol": "http", "timeout": 4.5, - "url": "http://dff-dream-persona-gpt-j-prompted-skill:8134/respond" + "url": "http://dff-dream-persona-gpt-jt-prompted-skill:8134/respond" }, "dialog_formatter": { "name": "state_formatters.dp_formatters:dff_prompted_skill_formatter", diff --git a/assistant_dists/dream_persona_prompted/cpu.yml b/assistant_dists/dream_persona_prompted/cpu.yml index 19faae6fdc..4223191686 100644 --- a/assistant_dists/dream_persona_prompted/cpu.yml +++ b/assistant_dists/dream_persona_prompted/cpu.yml @@ -8,7 +8,7 @@ services: environment: DEVICE: cpu CUDA_VISIBLE_DEVICES: "" - transformers-lm-gptj: + transformers-lm-gptjt: environment: DEVICE: cpu CUDA_VISIBLE_DEVICES: "" diff --git a/assistant_dists/dream_persona_prompted/dev.yml b/assistant_dists/dream_persona_prompted/dev.yml index 68346c1777..93875ec941 100644 --- a/assistant_dists/dream_persona_prompted/dev.yml +++ b/assistant_dists/dream_persona_prompted/dev.yml @@ -34,14 +34,14 @@ services: - "./common:/src/common" ports: - 8135:8135 - transformers-lm-gptj: + transformers-lm-gptjt: volumes: - "./services/transformers_lm:/src" - "./common:/src/common" - "~/.deeppavlov/cache:/root/.cache" ports: - - 8130:8130 - dff-dream-persona-gpt-j-prompted-skill: + - 8161:8161 + dff-dream-persona-gpt-jt-prompted-skill: volumes: - "./skills/dff_template_prompted_skill:/src" - "./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 dfd8644d4a..21d10e43e5 100644 --- a/assistant_dists/dream_persona_prompted/docker-compose.override.yml +++ b/assistant_dists/dream_persona_prompted/docker-compose.override.yml @@ -3,8 +3,8 @@ 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, ranking-based-response-selector:8002, combined-classification:8087, - sentence-ranker:8128, prompt-selector:8135, transformers-lm-gptj:8130, - dff-dream-persona-gpt-j-prompted-skill:8134" + sentence-ranker:8128, prompt-selector:8135, transformers-lm-gptjt:8161, + dff-dream-persona-gpt-jt-prompted-skill:8134" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} HIGH_PRIORITY_INTENTS: 1 RESTRICTION_FOR_SENSITIVE_CASE: 1 @@ -105,17 +105,17 @@ services: reservations: memory: 3G - transformers-lm-gptj: + transformers-lm-gptjt: env_file: [ .env ] build: args: - SERVICE_PORT: 8130 - SERVICE_NAME: transformers_lm_gptj - PRETRAINED_MODEL_NAME_OR_PATH: EleutherAI/gpt-j-6B + SERVICE_PORT: 8161 + SERVICE_NAME: transformers_lm_gptjt + PRETRAINED_MODEL_NAME_OR_PATH: togethercomputer/GPT-JT-6B-v1 HALF_PRECISION: 0 context: . dockerfile: ./services/transformers_lm/Dockerfile - command: flask run -h 0.0.0.0 -p 8130 + command: flask run -h 0.0.0.0 -p 8161 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server @@ -126,14 +126,14 @@ services: reservations: memory: 50G - dff-dream-persona-gpt-j-prompted-skill: + dff-dream-persona-gpt-jt-prompted-skill: env_file: [ .env ] build: args: SERVICE_PORT: 8134 SERVICE_NAME: dff_dream_persona_prompted_skill PROMPT_FILE: common/prompts/dream_persona.json - GENERATIVE_SERVICE_URL: http://transformers-lm-gptj:8130/respond + GENERATIVE_SERVICE_URL: http://transformers-lm-gptjt:8161/respond GENERATIVE_SERVICE_CONFIG: default_generative_config.json GENERATIVE_TIMEOUT: 120 N_UTTERANCES_CONTEXT: 7 diff --git a/assistant_dists/dream_persona_prompted/gpu1.yml b/assistant_dists/dream_persona_prompted/gpu1.yml index 5a904e1b3c..249d85115b 100644 --- a/assistant_dists/dream_persona_prompted/gpu1.yml +++ b/assistant_dists/dream_persona_prompted/gpu1.yml @@ -18,7 +18,7 @@ services: restart: unless-stopped environment: - CUDA_VISIBLE_DEVICES=1 - transformers-lm-gptj: + transformers-lm-gptjt: restart: unless-stopped environment: - CUDA_VISIBLE_DEVICES=0 diff --git a/assistant_dists/dream_persona_prompted/pipeline_conf.json b/assistant_dists/dream_persona_prompted/pipeline_conf.json index 749dca1bc0..e0f238a674 100644 --- a/assistant_dists/dream_persona_prompted/pipeline_conf.json +++ b/assistant_dists/dream_persona_prompted/pipeline_conf.json @@ -225,7 +225,7 @@ "is_enabled": true, "source": { "component": "components/6lLhP7zuoiI0bxJEDLWUg.yml", - "service": "skills/dff_template_prompted_skill/service_configs/dff-dream-persona-gpt-j-prompted-skill" + "service": "skills/dff_template_prompted_skill/service_configs/dff-dream-persona-gpt-jt-prompted-skill" } }, "dummy_skill": { @@ -268,9 +268,9 @@ } }, "metadata": { - "display_name": "GPT-J-based Prompted Dream", + "display_name": "Persona-based Prompted Dream", "author": "DeepPavlov", - "description": "This is a simple dialog system that can chat with you on any topic. It has a pre-defined 'personality' and uses `GPT-J 6B` model by EleutherAI to generate responses.", + "description": "This is a simple dialog system that can chat with you on any topic. It has a pre-defined 'personality' and uses `GPT-JT 6B` model to generate responses.", "version": "0.0.1", "date_created": "2023-01-10T02:00:00", "ram_usage": "50 GB", diff --git a/assistant_dists/dream_persona_prompted/proxy.yml b/assistant_dists/dream_persona_prompted/proxy.yml index 8981fc39ae..38f4b486bf 100644 --- a/assistant_dists/dream_persona_prompted/proxy.yml +++ b/assistant_dists/dream_persona_prompted/proxy.yml @@ -27,13 +27,13 @@ services: - PROXY_PASS=proxy.deeppavlov.ai:8128 - PORT=8128 - transformers-lm-gptj: + transformers-lm-gptjt: command: ["nginx", "-g", "daemon off;"] build: context: dp/proxy/ dockerfile: Dockerfile environment: - - PROXY_PASS=proxy.deeppavlov.ai:8130 - - PORT=8130 + - PROXY_PASS=proxy.deeppavlov.ai:8161 + - PORT=8161 version: "3.7" diff --git a/assistant_dists/dream_russian/dev.yml b/assistant_dists/dream_russian/dev.yml index 1a78c9b168..fe7d76f117 100644 --- a/assistant_dists/dream_russian/dev.yml +++ b/assistant_dists/dream_russian/dev.yml @@ -47,7 +47,7 @@ services: - "./annotators/toxic_classification_ru:/src" - "~/.deeppavlov/cache:/root/.cache" ports: - - 8126:8126 + - 8118:8118 ner-ru: volumes: - './annotators/NER_deeppavlov:/src' @@ -130,7 +130,7 @@ services: - "./annotators/fact_retrieval_rus:/src" - "~/.deeppavlov:/root/.deeppavlov" ports: - - 8130:8130 + - 8110:8110 text-qa-ru: volumes: - "./services/text_qa:/src" diff --git a/assistant_dists/dream_russian/docker-compose.override.yml b/assistant_dists/dream_russian/docker-compose.override.yml index bc4df9cb4a..7a18bbc57a 100644 --- a/assistant_dists/dream_russian/docker-compose.override.yml +++ b/assistant_dists/dream_russian/docker-compose.override.yml @@ -7,8 +7,8 @@ services: ner-ru:8021, personal-info-ru-skill:8030, sentseg-ru:8011, spelling-preprocessing-ru:8074, entity-linking-ru:8075, wiki-parser-ru:8077, dff-generative-ru-skill:8092, dff-friendship-ru-skill:8086, entity-detection-ru:8103, dialogpt-ru:8125, - dff-template-skill:8120, spacy-annotator-ru:8129, dialogrpt-ru:8122, toxic-classification-ru:8126, - fact-retrieval-ru:8130, text-qa-ru:8078" + dff-template-skill:8120, spacy-annotator-ru:8129, dialogrpt-ru:8122, toxic-classification-ru:8118, + fact-retrieval-ru:8110, text-qa-ru:8078" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1200} HIGH_PRIORITY_INTENTS: 1 RESTRICTION_FOR_SENSITIVE_CASE: 1 @@ -144,10 +144,10 @@ services: build: context: ./annotators/toxic_classification_ru/ args: - SERVICE_PORT: 8126 + SERVICE_PORT: 8118 PRETRAINED_MODEL_NAME_OR_PATH: s-nlp/russian_toxicity_classifier LANGUAGE: RU - command: flask run -h 0.0.0.0 -p 8126 + command: flask run -h 0.0.0.0 -p 8118 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server @@ -407,11 +407,11 @@ services: CONFIG: fact_retrieval_rus.json COMMIT: c8264bf82eaa3ed138395ab68f71d47a4175f2fc TOP_N: 20 - SERVICE_PORT: 8130 + SERVICE_PORT: 8110 SRC_DIR: annotators/fact_retrieval_rus context: ./ dockerfile: annotators/fact_retrieval_rus/Dockerfile - command: flask run -h 0.0.0.0 -p 8130 + command: flask run -h 0.0.0.0 -p 8110 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server diff --git a/assistant_dists/dream_russian/pipeline_conf.json b/assistant_dists/dream_russian/pipeline_conf.json index cbae91e28f..f9490820bc 100644 --- a/assistant_dists/dream_russian/pipeline_conf.json +++ b/assistant_dists/dream_russian/pipeline_conf.json @@ -141,7 +141,7 @@ "connector": { "protocol": "http", "timeout": 1.0, - "url": "http://toxic-classification-ru:8126/respond" + "url": "http://toxic-classification-ru:8118/respond" }, "dialog_formatter": "state_formatters.dp_formatters:preproc_last_human_utt_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", @@ -235,7 +235,7 @@ "connector": { "protocol": "http", "timeout": 1.0, - "url": "http://fact-retrieval-ru:8130/respond" + "url": "http://fact-retrieval-ru:8110/respond" }, "dialog_formatter": "state_formatters.dp_formatters:fact_retrieval_rus_formatter_dialog", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", @@ -367,7 +367,7 @@ "connector": { "protocol": "http", "timeout": 1.0, - "url": "http://toxic-classification-ru:8126/respond_batch" + "url": "http://toxic-classification-ru:8118/respond_batch" }, "dialog_formatter": "state_formatters.dp_formatters:hypotheses_list", "response_formatter": "state_formatters.dp_formatters:simple_formatter_service", diff --git a/assistant_dists/marketing_assistant/cpu.yml b/assistant_dists/marketing_assistant/cpu.yml index 19faae6fdc..4223191686 100644 --- a/assistant_dists/marketing_assistant/cpu.yml +++ b/assistant_dists/marketing_assistant/cpu.yml @@ -8,7 +8,7 @@ services: environment: DEVICE: cpu CUDA_VISIBLE_DEVICES: "" - transformers-lm-gptj: + transformers-lm-gptjt: environment: DEVICE: cpu CUDA_VISIBLE_DEVICES: "" diff --git a/assistant_dists/marketing_assistant/dev.yml b/assistant_dists/marketing_assistant/dev.yml index 89f817227e..ebd022ea02 100644 --- a/assistant_dists/marketing_assistant/dev.yml +++ b/assistant_dists/marketing_assistant/dev.yml @@ -34,13 +34,13 @@ services: - "./common:/src/common" ports: - 8135:8135 - transformers-lm-gptj: + transformers-lm-gptjt: volumes: - "./services/transformers_lm:/src" - "./common:/src/common" - "~/.deeppavlov/cache:/root/.cache" ports: - - 8130:8130 + - 8161:8161 dff-marketing-prompted-skill: volumes: - "./skills/dff_template_prompted_skill:/src" diff --git a/assistant_dists/marketing_assistant/docker-compose.override.yml b/assistant_dists/marketing_assistant/docker-compose.override.yml index 7d3cf918af..8c83168f02 100644 --- a/assistant_dists/marketing_assistant/docker-compose.override.yml +++ b/assistant_dists/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/marketing_assistant/pipeline_conf.json' environment: WAIT_HOSTS: "sentseg:8011, ranking-based-response-selector:8002, combined-classification:8087, - sentence-ranker:8128, prompt-selector:8135, transformers-lm-gptj:8130, + sentence-ranker:8128, prompt-selector:8135, transformers-lm-gptjt:8161, dff-marketing-prompted-skill:8138" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} HIGH_PRIORITY_INTENTS: 1 @@ -105,17 +105,17 @@ services: reservations: memory: 3G - transformers-lm-gptj: + transformers-lm-gptjt: env_file: [ .env ] build: args: - SERVICE_PORT: 8130 - SERVICE_NAME: transformers_lm_gptj - PRETRAINED_MODEL_NAME_OR_PATH: EleutherAI/gpt-j-6B + SERVICE_PORT: 8161 + SERVICE_NAME: transformers_lm_gptjt + PRETRAINED_MODEL_NAME_OR_PATH: togethercomputer/GPT-JT-6B-v1 HALF_PRECISION: 0 context: . dockerfile: ./services/transformers_lm/Dockerfile - command: flask run -h 0.0.0.0 -p 8130 + command: flask run -h 0.0.0.0 -p 8161 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server @@ -133,7 +133,7 @@ services: SERVICE_PORT: 8138 SERVICE_NAME: dff_marketing_prompted_skill PROMPT_FILE: common/prompts/marketing.json - GENERATIVE_SERVICE_URL: http://transformers-lm-gptj:8130/respond + GENERATIVE_SERVICE_URL: http://transformers-lm-gptjt:8161/respond GENERATIVE_SERVICE_CONFIG: default_generative_config.json GENERATIVE_TIMEOUT: 120 N_UTTERANCES_CONTEXT: 7 diff --git a/assistant_dists/marketing_assistant/proxy.yml b/assistant_dists/marketing_assistant/proxy.yml index 7aab496e5c..1d7afd4919 100644 --- a/assistant_dists/marketing_assistant/proxy.yml +++ b/assistant_dists/marketing_assistant/proxy.yml @@ -27,13 +27,13 @@ services: - PROXY_PASS=proxy.deeppavlov.ai:8128 - PORT=8128 - transformers-lm-gptj: + transformers-lm-gptjt: command: [ "nginx", "-g", "daemon off;" ] build: context: dp/proxy/ dockerfile: Dockerfile environment: - - PROXY_PASS=proxy.deeppavlov.ai:8130 - - PORT=8130 + - PROXY_PASS=proxy.deeppavlov.ai:8161 + - PORT=8161 version: '3.7' diff --git a/assistant_dists/universal_prompted_assistant/cpu.yml b/assistant_dists/universal_prompted_assistant/cpu.yml index a8eceb0d6a..f1968f7399 100644 --- a/assistant_dists/universal_prompted_assistant/cpu.yml +++ b/assistant_dists/universal_prompted_assistant/cpu.yml @@ -8,7 +8,7 @@ services: environment: DEVICE: cpu CUDA_VISIBLE_DEVICES: "" - transformers-lm-gptj: + transformers-lm-gptjt: environment: DEVICE: cpu CUDA_VISIBLE_DEVICES: "" diff --git a/assistant_dists/universal_prompted_assistant/dev.yml b/assistant_dists/universal_prompted_assistant/dev.yml index 57314e6a1a..2d211d55e3 100644 --- a/assistant_dists/universal_prompted_assistant/dev.yml +++ b/assistant_dists/universal_prompted_assistant/dev.yml @@ -28,13 +28,13 @@ services: - "~/.deeppavlov/cache:/root/.cache" ports: - 8128:8128 - transformers-lm-gptj: + transformers-lm-gptjt: volumes: - "./services/transformers_lm:/src" - "./common:/src/common" - "~/.deeppavlov/cache:/root/.cache" ports: - - 8130:8130 + - 8161:8161 transformers-lm-oasst12b: volumes: - "./services/transformers_lm:/src" diff --git a/assistant_dists/universal_prompted_assistant/docker-compose.override.yml b/assistant_dists/universal_prompted_assistant/docker-compose.override.yml index 434852926b..b81da4c04e 100644 --- a/assistant_dists/universal_prompted_assistant/docker-compose.override.yml +++ b/assistant_dists/universal_prompted_assistant/docker-compose.override.yml @@ -4,7 +4,7 @@ services: environment: WAIT_HOSTS: "sentseg:8011, ranking-based-response-selector:8002, combined-classification:8087, sentence-ranker:8128, - transformers-lm-gptj:8130, transformers-lm-oasst12b:8158, openai-api-chatgpt:8145, openai-api-davinci3:8131, + transformers-lm-gptjt:8161, transformers-lm-oasst12b:8158, openai-api-chatgpt:8145, openai-api-davinci3:8131, openai-api-gpt4:8159, openai-api-gpt4-32k:8160, dff-universal-prompted-skill:8147" WAIT_HOSTS_TIMEOUT: ${WAIT_TIMEOUT:-1000} @@ -83,17 +83,17 @@ services: reservations: memory: 3G - transformers-lm-gptj: + transformers-lm-gptjt: env_file: [ .env ] build: args: - SERVICE_PORT: 8130 - SERVICE_NAME: transformers_lm_gptj - PRETRAINED_MODEL_NAME_OR_PATH: EleutherAI/gpt-j-6B + SERVICE_PORT: 8161 + SERVICE_NAME: transformers_lm_gptjt + PRETRAINED_MODEL_NAME_OR_PATH: togethercomputer/GPT-JT-6B-v1 HALF_PRECISION: 0 context: . dockerfile: ./services/transformers_lm/Dockerfile - command: flask run -h 0.0.0.0 -p 8130 + command: flask run -h 0.0.0.0 -p 8161 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server diff --git a/assistant_dists/universal_prompted_assistant/proxy.yml b/assistant_dists/universal_prompted_assistant/proxy.yml index 927f587996..8a4ef9596b 100644 --- a/assistant_dists/universal_prompted_assistant/proxy.yml +++ b/assistant_dists/universal_prompted_assistant/proxy.yml @@ -27,14 +27,14 @@ services: - PROXY_PASS=proxy.deeppavlov.ai:8128 - PORT=8128 - transformers-lm-gptj: + transformers-lm-gptjt: command: [ "nginx", "-g", "daemon off;" ] build: context: dp/proxy/ dockerfile: Dockerfile environment: - - PROXY_PASS=proxy.deeppavlov.ai:8130 - - PORT=8130 + - PROXY_PASS=proxy.deeppavlov.ai:8161 + - PORT=8161 transformers-lm-oasst12b: command: [ "nginx", "-g", "daemon off;" ] diff --git a/common/infilling.py b/common/infilling.py index 300dce8aa8..d0288c61bc 100644 --- a/common/infilling.py +++ b/common/infilling.py @@ -2,7 +2,7 @@ import requests -INFILLING_SERVICE_URL = os.getenv("INFILLING_SERVICE_URL", "http://0.0.0.0:8122/respond") +INFILLING_SERVICE_URL = os.getenv("INFILLING_SERVICE_URL", "http://0.0.0.0:8106/respond") def infill_texts(texts, timeout=1): diff --git a/common/prompts.py b/common/prompts.py index 710ec54684..4eb1542004 100644 --- a/common/prompts.py +++ b/common/prompts.py @@ -8,7 +8,7 @@ logger = logging.getLogger(__name__) with open("common/prompts/goals_for_prompts.json", "r") as f: - META_PROMPT = json.load(f)["prompt"] + META_GOALS_PROMPT = json.load(f)["prompt"] def send_request_to_prompted_generative_service(dialog_context, prompt, url, config, timeout, sending_variables): diff --git a/components.tsv b/components.tsv index 18d54181d1..189889c450 100644 --- a/components.tsv +++ b/components.tsv @@ -1,70 +1,117 @@ +3000 files 3662 harvesters-maintenance-skill 3772 faq-skill 3882 harvesters-maintenance-gobot-skill -4242 agent +4242 agent +8002 ranking-based-response-selector,ranking-based-response-selector-ru +8003 8004 convers-evaluator-annotator 8005 rule-based-response-selector 8006 spacy-nounphrases 8007 rake-keywords -8008 dff-program-y-skill -8009 scripts-priority-selector +8008 dff-program-y-skill,dff-program-y-ru-skill +8009 convers-evaluation-selector,convers-evaluation-selector-ru,scripts-priority-selector 8010 personality-catcher -8011 sentseg-ru -8012 dff-intent-responder-skill +8011 sentseg,sentseg-ru +8012 dff-intent-responder-skill,dff-intent-responder-ru-skill 8013 toxic-classification-multilingual -8014 intent-catcher-ru +8014 intent-catcher,intent-catcher-ru 8015 emotion-classification-deepy +8016 8017 sentrewrite -8018 badlisted-words-ru -8021 ner-ru +8018 badlisted-words,badlisted-words-ru +8019 +8020 +8021 ner-ru,ner 8022 dff-program-y-dangerous-skill 8023 dff-movie-skill 8024 sentiment-classification-multilingual +8025 +8026 +8027 +8028 8029 convert-reddit -8030 personal-info-skill +8030 personal-info-ru-skill,personal-info-skill 8031 asr 8032 dff-book-skill 8033 misheard-asr 8034 dff-book-sfc-skill +8035 +8036 8037 dff-weather-skill +8038 +8039 +8040 +8041 +8042 +8043 +8044 +8045 +8046 8047 eliza +8048 8049 emotion-skill +8050 +8051 8052 dummy-skill-dialog 8053 comet-atomic 8054 meta-script-skill +8055 +8056 8057 dff-short-story-skill +8058 +8059 +8060 8061 dff-coronavirus-skill 8062 small-talk-skill +8063 8064 dff-program-y-wide-skill 8065 comet-conceptnet 8066 news-api-skill +8067 8068 game-cooperative-skill +8069 +8070 8071 factoid-qa 8072 kbqa -8074 spelling-preprocessing-ru -8075 entity-linking -8077 wiki-parser-ru -8078 text-qa-ru +8073 +8074 spelling-preprocessing,spelling-preprocessing-ru +8075 entity-linking-ru,entity-linking,entity-linking-deepy +8076 +8077 wiki-parser-ru,wiki-parser +8078 text-qa-ru,text-qa +8079 8080 dff-grounding-skill +8081 +8082 +8083 knowledge-grounding +8084 8085 knowledge-grounding-skill -8086 dff-friendship-skill +8086 dff-friendship-ru-skill,dff-friendship-skill 8087 combined-classification +8088 8089 entity-storer 8090 midas-classification +8091 8092 dff-generative-ru-skill +8093 8094 dff-animals-skill +8095 8096 dff-travel-skill 8097 dff-food-skill 8098 dff-sport-skill 8099 dff-music-skill 8100 fact-retrieval 8101 dff-science-skill -8103 entity-detection-ru +8102 masked-lm +8103 entity-detection-ru,entity-detection 8104 dff-funfact-skill 8105 dff-bot-persona-skill +8106 infilling 8107 speech-function-predictor 8108 speech-function-classifier 8109 dff-gossip-skill +8110 fact-retrieval-ru 8111 dff-wiki-skill 8112 news-api-annotator 8113 topic-recommendation @@ -72,21 +119,46 @@ 8115 dff-gaming-skill 8116 wiki-facts 8117 dff-art-skill +8118 toxic-classification-ru 8119 fact-random 8120 dff-template-skill 8121 midas-predictor 8122 dialogrpt-ru 8123 image-captioning -8125 dialogpt -8126 toxic-classification-ru +8124 dff-image-skill +8125 dialogpt,dialogpt-ru +8126 storygpt 8127 prompt-storygpt -8128 sentence-ranker-multilingual +8128 sentence-ranker,sentence-ranker-multilingual 8129 spacy-annotator-ru -8130 fact-retrieval-ru +8130 transformers-lm-gptj +8131 openai-api-davinci3 8132 gpt2-multilingual 8133 relative-persona-extractor -8134 dff-dream-persona-prompted-skill -8135 prompt-selector +8134 dff-dream-persona-gpt-j-prompted-skill +8135 prompt-selector,prompt-selector-ru 8136 property-extraction +8137 dff-dream-persona-davinci3-prompted-skill +8138 dff-marketing-prompted-skill +8139 dff-fairytale-prompted-skill 8140 seq2seq-persona-based -8188 dff-image-skill +8141 dff-nutrition-prompted-skill +8142 dff-life-coaching-prompted-skill +8143 dff-ai-faq-prompted-skill +8144 dff-fashion-stylist-prompted-skill +8145 openai-api-chatgpt +8146 dff-deeppavlov-prompted-skill +8147 dff-universal-prompted-skill +8148 +8149 transformers-lm-llama7bru +8150 +8151 dff-dream-persona-llama7bru-prompted-skill +8152 dff-deepy-prompted-skill +8153 +8154 dff-casual-email-prompted-skill +8155 dff-meeting-notes-prompted-skill +8156 dff-official-email-prompted-skill +8157 dff-plan-for-article-prompted-skill +8158 transformers-lm-oasst12b +8159 openai-api-gpt4 +8160 openai-api-gpt4-32k diff --git a/components/3DTP1sVdmFIBYrC8OjRYA.yml b/components/3DTP1sVdmFIBYrC8OjRYA.yml index 7afc5f38ad..1ab503b992 100644 --- a/components/3DTP1sVdmFIBYrC8OjRYA.yml +++ b/components/3DTP1sVdmFIBYrC8OjRYA.yml @@ -11,7 +11,7 @@ group: candidate_annotators connector: protocol: http timeout: 1.0 - url: http://toxic-classification-ru:8126/respond_batch + url: http://toxic-classification-ru:8118/respond_batch dialog_formatter: state_formatters.dp_formatters:hypotheses_list response_formatter: state_formatters.dp_formatters:simple_formatter_service previous_services: diff --git a/components/LUiKFsqPaNHJC9SW4Mw.yml b/components/LUiKFsqPaNHJC9SW4Mw.yml index 11a103e502..009983fb29 100644 --- a/components/LUiKFsqPaNHJC9SW4Mw.yml +++ b/components/LUiKFsqPaNHJC9SW4Mw.yml @@ -11,7 +11,7 @@ group: annotators connector: protocol: http timeout: 1.0 - url: http://toxic-classification-ru:8126/respond + url: http://toxic-classification-ru:8118/respond dialog_formatter: state_formatters.dp_formatters:preproc_last_human_utt_dialog response_formatter: state_formatters.dp_formatters:simple_formatter_service previous_services: diff --git a/components/kjdhfkdshrf32rkw7f813.yml b/components/kjdhfkdshrf32rkw7f813.yml new file mode 100644 index 0000000000..2539ad07d1 --- /dev/null +++ b/components/kjdhfkdshrf32rkw7f813.yml @@ -0,0 +1,27 @@ +name: transformers_lm_gptjt +display_name: GPT-JT 6B +component_type: Generative +model_type: NN-based +is_customizable: false +author: publisher@deeppavlov.ai +description: An open-source English-only large language model which was fine-tuned + for instruction following but is NOT capable of code generation. + For more details, refer to + [HuggingFace Model Page](https://huggingface.co/togethercomputer/GPT-JT-6B-v1). + Free of charge. This model is up and running on our servers and can be used for free. +ram_usage: 50G +gpu_usage: 26G +group: services +connector: + protocol: http + timeout: 20.0 + url: http://transformers-lm-gptjt:8161/respond +dialog_formatter: null +response_formatter: null +previous_services: null +required_previous_services: null +state_manager_method: null +tags: null +endpoint: respond +service: services/transformers_lm/service_configs/transformers-lm-gptjt +date_created: '2023-04-16T09:45:32' diff --git a/components/unB9cRBV3MRGqKtrbQDPA.yml b/components/unB9cRBV3MRGqKtrbQDPA.yml index f77d7a6d9c..965b53adeb 100644 --- a/components/unB9cRBV3MRGqKtrbQDPA.yml +++ b/components/unB9cRBV3MRGqKtrbQDPA.yml @@ -13,7 +13,7 @@ group: skills connector: protocol: http timeout: 2.0 - url: http://dff-image-skill:8188/respond + url: http://dff-image-skill:8124/respond dialog_formatter: state_formatters.dp_formatters:dff_image_skill_formatter response_formatter: state_formatters.dp_formatters:skill_with_attributes_formatter_service previous_services: diff --git a/components/vE3pRKimWyPc5qaeW8Q1Q.yml b/components/vE3pRKimWyPc5qaeW8Q1Q.yml index 4ab69761d8..257c3046bc 100644 --- a/components/vE3pRKimWyPc5qaeW8Q1Q.yml +++ b/components/vE3pRKimWyPc5qaeW8Q1Q.yml @@ -15,7 +15,7 @@ group: annotators connector: protocol: http timeout: 1.0 - url: http://fact-retrieval-ru:8130/respond + url: http://fact-retrieval-ru:8110/respond dialog_formatter: state_formatters.dp_formatters:fact_retrieval_rus_formatter_dialog response_formatter: state_formatters.dp_formatters:simple_formatter_service previous_services: diff --git a/response_selectors/llm_based_response_selector/server.py b/response_selectors/llm_based_response_selector/server.py index 8372cd3fa0..785a5d89c3 100644 --- a/response_selectors/llm_based_response_selector/server.py +++ b/response_selectors/llm_based_response_selector/server.py @@ -3,13 +3,13 @@ import json import logging import numpy as np -import requests import time from copy import deepcopy from os import getenv import sentry_sdk from flask import Flask, request, jsonify +from common.prompts import send_request_to_prompted_generative_service from common.utils import is_toxic_or_badlisted_utterance @@ -62,18 +62,15 @@ def select_response_by_scores(hypotheses, scores): def select_response(dialog_context, hypotheses): try: - response = requests.post( + response = send_request_to_prompted_generative_service( + dialog_context, + PROMPT + "\nHypotheses:\n" + "\n".join([f'"{hyp["text"]}"' for hyp in hypotheses]), GENERATIVE_SERVICE_URL, - json={ - "dialog_contexts": [dialog_context], - "prompts": [PROMPT], - "configs": [GENERATIVE_SERVICE_CONFIG], - **sending_variables, - }, - timeout=GENERATIVE_TIMEOUT, + GENERATIVE_SERVICE_CONFIG, + GENERATIVE_TIMEOUT, + sending_variables, ) - # batch of a list of one string [["this is the response"]] - result = response.json()[0][0] + result = response[0] except Exception as e: sentry_sdk.capture_exception(e) logger.exception(e) @@ -114,6 +111,7 @@ def respond(): selected_bot_attributes.append(hypotheses[best_id].pop("bot_attributes", {})) hypotheses[best_id].pop("annotations", {}) selected_attributes.append(hypotheses[best_id]) + except Exception as e: sentry_sdk.capture_exception(e) logger.exception(e) @@ -122,6 +120,7 @@ def respond(): "Selected a response with the highest confidence." ) selected_resp, best_id = select_response_by_scores(hypotheses, [hyp["confidence"] for hyp in hypotheses]) + selected_responses.append(hypotheses[best_id].pop("text")) selected_skill_names.append(hypotheses[best_id].pop("skill_name")) selected_confidences.append(hypotheses[best_id].pop("confidence")) diff --git a/services/infilling/service_configs/infilling/environment.yml b/services/infilling/service_configs/infilling/environment.yml index 43c2ea6272..3a1069ecc1 100644 --- a/services/infilling/service_configs/infilling/environment.yml +++ b/services/infilling/service_configs/infilling/environment.yml @@ -1,4 +1,4 @@ -SERVICE_PORT: 8139 +SERVICE_PORT: 8106 SERVICE_NAME: infilling CUDA_VISIBLE_DEVICES: '0' FLASK_APP: server diff --git a/services/infilling/service_configs/infilling/service.yml b/services/infilling/service_configs/infilling/service.yml index 0756d71533..1839ec775d 100644 --- a/services/infilling/service_configs/infilling/service.yml +++ b/services/infilling/service_configs/infilling/service.yml @@ -7,11 +7,11 @@ compose: build: context: ./services/infilling/ args: - SERVICE_PORT: 8139 + SERVICE_PORT: 8106 SERVICE_NAME: infilling CUDA_VISIBLE_DEVICES: '0' FLASK_APP: server - command: flask run -h 0.0.0.0 -p 8139 + command: flask run -h 0.0.0.0 -p 8106 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server @@ -25,5 +25,5 @@ compose: - ./services/infilling:/src - ~/.deeppavlov:/root/.deeppavlov ports: - - 8139:8139 + - 8106:8106 proxy: null diff --git a/services/masked_lm/service_configs/masked-lm/service.yml b/services/masked_lm/service_configs/masked-lm/service.yml index 66732ff80f..2a4b1a3462 100644 --- a/services/masked_lm/service_configs/masked-lm/service.yml +++ b/services/masked_lm/service_configs/masked-lm/service.yml @@ -7,12 +7,12 @@ compose: build: context: ./services/masked_lm/ args: - SERVICE_PORT: 8141 + SERVICE_PORT: 8102 SERVICE_NAME: masked_lm PRETRAINED_MODEL_NAME_OR_PATH: bert-base-uncased CUDA_VISIBLE_DEVICES: '0' FLASK_APP: server - command: flask run -h 0.0.0.0 -p 8141 + command: flask run -h 0.0.0.0 -p 8102 environment: - CUDA_VISIBLE_DEVICES=0 - FLASK_APP=server @@ -27,5 +27,5 @@ compose: - ./common:/src/common - ~/.deeppavlov/cache:/root/.cache ports: - - 8141:8141 + - 8102:8102 proxy: null diff --git a/services/openai_api_lm/server.py b/services/openai_api_lm/server.py index 2306c440e0..5de005687e 100644 --- a/services/openai_api_lm/server.py +++ b/services/openai_api_lm/server.py @@ -5,7 +5,7 @@ import openai import sentry_sdk -from common.prompts import META_PROMPT +from common.prompts import META_GOALS_PROMPT from common.universal_templates import GENERATIVE_ROBOT_TEMPLATE from flask import Flask, request, jsonify from sentry_sdk.integrations.flask import FlaskIntegration @@ -96,7 +96,8 @@ def respond(): st_time = time.time() contexts = request.json.get("dialog_contexts", []) prompts = request.json.get("prompts", []) - configs = request.json.get("configs", []) + configs = request.json.get("configs", None) + configs = [None] * len(prompts) if configs is None else configs configs = [DEFAULT_CONFIGS[PRETRAINED_MODEL_NAME_OR_PATH] if el is None else el for el in configs] if len(contexts) > 0 and len(prompts) == 0: prompts = [""] * len(contexts) @@ -144,7 +145,7 @@ def generate_goals(): try: responses = [] for openai_api_key, openai_org, prompt, config in zip(openai_api_keys, openai_orgs, prompts, configs): - context = ["hi", META_PROMPT + f"\nPrompt: '''{prompt}'''\nResult:"] + context = ["hi", META_GOALS_PROMPT + f"\nPrompt: '''{prompt}'''\nResult:"] goals_for_prompt = generate_responses(context, openai_api_key, openai_org, "", config)[0] logger.info(f"Generated goals: `{goals_for_prompt}` for prompt: `{prompt}`") responses += [goals_for_prompt] diff --git a/services/transformers_lm/server.py b/services/transformers_lm/server.py index aecda21c6c..5835e9d6de 100644 --- a/services/transformers_lm/server.py +++ b/services/transformers_lm/server.py @@ -9,7 +9,7 @@ from sentry_sdk.integrations.flask import FlaskIntegration from transformers import AutoModelForCausalLM, AutoTokenizer -from common.prompts import META_PROMPT +from common.prompts import META_GOALS_PROMPT from common.universal_templates import GENERATIVE_ROBOT_TEMPLATE @@ -36,6 +36,7 @@ "OpenAssistant/pythia-12b-sft-v8-7k-steps": json.load( open("generative_configs/default_generative_config.json", "r") ), + "togethercomputer/GPT-JT-6B-v1": json.load(open("generative_configs/default_generative_config.json", "r")), } @@ -119,7 +120,8 @@ def respond(): st_time = time.time() contexts = request.json.get("dialog_contexts", []) prompts = request.json.get("prompts", []) - configs = request.json.get("configs", []) + configs = request.json.get("configs", None) + configs = [None] * len(prompts) if configs is None else configs configs = [DEFAULT_CONFIGS[PRETRAINED_MODEL_NAME_OR_PATH] if el is None else el for el in configs] if len(contexts) > 0 and len(prompts) == 0: prompts = [""] * len(contexts) @@ -160,7 +162,7 @@ def generate_goals(): try: responses = [] for prompt, config in zip(prompts, configs): - context = ["hi", META_PROMPT + f"\nPrompt: '''{prompt}'''\nResult:"] + context = ["hi", META_GOALS_PROMPT + f"\nPrompt: '''{prompt}'''\nResult:"] goals_for_prompt = generate_responses(context, model, tokenizer, "", config)[0] logger.info(f"Generated goals: `{goals_for_prompt}` for prompt: `{prompt}`") responses += [goals_for_prompt] diff --git a/services/transformers_lm/service_configs/transformers-lm-gptjt/environment.yml b/services/transformers_lm/service_configs/transformers-lm-gptjt/environment.yml new file mode 100644 index 0000000000..bc0eb9ca3e --- /dev/null +++ b/services/transformers_lm/service_configs/transformers-lm-gptjt/environment.yml @@ -0,0 +1,6 @@ +SERVICE_PORT: 8161 +SERVICE_NAME: transformers_lm_gptjt +PRETRAINED_MODEL_NAME_OR_PATH: togethercomputer/GPT-JT-6B-v1 +HALF_PRECISION: 0 +CUDA_VISIBLE_DEVICES: '0' +FLASK_APP: server diff --git a/services/transformers_lm/service_configs/transformers-lm-gptjt/service.yml b/services/transformers_lm/service_configs/transformers-lm-gptjt/service.yml new file mode 100644 index 0000000000..cdca5c56fc --- /dev/null +++ b/services/transformers_lm/service_configs/transformers-lm-gptjt/service.yml @@ -0,0 +1,43 @@ +name: transformers-lm-gptjt +endpoints: +- respond +compose: + env_file: + - .env + build: + args: + SERVICE_PORT: 8161 + SERVICE_NAME: transformers_lm_gptjt + PRETRAINED_MODEL_NAME_OR_PATH: togethercomputer/GPT-JT-6B-v1 + HALF_PRECISION: 0 + CUDA_VISIBLE_DEVICES: '0' + FLASK_APP: server + context: . + dockerfile: ./services/transformers_lm/Dockerfile + command: flask run -h 0.0.0.0 -p 8161 + environment: + - CUDA_VISIBLE_DEVICES=0 + - FLASK_APP=server + deploy: + resources: + limits: + memory: 50G + reservations: + memory: 50G + volumes: + - ./services/transformers_lm:/src + - ./common:/src/common + - ~/.deeppavlov/cache:/root/.cache + ports: + - 8161:8161 +proxy: + command: + - nginx + - -g + - daemon off; + build: + context: dp/proxy/ + dockerfile: Dockerfile + environment: + - PROXY_PASS=dream.deeppavlov.ai:8161 + - PORT=8161 diff --git a/services/transformers_peft_lm/server.py b/services/transformers_peft_lm/server.py index 533831c113..c211be5842 100644 --- a/services/transformers_peft_lm/server.py +++ b/services/transformers_peft_lm/server.py @@ -10,7 +10,7 @@ from sentry_sdk.integrations.flask import FlaskIntegration from transformers import AutoModelForCausalLM, AutoTokenizer, GenerationConfig -from common.prompts import META_PROMPT +from common.prompts import META_GOALS_PROMPT from common.universal_templates import GENERATIVE_ROBOT_TEMPLATE @@ -146,7 +146,7 @@ def generate_goals(): try: responses = [] for prompt in prompts: - context = ["hi", META_PROMPT + f"\nPrompt: '''{prompt}'''\nResult:"] + context = ["hi", META_GOALS_PROMPT + f"\nPrompt: '''{prompt}'''\nResult:"] goals_for_prompt = generate_responses(context, model, tokenizer, "")[0] logger.info(f"Generated goals: `{goals_for_prompt}` for prompt: `{prompt}`") responses += [goals_for_prompt] diff --git a/skills/dff_art_skill/tests/lets_talk_in.json b/skills/dff_art_skill/tests/lets_talk_in.json index 24f0d40a32..1d4b7fb8dc 100644 --- a/skills/dff_art_skill/tests/lets_talk_in.json +++ b/skills/dff_art_skill/tests/lets_talk_in.json @@ -310,6 +310,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_art_skill/tests/lets_talk_out.json b/skills/dff_art_skill/tests/lets_talk_out.json index fce0bd9943..25dd680cdd 100644 --- a/skills/dff_art_skill/tests/lets_talk_out.json +++ b/skills/dff_art_skill/tests/lets_talk_out.json @@ -42,8 +42,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_book_sfc_skill/tests/favs_in.json b/skills/dff_book_sfc_skill/tests/favs_in.json index a35920aece..a66b1f81ac 100644 --- a/skills/dff_book_sfc_skill/tests/favs_in.json +++ b/skills/dff_book_sfc_skill/tests/favs_in.json @@ -779,6 +779,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_book_sfc_skill/tests/favs_out.json b/skills/dff_book_sfc_skill/tests/favs_out.json index 241787ad84..435238e710 100644 --- a/skills/dff_book_sfc_skill/tests/favs_out.json +++ b/skills/dff_book_sfc_skill/tests/favs_out.json @@ -75,8 +75,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_book_skill/tests/concrete_book_in.json b/skills/dff_book_skill/tests/concrete_book_in.json index 2bd8eaf820..d60a661355 100644 --- a/skills/dff_book_skill/tests/concrete_book_in.json +++ b/skills/dff_book_skill/tests/concrete_book_in.json @@ -584,6 +584,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_book_skill/tests/concrete_book_out.json b/skills/dff_book_skill/tests/concrete_book_out.json index e381690fbc..f2cc89d976 100644 --- a/skills/dff_book_skill/tests/concrete_book_out.json +++ b/skills/dff_book_skill/tests/concrete_book_out.json @@ -83,8 +83,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_book_skill/tests/favs_in.json b/skills/dff_book_skill/tests/favs_in.json index 92a2f9bb7f..3766bcbd99 100644 --- a/skills/dff_book_skill/tests/favs_in.json +++ b/skills/dff_book_skill/tests/favs_in.json @@ -767,6 +767,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_book_skill/tests/favs_out.json b/skills/dff_book_skill/tests/favs_out.json index b392e44eb7..092f513179 100644 --- a/skills/dff_book_skill/tests/favs_out.json +++ b/skills/dff_book_skill/tests/favs_out.json @@ -98,8 +98,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_book_skill/tests/lets_talk_about_books_in.json b/skills/dff_book_skill/tests/lets_talk_about_books_in.json index 152820175c..6c8a0cb397 100644 --- a/skills/dff_book_skill/tests/lets_talk_about_books_in.json +++ b/skills/dff_book_skill/tests/lets_talk_about_books_in.json @@ -310,6 +310,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_book_skill/tests/lets_talk_about_books_out.json b/skills/dff_book_skill/tests/lets_talk_about_books_out.json index 076d8ab3ca..e5b0201874 100644 --- a/skills/dff_book_skill/tests/lets_talk_about_books_out.json +++ b/skills/dff_book_skill/tests/lets_talk_about_books_out.json @@ -45,8 +45,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/changeable_tests/city_stats_in.json b/skills/dff_coronavirus_skill/changeable_tests/city_stats_in.json index cf549be2b0..8d0c29c2d4 100644 --- a/skills/dff_coronavirus_skill/changeable_tests/city_stats_in.json +++ b/skills/dff_coronavirus_skill/changeable_tests/city_stats_in.json @@ -1089,6 +1089,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_coronavirus_skill/changeable_tests/city_stats_out.json b/skills/dff_coronavirus_skill/changeable_tests/city_stats_out.json index 635f3c8304..aba8c586a8 100644 --- a/skills/dff_coronavirus_skill/changeable_tests/city_stats_out.json +++ b/skills/dff_coronavirus_skill/changeable_tests/city_stats_out.json @@ -57,8 +57,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/changeable_tests/country_stats_2_in.json b/skills/dff_coronavirus_skill/changeable_tests/country_stats_2_in.json index 786fc1516f..fc0081fb59 100644 --- a/skills/dff_coronavirus_skill/changeable_tests/country_stats_2_in.json +++ b/skills/dff_coronavirus_skill/changeable_tests/country_stats_2_in.json @@ -869,6 +869,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_coronavirus_skill/changeable_tests/country_stats_2_out.json b/skills/dff_coronavirus_skill/changeable_tests/country_stats_2_out.json index ebc61fa5fc..407e953454 100644 --- a/skills/dff_coronavirus_skill/changeable_tests/country_stats_2_out.json +++ b/skills/dff_coronavirus_skill/changeable_tests/country_stats_2_out.json @@ -57,8 +57,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/asthma_mentioned_in.json b/skills/dff_coronavirus_skill/tests/asthma_mentioned_in.json index f57333c1de..a9a8411bd8 100644 --- a/skills/dff_coronavirus_skill/tests/asthma_mentioned_in.json +++ b/skills/dff_coronavirus_skill/tests/asthma_mentioned_in.json @@ -289,6 +289,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_coronavirus_skill/tests/asthma_mentioned_out.json b/skills/dff_coronavirus_skill/tests/asthma_mentioned_out.json index 2f60bf53c2..63efe510f3 100644 --- a/skills/dff_coronavirus_skill/tests/asthma_mentioned_out.json +++ b/skills/dff_coronavirus_skill/tests/asthma_mentioned_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/bot_has_covid_in.json b/skills/dff_coronavirus_skill/tests/bot_has_covid_in.json index a8e0543db4..c2a81bf7c0 100644 --- a/skills/dff_coronavirus_skill/tests/bot_has_covid_in.json +++ b/skills/dff_coronavirus_skill/tests/bot_has_covid_in.json @@ -336,6 +336,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_coronavirus_skill/tests/bot_has_covid_out.json b/skills/dff_coronavirus_skill/tests/bot_has_covid_out.json index 6be785b435..5ced3007d7 100644 --- a/skills/dff_coronavirus_skill/tests/bot_has_covid_out.json +++ b/skills/dff_coronavirus_skill/tests/bot_has_covid_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/clarify_intention_virus_in.json b/skills/dff_coronavirus_skill/tests/clarify_intention_virus_in.json index 673e6fbb5b..93e1a2eb3f 100644 --- a/skills/dff_coronavirus_skill/tests/clarify_intention_virus_in.json +++ b/skills/dff_coronavirus_skill/tests/clarify_intention_virus_in.json @@ -337,6 +337,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_coronavirus_skill/tests/clarify_intention_virus_out.json b/skills/dff_coronavirus_skill/tests/clarify_intention_virus_out.json index 0af77569db..ba4e277f7c 100644 --- a/skills/dff_coronavirus_skill/tests/clarify_intention_virus_out.json +++ b/skills/dff_coronavirus_skill/tests/clarify_intention_virus_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/core_fact_2_in.json b/skills/dff_coronavirus_skill/tests/core_fact_2_in.json index 949bff3c8e..82ba84fde3 100644 --- a/skills/dff_coronavirus_skill/tests/core_fact_2_in.json +++ b/skills/dff_coronavirus_skill/tests/core_fact_2_in.json @@ -264,6 +264,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_coronavirus_skill/tests/core_fact_2_out.json b/skills/dff_coronavirus_skill/tests/core_fact_2_out.json index 2d8df491c7..f79ba86914 100644 --- a/skills/dff_coronavirus_skill/tests/core_fact_2_out.json +++ b/skills/dff_coronavirus_skill/tests/core_fact_2_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/country_stats_in.json b/skills/dff_coronavirus_skill/tests/country_stats_in.json index 949bff3c8e..82ba84fde3 100644 --- a/skills/dff_coronavirus_skill/tests/country_stats_in.json +++ b/skills/dff_coronavirus_skill/tests/country_stats_in.json @@ -264,6 +264,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_coronavirus_skill/tests/country_stats_out.json b/skills/dff_coronavirus_skill/tests/country_stats_out.json index be9d645b6d..237b34606c 100644 --- a/skills/dff_coronavirus_skill/tests/country_stats_out.json +++ b/skills/dff_coronavirus_skill/tests/country_stats_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/covid_advice_in.json b/skills/dff_coronavirus_skill/tests/covid_advice_in.json index a4887ecfae..4b7506e847 100644 --- a/skills/dff_coronavirus_skill/tests/covid_advice_in.json +++ b/skills/dff_coronavirus_skill/tests/covid_advice_in.json @@ -290,6 +290,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_coronavirus_skill/tests/covid_advice_out.json b/skills/dff_coronavirus_skill/tests/covid_advice_out.json index a220d2e46c..978b1ccebf 100644 --- a/skills/dff_coronavirus_skill/tests/covid_advice_out.json +++ b/skills/dff_coronavirus_skill/tests/covid_advice_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/covid_origin_in.json b/skills/dff_coronavirus_skill/tests/covid_origin_in.json index a4887ecfae..4b7506e847 100644 --- a/skills/dff_coronavirus_skill/tests/covid_origin_in.json +++ b/skills/dff_coronavirus_skill/tests/covid_origin_in.json @@ -290,6 +290,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_coronavirus_skill/tests/covid_origin_out.json b/skills/dff_coronavirus_skill/tests/covid_origin_out.json index bbe926a9ac..a2f38a18fc 100644 --- a/skills/dff_coronavirus_skill/tests/covid_origin_out.json +++ b/skills/dff_coronavirus_skill/tests/covid_origin_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/covid_symptoms_in.json b/skills/dff_coronavirus_skill/tests/covid_symptoms_in.json index 24f83dad7e..be5244b2d6 100644 --- a/skills/dff_coronavirus_skill/tests/covid_symptoms_in.json +++ b/skills/dff_coronavirus_skill/tests/covid_symptoms_in.json @@ -625,6 +625,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_coronavirus_skill/tests/covid_symptoms_out.json b/skills/dff_coronavirus_skill/tests/covid_symptoms_out.json index 991f790ba0..89067203a4 100644 --- a/skills/dff_coronavirus_skill/tests/covid_symptoms_out.json +++ b/skills/dff_coronavirus_skill/tests/covid_symptoms_out.json @@ -67,8 +67,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/covid_treatment_in.json b/skills/dff_coronavirus_skill/tests/covid_treatment_in.json index ab2a3f9091..895fd45378 100644 --- a/skills/dff_coronavirus_skill/tests/covid_treatment_in.json +++ b/skills/dff_coronavirus_skill/tests/covid_treatment_in.json @@ -314,6 +314,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_coronavirus_skill/tests/covid_treatment_out.json b/skills/dff_coronavirus_skill/tests/covid_treatment_out.json index 2ce9fcaa7e..0b4a915676 100644 --- a/skills/dff_coronavirus_skill/tests/covid_treatment_out.json +++ b/skills/dff_coronavirus_skill/tests/covid_treatment_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/facts_and_age_risks_in.json b/skills/dff_coronavirus_skill/tests/facts_and_age_risks_in.json index 949bff3c8e..82ba84fde3 100644 --- a/skills/dff_coronavirus_skill/tests/facts_and_age_risks_in.json +++ b/skills/dff_coronavirus_skill/tests/facts_and_age_risks_in.json @@ -264,6 +264,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_coronavirus_skill/tests/facts_and_age_risks_out.json b/skills/dff_coronavirus_skill/tests/facts_and_age_risks_out.json index 901770f85d..870e6d8ac9 100644 --- a/skills/dff_coronavirus_skill/tests/facts_and_age_risks_out.json +++ b/skills/dff_coronavirus_skill/tests/facts_and_age_risks_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/quarantine_end_in.json b/skills/dff_coronavirus_skill/tests/quarantine_end_in.json index aed23413dc..cd82b652a4 100644 --- a/skills/dff_coronavirus_skill/tests/quarantine_end_in.json +++ b/skills/dff_coronavirus_skill/tests/quarantine_end_in.json @@ -335,6 +335,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_coronavirus_skill/tests/quarantine_end_out.json b/skills/dff_coronavirus_skill/tests/quarantine_end_out.json index 260d32a137..5c99c70a2e 100644 --- a/skills/dff_coronavirus_skill/tests/quarantine_end_out.json +++ b/skills/dff_coronavirus_skill/tests/quarantine_end_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/uninteresting_topic_in.json b/skills/dff_coronavirus_skill/tests/uninteresting_topic_in.json index 949bff3c8e..82ba84fde3 100644 --- a/skills/dff_coronavirus_skill/tests/uninteresting_topic_in.json +++ b/skills/dff_coronavirus_skill/tests/uninteresting_topic_in.json @@ -264,6 +264,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_coronavirus_skill/tests/uninteresting_topic_out.json b/skills/dff_coronavirus_skill/tests/uninteresting_topic_out.json index 9eefe27643..e5cdeb2d62 100644 --- a/skills/dff_coronavirus_skill/tests/uninteresting_topic_out.json +++ b/skills/dff_coronavirus_skill/tests/uninteresting_topic_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/user_resilience_to_covid_in.json b/skills/dff_coronavirus_skill/tests/user_resilience_to_covid_in.json index 174d8038e6..919c92b33c 100644 --- a/skills/dff_coronavirus_skill/tests/user_resilience_to_covid_in.json +++ b/skills/dff_coronavirus_skill/tests/user_resilience_to_covid_in.json @@ -331,6 +331,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_coronavirus_skill/tests/user_resilience_to_covid_out.json b/skills/dff_coronavirus_skill/tests/user_resilience_to_covid_out.json index 1ceb91f9ed..20585a3431 100644 --- a/skills/dff_coronavirus_skill/tests/user_resilience_to_covid_out.json +++ b/skills/dff_coronavirus_skill/tests/user_resilience_to_covid_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/vaccine_safety_in.json b/skills/dff_coronavirus_skill/tests/vaccine_safety_in.json index d52a292bf6..cf7a1b60bb 100644 --- a/skills/dff_coronavirus_skill/tests/vaccine_safety_in.json +++ b/skills/dff_coronavirus_skill/tests/vaccine_safety_in.json @@ -329,6 +329,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_coronavirus_skill/tests/vaccine_safety_out.json b/skills/dff_coronavirus_skill/tests/vaccine_safety_out.json index c9b81fd872..66f7703647 100644 --- a/skills/dff_coronavirus_skill/tests/vaccine_safety_out.json +++ b/skills/dff_coronavirus_skill/tests/vaccine_safety_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_coronavirus_skill/tests/what_is_covid_in.json b/skills/dff_coronavirus_skill/tests/what_is_covid_in.json index 3665ca2206..71473c72a3 100644 --- a/skills/dff_coronavirus_skill/tests/what_is_covid_in.json +++ b/skills/dff_coronavirus_skill/tests/what_is_covid_in.json @@ -264,6 +264,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_coronavirus_skill/tests/what_is_covid_out.json b/skills/dff_coronavirus_skill/tests/what_is_covid_out.json index e14c0ddc4e..f877dfe5ab 100644 --- a/skills/dff_coronavirus_skill/tests/what_is_covid_out.json +++ b/skills/dff_coronavirus_skill/tests/what_is_covid_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_food_skill/tests/lets_talk_in.json b/skills/dff_food_skill/tests/lets_talk_in.json index b5a655897b..3e5c41905c 100644 --- a/skills/dff_food_skill/tests/lets_talk_in.json +++ b/skills/dff_food_skill/tests/lets_talk_in.json @@ -154,6 +154,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_food_skill/tests/lets_talk_out.json b/skills/dff_food_skill/tests/lets_talk_out.json index 6973e9c8dd..1738bf6b82 100644 --- a/skills/dff_food_skill/tests/lets_talk_out.json +++ b/skills/dff_food_skill/tests/lets_talk_out.json @@ -19,8 +19,9 @@ "dff_shared_state": {}, "used_links": {}, "age_group":"", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must" diff --git a/skills/dff_friendship_skill/tests/how_bot_is_doing_RU_in.json b/skills/dff_friendship_skill/tests/how_bot_is_doing_RU_in.json index 87a5e4042d..92bf396d65 100644 --- a/skills/dff_friendship_skill/tests/how_bot_is_doing_RU_in.json +++ b/skills/dff_friendship_skill/tests/how_bot_is_doing_RU_in.json @@ -226,6 +226,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_friendship_skill/tests/how_bot_is_doing_RU_out.json b/skills/dff_friendship_skill/tests/how_bot_is_doing_RU_out.json index efd33aaa68..e821912992 100644 --- a/skills/dff_friendship_skill/tests/how_bot_is_doing_RU_out.json +++ b/skills/dff_friendship_skill/tests/how_bot_is_doing_RU_out.json @@ -51,8 +51,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must" diff --git a/skills/dff_friendship_skill/tests/how_bot_is_doing_in.json b/skills/dff_friendship_skill/tests/how_bot_is_doing_in.json index 091edeada6..b707ab1ddc 100644 --- a/skills/dff_friendship_skill/tests/how_bot_is_doing_in.json +++ b/skills/dff_friendship_skill/tests/how_bot_is_doing_in.json @@ -526,6 +526,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_friendship_skill/tests/how_bot_is_doing_out.json b/skills/dff_friendship_skill/tests/how_bot_is_doing_out.json index 0657b94f71..490e127e67 100644 --- a/skills/dff_friendship_skill/tests/how_bot_is_doing_out.json +++ b/skills/dff_friendship_skill/tests/how_bot_is_doing_out.json @@ -51,8 +51,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must" diff --git a/skills/dff_friendship_skill/tests/lets_talk_RU_in.json b/skills/dff_friendship_skill/tests/lets_talk_RU_in.json index e0218c374f..0e22f303d9 100644 --- a/skills/dff_friendship_skill/tests/lets_talk_RU_in.json +++ b/skills/dff_friendship_skill/tests/lets_talk_RU_in.json @@ -104,6 +104,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_friendship_skill/tests/lets_talk_RU_out.json b/skills/dff_friendship_skill/tests/lets_talk_RU_out.json index 531c7d0c47..a1d91f0bcc 100644 --- a/skills/dff_friendship_skill/tests/lets_talk_RU_out.json +++ b/skills/dff_friendship_skill/tests/lets_talk_RU_out.json @@ -40,8 +40,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must" diff --git a/skills/dff_friendship_skill/tests/lets_talk_in.json b/skills/dff_friendship_skill/tests/lets_talk_in.json index 8e3575824f..5bbd8baebe 100644 --- a/skills/dff_friendship_skill/tests/lets_talk_in.json +++ b/skills/dff_friendship_skill/tests/lets_talk_in.json @@ -241,6 +241,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_friendship_skill/tests/lets_talk_out.json b/skills/dff_friendship_skill/tests/lets_talk_out.json index a9f829be87..acc610434d 100644 --- a/skills/dff_friendship_skill/tests/lets_talk_out.json +++ b/skills/dff_friendship_skill/tests/lets_talk_out.json @@ -40,8 +40,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must" diff --git a/skills/dff_friendship_skill/tests/no_hobbies_RU_in.json b/skills/dff_friendship_skill/tests/no_hobbies_RU_in.json index 23ace80041..bb07210b62 100644 --- a/skills/dff_friendship_skill/tests/no_hobbies_RU_in.json +++ b/skills/dff_friendship_skill/tests/no_hobbies_RU_in.json @@ -233,6 +233,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_friendship_skill/tests/no_hobbies_RU_out.json b/skills/dff_friendship_skill/tests/no_hobbies_RU_out.json index 3ab9ae5bb2..08b2e78662 100644 --- a/skills/dff_friendship_skill/tests/no_hobbies_RU_out.json +++ b/skills/dff_friendship_skill/tests/no_hobbies_RU_out.json @@ -59,8 +59,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must", diff --git a/skills/dff_friendship_skill/tests/no_hobbies_in.json b/skills/dff_friendship_skill/tests/no_hobbies_in.json index 00ca57d0c1..2efa0080f1 100644 --- a/skills/dff_friendship_skill/tests/no_hobbies_in.json +++ b/skills/dff_friendship_skill/tests/no_hobbies_in.json @@ -530,6 +530,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_friendship_skill/tests/no_hobbies_out.json b/skills/dff_friendship_skill/tests/no_hobbies_out.json index dbf37eda74..31f042e220 100644 --- a/skills/dff_friendship_skill/tests/no_hobbies_out.json +++ b/skills/dff_friendship_skill/tests/no_hobbies_out.json @@ -59,8 +59,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must", diff --git a/skills/dff_friendship_skill/tests/no_recent_events_RU_in.json b/skills/dff_friendship_skill/tests/no_recent_events_RU_in.json index b6a4e59e58..418a0187af 100644 --- a/skills/dff_friendship_skill/tests/no_recent_events_RU_in.json +++ b/skills/dff_friendship_skill/tests/no_recent_events_RU_in.json @@ -237,6 +237,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_friendship_skill/tests/no_recent_events_RU_out.json b/skills/dff_friendship_skill/tests/no_recent_events_RU_out.json index 05e8fa0847..ca06e50f52 100644 --- a/skills/dff_friendship_skill/tests/no_recent_events_RU_out.json +++ b/skills/dff_friendship_skill/tests/no_recent_events_RU_out.json @@ -55,8 +55,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must", diff --git a/skills/dff_friendship_skill/tests/no_recent_events_in.json b/skills/dff_friendship_skill/tests/no_recent_events_in.json index 75a996fbe5..4970bb2af3 100644 --- a/skills/dff_friendship_skill/tests/no_recent_events_in.json +++ b/skills/dff_friendship_skill/tests/no_recent_events_in.json @@ -550,6 +550,9 @@ "emotion_skill" ] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_friendship_skill/tests/no_recent_events_out.json b/skills/dff_friendship_skill/tests/no_recent_events_out.json index 87c7d5dfbe..a256adce42 100644 --- a/skills/dff_friendship_skill/tests/no_recent_events_out.json +++ b/skills/dff_friendship_skill/tests/no_recent_events_out.json @@ -57,7 +57,8 @@ "age_group": "unknown", "disliked_skills": [ "emotion_skill" - ] + ], + "prompts_goals": {} }, {}, { diff --git a/skills/dff_funfact_skill/tests/random_funfact_in.json b/skills/dff_funfact_skill/tests/random_funfact_in.json index d90cf3f056..de434fabb3 100644 --- a/skills/dff_funfact_skill/tests/random_funfact_in.json +++ b/skills/dff_funfact_skill/tests/random_funfact_in.json @@ -677,5 +677,17 @@ "used_links_batch": [ {} ], + "age_group_batch": [ + "unknown" + ], + "disliked_skills_batch": [ + [] + ], + "prompts_goals_batch": [ + {} + ], + "clarification_request_flag_batch": [ + false + ], "random_seed": 2718 } diff --git a/skills/dff_funfact_skill/tests/random_funfact_out.json b/skills/dff_funfact_skill/tests/random_funfact_out.json index fdedbb637d..d82bf04a09 100644 --- a/skills/dff_funfact_skill/tests/random_funfact_out.json +++ b/skills/dff_funfact_skill/tests/random_funfact_out.json @@ -38,8 +38,9 @@ }, "dff_shared_state": {}, "used_links": {}, - "age_group": "", - "disliked_skills": {} + "age_group": "unknown", + "disliked_skills": [], + "prompts_goals": {} }, {}, { diff --git a/skills/dff_gaming_skill/tests/lets_talk_in.json b/skills/dff_gaming_skill/tests/lets_talk_in.json index d492ef8457..ec850c0f92 100644 --- a/skills/dff_gaming_skill/tests/lets_talk_in.json +++ b/skills/dff_gaming_skill/tests/lets_talk_in.json @@ -490,6 +490,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_gaming_skill/tests/lets_talk_out.json b/skills/dff_gaming_skill/tests/lets_talk_out.json index 8e794a8990..7540044f22 100644 --- a/skills/dff_gaming_skill/tests/lets_talk_out.json +++ b/skills/dff_gaming_skill/tests/lets_talk_out.json @@ -24,8 +24,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must", diff --git a/skills/dff_generative_skill/tests/lets_talk_in.json b/skills/dff_generative_skill/tests/lets_talk_in.json index 04dc5f5084..abe68b10ab 100644 --- a/skills/dff_generative_skill/tests/lets_talk_in.json +++ b/skills/dff_generative_skill/tests/lets_talk_in.json @@ -426,6 +426,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_generative_skill/tests/lets_talk_out.json b/skills/dff_generative_skill/tests/lets_talk_out.json index cbdff2fdfd..5f5f242e22 100644 --- a/skills/dff_generative_skill/tests/lets_talk_out.json +++ b/skills/dff_generative_skill/tests/lets_talk_out.json @@ -113,7 +113,8 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] + "disliked_skills": [], + "prompts_goals": {} }, { "dff_generative_skill_state": { @@ -217,7 +218,8 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] + "disliked_skills": [], + "prompts_goals": {} }, { "dff_generative_skill_state": { @@ -321,7 +323,8 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] + "disliked_skills": [], + "prompts_goals": {} } ], [ diff --git a/skills/dff_grounding_skill/tests/general_in.json b/skills/dff_grounding_skill/tests/general_in.json index 3af6270e6f..848b181c4f 100644 --- a/skills/dff_grounding_skill/tests/general_in.json +++ b/skills/dff_grounding_skill/tests/general_in.json @@ -685,6 +685,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_grounding_skill/tests/general_out.json b/skills/dff_grounding_skill/tests/general_out.json index a43eae0118..c1bc6da7f2 100644 --- a/skills/dff_grounding_skill/tests/general_out.json +++ b/skills/dff_grounding_skill/tests/general_out.json @@ -203,7 +203,8 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] + "disliked_skills": [], + "prompts_goals": {} }, { "dff_grounding_skill_state": { @@ -400,6 +401,7 @@ "used_links": {}, "age_group": "unknown", "disliked_skills": [], + "prompts_goals": {}, "dff_grounding_skill": { "used_universal_intent_responses": [ "I'm ashamed, I don't know.", diff --git a/skills/dff_grounding_skill/tests/lets_talk_in.json b/skills/dff_grounding_skill/tests/lets_talk_in.json index 7fb73d19da..7205a37460 100644 --- a/skills/dff_grounding_skill/tests/lets_talk_in.json +++ b/skills/dff_grounding_skill/tests/lets_talk_in.json @@ -950,6 +950,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_grounding_skill/tests/lets_talk_out.json b/skills/dff_grounding_skill/tests/lets_talk_out.json index dc32e0a3a7..2c1442493c 100644 --- a/skills/dff_grounding_skill/tests/lets_talk_out.json +++ b/skills/dff_grounding_skill/tests/lets_talk_out.json @@ -134,7 +134,8 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] + "disliked_skills": [], + "prompts_goals": {} }, { "dff_grounding_skill_state": { @@ -259,7 +260,8 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] + "disliked_skills": [], + "prompts_goals": {} }, { "dff_grounding_skill_state": { @@ -385,6 +387,7 @@ "used_links": {}, "age_group": "unknown", "disliked_skills": [], + "prompts_goals": {}, "dff_grounding_skill": { "used_universal_intent_responses": [ "It's been really cool getting to know you better.", diff --git a/skills/dff_grounding_skill/tests/recording_test_in.json b/skills/dff_grounding_skill/tests/recording_test_in.json index a46d892aa9..5e96068ae4 100644 --- a/skills/dff_grounding_skill/tests/recording_test_in.json +++ b/skills/dff_grounding_skill/tests/recording_test_in.json @@ -719,6 +719,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_grounding_skill/tests/recording_test_out.json b/skills/dff_grounding_skill/tests/recording_test_out.json index 2cfc4f0f49..bf1d7d02b4 100644 --- a/skills/dff_grounding_skill/tests/recording_test_out.json +++ b/skills/dff_grounding_skill/tests/recording_test_out.json @@ -146,7 +146,8 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] + "disliked_skills": [], + "prompts_goals": {} }, { "dff_grounding_skill_state": { @@ -286,6 +287,7 @@ "used_links": {}, "age_group": "unknown", "disliked_skills": [], + "prompts_goals": {}, "dff_grounding_skill": { "used_universal_intent_responses": [ "I'm ashamed, I don't know.", diff --git a/skills/dff_image_skill/service_configs/dff-image-skill/environment.yml b/skills/dff_image_skill/service_configs/dff-image-skill/environment.yml index 172ba31e24..8928d7aac7 100644 --- a/skills/dff_image_skill/service_configs/dff-image-skill/environment.yml +++ b/skills/dff_image_skill/service_configs/dff-image-skill/environment.yml @@ -1,3 +1,3 @@ -SERVICE_PORT: 8188 +SERVICE_PORT: 8124 SERVICE_NAME: dff_image_skill LANGUAGE: EN diff --git a/skills/dff_image_skill/service_configs/dff-image-skill/service.yml b/skills/dff_image_skill/service_configs/dff-image-skill/service.yml index baf0e3a2e5..c25d0aa6a1 100644 --- a/skills/dff_image_skill/service_configs/dff-image-skill/service.yml +++ b/skills/dff_image_skill/service_configs/dff-image-skill/service.yml @@ -6,12 +6,12 @@ compose: - .env build: args: - SERVICE_PORT: 8188 + SERVICE_PORT: 8124 SERVICE_NAME: dff_image_skill LANGUAGE: EN context: . dockerfile: ./skills/dff_image_skill/Dockerfile - command: gunicorn --workers=1 server:app -b 0.0.0.0:8188 --reload + command: gunicorn --workers=1 server:app -b 0.0.0.0:8124 --reload deploy: resources: limits: @@ -22,5 +22,5 @@ compose: - ./skills/dff_image_skill:/src - ./common:/src/common ports: - - 8188:8188 + - 8124:8124 proxy: null diff --git a/skills/dff_image_skill/tests/lets_talk_in.json b/skills/dff_image_skill/tests/lets_talk_in.json index af26204d62..f938905440 100644 --- a/skills/dff_image_skill/tests/lets_talk_in.json +++ b/skills/dff_image_skill/tests/lets_talk_in.json @@ -404,6 +404,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_image_skill/tests/lets_talk_out.json b/skills/dff_image_skill/tests/lets_talk_out.json index 75ea96b830..1aea316f07 100644 --- a/skills/dff_image_skill/tests/lets_talk_out.json +++ b/skills/dff_image_skill/tests/lets_talk_out.json @@ -48,8 +48,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_cant_do_in.json b/skills/dff_intent_responder_skill/tests/intent_cant_do_in.json index a092886bda..f9f60140cd 100644 --- a/skills/dff_intent_responder_skill/tests/intent_cant_do_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_cant_do_in.json @@ -639,6 +639,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_cant_do_out.json b/skills/dff_intent_responder_skill/tests/intent_cant_do_out.json index b707834900..9c1b4064d3 100644 --- a/skills/dff_intent_responder_skill/tests/intent_cant_do_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_cant_do_out.json @@ -88,8 +88,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_choose_topic_RU_in.json b/skills/dff_intent_responder_skill/tests/intent_choose_topic_RU_in.json index b0d926d6b5..24281179c6 100644 --- a/skills/dff_intent_responder_skill/tests/intent_choose_topic_RU_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_choose_topic_RU_in.json @@ -206,6 +206,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_choose_topic_RU_out.json b/skills/dff_intent_responder_skill/tests/intent_choose_topic_RU_out.json index a5559fdffa..9f6b1bec13 100644 --- a/skills/dff_intent_responder_skill/tests/intent_choose_topic_RU_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_choose_topic_RU_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_choose_topic_in.json b/skills/dff_intent_responder_skill/tests/intent_choose_topic_in.json index 213d64511d..d688cbf239 100644 --- a/skills/dff_intent_responder_skill/tests/intent_choose_topic_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_choose_topic_in.json @@ -600,6 +600,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_choose_topic_out.json b/skills/dff_intent_responder_skill/tests/intent_choose_topic_out.json index 51b1b47538..af351c2701 100644 --- a/skills/dff_intent_responder_skill/tests/intent_choose_topic_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_choose_topic_out.json @@ -84,8 +84,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_dont_understand_in.json b/skills/dff_intent_responder_skill/tests/intent_dont_understand_in.json index 4a5f8ef5fe..61bceacba2 100644 --- a/skills/dff_intent_responder_skill/tests/intent_dont_understand_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_dont_understand_in.json @@ -684,6 +684,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_dont_understand_out.json b/skills/dff_intent_responder_skill/tests/intent_dont_understand_out.json index b3d52fd322..2b4ae9f271 100644 --- a/skills/dff_intent_responder_skill/tests/intent_dont_understand_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_dont_understand_out.json @@ -80,8 +80,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_exit_RU_in.json b/skills/dff_intent_responder_skill/tests/intent_exit_RU_in.json index 7a39f1c4e5..d286932579 100644 --- a/skills/dff_intent_responder_skill/tests/intent_exit_RU_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_exit_RU_in.json @@ -206,6 +206,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_exit_RU_out.json b/skills/dff_intent_responder_skill/tests/intent_exit_RU_out.json index e630eb85d1..f0e856400d 100644 --- a/skills/dff_intent_responder_skill/tests/intent_exit_RU_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_exit_RU_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_exit_in.json b/skills/dff_intent_responder_skill/tests/intent_exit_in.json index b2569b103e..0a9b7d09fb 100644 --- a/skills/dff_intent_responder_skill/tests/intent_exit_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_exit_in.json @@ -547,6 +547,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_exit_out.json b/skills/dff_intent_responder_skill/tests/intent_exit_out.json index 2ef54383d8..5c0fe97235 100644 --- a/skills/dff_intent_responder_skill/tests/intent_exit_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_exit_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_get_dialog_id_in.json b/skills/dff_intent_responder_skill/tests/intent_get_dialog_id_in.json index 514f68b452..a10b170109 100644 --- a/skills/dff_intent_responder_skill/tests/intent_get_dialog_id_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_get_dialog_id_in.json @@ -564,6 +564,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_intent_responder_skill/tests/intent_get_dialog_id_out.json b/skills/dff_intent_responder_skill/tests/intent_get_dialog_id_out.json index 9b51f43deb..34d4d19560 100644 --- a/skills/dff_intent_responder_skill/tests/intent_get_dialog_id_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_get_dialog_id_out.json @@ -64,8 +64,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_repeat_in.json b/skills/dff_intent_responder_skill/tests/intent_repeat_in.json index 2b5f732bf2..ca7e059285 100644 --- a/skills/dff_intent_responder_skill/tests/intent_repeat_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_repeat_in.json @@ -598,6 +598,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_repeat_out.json b/skills/dff_intent_responder_skill/tests/intent_repeat_out.json index 9ad614f6ac..d84aeb8879 100644 --- a/skills/dff_intent_responder_skill/tests/intent_repeat_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_repeat_out.json @@ -48,8 +48,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_tell_me_a_story_in.json b/skills/dff_intent_responder_skill/tests/intent_tell_me_a_story_in.json index 4170e93b47..188ec5460e 100644 --- a/skills/dff_intent_responder_skill/tests/intent_tell_me_a_story_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_tell_me_a_story_in.json @@ -698,6 +698,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_tell_me_a_story_out.json b/skills/dff_intent_responder_skill/tests/intent_tell_me_a_story_out.json index 78d98e8a3a..9104d48227 100644 --- a/skills/dff_intent_responder_skill/tests/intent_tell_me_a_story_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_tell_me_a_story_out.json @@ -92,8 +92,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_RU_in.json b/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_RU_in.json index 9a101ccccf..2957aed671 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_RU_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_RU_in.json @@ -206,6 +206,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_RU_out.json b/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_RU_out.json index d281d986b3..bdcff768ca 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_RU_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_RU_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_in.json b/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_in.json index f2ce46c18d..9c775083de 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_in.json @@ -644,6 +644,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_out.json b/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_out.json index 24d30efdab..9c786347b1 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_can_you_do_out.json @@ -76,8 +76,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_RU_in.json b/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_RU_in.json index b13b73437b..cb06a0e50e 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_RU_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_RU_in.json @@ -206,6 +206,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_RU_out.json b/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_RU_out.json index 1cc6ec8adb..8dd34961b6 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_RU_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_RU_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_in.json b/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_in.json index 162386a3aa..e1292e5e6c 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_in.json @@ -583,6 +583,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_out.json b/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_out.json index 92d1d8385f..9c0093d750 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_is_your_job_out.json @@ -72,8 +72,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_RU_in.json b/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_RU_in.json index a05eb9b8c1..1c59f31695 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_RU_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_RU_in.json @@ -206,6 +206,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_RU_out.json b/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_RU_out.json index fec8c1f544..166070371f 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_RU_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_RU_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_in.json b/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_in.json index bf908fa772..d4155a606e 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_in.json @@ -583,6 +583,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_out.json b/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_out.json index af9fe1e6c3..23a186931a 100644 --- a/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_what_is_your_name_out.json @@ -68,8 +68,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_RU_in.json b/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_RU_in.json index 0c7264e52e..34ea487b61 100644 --- a/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_RU_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_RU_in.json @@ -206,6 +206,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_RU_out.json b/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_RU_out.json index 6124612978..a2ca711f1e 100644 --- a/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_RU_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_RU_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_in.json b/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_in.json index 52fdcbb8e0..7cfbf071b1 100644 --- a/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_in.json @@ -564,6 +564,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_out.json b/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_out.json index 9b51f43deb..34d4d19560 100644 --- a/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_where_are_you_from_out.json @@ -64,8 +64,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_who_made_you_RU_in.json b/skills/dff_intent_responder_skill/tests/intent_who_made_you_RU_in.json index 4fa7f7d0aa..c2c9cf5441 100644 --- a/skills/dff_intent_responder_skill/tests/intent_who_made_you_RU_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_who_made_you_RU_in.json @@ -206,6 +206,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_who_made_you_RU_out.json b/skills/dff_intent_responder_skill/tests/intent_who_made_you_RU_out.json index 2323e7ef52..5700a2d06a 100644 --- a/skills/dff_intent_responder_skill/tests/intent_who_made_you_RU_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_who_made_you_RU_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_intent_responder_skill/tests/intent_who_made_you_in.json b/skills/dff_intent_responder_skill/tests/intent_who_made_you_in.json index 2cce1b15f6..c56dabfbb2 100644 --- a/skills/dff_intent_responder_skill/tests/intent_who_made_you_in.json +++ b/skills/dff_intent_responder_skill/tests/intent_who_made_you_in.json @@ -571,6 +571,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_intent_responder_skill/tests/intent_who_made_you_out.json b/skills/dff_intent_responder_skill/tests/intent_who_made_you_out.json index b259faa268..3274a95902 100644 --- a/skills/dff_intent_responder_skill/tests/intent_who_made_you_out.json +++ b/skills/dff_intent_responder_skill/tests/intent_who_made_you_out.json @@ -60,8 +60,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_movie_skill/tests/favorite_movie_out.json b/skills/dff_movie_skill/tests/favorite_movie_out.json index be2b14b16f..28a85ee18f 100644 --- a/skills/dff_movie_skill/tests/favorite_movie_out.json +++ b/skills/dff_movie_skill/tests/favorite_movie_out.json @@ -21,7 +21,7 @@ "used_links": {}, "age_group": "", "disliked_skills": [] - }, + }, {}, { "can_continue": "no" diff --git a/skills/dff_movie_skill/tests/genre_opinion_expression_and_request_out.json b/skills/dff_movie_skill/tests/genre_opinion_expression_and_request_out.json index 5089418373..bd3ba03a07 100644 --- a/skills/dff_movie_skill/tests/genre_opinion_expression_and_request_out.json +++ b/skills/dff_movie_skill/tests/genre_opinion_expression_and_request_out.json @@ -21,7 +21,7 @@ "used_links": {}, "age_group": "", "disliked_skills": [] - }, + }, {}, { "can_continue": "can_prompt" diff --git a/skills/dff_movie_skill/tests/genre_opinion_request_out.json b/skills/dff_movie_skill/tests/genre_opinion_request_out.json index 1eef6f8530..08197c4c2e 100644 --- a/skills/dff_movie_skill/tests/genre_opinion_request_out.json +++ b/skills/dff_movie_skill/tests/genre_opinion_request_out.json @@ -21,7 +21,7 @@ "used_links": {}, "age_group": "", "disliked_skills": [] - }, + }, {}, { "can_continue": "can_prompt" diff --git a/skills/dff_movie_skill/tests/lets_chat_about_movies_out.json b/skills/dff_movie_skill/tests/lets_chat_about_movies_out.json index 5b46e49b6d..f16a6ce03c 100644 --- a/skills/dff_movie_skill/tests/lets_chat_about_movies_out.json +++ b/skills/dff_movie_skill/tests/lets_chat_about_movies_out.json @@ -24,7 +24,7 @@ "used_links": {}, "age_group": "", "disliked_skills": [] - }, + }, {}, { "can_continue": "must" diff --git a/skills/dff_movie_skill/tests/mentioned_movie_clarification_out.json b/skills/dff_movie_skill/tests/mentioned_movie_clarification_out.json index 25b88d91e6..b5bee97afa 100644 --- a/skills/dff_movie_skill/tests/mentioned_movie_clarification_out.json +++ b/skills/dff_movie_skill/tests/mentioned_movie_clarification_out.json @@ -35,7 +35,7 @@ "used_links": {}, "age_group": "unknown", "disliked_skills": [] - }, + }, {}, { "can_continue": "must" diff --git a/skills/dff_movie_skill/tests/mentioned_movies_out.json b/skills/dff_movie_skill/tests/mentioned_movies_out.json index 6e0b515c28..e74cafc294 100644 --- a/skills/dff_movie_skill/tests/mentioned_movies_out.json +++ b/skills/dff_movie_skill/tests/mentioned_movies_out.json @@ -24,7 +24,7 @@ "used_links": {}, "age_group": "", "disliked_skills": [] - }, + }, {}, { "can_continue": "must" diff --git a/skills/dff_movie_skill/tests/mentioned_popular_movie_out.json b/skills/dff_movie_skill/tests/mentioned_popular_movie_out.json index 062e4fda8c..7cb4df3436 100644 --- a/skills/dff_movie_skill/tests/mentioned_popular_movie_out.json +++ b/skills/dff_movie_skill/tests/mentioned_popular_movie_out.json @@ -36,7 +36,7 @@ "used_links": {}, "age_group": "unknown", "disliked_skills": [] - }, + }, {}, { "can_continue": "must" diff --git a/skills/dff_movie_skill/tests/mentioned_rare_movie_out.json b/skills/dff_movie_skill/tests/mentioned_rare_movie_out.json index dbf7e7642b..de8129900a 100644 --- a/skills/dff_movie_skill/tests/mentioned_rare_movie_out.json +++ b/skills/dff_movie_skill/tests/mentioned_rare_movie_out.json @@ -35,7 +35,7 @@ "used_links": {}, "age_group": "unknown", "disliked_skills": [] - }, + }, {}, { "can_continue": "must" diff --git a/skills/dff_program_y_dangerous_skill/tests/f_u_in.json b/skills/dff_program_y_dangerous_skill/tests/f_u_in.json index e91c4e06cc..e146e8560f 100644 --- a/skills/dff_program_y_dangerous_skill/tests/f_u_in.json +++ b/skills/dff_program_y_dangerous_skill/tests/f_u_in.json @@ -234,6 +234,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_program_y_dangerous_skill/tests/f_u_out.json b/skills/dff_program_y_dangerous_skill/tests/f_u_out.json index 2ecb04b7cf..85839bbf80 100644 --- a/skills/dff_program_y_dangerous_skill/tests/f_u_out.json +++ b/skills/dff_program_y_dangerous_skill/tests/f_u_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "no" diff --git a/skills/dff_program_y_dangerous_skill/tests/you_are_stupid_in.json b/skills/dff_program_y_dangerous_skill/tests/you_are_stupid_in.json index 8176670ec1..835b7f3961 100644 --- a/skills/dff_program_y_dangerous_skill/tests/you_are_stupid_in.json +++ b/skills/dff_program_y_dangerous_skill/tests/you_are_stupid_in.json @@ -234,6 +234,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_program_y_dangerous_skill/tests/you_are_stupid_out.json b/skills/dff_program_y_dangerous_skill/tests/you_are_stupid_out.json index 59f7981cb1..8857b05e78 100644 --- a/skills/dff_program_y_dangerous_skill/tests/you_are_stupid_out.json +++ b/skills/dff_program_y_dangerous_skill/tests/you_are_stupid_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "no" diff --git a/skills/dff_program_y_skill/tests/activate_the_robot_in.json b/skills/dff_program_y_skill/tests/activate_the_robot_in.json index 9ea4c4c7ea..4f6dd4531d 100644 --- a/skills/dff_program_y_skill/tests/activate_the_robot_in.json +++ b/skills/dff_program_y_skill/tests/activate_the_robot_in.json @@ -234,6 +234,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_program_y_skill/tests/activate_the_robot_out.json b/skills/dff_program_y_skill/tests/activate_the_robot_out.json index a6f75bf72c..13e1956833 100644 --- a/skills/dff_program_y_skill/tests/activate_the_robot_out.json +++ b/skills/dff_program_y_skill/tests/activate_the_robot_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "no" diff --git a/skills/dff_program_y_skill/tests/favorite_color_in.json b/skills/dff_program_y_skill/tests/favorite_color_in.json index c87f3e28fd..952d74b851 100644 --- a/skills/dff_program_y_skill/tests/favorite_color_in.json +++ b/skills/dff_program_y_skill/tests/favorite_color_in.json @@ -234,6 +234,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_program_y_skill/tests/favorite_color_out.json b/skills/dff_program_y_skill/tests/favorite_color_out.json index 36e68ad677..d9beb0e098 100644 --- a/skills/dff_program_y_skill/tests/favorite_color_out.json +++ b/skills/dff_program_y_skill/tests/favorite_color_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "no" diff --git a/skills/dff_program_y_skill/tests/who_built_you_RU_in.json b/skills/dff_program_y_skill/tests/who_built_you_RU_in.json index ed0c2a2c87..dcd4835d97 100644 --- a/skills/dff_program_y_skill/tests/who_built_you_RU_in.json +++ b/skills/dff_program_y_skill/tests/who_built_you_RU_in.json @@ -47,6 +47,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_program_y_skill/tests/who_built_you_RU_out.json b/skills/dff_program_y_skill/tests/who_built_you_RU_out.json index 43f114cab1..1b054b3f79 100644 --- a/skills/dff_program_y_skill/tests/who_built_you_RU_out.json +++ b/skills/dff_program_y_skill/tests/who_built_you_RU_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "no" diff --git a/skills/dff_program_y_wide_skill/tests/ask_question_in.json b/skills/dff_program_y_wide_skill/tests/ask_question_in.json index 83f449824c..b2991e9b88 100644 --- a/skills/dff_program_y_wide_skill/tests/ask_question_in.json +++ b/skills/dff_program_y_wide_skill/tests/ask_question_in.json @@ -234,6 +234,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_program_y_wide_skill/tests/ask_question_out.json b/skills/dff_program_y_wide_skill/tests/ask_question_out.json index dc71f88b7e..832c85e024 100644 --- a/skills/dff_program_y_wide_skill/tests/ask_question_out.json +++ b/skills/dff_program_y_wide_skill/tests/ask_question_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "no" diff --git a/skills/dff_program_y_wide_skill/tests/talk_about_you_in.json b/skills/dff_program_y_wide_skill/tests/talk_about_you_in.json index 2c98946565..17fc73152c 100644 --- a/skills/dff_program_y_wide_skill/tests/talk_about_you_in.json +++ b/skills/dff_program_y_wide_skill/tests/talk_about_you_in.json @@ -234,6 +234,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_program_y_wide_skill/tests/talk_about_you_out.json b/skills/dff_program_y_wide_skill/tests/talk_about_you_out.json index 914ce04c00..3b94adad7b 100644 --- a/skills/dff_program_y_wide_skill/tests/talk_about_you_out.json +++ b/skills/dff_program_y_wide_skill/tests/talk_about_you_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "no" diff --git a/skills/dff_science_skill/old_tests/lets_talk_in.json b/skills/dff_science_skill/old_tests/lets_talk_in.json index fc68e4ddda..e37a6f880e 100644 --- a/skills/dff_science_skill/old_tests/lets_talk_in.json +++ b/skills/dff_science_skill/old_tests/lets_talk_in.json @@ -550,6 +550,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_science_skill/old_tests/lets_talk_out.json b/skills/dff_science_skill/old_tests/lets_talk_out.json index 470eac02dc..9dde0d5893 100644 --- a/skills/dff_science_skill/old_tests/lets_talk_out.json +++ b/skills/dff_science_skill/old_tests/lets_talk_out.json @@ -24,8 +24,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must", diff --git a/skills/dff_science_skill/old_tests/link_to_in.json b/skills/dff_science_skill/old_tests/link_to_in.json index fc68e4ddda..e37a6f880e 100644 --- a/skills/dff_science_skill/old_tests/link_to_in.json +++ b/skills/dff_science_skill/old_tests/link_to_in.json @@ -550,6 +550,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_science_skill/old_tests/link_to_out.json b/skills/dff_science_skill/old_tests/link_to_out.json index 470eac02dc..9dde0d5893 100644 --- a/skills/dff_science_skill/old_tests/link_to_out.json +++ b/skills/dff_science_skill/old_tests/link_to_out.json @@ -24,8 +24,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must", diff --git a/skills/dff_science_skill/old_tests/no_lets_talk_in.json b/skills/dff_science_skill/old_tests/no_lets_talk_in.json index 9e9bc8b830..a7ae671766 100644 --- a/skills/dff_science_skill/old_tests/no_lets_talk_in.json +++ b/skills/dff_science_skill/old_tests/no_lets_talk_in.json @@ -792,6 +792,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_science_skill/old_tests/no_lets_talk_out.json b/skills/dff_science_skill/old_tests/no_lets_talk_out.json index 3d7831c1d7..a53e935d6f 100644 --- a/skills/dff_science_skill/old_tests/no_lets_talk_out.json +++ b/skills/dff_science_skill/old_tests/no_lets_talk_out.json @@ -21,8 +21,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "no" diff --git a/skills/dff_science_skill/tests/link_to_in.json b/skills/dff_science_skill/tests/link_to_in.json index fc68e4ddda..e37a6f880e 100644 --- a/skills/dff_science_skill/tests/link_to_in.json +++ b/skills/dff_science_skill/tests/link_to_in.json @@ -550,6 +550,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_science_skill/tests/link_to_out.json b/skills/dff_science_skill/tests/link_to_out.json index 470eac02dc..9dde0d5893 100644 --- a/skills/dff_science_skill/tests/link_to_out.json +++ b/skills/dff_science_skill/tests/link_to_out.json @@ -24,8 +24,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must", diff --git a/skills/dff_short_story_skill/tests/tell_funny_story_in.json b/skills/dff_short_story_skill/tests/tell_funny_story_in.json index 83fd4c2962..7c30a78e89 100644 --- a/skills/dff_short_story_skill/tests/tell_funny_story_in.json +++ b/skills/dff_short_story_skill/tests/tell_funny_story_in.json @@ -234,6 +234,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_short_story_skill/tests/tell_funny_story_out.json b/skills/dff_short_story_skill/tests/tell_funny_story_out.json index 175af62b64..615bae61db 100644 --- a/skills/dff_short_story_skill/tests/tell_funny_story_out.json +++ b/skills/dff_short_story_skill/tests/tell_funny_story_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must" diff --git a/skills/dff_template_prompted_skill/service_configs/dff-dream-persona-gpt-j-prompted-skill/environment.yml b/skills/dff_template_prompted_skill/service_configs/dff-dream-persona-gpt-j-prompted-skill/environment.yml index 0cc91634f0..0d879677e1 100644 --- a/skills/dff_template_prompted_skill/service_configs/dff-dream-persona-gpt-j-prompted-skill/environment.yml +++ b/skills/dff_template_prompted_skill/service_configs/dff-dream-persona-gpt-j-prompted-skill/environment.yml @@ -1,7 +1,7 @@ SERVICE_PORT: 8134 SERVICE_NAME: dff_dream_persona_prompted_skill PROMPT_FILE: common/prompts/dream_persona.json -GENERATIVE_SERVICE_URL: http://transformers-lm-gptj:8130/respond +GENERATIVE_SERVICE_URL: http://transformers-lm-gptjt:8161/respond GENERATIVE_SERVICE_CONFIG: default_generative_config.json GENERATIVE_TIMEOUT: 120 N_UTTERANCES_CONTEXT: 7 diff --git a/skills/dff_template_prompted_skill/service_configs/dff-dream-persona-gpt-j-prompted-skill/service.yml b/skills/dff_template_prompted_skill/service_configs/dff-dream-persona-gpt-j-prompted-skill/service.yml index 3625327cf6..eb2f3eff77 100644 --- a/skills/dff_template_prompted_skill/service_configs/dff-dream-persona-gpt-j-prompted-skill/service.yml +++ b/skills/dff_template_prompted_skill/service_configs/dff-dream-persona-gpt-j-prompted-skill/service.yml @@ -9,7 +9,7 @@ compose: SERVICE_PORT: 8134 SERVICE_NAME: dff_dream_persona_prompted_skill PROMPT_FILE: common/prompts/dream_persona.json - GENERATIVE_SERVICE_URL: http://transformers-lm-gptj:8130/respond + GENERATIVE_SERVICE_URL: http://transformers-lm-gptjt:8161/respond GENERATIVE_SERVICE_CONFIG: default_generative_config.json GENERATIVE_TIMEOUT: 120 N_UTTERANCES_CONTEXT: 7 diff --git a/skills/dff_template_prompted_skill/service_configs/dff-marketing-prompted-skill/environment.yml b/skills/dff_template_prompted_skill/service_configs/dff-marketing-prompted-skill/environment.yml index c47735d19e..963cb8ec0a 100644 --- a/skills/dff_template_prompted_skill/service_configs/dff-marketing-prompted-skill/environment.yml +++ b/skills/dff_template_prompted_skill/service_configs/dff-marketing-prompted-skill/environment.yml @@ -1,7 +1,7 @@ SERVICE_PORT: 8138 SERVICE_NAME: dff_marketing_prompted_skill PROMPT_FILE: common/prompts/marketing.json -GENERATIVE_SERVICE_URL: http://transformers-lm-gptj:8130/respond +GENERATIVE_SERVICE_URL: http://transformers-lm-gptjt:8161/respond GENERATIVE_SERVICE_CONFIG: default_generative_config.json GENERATIVE_TIMEOUT: 120 N_UTTERANCES_CONTEXT: 7 diff --git a/skills/dff_template_prompted_skill/service_configs/dff-marketing-prompted-skill/service.yml b/skills/dff_template_prompted_skill/service_configs/dff-marketing-prompted-skill/service.yml index d0e688dd35..f212ff037b 100644 --- a/skills/dff_template_prompted_skill/service_configs/dff-marketing-prompted-skill/service.yml +++ b/skills/dff_template_prompted_skill/service_configs/dff-marketing-prompted-skill/service.yml @@ -9,7 +9,7 @@ compose: SERVICE_PORT: 8138 SERVICE_NAME: dff_marketing_prompted_skill PROMPT_FILE: common/prompts/marketing.json - GENERATIVE_SERVICE_URL: http://transformers-lm-gptj:8130/respond + GENERATIVE_SERVICE_URL: http://transformers-lm-gptjt:8161/respond GENERATIVE_SERVICE_CONFIG: default_generative_config.json GENERATIVE_TIMEOUT: 120 N_UTTERANCES_CONTEXT: 7 diff --git a/skills/dff_template_skill/tests/lets_talk_in.json b/skills/dff_template_skill/tests/lets_talk_in.json index e1c166fe72..15fb873dd3 100644 --- a/skills/dff_template_skill/tests/lets_talk_in.json +++ b/skills/dff_template_skill/tests/lets_talk_in.json @@ -234,6 +234,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ], diff --git a/skills/dff_template_skill/tests/lets_talk_out.json b/skills/dff_template_skill/tests/lets_talk_out.json index 706b32bdba..229271fb1e 100644 --- a/skills/dff_template_skill/tests/lets_talk_out.json +++ b/skills/dff_template_skill/tests/lets_talk_out.json @@ -65,7 +65,8 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] + "disliked_skills": [], + "prompts_goals": {} }, { "dff_template_skill_state": { @@ -123,7 +124,8 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] + "disliked_skills": [], + "prompts_goals": {} } ], [ diff --git a/skills/dff_universal_prompted_skill/scenario/response.py b/skills/dff_universal_prompted_skill/scenario/response.py index 2654b4a9fd..13263a2d45 100644 --- a/skills/dff_universal_prompted_skill/scenario/response.py +++ b/skills/dff_universal_prompted_skill/scenario/response.py @@ -33,6 +33,7 @@ "http://openai-api-davinci3:8131/respond": ["OPENAI_API_KEY", "OPENAI_ORGANIZATION"], "http://openai-api-gpt4:8159/respond": ["OPENAI_API_KEY", "OPENAI_ORGANIZATION"], "http://openai-api-gpt4-32k:8160/respond": ["OPENAI_API_KEY", "OPENAI_ORGANIZATION"], + "http://transformers-lm-gptjt:8161/respond": [], } diff --git a/skills/dff_weather_skill/tests/activity_question_in.json b/skills/dff_weather_skill/tests/activity_question_in.json index b868ba87c8..29714bd86f 100644 --- a/skills/dff_weather_skill/tests/activity_question_in.json +++ b/skills/dff_weather_skill/tests/activity_question_in.json @@ -1122,6 +1122,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_weather_skill/tests/activity_question_out.json b/skills/dff_weather_skill/tests/activity_question_out.json index 4d6c49bbd1..4f5445e32c 100644 --- a/skills/dff_weather_skill/tests/activity_question_out.json +++ b/skills/dff_weather_skill/tests/activity_question_out.json @@ -54,8 +54,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "no" diff --git a/skills/dff_weather_skill/tests/preferred_weather_in.json b/skills/dff_weather_skill/tests/preferred_weather_in.json index 4d508b3354..7d99bfa54d 100644 --- a/skills/dff_weather_skill/tests/preferred_weather_in.json +++ b/skills/dff_weather_skill/tests/preferred_weather_in.json @@ -875,6 +875,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_weather_skill/tests/preferred_weather_out.json b/skills/dff_weather_skill/tests/preferred_weather_out.json index 7ef69d4bf2..76bde5cffd 100644 --- a/skills/dff_weather_skill/tests/preferred_weather_out.json +++ b/skills/dff_weather_skill/tests/preferred_weather_out.json @@ -50,8 +50,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "can" diff --git a/skills/dff_weather_skill/tests/request_with_city_in.json b/skills/dff_weather_skill/tests/request_with_city_in.json index 667fefb896..b8924bd443 100644 --- a/skills/dff_weather_skill/tests/request_with_city_in.json +++ b/skills/dff_weather_skill/tests/request_with_city_in.json @@ -562,6 +562,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_weather_skill/tests/request_with_city_out.json b/skills/dff_weather_skill/tests/request_with_city_out.json index 903f7d823b..c0afdeeebc 100644 --- a/skills/dff_weather_skill/tests/request_with_city_out.json +++ b/skills/dff_weather_skill/tests/request_with_city_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must" diff --git a/skills/dff_weather_skill/tests/request_with_nonexistent_city_in.json b/skills/dff_weather_skill/tests/request_with_nonexistent_city_in.json index 40386cf061..8a7b8e9ecf 100644 --- a/skills/dff_weather_skill/tests/request_with_nonexistent_city_in.json +++ b/skills/dff_weather_skill/tests/request_with_nonexistent_city_in.json @@ -525,6 +525,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_weather_skill/tests/request_with_nonexistent_city_out.json b/skills/dff_weather_skill/tests/request_with_nonexistent_city_out.json index 55b65032f1..141ff166ef 100644 --- a/skills/dff_weather_skill/tests/request_with_nonexistent_city_out.json +++ b/skills/dff_weather_skill/tests/request_with_nonexistent_city_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must" diff --git a/skills/dff_weather_skill/tests/request_without_city_in.json b/skills/dff_weather_skill/tests/request_without_city_in.json index e39398ab1e..78b583ec22 100644 --- a/skills/dff_weather_skill/tests/request_without_city_in.json +++ b/skills/dff_weather_skill/tests/request_without_city_in.json @@ -277,6 +277,9 @@ "disliked_skills_batch": [ [] ], + "prompts_goals_batch": [ + {} + ], "clarification_request_flag_batch": [ false ] diff --git a/skills/dff_weather_skill/tests/request_without_city_out.json b/skills/dff_weather_skill/tests/request_without_city_out.json index fc653e1d0e..df03472a96 100644 --- a/skills/dff_weather_skill/tests/request_without_city_out.json +++ b/skills/dff_weather_skill/tests/request_without_city_out.json @@ -38,8 +38,9 @@ }, "used_links": {}, "age_group": "unknown", - "disliked_skills": [] - }, + "disliked_skills": [], + "prompts_goals": {} + }, {}, { "can_continue": "must"