Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use new sentence ranker #391

Merged
merged 3 commits into from
Apr 17, 2023
Merged

feat: use new sentence ranker #391

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d63368
feat: use new sentence ranker
dilyararimovna Apr 14, 2023
6e1cdb2
fix: codestyle
dilyararimovna Apr 17, 2023
57926e5
fix: sims
dilyararimovna Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assistant_dists/ai_faq_assistant/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/da_costa_clothes_assistant/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/deepy_assistant/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/dream/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/dream_mini/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/dream_mini_persona_based/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/dream_multimodal/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/dream_persona_openai_prompted/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/dream_persona_prompted/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/empathetic_marketing_assistant/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/fairytale_assistant/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/nutrition_assistant/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/rhodes_coaching_assistant/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion assistant_dists/universal_prompted_assistant/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions services/sentence_ranker/component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions services/sentence_ranker/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

у меня не проходит, вообще другие значения
(venv) smilga@gpu11:~/dream$ /home/smilga/dream/venv/bin/python /home/smilga/dream/services/sentence_ranker/test.py [0.922500729560852, 0.4283738136291504, 0.324562668800354, 0.3642802834510803, 0.36186355352401733] Traceback (most recent call last): File "/home/smilga/dream/services/sentence_ranker/test.py", line 26, in <module> test_respond() File "/home/smilga/dream/services/sentence_ranker/test.py", line 21, in test_respond assert round(score, 2) == round(gold[i], 2), f"Expected:{gold[i]}\tGot\n{score}" AssertionError: Expected:0.7672719955444336 Got 0.922500729560852

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

как запускаешь?

print("Success!")


Expand Down