-
Notifications
You must be signed in to change notification settings - Fork 77
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.
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
Dnnc config arg #585
Open
dimakarp1996
wants to merge
166
commits into
dev
Choose a base branch
from
dnnc_config_arg
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Dnnc config arg #585
Changes from all commits
Commits
Show all changes
166 commits
Select commit
Hold shift + click to select a range
72842e3
Fix requirements.txt (#84)
AndriiHura a67e15c
fix itsdangerous requirements
mtalimanchuk 0f8ef0e
pin itsdangerous requirements for all flask==1.1.1 servers
mtalimanchuk 6f0684a
Merge pull request #102 from deepmipt/fix/combined-classification-fla…
mtalimanchuk d237711
Merge pull request #103 from deepmipt/dev
dilyararimovna e990264
Merge pull request #107 from deepmipt/dev
dilyararimovna 3208f71
Merge pull request #119 from deepmipt/dev
dilyararimovna ab44553
Merge pull request #123 from deepmipt/dev
dilyararimovna 1c9a463
Merge pull request #137 from deepmipt/dev
dilyararimovna f8e4a59
Merge pull request #145 from deepmipt/dev
dilyararimovna 48872a6
Merge pull request #150 from deepmipt/dev
dilyararimovna ed42f0c
Merge pull request #153 from deepmipt/dev
dilyararimovna 30f290c
Merge pull request #155 from deepmipt/dev
dilyararimovna de510bc
Merge pull request #158 from deepmipt/dev
dilyararimovna ab2dcbd
Merge pull request #165 from deepmipt/dev
dilyararimovna 525783a
Merge pull request #174 from deepmipt/dev
dilyararimovna 7e87a36
Merge pull request #177 from deepmipt/dev
dilyararimovna 82a19df
Merge pull request #188 from deepmipt/dev
dilyararimovna 2b50d6d
Merge pull request #192 from deepmipt/dev
dilyararimovna 3e3dd71
Merge pull request #14 from deeppavlovteam/dev
dilyararimovna d42e1d6
Merge pull request #201 from deeppavlov/dev
dilyararimovna 4d5cb36
Merge pull request #206 from deeppavlov/dev
dilyararimovna 5c36b99
Merge pull request #216 from deeppavlov/dev
dilyararimovna 2961057
Merge pull request #247 from deeppavlov/dev
dilyararimovna c8632e9
Merge pull request #248 from deeppavlov/dev
dilyararimovna e4df912
Merge pull request #251 from deeppavlov/dev
dilyararimovna c8dc1fa
Merge pull request #258 from deeppavlov/dev
dilyararimovna 6a85fe4
Merge pull request #259 from deeppavlov/dev
dilyararimovna 92b29eb
Merge pull request #267 from deeppavlov/dev
dilyararimovna d74eca8
Merge pull request #272 from deeppavlov/dev
dilyararimovna 40326da
Merge pull request #286 from deeppavlov/dev
dilyararimovna bd21b37
Merge pull request #290 from deeppavlov/dev
dilyararimovna e6d15dc
Merge pull request #293 from deeppavlov/dev
dilyararimovna f627d8f
Merge pull request #294 from deeppavlov/dev
dilyararimovna a2d1b76
Merge pull request #296 from deeppavlov/dev
dilyararimovna 4c311c8
Merge pull request #297 from deeppavlov/dev
dilyararimovna ebb6de9
Merge pull request #300 from deeppavlov/dev
dilyararimovna fa37856
Merge pull request #305 from deeppavlov/dev
dilyararimovna 7bfe903
Merge pull request #316 from deeppavlov/dev
dilyararimovna 598e490
Merge pull request #320 from deeppavlov/dev
dilyararimovna 4c17e6f
Merge pull request #323 from deeppavlov/dev
dilyararimovna 9dbf729
Merge pull request #327 from deeppavlov/dev
dilyararimovna 28ac733
Merge pull request #332 from deeppavlov/dev
dilyararimovna 7015110
Merge pull request #340 from deeppavlov/dev
dilyararimovna aa44906
Merge pull request #350 from deeppavlov/dev
dilyararimovna a9bae9d
Merge pull request #352 from deeppavlov/dev
dilyararimovna 979f764
Merge pull request #355 from deeppavlov/dev
dilyararimovna f9ffefd
Merge pull request #356 from deeppavlov/dev
dilyararimovna a869d9f
Merge pull request #358 from deeppavlov/dev
dilyararimovna 8273f1f
Merge pull request #372 from deeppavlov/dev
dilyararimovna 375a987
Merge pull request #374 from deeppavlov/dev
dilyararimovna ed5d384
Merge pull request #379 from deeppavlov/dev
dilyararimovna 254d4cb
Merge pull request #387 from deeppavlov/dev
dilyararimovna 9ee02d4
Merge pull request #394 from deeppavlov/dev
dilyararimovna ab851f9
Merge pull request #399 from deeppavlov/dev
dilyararimovna 7c0dbf9
Merge pull request #401 from deeppavlov/dev
dilyararimovna 5e902b4
Merge pull request #404 from deeppavlov/dev
dilyararimovna 0051fe4
Merge pull request #436 from deeppavlov/dev
dilyararimovna d59baf8
Merge pull request #447 from deeppavlov/dev
dilyararimovna bf636b6
Merge pull request #451 from deeppavlov/dev
dilyararimovna 8106de6
Merge pull request #455 from deeppavlov/dev
dilyararimovna c28c38c
Merge pull request #459 from deeppavlov/dev
dilyararimovna 644ddab
Merge pull request #462 from deeppavlov/dev
dilyararimovna 9b2708f
Merge pull request #474 from deeppavlov/dev
dilyararimovna 528e063
Merge pull request #475 from deeppavlov/dev
dilyararimovna a0ff368
Merge pull request #485 from deeppavlov/dev
dilyararimovna 8c3f34d
Merge pull request #501 from deeppavlov/dev
dilyararimovna 82ae4a9
Merge pull request #511 from deeppavlov/dev
dilyararimovna 58e6912
Merge pull request #519 from deeppavlov/dev
dilyararimovna fa72dc6
Merge pull request #520 from deeppavlov/dev
dilyararimovna eed244e
Merge pull request #542 from deeppavlov/dev
dilyararimovna b0f1df3
Merge pull request #554 from deeppavlov/dev
dilyararimovna 9d1e48d
Merge pull request #557 from deeppavlov/dev
dilyararimovna 0015ded
Merge pull request #582 from deeppavlov/dev
dilyararimovna 79b033a
Update dev.yml
dimakarp1996 e37ea6f
Update docker-compose.override.yml
dimakarp1996 5df4153
Update gpu1.yml
dimakarp1996 14b4595
Update proxy.yml
dimakarp1996 d0cf210
Update cpu.yml
dimakarp1996 cf53b05
Update test.yml
dimakarp1996 03990a9
Update pipeline_conf.json
dimakarp1996 2c24f49
Create 2JUPwwo1SZzxuj4RXjI350.yml
dimakarp1996 cfae777
Create Readme.md
dimakarp1996 818c220
Create environment.yml
dimakarp1996 059ae07
Create classifier.json
dimakarp1996 aa50156
Create service.yml
dimakarp1996 ab3698e
Create Dockerfile
dimakarp1996 48b2820
Create requirements.txt
dimakarp1996 8c55ec3
Create load_test.py
dimakarp1996 cd5dd6b
Create requirements_load_test.txt
dimakarp1996 1a5f366
Create test.sh
dimakarp1996 5f42d80
Create test.py
dimakarp1996 8878a85
Update classifier.json
dimakarp1996 caf5180
Update runtests.sh
dimakarp1996 a629a05
Update classifier.json
dimakarp1996 698dd2e
Create utils.py
dimakarp1996 193f771
Create server.py
dimakarp1996 a92b53b
Create dnnc_classes.py
dimakarp1996 05acd47
Update utils.py
dimakarp1996 03cd5eb
Update server.py
dimakarp1996 ae0a7a7
Update dnnc_classes.py
dimakarp1996 05ee608
Update utils.py
dimakarp1996 f9822d8
Add files via upload
dimakarp1996 197997e
Delete annotators/dnnc_intents/data_full(1).json
dimakarp1996 bfe6ec2
Add files via upload
dimakarp1996 671b388
Update server.py
dimakarp1996 38a14d1
Update test.py
dimakarp1996 1a18dfd
Update utils.py
dimakarp1996 cf7b466
Update dnnc_classes.py
dimakarp1996 58407e6
Update load_test.py
dimakarp1996 6ffdc7f
Update server.py
dimakarp1996 684df29
Update test.py
dimakarp1996 f40f064
Update utils.py
dimakarp1996 4a1fe06
Update server.py
dimakarp1996 7b71743
Update server.py
dimakarp1996 62b5b58
black codestyle
c96b172
Update dev.yml
dimakarp1996 93614cf
Update docker-compose.override.yml
dimakarp1996 a71115a
Now bug is that container does not find requirements.txt
fbde76c
Update proxy.yml
dimakarp1996 1207989
Update docker-compose.override.yml
dimakarp1996 a06d3be
Update docker-compose.override.yml
dimakarp1996 adf9231
Update classifier.json
dimakarp1996 e50c401
Update classifier.json
dimakarp1996 7506ef4
Update classifier.json
dimakarp1996 23df970
Update classifier.json
dimakarp1996 f0d28ce
Update utils.py
dimakarp1996 71dd329
Update Dockerfile
dimakarp1996 ffe6517
Update Dockerfile
dimakarp1996 4cfd828
Update Dockerfile
dimakarp1996 fbeb9ee
Update Dockerfile
dimakarp1996 c265e41
Update requirements.txt
dimakarp1996 ef0d9e2
Update requirements.txt
dimakarp1996 1751503
Update requirements.txt
dimakarp1996 1d7e943
Update 2JUPwwo1SZzxuj4RXjI350.yml
dimakarp1996 712ddf9
Update docker-compose.override.yml
dimakarp1996 19e41fd
Update utils.py
dimakarp1996 3d5e61e
Update classifier.json
dimakarp1996 71b5762
Update utils.py
dimakarp1996 208947e
Update utils.py
dimakarp1996 422c3ae
Update utils.py
dimakarp1996 b5ae191
Update utils.py
dimakarp1996 13ff24f
Update utils.py
dimakarp1996 1698e3b
Update utils.py
dimakarp1996 e737701
Update utils.py
dimakarp1996 c433e58
codestyle still needs to pass
929b787
codestyle
6eb047a
codestyle
5866747
hj
9362fef
Old files preserved, new files added. Now logreg is in place, all 150…
03a3431
codestyle
ffea5f7
CPU-only
0170f7c
h
ae79269
Update server.py
dimakarp1996 d1cefcc
codestyle
4306c8c
hf
c2d6d3a
Update server.py
dimakarp1996 0ad100b
analogous to dnnc_intents branch
dimakarp1996 6d18eab
Delete annotators/dnnc_intents/logreg_files.tar.gz.md5
dimakarp1996 c3e8d83
Delete annotators/dnnc_intents/logreg_files.tar.gz
dimakarp1996 70caae1
Update 2JUPwwo1SZzxuj4RXjI350.yml
dimakarp1996 7a49fe2
Update Dockerfile
dimakarp1996 f9626b5
Update docker-compose.override.yml
dimakarp1996 09aecac
Update utils_roberta.py
dimakarp1996 383770c
codestyle
dimakarp1996 fd65563
Update Readme.md
dimakarp1996 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
FROM deeppavlov/base-gpu:0.17.5 | ||
|
||
RUN pip install git+https://github.com/deeppavlov/[email protected] | ||
|
||
WORKDIR /base/DeepPavlov | ||
|
||
WORKDIR /src | ||
RUN mkdir common | ||
|
||
COPY annotators/dnnc_intents/requirements.txt ./requirements.txt | ||
RUN pip install -r requirements.txt | ||
|
||
RUN python -m spacy download en_core_web_sm | ||
|
||
ARG SERVICE_PORT | ||
ENV SERVICE_PORT=$SERVICE_PORT | ||
ARG CONFIG | ||
ENV CONFIG=$CONFIG | ||
ARG CLASSES | ||
ENV CLASSES=$CLASSES | ||
|
||
COPY annotators/dnnc_intents/ ./ | ||
COPY common/ common/ | ||
|
||
CMD gunicorn --workers=1 server:app -b 0.0.0.0:${SERVICE_PORT} --timeout=1200 --preload |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# DNNC intent classifier | ||
## Description | ||
Classifier that classifies DNNC intent in the few-shot mode. Default version is the logistic regression. Howeve, with config classifier_roberta.json entailment-trained roberta is also supported | ||
## Input/Output | ||
**Input** | ||
Batch of last utterances | ||
**Output** | ||
For each utterance - dictionary {probable class: probability} | ||
## Dependencies | ||
As stated in requirements.txt. And if you use entailment-trained roberta, file utils_roberta.py also is useful |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
{ | ||
"chainer": { | ||
"in": ["x"], | ||
"pipe": [ | ||
{ | ||
"class_name": "stream_spacy_tokenizer", | ||
"in": [ | ||
"x" | ||
], | ||
"id": "my_tokenizer", | ||
"lemmas": false, | ||
"out": "token_lemmas", | ||
"spacy_model": "en_core_web_sm", | ||
"support_load_path": "{DOWNLOADS_PATH}/logreg_files/support_dataset.json" | ||
}, | ||
{ | ||
"ref": "my_tokenizer", | ||
"in": [ | ||
"token_lemmas" | ||
], | ||
"out": [ | ||
"text_lem" | ||
] | ||
}, | ||
{ | ||
"class_name": "fasttext", | ||
"in": [ | ||
"token_lemmas" | ||
], | ||
"load_path": "{DOWNLOADS_PATH}/embeddings/fasttext/{LANGUAGE}.bin", | ||
"mean": true, | ||
"out": [ | ||
"text_vector" | ||
] | ||
}, | ||
{ | ||
"in": [ | ||
"text_vector" | ||
], | ||
"out": [ | ||
"y_pred_probas" | ||
], | ||
"class_name": "sklearn_component", | ||
"main": true, | ||
"save_path": "{DOWNLOADS_PATH}/logreg_files/model.pkl", | ||
"load_path": "{DOWNLOADS_PATH}/logreg_files/model.pkl", | ||
"model_class": "sklearn.linear_model:LogisticRegression", | ||
"infer_method": "predict_proba", | ||
"C": 10, | ||
"penalty": "l2" | ||
} | ||
], | ||
"out": ["y_pred_probas"] | ||
}, | ||
"metadata": { | ||
"variables": { | ||
"ROOT_PATH": "~/.deeppavlov", | ||
"DOWNLOADS_PATH":"{ROOT_PATH}/downloads", | ||
"LOGREG_PATH": "{DOWNLOADS_PATH}/logreg_files", | ||
"LANGUAGE":"en" | ||
}, | ||
"imports":["utils"], | ||
"download": [ | ||
{ | ||
"url": "http://files.deeppavlov.ai/embeddings/fasttext/{LANGUAGE}.bin", | ||
"subdir": "{DOWNLOADS_PATH}/embeddings/fasttext" | ||
}, | ||
{ | ||
"url": "https://files.deeppavlov.ai/dream_data/dnnc_intents/logreg_files.tar.gz", | ||
"subdir": "{LOGREG_PATH}" | ||
} | ||
|
||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
{ | ||
"chainer": { | ||
"in": ["text"], | ||
"pipe": [ | ||
{ | ||
"class_name": "dnnc_preparer", | ||
"in": ["text"], | ||
"out": ["texts","dataset"] | ||
}, | ||
{ | ||
"class_name": "dnnc_pairgenerator", | ||
"in": ["texts", "dataset"], | ||
"out": ["x", "x_support", "x_populated", "y_support"], | ||
"bidirectional": false | ||
}, | ||
{ | ||
"class_name": "torch_transformers_preprocessor", | ||
"in": ["x_populated", "x_support"], | ||
"out": ["bert_features"], | ||
"vocab_file": "{BASE_MODEL}", | ||
"do_lower_case": true, | ||
"max_seq_length": 128 | ||
}, | ||
{ | ||
"class_name": "torch_transformers_classifier_batch1", | ||
"main": true, | ||
"in": ["bert_features"], | ||
"out": ["simmilarity_scores"], | ||
"n_classes": 2, | ||
"return_probas": true, | ||
"pretrained_bert": "{BASE_MODEL}", | ||
"save_path": "{MODEL_PATH}/model", | ||
"load_path": "{MODEL_PATH}/model", | ||
"is_binary": "{BINARY_CLASSIFICATION}" | ||
}, | ||
{ | ||
"class_name": "dnnc_proba2labels", | ||
"is_binary": "{BINARY_CLASSIFICATION}", | ||
"in": ["simmilarity_scores", "x", "x_populated", "x_support", "y_support"], | ||
"out": ["y_pred"], | ||
"confidence_threshold": 0.0 | ||
} | ||
], | ||
"out": ["y_pred"] | ||
}, | ||
"metadata": { | ||
"variables": { | ||
"ROOT_PATH": "~/.deeppavlov", | ||
"MODEL_PATH": "{ROOT_PATH}/models/fewshot/roberta_nli_mrpc_1_10", | ||
"BINARY_CLASSIFICATION": true, | ||
"BASE_MODEL": "roberta-base" | ||
}, | ||
"imports":["utils_roberta"], | ||
"download": [ | ||
{ | ||
"url": "http://files.deeppavlov.ai/v1/classifiers/fewshot/roberta_nli_mrpc_1_10.tar.gz", | ||
"subdir": "{MODEL_PATH}" | ||
} | ||
] | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
а базового докер образа поновее сразу нет? чтобы не переставлять, а сразу взять новый? если нет, напиши Феде запрос на такой, пожалуйста, в паблик канале слака.