diff --git a/annotators/relative_persona_extractor/test.py b/annotators/relative_persona_extractor/test.py index 4ab99aa2b1..ad5a87fa6f 100644 --- a/annotators/relative_persona_extractor/test.py +++ b/annotators/relative_persona_extractor/test.py @@ -19,19 +19,19 @@ def main(): } gold = [ { - "max_similarity": 0.695, + "max_similarity": 0.551, "persona": [ "I like Italian food especially pasta and pizza.", + "I like visiting interesting places virtually.", "I like to watch football and basketball on TV.", - "I like watching travel video blogs.", ], }, { - "max_similarity": 0.645, + "max_similarity": 0.474, "persona": [ + "I like visiting interesting places virtually.", "I like watching travel video blogs.", - "I like to watch football and basketball on TV.", - "I like Italian food especially pasta and pizza.", + "I like travelling.", ], }, ] diff --git a/assistant_dists/ai_faq_assistant/docker-compose.override.yml b/assistant_dists/ai_faq_assistant/docker-compose.override.yml index b5131f6d5c..36778b0e96 100644 --- a/assistant_dists/ai_faq_assistant/docker-compose.override.yml +++ b/assistant_dists/ai_faq_assistant/docker-compose.override.yml @@ -133,7 +133,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/da_costa_clothes_assistant/docker-compose.override.yml b/assistant_dists/da_costa_clothes_assistant/docker-compose.override.yml index 6040c97d8c..d8accafa89 100644 --- a/assistant_dists/da_costa_clothes_assistant/docker-compose.override.yml +++ b/assistant_dists/da_costa_clothes_assistant/docker-compose.override.yml @@ -133,7 +133,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/deepy_assistant/docker-compose.override.yml b/assistant_dists/deepy_assistant/docker-compose.override.yml index 0859b8303c..01913ec23f 100644 --- a/assistant_dists/deepy_assistant/docker-compose.override.yml +++ b/assistant_dists/deepy_assistant/docker-compose.override.yml @@ -133,7 +133,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/dream/docker-compose.override.yml b/assistant_dists/dream/docker-compose.override.yml index daed4763ec..89e6fc34c1 100644 --- a/assistant_dists/dream/docker-compose.override.yml +++ b/assistant_dists/dream/docker-compose.override.yml @@ -1276,7 +1276,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/dream_mini/docker-compose.override.yml b/assistant_dists/dream_mini/docker-compose.override.yml index 923fcf776e..af3b4fb5e2 100644 --- a/assistant_dists/dream_mini/docker-compose.override.yml +++ b/assistant_dists/dream_mini/docker-compose.override.yml @@ -177,7 +177,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/dream_mini_persona_based/docker-compose.override.yml b/assistant_dists/dream_mini_persona_based/docker-compose.override.yml index 50cb7ce157..e2083e35ce 100644 --- a/assistant_dists/dream_mini_persona_based/docker-compose.override.yml +++ b/assistant_dists/dream_mini_persona_based/docker-compose.override.yml @@ -179,7 +179,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/dream_multimodal/docker-compose.override.yml b/assistant_dists/dream_multimodal/docker-compose.override.yml index f55e0ec73d..3dcd4c7b8e 100644 --- a/assistant_dists/dream_multimodal/docker-compose.override.yml +++ b/assistant_dists/dream_multimodal/docker-compose.override.yml @@ -181,7 +181,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/dream_persona_openai_prompted/docker-compose.override.yml b/assistant_dists/dream_persona_openai_prompted/docker-compose.override.yml index 1a1056e6ca..8672d1c767 100644 --- a/assistant_dists/dream_persona_openai_prompted/docker-compose.override.yml +++ b/assistant_dists/dream_persona_openai_prompted/docker-compose.override.yml @@ -133,7 +133,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/dream_persona_prompted/docker-compose.override.yml b/assistant_dists/dream_persona_prompted/docker-compose.override.yml index d3d8abc9a3..08ee32372f 100644 --- a/assistant_dists/dream_persona_prompted/docker-compose.override.yml +++ b/assistant_dists/dream_persona_prompted/docker-compose.override.yml @@ -133,7 +133,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/empathetic_marketing_assistant/docker-compose.override.yml b/assistant_dists/empathetic_marketing_assistant/docker-compose.override.yml index e9e1941336..5c81495db1 100644 --- a/assistant_dists/empathetic_marketing_assistant/docker-compose.override.yml +++ b/assistant_dists/empathetic_marketing_assistant/docker-compose.override.yml @@ -133,7 +133,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/fairytale_assistant/docker-compose.override.yml b/assistant_dists/fairytale_assistant/docker-compose.override.yml index 1adbe95a82..ac68373abb 100644 --- a/assistant_dists/fairytale_assistant/docker-compose.override.yml +++ b/assistant_dists/fairytale_assistant/docker-compose.override.yml @@ -133,7 +133,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/nutrition_assistant/docker-compose.override.yml b/assistant_dists/nutrition_assistant/docker-compose.override.yml index df99c55ae4..7409ab7201 100644 --- a/assistant_dists/nutrition_assistant/docker-compose.override.yml +++ b/assistant_dists/nutrition_assistant/docker-compose.override.yml @@ -133,7 +133,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/rhodes_coaching_assistant/docker-compose.override.yml b/assistant_dists/rhodes_coaching_assistant/docker-compose.override.yml index 1c7789a424..3da1bfb5de 100644 --- a/assistant_dists/rhodes_coaching_assistant/docker-compose.override.yml +++ b/assistant_dists/rhodes_coaching_assistant/docker-compose.override.yml @@ -133,7 +133,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/assistant_dists/universal_prompted_assistant/docker-compose.override.yml b/assistant_dists/universal_prompted_assistant/docker-compose.override.yml index ba99cea0e4..f0cb0f2e89 100644 --- a/assistant_dists/universal_prompted_assistant/docker-compose.override.yml +++ b/assistant_dists/universal_prompted_assistant/docker-compose.override.yml @@ -114,7 +114,7 @@ services: args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 context: ./services/sentence_ranker/ command: flask run -h 0.0.0.0 -p 8128 environment: diff --git a/services/sentence_ranker/component.yml b/services/sentence_ranker/component.yml index 9ab8ebb94a..1bbfa10eb4 100644 --- a/services/sentence_ranker/component.yml +++ b/services/sentence_ranker/component.yml @@ -8,8 +8,8 @@ sentence-ranker: author: DeepPavlov description: ranking model given as `PRETRAINED_MODEL_NAME_OR_PATH` which for a pair os sentences returns a float score of correspondence - ram_usage: 1.2G - gpu_usage: 2.1G + ram_usage: 1.5G + gpu_usage: 800M port: 8128 endpoints: - group: candidate_annotators @@ -19,7 +19,7 @@ sentence-ranker: build_args: SERVICE_PORT: 8128 SERVICE_NAME: sentence_ranker - PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/bert-base-nli-mean-tokens + PRETRAINED_MODEL_NAME_OR_PATH: sentence-transformers/all-MiniLM-L6-v2 date_created: '2023-03-16T09:45:32' sentence-ranker-multilingual: name: sentence_ranker diff --git a/services/sentence_ranker/test.py b/services/sentence_ranker/test.py index bf5346f474..edceccd95d 100644 --- a/services/sentence_ranker/test.py +++ b/services/sentence_ranker/test.py @@ -5,19 +5,19 @@ def test_respond(): url = "http://0.0.0.0:8128/respond" sentence_pairs = [ - ["Привет! Как дела?", "хорошо. а у тебя как дела?"], - ["Привет! Как дела?", "какой твой любимый фильм?"], - ["Какой твой любимый фильм?", "Гордость и предубеждение"], - ["Какой твой любимый фильм?", "пересматриваю Гордость и предубеждение иногда."], - ["Какой твой любимый фильм?", "я люблю играть в компьютерные игры."], + ["Hi! How are you?", "Good. How are you?"], + ["Hi! How are you?", "what's your favorite movie?"], + ["What's your favorite movie?", "Pride and Prejudice"], + ["What's your favorite movie?", "I watch Pride and Prejudice sometimes."], + ["What's your favorite movie?", "I like to play computer games."], ] - gold = [0.8988315, 0.62241143, 0.65046525, 0.54038674, 0.48419473] + gold = [0.7672719955444336, 0.15072298049926758, 0.5039470791816711, 0.4652850031852722, 0.23436866700649261] request_data = {"sentence_pairs": sentence_pairs} result = requests.post(url, json=request_data).json()[0]["batch"] for i, score in enumerate(result): - assert score != 0.0, f"Expected:{gold[i]}\tGot\n{score}" + assert round(score, 2) == round(gold[i], 2), f"Expected:{gold[i]}\tGot\n{score}" print("Success!")