Dream distribution with SF-based DM #572

nstsj · 2023-09-26T11:42:58Z

branch renamed as Dilya suggested
distribution folder at 'dream/assistant_dists/dream_SFC_based_dm' renamed to 'dream/assistant_dists/dream_ranking_and_sfc_based_dm'

…_for_AC_SFC

dilyararimovna · 2023-09-28T11:52:29Z

annotators/speech_function_classifier/Dockerfile

-
-RUN pip install -r requirements.txt && \
-    python -c "import nltk; nltk.download('punkt')"
+RUN pip install git+https://github.com/deeppavlov/DeepPavlov.git@feat/speech-fn && \


замените с ветки на конкретный комит

а лучше даже релиз

НАПОМИНАЮ

annotators/speech_function_classifier/models.py

dilyararimovna · 2023-09-28T11:55:04Z

assistant_dists/dream_ranking_and_sfc_based_dm/telegram.yml

@@ -0,0 +1,17 @@
+services:
+  agent-tg:
+    command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.channel=telegram agent.telegram_token=$TG_TOKEN agent.pipeline_config=assistant_dists/dream_Speech_models_based/pipeline_conf.json agent.db_config=assistant_dists/dream_Speech_models_based/db_conf.json'


название дистрибутива

чекнула, сейчас актуальное название дистрибутива: dream_ranking_and_sf_based_dm

dilyararimovna · 2023-09-28T11:55:35Z

components/XWQGXXbppnHZVm1hyDIw.yml

@@ -4,8 +4,7 @@ component_type: null
 model_type: NN-based
 is_customizable: false
 author: publisher@deeppavlov.ai
-description: a hierarchical algorithm based on several linear models and a rule-based
-  approach for the prediction of speech functions described by Eggins and Slade
+description: an algorithm based on NN


make a more detailed descriptions

НАПОМИНАЮ

components/XWQGXXbppnHZVm1hyDIw.yml

dilyararimovna · 2023-09-28T11:56:15Z

assistant_dists/dream_ranking_and_sfc_based_dm/docker-compose.override.yml

+      LANGUAGE: EN
+      FALLBACK_FILE: fallbacks_dream_en.json
+
+  ranking-based-response-selector:


dilyararimovna · 2023-09-28T11:56:23Z

assistant_dists/dream_ranking_and_sfc_based_dm/docker-compose.override.yml

@@ -0,0 +1,444 @@
+services:
+  agent:
+    command: sh -c 'bin/wait && python -m deeppavlov_agent.run agent.channel=telegram agent.telegram_token=$TG_TOKEN agent.pipeline_config=assistant_dists/dream_Speech_models_based/pipeline_conf.json agent.db_config=assistant_dists/dream_Speech_models_based/db_conf.json'


checked, the name is correct now, dream_ranking_and_sf_based_dm

dilyararimovna · 2023-09-28T11:56:54Z

assistant_dists/dream_ranking_and_sfc_based_dm/docker-compose.override.yml

+        limits:
+          memory: 1G
+        reservations:
+          memory: 1G


are you sure?

dilyararimovna · 2023-09-28T11:57:39Z

assistant_dists/dream_ranking_and_sfc_based_dm/docker-compose.override.yml

+          combined-classification:8087, fact-retrieval:8100, entity-detection:8103,
+          speech-function-classifier:8108,
+          sentence-ranker:8128, property-extraction:8136, prompt-selector:8135, openai-api-chatgpt:8145,
+          openai-api-chatgpt-16k:8167, summarization-annotator:8058, dialog-summarizer:8059"


why did you remove ALL llm-based skills?

I do not completely understand - where is a new response selector? you had to create a new response selector, and make a function to integrate SF to response selection

That's a good question. The removal was accidental and unintentional, we're taking them back rn

new response selector has arrived

regarding llm-based skills, we had to drop dff-dream-faq-prompted-skill, dff-google-api-skill and dff-dream-persona-chatgpt-prompted-skill bc they require api keys which we didnt have atm. If the skills are crucial, we'll add them back when we know what to add to .env_secret file

dilyararimovna · 2023-09-28T11:59:29Z

assistant_dists/dream_ranking_and_sfc_based_dm/docker-compose.override.yml

+          combined-classification:8087, fact-retrieval:8100, entity-detection:8103,
+          speech-function-classifier:8108,
+          sentence-ranker:8128, property-extraction:8136, prompt-selector:8135, openai-api-chatgpt:8145,
+          openai-api-chatgpt-16k:8167, summarization-annotator:8058, dialog-summarizer:8059"


I do not completely understand - where is a new response selector? you had to create a new response selector, and make a function to integrate SF to response selection

dilyararimovna · 2023-10-01T08:09:30Z

annotators/speech_function_classifier/Dockerfile

-
-RUN pip install -r requirements.txt && \
-    python -c "import nltk; nltk.download('punkt')"
+RUN pip install git+https://github.com/deeppavlov/DeepPavlov.git@feat/speech-fn && \


НАПОМИНАЮ

annotators/speech_function_classifier/models.py

assistant_dists/dream_ranking_and_sf_based_dm/dev.yml

assistant_dists/dream_ranking_and_sf_based_dm/cpu.yml

dilyararimovna · 2023-10-01T08:11:12Z

assistant_dists/dream_ranking_and_sf_based_dm/docker-compose.override.yml

+      LANGUAGE: EN
+      FALLBACK_FILE: fallbacks_dream_en.json
+
+  ranking-based-response-selector:


заменить во всей папке с дистрибутивом на нужный

components/XWQGXXbppnHZVm1hyDIw.yml

dilyararimovna · 2023-10-01T08:14:04Z

response_selectors/ranking_and_sf_based_response_selector/server.py

+        except ValueError:
+            logger.info(f"Speech function index could not be found from {hyp}, id: {hyp_id}.")
+
+        scores[hyp_id] += speech_predictor_scores[speech_index]


эта строчка должна быть внутри try-except scope, который выше

dilyararimovna · 2023-10-01T08:15:10Z

response_selectors/ranking_and_sf_based_response_selector/server.py

+        speech_predictor_scores = [v["confidence"] for v in speech_predictor]
+        speech_index = None
+        try:
+            speech_index = speech_predictor_hyps.index(hyp)


кажется, здесь должно быть не (hyp),а классы, присвоенные аннотатором гипотез hyp.get("annotations", {}).get("speech_function_classifier", {})

Действительно, просмотрел этот момент. Изменил.

dilyararimovna · 2023-10-01T08:15:57Z

...response_selector/service_configs/ranking-and-intent-based-response-selector/environment.yml

+SERVICE_PORT: 8081
+SERVICE_NAME: response_selector
+SENTENCE_RANKER_ANNOTATION_NAME: sentence_ranker
+SENTENCE_RANKER_SERVICE_URL: http://sentence-ranker:8128/respond


убрать нэти файлы и создать карточки-файлы под твой респонс селектор

dilyararimovna · 2023-10-01T08:17:01Z

assistant_dists/dream_ranking_and_sf_based_dm/pipeline_conf.json

+                "service": "services/response_annotator_selectors/service_configs/agent"
+            }
+        },
+        "candidate_annotators": {


чтоыб сверять речевые функции гипотез с предсказанными предиктором, нужно аннотировать гипотезы с помощью speech-function-classifier

…nfigs

dilyararimovna · 2023-12-28T11:52:19Z

state_formatters/dp_formatters.py

+        res = dialog["human_utterances"][-1]["annotations"].get("speech_function_classifier", [""])
+        logger.info(f"formatter log sfp/sfc: {res}")
+    except Exception as e:
+        logger.error(f"Failed to format sfc output: {e}")


в чем может быть ошибка?

…v/dream into dream_ranking_and_sfc_based_dm

…ilya' into dream_ranking_and_sfc_based_dm_dilya

avglinsky and others added 17 commits September 4, 2023 18:37

speech-function-classifier model changed

3ae7c15

dream_Speech_models_based dist initial added

4dcc6ba

secret required skills removed

505bfd2

more fixes

347d1b9

adding sfc to configs and minor refactoring of sfc

f56ca75

Dockerfile fixed

9077d78

Merge remote-tracking branch 'origin/dist_n1_for_AC_SFC' into dist_n1…

275ea4a

…_for_AC_SFC

Dockerfile fixed 1

67987c7

minor fix

48d7028

minor fix 2

aff3be5

minor fix 3

0f61cdf

minor fix 4

4dce73e

minor fix 5

d52ae67

fixing 120 symbols line check in models.py

fb1c18c

fixing 120 symbols line check in models.py

b3552d1

renamed branch and dist folder for future convenience

2f4a529

branch renamed according to suggestions

db5bb74

dilyararimovna requested changes Sep 28, 2023

View reviewed changes

moon-strider and others added 5 commits September 29, 2023 17:24

initial sf-based response selector commit

fba525c

added sf-based rs to configs

58178b2

Merge branch 'dev' into dream_ranking_and_sfc_based_dm

64846ef

fix: pipeline and cards - almost ready

a3d00d2

fix: cards

ef70b63

dilyararimovna requested changes Oct 1, 2023

View reviewed changes

nstsj and others added 5 commits October 2, 2023 23:46

ranking_and_sf_based_response_selector updates: component card and co…

fb02952

…nfigs

fixes according to the PR comments + codestyle fixes

faf5b44

added sfp to configs

4878f8e

context fixed

49a5bad

another fix

e20cfa4

moon-strider added 2 commits December 26, 2023 16:12

minor pr fix

60ca89a

minor config addition

f3c6c4d

dilyararimovna reviewed Dec 28, 2023

View reviewed changes

moon-strider and others added 4 commits December 28, 2023 16:02

server fixed for sfc

a28a0c3

fix: components

8938be0

dream_sfc reverted, minor pr fixes

59e5507

fix: ranking and intent based resp selector

1418271

dilyararimovna previously approved these changes Jan 12, 2024

View reviewed changes

dilyararimovna dismissed their stale review via 1418271 January 12, 2024 08:19

moon-strider and others added 17 commits January 12, 2024 11:31

zip_longest -> zip

afbb755

Merge branch 'dream_ranking_and_sfc_based_dm' of github.com:deeppavlo…

2821a6f

…v/dream into dream_ranking_and_sfc_based_dm

fix: codestyle

37952fd

sfc service and sfp formatter reverted to working state

195eb6e

fix: fixes for sf

e3dd206

fix: first turn

f3b416b

fix: tests

722d8cc

fix: tests

576a78f

fix: tests

465a75c

fix: imports

2a734e9

fix: black style

4543619

fix: logs

2e5b518

Merge remote-tracking branch 'origin/dream_ranking_and_sfc_based_dm_d…

cad3911

…ilya' into dream_ranking_and_sfc_based_dm_dilya

fix: pipeline

f93fad9

fix: sfp

2850aef

fix: codestyle black

fece987

fix: codestyle

03fb430

dilyararimovna changed the title ~~[WIP] Dream distribution with SF-based DM~~ Dream distribution with SF-based DM Jan 15, 2024

fix: tests

79e22b0

dilyararimovna approved these changes Jan 15, 2024

View reviewed changes

dilyararimovna merged commit 8f4d876 into dev Jan 15, 2024
32 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dream distribution with SF-based DM #572

Dream distribution with SF-based DM #572

nstsj commented Sep 26, 2023

dilyararimovna Sep 28, 2023

dilyararimovna Sep 28, 2023

dilyararimovna Oct 1, 2023

nstsj Oct 2, 2023

dilyararimovna Sep 28, 2023

nstsj Oct 2, 2023

dilyararimovna Sep 28, 2023

dilyararimovna Oct 1, 2023

nstsj Oct 2, 2023

dilyararimovna Sep 28, 2023

nstsj Oct 2, 2023

dilyararimovna Sep 28, 2023

nstsj Oct 2, 2023

dilyararimovna Sep 28, 2023

dilyararimovna Sep 28, 2023

dilyararimovna Sep 28, 2023

nstsj Sep 28, 2023

nstsj Oct 2, 2023

dilyararimovna Sep 28, 2023

dilyararimovna Oct 1, 2023

dilyararimovna Oct 1, 2023

moon-strider Oct 16, 2023

dilyararimovna Oct 1, 2023

moon-strider Oct 9, 2023

dilyararimovna Oct 1, 2023

moon-strider Oct 9, 2023

dilyararimovna Oct 1, 2023

nstsj Oct 2, 2023

dilyararimovna Oct 1, 2023

dilyararimovna Oct 11, 2023

moon-strider Oct 16, 2023

dilyararimovna Dec 28, 2023

Dream distribution with SF-based DM #572

Dream distribution with SF-based DM #572

Conversation

nstsj commented Sep 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment