From 669483ec7f0d3a108ff19059bf8db7396f5a4542 Mon Sep 17 00:00:00 2001 From: pseusys Date: Mon, 28 Aug 2023 12:14:20 +0200 Subject: [PATCH 01/11] drawio build make target added --- .gitignore | 2 ++ docs/source/diagrams/dff/addons.drawio | 1 + docs/source/diagrams/dff/framework.drawio | 1 + docs/source/diagrams/dff/infrastructure.drawio | 1 + docs/source/diagrams/dialog_graph/dialog.drawio | 1 + makefile | 17 +++++++++++++++++ 6 files changed, 23 insertions(+) create mode 100644 docs/source/diagrams/dff/addons.drawio create mode 100644 docs/source/diagrams/dff/framework.drawio create mode 100644 docs/source/diagrams/dff/infrastructure.drawio create mode 100644 docs/source/diagrams/dialog_graph/dialog.drawio diff --git a/.gitignore b/.gitignore index 8c0ff0965..9cb91d044 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ build/ docs/source/apiref docs/source/release_notes.rst docs/source/tutorials +docs/source/_static/drawio +docs/source/diagrams/*/export *__pycache__* *.idea/* .idea/* diff --git a/docs/source/diagrams/dff/addons.drawio b/docs/source/diagrams/dff/addons.drawio new file mode 100644 index 000000000..403bf3778 --- /dev/null +++ b/docs/source/diagrams/dff/addons.drawio @@ -0,0 +1 @@ +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 diff --git a/docs/source/diagrams/dff/framework.drawio b/docs/source/diagrams/dff/framework.drawio new file mode 100644 index 000000000..46e022fc6 --- /dev/null +++ b/docs/source/diagrams/dff/framework.drawio @@ -0,0 +1 @@ +7VnZjts2FP0aA+1DAi2WLD/Omg6aoEENpM0jLV3JxFCkSlFe8vW9lKjNkmMPKjfTNA/jIS/3cw55eamZe5fu30mSbT6ICNjMsaL9zL2fOY7tBkv8py2HyjIPgsqQSBqZSq1hRb+AMVrGWtAI8l5FJQRTNOsbQ8E5hKpnI1KKXb9aLFh/1IwkMDCsQsKG1j9opDZmFbbb2n8BmmzMyF5gClJS1zULyTckEruOyX2YuXdSCFWl0v0dMI1dDUvV7vFEaTMvCVxd1GBetdgSVpi1zRyfYdvbPCMc04lO31PCRFLSgXxq4iCnCYeoBB5/gJM1goMLCjEpqXgTSboFXnGwBZkTRQUneuybJ91gn4GkwEOox8NJdoc0+KhDjbkUBY9Az9vC4t2GKlhlJNSlO5wV2jYqZZizMRlTxu4EE7Js60YEgjjUi1JSPEOnxA8DWMe65BlUuDHNhzAaZHElCvYdk4H1HYgUlDxgFVPqzw3FRuJ+YPK7VjB2bdt0xGLX2iBGpEnTd0skJgyXJ3j1RnidEFCwIw8WY4Au/YVL/CsAeoSn6w/x9PwxPN1gAjz96+IZByGEowJdB97cs66Pp2cvL8SzOUj/CZ6L6+KJ6gyi+RiegbN2/X9Bn2P7/QSeU+z34DyeEKEPM1kuOPQBxIXLw58a7Ldenf3cLbvfGyaq3MHkLoMxF4UMzTzq9SoiEzDV6unqOX4VbAkMPcm274fHkDNNPwqKU2lJ8o9Yspb9LqpJmVZH+DfTuIyS5UsZ2FPVIQBzn2vEMd3CrzOHLhffjjV3atYu1Xs9m47emzvKI8MblWM98IQixKdPFfv8qTL1GeG4ffkt7JFLwdgh4U9wRjSsfieCdF6VIJ2zgryJIsHz1yVIuz6l6lvAfPnWG0rSW15Jku5Z1B4lSWEn5PPrAu54J7vL4fXpejv5XNRmhYzk1QD+X4UOJm9xXarNYRVGeNKroaO1tryOwqpu17IJBUVKqB5ilUFIYxpi8j12VeiQ2bF+qltA2rRYve/EeK39Z01nkWVCquEw+J+kmkO+zvW/GO9vjrUuKIso1/KIGZ47/ZgzP9/NpcFmiVZfQL2LpDksu7dOYyIMA2PM4pwUoP1Wa4qGhN2YgpRGkR5mVLH9O6/AQqq0wq4TAdhH3sga8UaLEQ0HU2h4GKE+7BXwCFm0TvlynBlO7ASnJ6X/6Yke6Mu1b+f64ki4fuRwZVShrTR+2UFtBC8N4TPqPv8hq66sjo5Gzx31KVcT1jBUX4lY7XBJWlmwBSayFMqo4Fc6cvRUGrPWlOujRsuxOnwiGscgq4bhhqi1KFMk1/wbnayhFE0mSYjswNDb/z8U4Bw5x2DEOV6N/7GnhYrjWJTktXTUW14XvMnLZ+YbrODMs/3wPHgEogrZ2+xVh696s09Ap3/kJ5zF0E80EVnvacOags/h08Y9UURvPcEYhPpdeaZHN16h+tVbvapFOGGHnOo9KmL8KXIorxKwIVsqZD7a9rdM0ZR+Iabzd+bZ+2EPYVHZpnys+gav097RGe1c6Pq9KRhdDhi9KcrPCDXOdxgoKVmc5vZ3CEWKh3h0zNDZlh/wMmql+ovUOPNPuOUSWXdrfEHf/eeNO/m+RDC3nMtimGCCF/X6ktARwUcptuV3PewZ/2TBcRNC439zhT4W74XlRdA44K+F0/9JDsY+a4xyMHcm4MAecPBjI74CEXgjDnb0NF68/DTGbPt5uXrWbr/Ruw9/Aw== diff --git a/docs/source/diagrams/dff/infrastructure.drawio b/docs/source/diagrams/dff/infrastructure.drawio new file mode 100644 index 000000000..9b4cd4112 --- /dev/null +++ b/docs/source/diagrams/dff/infrastructure.drawio @@ -0,0 +1 @@ +7Vpfc6MqHP00eeyOiqh5bJN27525O7MzfdjtI1GizBrJIPnT/fQLEVTENmkSk71tnyI/AeGc8zuAZgQmi+1XhpbZN5rgfOQ5yXYEpiPPcyPHEz8y8lxF/CiqAikjiarUBB7Jb6yCjoquSIJLoyKnNOdkaQZjWhQ45kYMMUY3ZrU5zc2nLlGKrcBjjHI7+oMkPFOzcEET/weTNFNPhpG6sUC6rppImaGEblohcD8CE0Ypr64W2wnOJXYalqrdwwt363ExXPBDGgBFRMmf9dxwIqaqipTxjKa0QPl9E70rf2Eey3m4opDxRa4u8Zbwn63rJ3HtfIGqNJXsO7rwrAsFZ88/24VWK1lsmu1Kul28YmucqIeVHDF+K3kVgThHZUliHX4guR6fDY7Cq6QrFmtqQ6UnxFKsqgFVT0LTaqgg/YrpAouxiQoM54iTtakSpMSW1vVUUzFi9NyqsKSk4GWr5+8yICqovPHHSjU6a0KDXHFR9ahLraE1oZ0AXhCDUuka5Ss1hQktON7KMfw77VXKf2gmctuQAcpJWkgiBMyYicAaM05E8tyqGwuSJDshMVyS32i260+SqgAQncO7EZz2UqYVKzvF21FPtqsOjYwyWFKtbpwvjh96BqQ3qvg2Ii2mOg3ofF4KLZlcvZUd6B+Rqj3Z6RyTne5fnJ1+eO7sNFh6jZLwCEoMbPr4qTl5at3p5+dAaBuTbZh7Mojrp/FoSmA0iGFaeQbcwEjfwHfMLqpBqVYnpZ+eZsscpwTlNBWxh1wQ4DmPmK2JgKWrCUZXRVJTvskIx49LtMNvI/ZHpgyMxbXrnJwuX6PF8sQXvc9zzKUEqKXE2TTbmXrZy1pbmbrhKXmjO25jiYRvo/J/AR4MOuD5NniuXqvb4LnwHOANYTqX2LId5CYg6tl+ja9l8Ho0LaGOvCAX47qbiYtUXsiNURUSvdXR03Q8F949oTllu7YAuwnE4c7YGf2FW3fGQQhQ0FX+OTQedTQe2Rr3YZ8/nAH18X7U643pwNAL4KPE74M+8mYgGAL6AMK90AcDQa+d7H2ai6/fFbR3j961zMW3V8EPai6+ezlz0Xx/msuL0A9mLuBdm4vfYy7waubif5qLRuKC5gI/zWUP9IOZS7Af+hmV7w5kl+JZMRd4HEKCeA5Zlng/AahcVh8b5mQrSfsLGKl9QDPiAJuR0GZEx05ixH5jclsUlCMBfHma1C9zzr9xuwf9sY1e71uS+vR/En724RNp/AaHryPdeRTjOO6T7iyCPnx1kXwL4H7Huz0b8HEP3uAccNunziUtpWFcDfUDVs9zoA66n5UuB7p+IfaRNA5NuGGPJQ8Gt33k/CAa7xgL9C8Iun3ifOca95zQdJSeN1iDoW1/xP4YEgfXtHH73PMNlyUuUizQdibVh/kryH2Og365J+F45pxL7uHYNBfvMLl3P1Yehbx97JnevX/IgeeZYu95jTUY5Pa+XIpd/mVM4J4Jm5H/dhsY9QSVWd2dLHxHnGNW7CKe458H5u4BKIA2zK6G/kRTEcXmf2/VB/rmz4Pg/g8= diff --git a/docs/source/diagrams/dialog_graph/dialog.drawio b/docs/source/diagrams/dialog_graph/dialog.drawio new file mode 100644 index 000000000..b3b2c120a --- /dev/null +++ b/docs/source/diagrams/dialog_graph/dialog.drawio @@ -0,0 +1 @@ +5ZpNb6MwEIZ/TY4bGYwJObZJ272stFIP2z1VDhiwSnBknK/99WuCHSBm81ERyia5xDOMwZ6ZB0evMoCT+eaF40X8gwUkGdgg2AzgdGDbFvTG8iv3bAuP43mFI+I0UEGl45X+IcoJlHdJA5LVAgVjiaCLutNnaUp8UfNhztm6HhaypP7UBY6I4Xj1cWJ6f9FAxGoXFiz93wmNYvVk5KkLc6xj1UayGAdsXXHBpwGccMZEMZpvJiTJc6fTUsx7/sfV/bo4ScU5E6AqRCa2em8kkFtVJuMiZhFLcfJUeh/9JV+R/AaWNGIxT9SQbKh4q4x/yzEYImVN8+oDbWy1kQq+fasalVm5WU7bWXpeyFIxYQnju0VDsPvsooKHvMDS7Sc4y6hfOJ9popeZCc4+yMFk182vfBDhxyrMTKXKbsaW3FfJclQdBeYR0dVWvjyRlYmqAC+EzYnciQzgJMGCruo9hVVrRvu4snxyoCrYXE29mhVOluquU4oTFknfUgjCcepLbA4rztkyDfYFXcdUkNcF3m1xLfmtF3lFuKCShIeERqn0CZYHhDK9lYwGiHiB05Rrz57BC3KdP41sjmZRX1V7V28Ua6TsdcmnDZQvrrBpeaCFxFtGUr8II+syjD7R8bbZ8Y7TdsfvpkqQ8bYSsGA0FVnlzj9zR9kC+/qqHtA98XxuvAMOil6soGyB/VbO6wrbwFEmV9JDFzgV70BT+Q6M7rkIyUP4MPFCvwk+1/fILLwCfMiWnVZLJTDxs2xk4me3QR+8An3gM/RdeIh9gj6ngT63F/TBozCdDB+1zJ5zlD3rltmDXbKH7ufkcxvY83rBnnGSjS47+SBomT73zJPP/N3039Pndknf6H5OPq+BvnEv6INHYToZDltmzzvz5LtB9sZdsjc28jwcDm8up9DuMKdaOmkSMCRDRGF4e+oFtJxa1ruVL9D9yBeoQb5A/ZAvEKj3wCn5wohvWb7QqarAWDD4Lr7Zrb7nwpC4fuN7LhiNZ+D8Sl8AHHK/UrJA9yNZoAbJAvVEsoBHCTod37JogUzRYk9cu7/WQs8nzcTNPOSgjojrUqhA9yNUoAahAvVDqDDOrBNCxWF820IFMoUKTdwNnnBdShPofqQJ1CBNoJ5IE/AoP6fjWxYnkClOlLw93uIZ16Ukga4vSfTiRXZNTUKa5d9vig4v/8MEn/4C diff --git a/makefile b/makefile index 713b08836..10544fd96 100644 --- a/makefile +++ b/makefile @@ -1,3 +1,5 @@ +.ONESHELL: + SHELL = /bin/bash PYTHON = python3 @@ -8,6 +10,7 @@ TEST_COVERAGE_THRESHOLD=95 TEST_ALLOW_SKIP=all # for more info, see tests/conftest.py PATH := $(VENV_PATH)/bin:$(PATH) +PWD := $(shell pwd) help: @echo "Thanks for your interest in Dialog Flow Framework!" @@ -62,6 +65,20 @@ test: venv test_all: venv wait_db test lint .PHONY: test_all +build_drawio: + docker run -it --rm --name="drawio-convert" -v $(PWD)/docs/source/diagrams:/data rlespinasse/drawio-export -f png --on-changes --remove-page-suffix + for folder in docs/source/diagrams/*; do + foldername=`basename $${folder}` + for file in $${folder}/*; do + filename=`basename $${file}` + if [[ -d $${file} && $${filename} == "export" ]]; then + mkdir -p docs/source/_static/drawio/$${foldername} + cp -r $${file}/* docs/source/_static/drawio/$${foldername} + fi + done + done +.PHONY: build_drawio + doc: venv clean_docs python3 docs/source/utils/patching.py sphinx-apidoc -e -E -f -o docs/source/apiref dff From be318d514e66b6f022d4b83eb0154f5cb658ac67 Mon Sep 17 00:00:00 2001 From: pseusys Date: Mon, 28 Aug 2023 12:18:25 +0200 Subject: [PATCH 02/11] binary attribute for .drawio files added --- .gitattributes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 7707509be..fa671e04f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ * text=auto *.py text eol=lf *.sh text eol=lf -* text working-tree-encoding=UTF-8 \ No newline at end of file +*.drawio binary +* text working-tree-encoding=UTF-8 From 0fa824832f67f713f5b0e9381dbbd18dfa7710fc Mon Sep 17 00:00:00 2001 From: pseusys Date: Mon, 28 Aug 2023 12:19:51 +0200 Subject: [PATCH 03/11] clean target added --- makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 10544fd96..88be71f32 100644 --- a/makefile +++ b/makefile @@ -79,7 +79,7 @@ build_drawio: done .PHONY: build_drawio -doc: venv clean_docs +doc: venv clean_docs build_drawio python3 docs/source/utils/patching.py sphinx-apidoc -e -E -f -o docs/source/apiref dff sphinx-build -M clean docs/source docs/build @@ -108,6 +108,7 @@ clean_docs: rm -rf docs/tutorials rm -rf docs/source/apiref rm -rf docs/source/tutorials + rm -rf docs/source/_static/drawio .PHONY: clean_docs clean: clean_docs From ccafd92c23bef7095a76bb3a3603ea07f0423d77 Mon Sep 17 00:00:00 2001 From: pseusys Date: Wed, 6 Sep 2023 06:34:24 +0200 Subject: [PATCH 04/11] permissions issue fixed --- makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/makefile b/makefile index 88be71f32..4bc8a5037 100644 --- a/makefile +++ b/makefile @@ -67,6 +67,7 @@ test_all: venv wait_db test lint build_drawio: docker run -it --rm --name="drawio-convert" -v $(PWD)/docs/source/diagrams:/data rlespinasse/drawio-export -f png --on-changes --remove-page-suffix + docker run -it --rm --name="drawio-reperm" -v $(PWD)/docs/source/diagrams:/data --entrypoint chown rlespinasse/drawio-export -R "$(shell id -u):$(shell id -g)" /data for folder in docs/source/diagrams/*; do foldername=`basename $${folder}` for file in $${folder}/*; do @@ -109,6 +110,7 @@ clean_docs: rm -rf docs/source/apiref rm -rf docs/source/tutorials rm -rf docs/source/_static/drawio + rm -rf docs/source/diagrams/**/export .PHONY: clean_docs clean: clean_docs From 12eaaa4523ba77fee913c8d69f0522af9123633a Mon Sep 17 00:00:00 2001 From: pseusys Date: Fri, 8 Sep 2023 22:19:56 +0200 Subject: [PATCH 05/11] example diagram added --- dff/pipeline/pipeline/actor.py | 5 +++++ docs/source/diagrams/dfe/user_actor.drawio | 1 + 2 files changed, 6 insertions(+) create mode 100644 docs/source/diagrams/dfe/user_actor.drawio diff --git a/dff/pipeline/pipeline/actor.py b/dff/pipeline/pipeline/actor.py index ad2c7b015..70107b93f 100644 --- a/dff/pipeline/pipeline/actor.py +++ b/dff/pipeline/pipeline/actor.py @@ -16,6 +16,11 @@ Overall, the actor acts as a bridge between the user's input and the dialog graph, making sure that the conversation follows the expected flow and providing a personalized experience to the user. + +Below you can see a diagram of user request processing with Actor. +Both request and result are saved to :py:class:`.Context`. + +.. figure:: /_static/drawio/dfe/user_actor.png """ import logging from typing import Union, Callable, Optional, Dict, List, Any, ForwardRef diff --git a/docs/source/diagrams/dfe/user_actor.drawio b/docs/source/diagrams/dfe/user_actor.drawio new file mode 100644 index 000000000..c1fb88c29 --- /dev/null +++ b/docs/source/diagrams/dfe/user_actor.drawio @@ -0,0 +1 @@ +zVhNk6IwEP01XrZqtwhf4nUcZ/ayJw87c4zQAjWRuCEo7q/fIB0BwRFX0blQ6Zfv1/26U4ys6Sp/FXQd/eIBsJFpBPnIeh6ZpuNa6lsAuxIgrmOXSCjiALEKmMd/AUED0SwOIG0MlJwzGa+boM+TBHzZwKgQfNsctuSsueuahtAC5j5lbfR3HMioRG1iVfhPiMMId3Y87FhRPRYvkkY04NsaZM1G1lRwLsvWKp8CK7jTtJTzXk70Hs4lIJF9JozxGHKnrwaBuimaXMiIhzyhbFahT5FcMdVJVBPyWL6ptvHDQeu9sLD9nNeNnTYSKXZvdeO9WqEwq2l7S89LP0D6EW7sZ2IDARrLmLEpZ1zsb2AtPR98v5ghBf+AWs/Cc2ynWKtNEzKX8kz4yISJgUVFCNqRJVRwVJuG1L4CX4E6sRoggFEZb5rRQjHowsO4yjGqgb7p9hOeZUNZhouOTJepUz0tVCMsGlkKQoNquQPe9jBjSieFJ7dRLGG+pvsbb5VUm96l6boUzzLOC7KPiQ4oeMtOol3fg8Xy2GknWd+AkJB/yij2TsaoJMwc310blbStdEgIZpOopsEDeI0bJv8hl0aoNvg4KyTST0jkMiEdeRFI4MC4y4sTd2xRt69cdPKr68V9lF60s7+GpwZivINw7YT7M26dz1ALVdWKevRSbOVLfu905YAX2F20e+bCct0B0hUxbeeR+cobWgWkpoFKEb1UcKsy7XSogDxKBc55FQj4k0Eqe8W+4FkSHJxxJv4v5/fm4U4soxnu43FHuBtGO9z1g/iqpG+0CLx10r8g3Kt3blWRD6Xi/uXZbcvEfJRK3D4qSdc8UWl/aJn04Hd4mdhdVWEwmZhf6W10SibGZTK5VTXRpaOuk4e9qfRhPhPKN58nKu4GqCcNL9+Q7oueT+ZRPSEdQjE7hGLfQig93rQPYf+amnAN+44xHPvKrH577ftq/w6t2T8= \ No newline at end of file From 4065dad0153a0a0fc1e9697f8f9c6ada6a949ee1 Mon Sep 17 00:00:00 2001 From: pseusys Date: Wed, 13 Sep 2023 09:36:09 +0200 Subject: [PATCH 06/11] file check added --- makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/makefile b/makefile index bf7b1eadf..7b0441187 100644 --- a/makefile +++ b/makefile @@ -68,6 +68,7 @@ test_all: venv wait_db test lint build_drawio: docker run -it --rm --name="drawio-convert" -v $(PWD)/docs/source/diagrams:/data rlespinasse/drawio-export -f png --on-changes --remove-page-suffix docker run -it --rm --name="drawio-reperm" -v $(PWD)/docs/source/diagrams:/data --entrypoint chown rlespinasse/drawio-export -R "$(shell id -u):$(shell id -g)" /data + stat docs/source/_static/drawio/dfe/user_actor.png for folder in docs/source/diagrams/*; do foldername=`basename $${folder}` for file in $${folder}/*; do From a3a7e2f8d793f3b135e52974fcc67dd57043e158 Mon Sep 17 00:00:00 2001 From: pseusys Date: Wed, 13 Sep 2023 09:57:20 +0200 Subject: [PATCH 07/11] some more logging --- makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 7b0441187..242383cdd 100644 --- a/makefile +++ b/makefile @@ -68,7 +68,6 @@ test_all: venv wait_db test lint build_drawio: docker run -it --rm --name="drawio-convert" -v $(PWD)/docs/source/diagrams:/data rlespinasse/drawio-export -f png --on-changes --remove-page-suffix docker run -it --rm --name="drawio-reperm" -v $(PWD)/docs/source/diagrams:/data --entrypoint chown rlespinasse/drawio-export -R "$(shell id -u):$(shell id -g)" /data - stat docs/source/_static/drawio/dfe/user_actor.png for folder in docs/source/diagrams/*; do foldername=`basename $${folder}` for file in $${folder}/*; do @@ -76,9 +75,11 @@ build_drawio: if [[ -d $${file} && $${filename} == "export" ]]; then mkdir -p docs/source/_static/drawio/$${foldername} cp -r $${file}/* docs/source/_static/drawio/$${foldername} + echo "$${file}" fi done done + stat docs/source/_static/drawio/dfe/user_actor.png .PHONY: build_drawio doc: venv clean_docs build_drawio From 25b23ca656dfd21cb2acc9c4bcf77cc7d6fe2ba9 Mon Sep 17 00:00:00 2001 From: pseusys Date: Wed, 13 Sep 2023 10:10:09 +0200 Subject: [PATCH 08/11] tty reqs removed --- makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 242383cdd..26a4eadc2 100644 --- a/makefile +++ b/makefile @@ -66,8 +66,8 @@ test_all: venv wait_db test lint .PHONY: test_all build_drawio: - docker run -it --rm --name="drawio-convert" -v $(PWD)/docs/source/diagrams:/data rlespinasse/drawio-export -f png --on-changes --remove-page-suffix - docker run -it --rm --name="drawio-reperm" -v $(PWD)/docs/source/diagrams:/data --entrypoint chown rlespinasse/drawio-export -R "$(shell id -u):$(shell id -g)" /data + docker run --rm --name="drawio-convert" -v $(PWD)/docs/source/diagrams:/data rlespinasse/drawio-export -f png --on-changes --remove-page-suffix + docker run --rm --name="drawio-reperm" -v $(PWD)/docs/source/diagrams:/data --entrypoint chown rlespinasse/drawio-export -R "$(shell id -u):$(shell id -g)" /data for folder in docs/source/diagrams/*; do foldername=`basename $${folder}` for file in $${folder}/*; do @@ -75,11 +75,9 @@ build_drawio: if [[ -d $${file} && $${filename} == "export" ]]; then mkdir -p docs/source/_static/drawio/$${foldername} cp -r $${file}/* docs/source/_static/drawio/$${foldername} - echo "$${file}" fi done done - stat docs/source/_static/drawio/dfe/user_actor.png .PHONY: build_drawio doc: venv clean_docs build_drawio From a6d8a255f877d093477b415c0726445a00fb1ed8 Mon Sep 17 00:00:00 2001 From: pseusys Date: Sun, 24 Sep 2023 21:15:54 +0200 Subject: [PATCH 09/11] review finished --- dff/pipeline/pipeline/actor.py | 2 +- docs/source/diagrams/dff/addons.drawio | 1 - docs/source/diagrams/dff/framework.drawio | 1 - docs/source/diagrams/dff/infrastructure.drawio | 1 - docs/source/diagrams/dialog_graph/dialog.drawio | 1 - makefile | 2 +- 6 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 docs/source/diagrams/dff/addons.drawio delete mode 100644 docs/source/diagrams/dff/framework.drawio delete mode 100644 docs/source/diagrams/dff/infrastructure.drawio delete mode 100644 docs/source/diagrams/dialog_graph/dialog.drawio diff --git a/dff/pipeline/pipeline/actor.py b/dff/pipeline/pipeline/actor.py index 70107b93f..1bd5878b0 100644 --- a/dff/pipeline/pipeline/actor.py +++ b/dff/pipeline/pipeline/actor.py @@ -18,7 +18,7 @@ making sure that the conversation follows the expected flow and providing a personalized experience to the user. Below you can see a diagram of user request processing with Actor. -Both request and result are saved to :py:class:`.Context`. +Both `request` and `response` are saved to :py:class:`.Context`. .. figure:: /_static/drawio/dfe/user_actor.png """ diff --git a/docs/source/diagrams/dff/addons.drawio b/docs/source/diagrams/dff/addons.drawio deleted file mode 100644 index 403bf3778..000000000 --- a/docs/source/diagrams/dff/addons.drawio +++ /dev/null @@ -1 +0,0 @@ -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 diff --git a/docs/source/diagrams/dff/framework.drawio b/docs/source/diagrams/dff/framework.drawio deleted file mode 100644 index 46e022fc6..000000000 --- a/docs/source/diagrams/dff/framework.drawio +++ /dev/null @@ -1 +0,0 @@ -7VnZjts2FP0aA+1DAi2WLD/Omg6aoEENpM0jLV3JxFCkSlFe8vW9lKjNkmMPKjfTNA/jIS/3cw55eamZe5fu30mSbT6ICNjMsaL9zL2fOY7tBkv8py2HyjIPgsqQSBqZSq1hRb+AMVrGWtAI8l5FJQRTNOsbQ8E5hKpnI1KKXb9aLFh/1IwkMDCsQsKG1j9opDZmFbbb2n8BmmzMyF5gClJS1zULyTckEruOyX2YuXdSCFWl0v0dMI1dDUvV7vFEaTMvCVxd1GBetdgSVpi1zRyfYdvbPCMc04lO31PCRFLSgXxq4iCnCYeoBB5/gJM1goMLCjEpqXgTSboFXnGwBZkTRQUneuybJ91gn4GkwEOox8NJdoc0+KhDjbkUBY9Az9vC4t2GKlhlJNSlO5wV2jYqZZizMRlTxu4EE7Js60YEgjjUi1JSPEOnxA8DWMe65BlUuDHNhzAaZHElCvYdk4H1HYgUlDxgFVPqzw3FRuJ+YPK7VjB2bdt0xGLX2iBGpEnTd0skJgyXJ3j1RnidEFCwIw8WY4Au/YVL/CsAeoSn6w/x9PwxPN1gAjz96+IZByGEowJdB97cs66Pp2cvL8SzOUj/CZ6L6+KJ6gyi+RiegbN2/X9Bn2P7/QSeU+z34DyeEKEPM1kuOPQBxIXLw58a7Ldenf3cLbvfGyaq3MHkLoMxF4UMzTzq9SoiEzDV6unqOX4VbAkMPcm274fHkDNNPwqKU2lJ8o9Yspb9LqpJmVZH+DfTuIyS5UsZ2FPVIQBzn2vEMd3CrzOHLhffjjV3atYu1Xs9m47emzvKI8MblWM98IQixKdPFfv8qTL1GeG4ffkt7JFLwdgh4U9wRjSsfieCdF6VIJ2zgryJIsHz1yVIuz6l6lvAfPnWG0rSW15Jku5Z1B4lSWEn5PPrAu54J7vL4fXpejv5XNRmhYzk1QD+X4UOJm9xXarNYRVGeNKroaO1tryOwqpu17IJBUVKqB5ilUFIYxpi8j12VeiQ2bF+qltA2rRYve/EeK39Z01nkWVCquEw+J+kmkO+zvW/GO9vjrUuKIso1/KIGZ47/ZgzP9/NpcFmiVZfQL2LpDksu7dOYyIMA2PM4pwUoP1Wa4qGhN2YgpRGkR5mVLH9O6/AQqq0wq4TAdhH3sga8UaLEQ0HU2h4GKE+7BXwCFm0TvlynBlO7ASnJ6X/6Yke6Mu1b+f64ki4fuRwZVShrTR+2UFtBC8N4TPqPv8hq66sjo5Gzx31KVcT1jBUX4lY7XBJWlmwBSayFMqo4Fc6cvRUGrPWlOujRsuxOnwiGscgq4bhhqi1KFMk1/wbnayhFE0mSYjswNDb/z8U4Bw5x2DEOV6N/7GnhYrjWJTktXTUW14XvMnLZ+YbrODMs/3wPHgEogrZ2+xVh696s09Ap3/kJ5zF0E80EVnvacOags/h08Y9UURvPcEYhPpdeaZHN16h+tVbvapFOGGHnOo9KmL8KXIorxKwIVsqZD7a9rdM0ZR+Iabzd+bZ+2EPYVHZpnys+gav097RGe1c6Pq9KRhdDhi9KcrPCDXOdxgoKVmc5vZ3CEWKh3h0zNDZlh/wMmql+ovUOPNPuOUSWXdrfEHf/eeNO/m+RDC3nMtimGCCF/X6ktARwUcptuV3PewZ/2TBcRNC439zhT4W74XlRdA44K+F0/9JDsY+a4xyMHcm4MAecPBjI74CEXgjDnb0NF68/DTGbPt5uXrWbr/Ruw9/Aw== diff --git a/docs/source/diagrams/dff/infrastructure.drawio b/docs/source/diagrams/dff/infrastructure.drawio deleted file mode 100644 index 9b4cd4112..000000000 --- a/docs/source/diagrams/dff/infrastructure.drawio +++ /dev/null @@ -1 +0,0 @@ -7Vpfc6MqHP00eeyOiqh5bJN27525O7MzfdjtI1GizBrJIPnT/fQLEVTENmkSk71tnyI/AeGc8zuAZgQmi+1XhpbZN5rgfOQ5yXYEpiPPcyPHEz8y8lxF/CiqAikjiarUBB7Jb6yCjoquSIJLoyKnNOdkaQZjWhQ45kYMMUY3ZrU5zc2nLlGKrcBjjHI7+oMkPFOzcEET/weTNFNPhpG6sUC6rppImaGEblohcD8CE0Ypr64W2wnOJXYalqrdwwt363ExXPBDGgBFRMmf9dxwIqaqipTxjKa0QPl9E70rf2Eey3m4opDxRa4u8Zbwn63rJ3HtfIGqNJXsO7rwrAsFZ88/24VWK1lsmu1Kul28YmucqIeVHDF+K3kVgThHZUliHX4guR6fDY7Cq6QrFmtqQ6UnxFKsqgFVT0LTaqgg/YrpAouxiQoM54iTtakSpMSW1vVUUzFi9NyqsKSk4GWr5+8yICqovPHHSjU6a0KDXHFR9ahLraE1oZ0AXhCDUuka5Ss1hQktON7KMfw77VXKf2gmctuQAcpJWkgiBMyYicAaM05E8tyqGwuSJDshMVyS32i260+SqgAQncO7EZz2UqYVKzvF21FPtqsOjYwyWFKtbpwvjh96BqQ3qvg2Ii2mOg3ofF4KLZlcvZUd6B+Rqj3Z6RyTne5fnJ1+eO7sNFh6jZLwCEoMbPr4qTl5at3p5+dAaBuTbZh7Mojrp/FoSmA0iGFaeQbcwEjfwHfMLqpBqVYnpZ+eZsscpwTlNBWxh1wQ4DmPmK2JgKWrCUZXRVJTvskIx49LtMNvI/ZHpgyMxbXrnJwuX6PF8sQXvc9zzKUEqKXE2TTbmXrZy1pbmbrhKXmjO25jiYRvo/J/AR4MOuD5NniuXqvb4LnwHOANYTqX2LId5CYg6tl+ja9l8Ho0LaGOvCAX47qbiYtUXsiNURUSvdXR03Q8F949oTllu7YAuwnE4c7YGf2FW3fGQQhQ0FX+OTQedTQe2Rr3YZ8/nAH18X7U643pwNAL4KPE74M+8mYgGAL6AMK90AcDQa+d7H2ai6/fFbR3j961zMW3V8EPai6+ezlz0Xx/msuL0A9mLuBdm4vfYy7waubif5qLRuKC5gI/zWUP9IOZS7Af+hmV7w5kl+JZMRd4HEKCeA5Zlng/AahcVh8b5mQrSfsLGKl9QDPiAJuR0GZEx05ixH5jclsUlCMBfHma1C9zzr9xuwf9sY1e71uS+vR/En724RNp/AaHryPdeRTjOO6T7iyCPnx1kXwL4H7Huz0b8HEP3uAccNunziUtpWFcDfUDVs9zoA66n5UuB7p+IfaRNA5NuGGPJQ8Gt33k/CAa7xgL9C8Iun3ifOca95zQdJSeN1iDoW1/xP4YEgfXtHH73PMNlyUuUizQdibVh/kryH2Og365J+F45pxL7uHYNBfvMLl3P1Yehbx97JnevX/IgeeZYu95jTUY5Pa+XIpd/mVM4J4Jm5H/dhsY9QSVWd2dLHxHnGNW7CKe458H5u4BKIA2zK6G/kRTEcXmf2/VB/rmz4Pg/g8= diff --git a/docs/source/diagrams/dialog_graph/dialog.drawio b/docs/source/diagrams/dialog_graph/dialog.drawio deleted file mode 100644 index b3b2c120a..000000000 --- a/docs/source/diagrams/dialog_graph/dialog.drawio +++ /dev/null @@ -1 +0,0 @@ -5ZpNb6MwEIZ/TY4bGYwJObZJ272stFIP2z1VDhiwSnBknK/99WuCHSBm81ERyia5xDOMwZ6ZB0evMoCT+eaF40X8gwUkGdgg2AzgdGDbFvTG8iv3bAuP43mFI+I0UEGl45X+IcoJlHdJA5LVAgVjiaCLutNnaUp8UfNhztm6HhaypP7UBY6I4Xj1cWJ6f9FAxGoXFiz93wmNYvVk5KkLc6xj1UayGAdsXXHBpwGccMZEMZpvJiTJc6fTUsx7/sfV/bo4ScU5E6AqRCa2em8kkFtVJuMiZhFLcfJUeh/9JV+R/AaWNGIxT9SQbKh4q4x/yzEYImVN8+oDbWy1kQq+fasalVm5WU7bWXpeyFIxYQnju0VDsPvsooKHvMDS7Sc4y6hfOJ9popeZCc4+yMFk182vfBDhxyrMTKXKbsaW3FfJclQdBeYR0dVWvjyRlYmqAC+EzYnciQzgJMGCruo9hVVrRvu4snxyoCrYXE29mhVOluquU4oTFknfUgjCcepLbA4rztkyDfYFXcdUkNcF3m1xLfmtF3lFuKCShIeERqn0CZYHhDK9lYwGiHiB05Rrz57BC3KdP41sjmZRX1V7V28Ua6TsdcmnDZQvrrBpeaCFxFtGUr8II+syjD7R8bbZ8Y7TdsfvpkqQ8bYSsGA0FVnlzj9zR9kC+/qqHtA98XxuvAMOil6soGyB/VbO6wrbwFEmV9JDFzgV70BT+Q6M7rkIyUP4MPFCvwk+1/fILLwCfMiWnVZLJTDxs2xk4me3QR+8An3gM/RdeIh9gj6ngT63F/TBozCdDB+1zJ5zlD3rltmDXbKH7ufkcxvY83rBnnGSjS47+SBomT73zJPP/N3039Pndknf6H5OPq+BvnEv6INHYToZDltmzzvz5LtB9sZdsjc28jwcDm8up9DuMKdaOmkSMCRDRGF4e+oFtJxa1ruVL9D9yBeoQb5A/ZAvEKj3wCn5wohvWb7QqarAWDD4Lr7Zrb7nwpC4fuN7LhiNZ+D8Sl8AHHK/UrJA9yNZoAbJAvVEsoBHCTod37JogUzRYk9cu7/WQs8nzcTNPOSgjojrUqhA9yNUoAahAvVDqDDOrBNCxWF820IFMoUKTdwNnnBdShPofqQJ1CBNoJ5IE/AoP6fjWxYnkClOlLw93uIZ16Ukga4vSfTiRXZNTUKa5d9vig4v/8MEn/4C diff --git a/makefile b/makefile index 26a4eadc2..cfcffb2a1 100644 --- a/makefile +++ b/makefile @@ -67,7 +67,7 @@ test_all: venv wait_db test lint build_drawio: docker run --rm --name="drawio-convert" -v $(PWD)/docs/source/diagrams:/data rlespinasse/drawio-export -f png --on-changes --remove-page-suffix - docker run --rm --name="drawio-reperm" -v $(PWD)/docs/source/diagrams:/data --entrypoint chown rlespinasse/drawio-export -R "$(shell id -u):$(shell id -g)" /data + docker run --rm --name="drawio-chown" -v $(PWD)/docs/source/diagrams:/data --entrypoint chown rlespinasse/drawio-export -R "$(shell id -u):$(shell id -g)" /data for folder in docs/source/diagrams/*; do foldername=`basename $${folder}` for file in $${folder}/*; do From 3f9f1856a6a3c6629b16ac1c0a3dfa1c50bd85d9 Mon Sep 17 00:00:00 2001 From: pseusys Date: Fri, 29 Sep 2023 11:01:14 +0200 Subject: [PATCH 10/11] first review --- .gitignore | 2 +- docs/source/{diagrams => drawio_src}/dfe/user_actor.drawio | 0 makefile | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename docs/source/{diagrams => drawio_src}/dfe/user_actor.drawio (100%) diff --git a/.gitignore b/.gitignore index 9cb91d044..a756ea856 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ docs/source/apiref docs/source/release_notes.rst docs/source/tutorials docs/source/_static/drawio -docs/source/diagrams/*/export +docs/source/diagrams/**/export *__pycache__* *.idea/* .idea/* diff --git a/docs/source/diagrams/dfe/user_actor.drawio b/docs/source/drawio_src/dfe/user_actor.drawio similarity index 100% rename from docs/source/diagrams/dfe/user_actor.drawio rename to docs/source/drawio_src/dfe/user_actor.drawio diff --git a/makefile b/makefile index cfcffb2a1..7096b1492 100644 --- a/makefile +++ b/makefile @@ -66,9 +66,9 @@ test_all: venv wait_db test lint .PHONY: test_all build_drawio: - docker run --rm --name="drawio-convert" -v $(PWD)/docs/source/diagrams:/data rlespinasse/drawio-export -f png --on-changes --remove-page-suffix - docker run --rm --name="drawio-chown" -v $(PWD)/docs/source/diagrams:/data --entrypoint chown rlespinasse/drawio-export -R "$(shell id -u):$(shell id -g)" /data - for folder in docs/source/diagrams/*; do + docker run --rm --name="drawio-convert" -v $(PWD)/docs/source/drawio_src:/data rlespinasse/drawio-export -f png --on-changes --remove-page-suffix + docker run --rm --name="drawio-chown" -v $(PWD)/docs/source/drawio_src:/data --entrypoint chown rlespinasse/drawio-export -R "$(shell id -u):$(shell id -g)" /data + for folder in docs/source/drawio_src/*; do foldername=`basename $${folder}` for file in $${folder}/*; do filename=`basename $${file}` From 71213e80c32d71c26c31c5556c6ee5843489ee53 Mon Sep 17 00:00:00 2001 From: pseusys Date: Fri, 29 Sep 2023 11:02:48 +0200 Subject: [PATCH 11/11] star fix --- .dockerignore | 2 ++ .gitignore | 2 +- makefile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index d8583d620..a0f41b0cd 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,6 +7,8 @@ docs/source/apiref docs/source/_misc docs/source/release_notes.rst docs/source/tutorials +docs/source/_static/drawio +docs/source/drawio_src/**/export *__pycache__* *.idea/* .idea/* diff --git a/.gitignore b/.gitignore index 003754257..a0f41b0cd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ docs/source/_misc docs/source/release_notes.rst docs/source/tutorials docs/source/_static/drawio -docs/source/diagrams/**/export +docs/source/drawio_src/**/export *__pycache__* *.idea/* .idea/* diff --git a/makefile b/makefile index 039dccda0..c243685dd 100644 --- a/makefile +++ b/makefile @@ -111,7 +111,7 @@ clean_docs: rm -rf docs/source/_misc rm -rf docs/source/tutorials rm -rf docs/source/_static/drawio - rm -rf docs/source/diagrams/**/export + rm -rf docs/source/drawio_src/**/export .PHONY: clean_docs clean: clean_docs