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.

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

Dream distribution with SF-based DM #572

Merged
merged 87 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
3ae7c15
speech-function-classifier model changed
avglinsky Sep 4, 2023
4dcc6ba
dream_Speech_models_based dist initial added
avglinsky Sep 7, 2023
505bfd2
secret required skills removed
moon-strider Sep 7, 2023
347d1b9
more fixes
moon-strider Sep 7, 2023
f56ca75
adding sfc to configs and minor refactoring of sfc
moon-strider Sep 8, 2023
9077d78
Dockerfile fixed
avglinsky Sep 8, 2023
275ea4a
Merge remote-tracking branch 'origin/dist_n1_for_AC_SFC' into dist_n1…
avglinsky Sep 8, 2023
67987c7
Dockerfile fixed 1
avglinsky Sep 8, 2023
48d7028
minor fix
moon-strider Sep 8, 2023
aff3be5
minor fix 2
moon-strider Sep 8, 2023
0f61cdf
minor fix 3
moon-strider Sep 8, 2023
4dce73e
minor fix 4
moon-strider Sep 8, 2023
d52ae67
minor fix 5
moon-strider Sep 8, 2023
fb1c18c
fixing 120 symbols line check in models.py
avglinsky Sep 20, 2023
b3552d1
fixing 120 symbols line check in models.py
avglinsky Sep 20, 2023
2f4a529
renamed branch and dist folder for future convenience
nstsj Sep 20, 2023
db5bb74
branch renamed according to suggestions
nstsj Sep 26, 2023
fba525c
initial sf-based response selector commit
moon-strider Sep 29, 2023
58178b2
added sf-based rs to configs
moon-strider Sep 29, 2023
64846ef
Merge branch 'dev' into dream_ranking_and_sfc_based_dm
dilyararimovna Oct 1, 2023
a3d00d2
fix: pipeline and cards - almost ready
dilyararimovna Oct 1, 2023
ef70b63
fix: cards
dilyararimovna Oct 1, 2023
fb02952
ranking_and_sf_based_response_selector updates: component card and co…
nstsj Oct 2, 2023
faf5b44
fixes according to the PR comments + codestyle fixes
nstsj Oct 2, 2023
4878f8e
added sfp to configs
moon-strider Oct 3, 2023
49a5bad
context fixed
moon-strider Oct 3, 2023
e20cfa4
another fix
moon-strider Oct 3, 2023
d097abf
gunicorn -> uvicorn
moon-strider Oct 3, 2023
11a3c2e
fixed some things
moon-strider Oct 3, 2023
71e999a
another fix
moon-strider Oct 3, 2023
a91ceed
attempting to fix rs
moon-strider Oct 4, 2023
c32b718
added dialog logging to rs
moon-strider Oct 4, 2023
f470815
fixed prompt-selector deps
moon-strider Oct 4, 2023
86ce555
fixing rs
moon-strider Oct 4, 2023
23b52a5
fixed rs
moon-strider Oct 4, 2023
50def10
fixed critical typo in conf, FastAPI -> Flask for sfc
moon-strider Oct 5, 2023
0df0fb1
reqs fixed
moon-strider Oct 5, 2023
77b4617
reqs fixed 2
moon-strider Oct 5, 2023
eede51a
more fixes
moon-strider Oct 5, 2023
2bf4b58
fixed sfc 100%
moon-strider Oct 5, 2023
bb9cb69
response selector fixed
moon-strider Oct 9, 2023
abbf790
New SFP version
lostyakova Oct 10, 2023
ce3f165
New SFP version
lostyakova Oct 10, 2023
edb1a25
dp_formatter fixed for sfp
moon-strider Oct 11, 2023
084df85
sfp formatter changed & sfp FAPI -> Flask
moon-strider Oct 11, 2023
68d96a6
reqs fixed for sfp
moon-strider Oct 11, 2023
09bfa25
reqs fixed again
moon-strider Oct 11, 2023
3db5027
uvicorn -> gunicorn for sfp
moon-strider Oct 11, 2023
b19c326
typo in reqs fixed
moon-strider Oct 11, 2023
db94f2c
asyncs removed from sfp
moon-strider Oct 11, 2023
309d23a
minor dp formatter and rs fix
moon-strider Oct 11, 2023
810f55c
many pr fixes
moon-strider Oct 16, 2023
1987c4f
small sfc revamp
moon-strider Oct 16, 2023
89fb872
another pr revampt
moon-strider Oct 16, 2023
5c31bda
pr fix
moon-strider Oct 16, 2023
2021fcf
added logging
moon-strider Oct 16, 2023
ea17d31
fixing batch sfc
moon-strider Oct 17, 2023
628ae54
Merge branch 'dev' into dream_ranking_and_sfc_based_dm
moon-strider Dec 6, 2023
8d668bb
Bug fixes of SFC
Dec 12, 2023
8d3ae9f
Style fix
Dec 12, 2023
9656c40
codestyle fixed for pr
moon-strider Dec 25, 2023
a88a0be
fixes for pr
moon-strider Dec 25, 2023
4b21ebf
removed unused import
moon-strider Dec 26, 2023
60ca89a
minor pr fix
moon-strider Dec 26, 2023
f3c6c4d
minor config addition
moon-strider Dec 28, 2023
a28a0c3
server fixed for sfc
moon-strider Dec 28, 2023
8938be0
fix: components
dilyararimovna Dec 29, 2023
59e5507
dream_sfc reverted, minor pr fixes
moon-strider Jan 10, 2024
1418271
fix: ranking and intent based resp selector
dilyararimovna Jan 12, 2024
afbb755
zip_longest -> zip
moon-strider Jan 12, 2024
2821a6f
Merge branch 'dream_ranking_and_sfc_based_dm' of github.com:deeppavlo…
moon-strider Jan 12, 2024
37952fd
fix: codestyle
dilyararimovna Jan 12, 2024
195eb6e
sfc service and sfp formatter reverted to working state
moon-strider Jan 15, 2024
e3dd206
fix: fixes for sf
dilyararimovna Jan 15, 2024
f3b416b
fix: first turn
dilyararimovna Jan 15, 2024
722d8cc
fix: tests
dilyararimovna Jan 15, 2024
576a78f
fix: tests
dilyararimovna Jan 15, 2024
465a75c
fix: tests
dilyararimovna Jan 15, 2024
2a734e9
fix: imports
dilyararimovna Jan 15, 2024
4543619
fix: black style
dilyararimovna Jan 15, 2024
2e5b518
fix: logs
dilyararimovna Jan 15, 2024
cad3911
Merge remote-tracking branch 'origin/dream_ranking_and_sfc_based_dm_d…
dilyararimovna Jan 15, 2024
f93fad9
fix: pipeline
dilyararimovna Jan 15, 2024
2850aef
fix: sfp
dilyararimovna Jan 15, 2024
fece987
fix: codestyle black
dilyararimovna Jan 15, 2024
03fb430
fix: codestyle
dilyararimovna Jan 15, 2024
79e22b0
fix: tests
dilyararimovna Jan 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 7 additions & 12 deletions annotators/speech_function_classifier/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,20 @@ WORKDIR /src

RUN apt-get update && apt-get install -y --allow-unauthenticated git curl && rm -rf /var/lib/apt/lists/*

RUN mkdir /models && \
curl https://files.deeppavlov.ai/alexaprize_data/speech_function_classifier.tar.gz --output arch.tgz && \
tar zxfv arch.tgz && \
rm -rf arch.tgz && \
curl https://files.deeppavlov.ai/dream/speech_function_classifier/res_cor.json --output data/res_cor.json && \
mv data/* /models && \
rm -rf data
# RUN git clone -b feat/speech-fn https://github.com/deeppavlov/DeepPavlov.git && \
# cd DeepPavlov && pip install -e . && cd .. && rm -rf DeepPavlov && python -m deeppavlov download speech_fn

COPY annotators/speech_function_classifier/requirements.txt requirements.txt

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 && \
Copy link
Collaborator

Choose a reason for hiding this comment

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

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

Copy link
Collaborator

Choose a reason for hiding this comment

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

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

Copy link
Collaborator

Choose a reason for hiding this comment

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

НАПОМИНАЮ

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

done

python -m deeppavlov download speech_fn

COPY . ./

RUN pip install -r requirements.txt

ARG SERVICE_NAME
ENV SERVICE_NAME ${SERVICE_NAME}

ARG SERVICE_PORT
ENV SERVICE_PORT ${SERVICE_PORT}

CMD gunicorn --workers=1 server:app -b 0.0.0.0:${SERVICE_PORT}
CMD gunicorn -k uvicorn.workers.UvicornWorker --workers=1 server:app -b 0.0.0.0:${SERVICE_PORT}