diff --git a/docs/examples/dynamics/broker.py b/docs/examples/dynamics/broker.py new file mode 100644 index 0000000..261b1ca --- /dev/null +++ b/docs/examples/dynamics/broker.py @@ -0,0 +1,24 @@ +import asyncio + +from taskiq_redis import ListQueueBroker + + +async def main() -> None: + # Here we define a broker. + dyn_broker = ListQueueBroker("redis://localhost") + await dyn_broker.startup() + + # Now we register lambda as a task. + dyn_task = dyn_broker.register_task( + lambda x: print("A", x), + task_name="dyn_task", + ) + + # now we can send it. + await dyn_task.kiq(x=1) + + await dyn_broker.shutdown() + + +if __name__ == "__main__": + asyncio.run(main()) diff --git a/docs/examples/dynamics/receiver.py b/docs/examples/dynamics/receiver.py new file mode 100644 index 0000000..b55c61b --- /dev/null +++ b/docs/examples/dynamics/receiver.py @@ -0,0 +1,35 @@ +import asyncio + +from taskiq_redis import ListQueueBroker + +from taskiq.api import run_receiver_task + + +async def main() -> None: + # Here we define a broker. + dyn_broker = ListQueueBroker("redis://localhost") + await dyn_broker.startup() + worker_task = asyncio.create_task(run_receiver_task(dyn_broker)) + + # Now we register lambda as a task. + dyn_task = dyn_broker.register_task( + lambda x: print("A", x), + task_name="dyn_task", + ) + + # now we can send it. + await dyn_task.kiq(x=1) + + await asyncio.sleep(2) + + worker_task.cancel() + try: + await worker_task + except asyncio.CancelledError: + print("Worker successfully exited.") + + await dyn_broker.shutdown() + + +if __name__ == "__main__": + asyncio.run(main()) diff --git a/docs/examples/dynamics/scheduler.py b/docs/examples/dynamics/scheduler.py new file mode 100644 index 0000000..9a88709 --- /dev/null +++ b/docs/examples/dynamics/scheduler.py @@ -0,0 +1,60 @@ +import asyncio +import datetime + +from taskiq_redis import ListQueueBroker + +from taskiq import TaskiqScheduler +from taskiq.api import run_receiver_task, run_scheduler_task +from taskiq.schedule_sources import LabelScheduleSource + + +async def main() -> None: + # Here we define a broker. + dyn_broker = ListQueueBroker("redis://localhost") + dyn_scheduler = TaskiqScheduler(dyn_broker, [LabelScheduleSource(dyn_broker)]) + + await dyn_broker.startup() + + # Now we register lambda as a task. + dyn_task = dyn_broker.register_task( + lambda x: print("A", x), + task_name="dyn_task", + # We add a schedule when to run task. + schedule=[ + { + # Here we also can specify cron instead of time. + "time": datetime.datetime.utcnow() + datetime.timedelta(seconds=2), + "args": [22], + }, + ], + ) + + # We create scheduler after the task declaration, + # so we don't have to wait a minute before it gets to the task. + # However, defining a scheduler before the task declaration is also possible. + # but we have to wait till it gets to task execution for the second time. + worker_task = asyncio.create_task(run_receiver_task(dyn_broker)) + scheduler_task = asyncio.create_task(run_scheduler_task(dyn_scheduler)) + + # We still able to send the task. + await dyn_task.kiq(x=1) + + await asyncio.sleep(10) + + worker_task.cancel() + try: + await worker_task + except asyncio.CancelledError: + print("Worker successfully exited.") + + scheduler_task.cancel() + try: + await scheduler_task + except asyncio.CancelledError: + print("Scheduler successfully exited.") + + await dyn_broker.shutdown() + + +if __name__ == "__main__": + asyncio.run(main()) diff --git a/docs/guide/dynamic-brokers.md b/docs/guide/dynamic-brokers.md new file mode 100644 index 0000000..0899798 --- /dev/null +++ b/docs/guide/dynamic-brokers.md @@ -0,0 +1,37 @@ +--- +title: Dynamic Environments +order: 9 +--- + +This article is for all the people who want to dynamically create brokers, register tasks, and run them inside their code. Or maybe implement more complex logic. + +The Taskiq allows you to create broker instances in all parts of your application. You +can register tasks dynamically and run them. But when tasks are created dynamically, +the `taskiq worker` command won't be able to find them. + +To define tasks and assign them to broker, use `register_task` method. + +@[code python](../examples/dynamics/broker.py) + +The problem with this code is that if we run the `taskiq worker` command, it won't be able +to execute our tasks. Because lambdas are created within the `main` function and they +are not visible outside of it. + +To surpass this issue, we need to create a dynamic worker task within the current loop. +Or, we can create a code that can listen to our brokers and have all information about dynamic +functions. + +Here I won't be showing how to create your own CLI command, but I'll show you how to create +a dynamic worker within the current loop. + +@[code python](../examples/dynamics/receiver.py) + +Here we define a dynamic lambda task with some name, assign it to broker, as we did before. +The only difference is that we start our receiver coroutine, that will listen to the new +messages and execute them. Receiver task will be executed in the current loop, and when main function +exits, the receriver task is canceled. But for illustration purpose, I canceled it manually. + +Sometimes you need to run not only receiver, but a scheduler as well. You can do it, by using +another function that also can work within the current loop. + +@[code python](../examples/dynamics/scheduler.py) diff --git a/docs/guide/testing-taskiq.md b/docs/guide/testing-taskiq.md index 1105f98..4dbf42e 100644 --- a/docs/guide/testing-taskiq.md +++ b/docs/guide/testing-taskiq.md @@ -1,5 +1,5 @@ --- -order: 9 +order: 10 --- # Testing with taskiq diff --git a/poetry.lock b/poetry.lock index 2f69c72..c55b985 100644 --- a/poetry.lock +++ b/poetry.lock @@ -16,24 +16,24 @@ typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.9\""} [[package]] name = "anyio" -version = "3.7.1" +version = "4.0.0" description = "High level compatibility layer for multiple asynchronous event loop implementations" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "anyio-3.7.1-py3-none-any.whl", hash = "sha256:91dee416e570e92c64041bd18b900d1d6fa78dff7048769ce5ac5ddad004fbb5"}, - {file = "anyio-3.7.1.tar.gz", hash = "sha256:44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780"}, + {file = "anyio-4.0.0-py3-none-any.whl", hash = "sha256:cfdb2b588b9fc25ede96d8db56ed50848b0b649dca3dd1df0b11f683bb9e0b5f"}, + {file = "anyio-4.0.0.tar.gz", hash = "sha256:f7ed51751b2c2add651e5747c891b47e26d2a21be5d32d9311dfe9692f3e5d7a"}, ] [package.dependencies] -exceptiongroup = {version = "*", markers = "python_version < \"3.11\""} +exceptiongroup = {version = ">=1.0.2", markers = "python_version < \"3.11\""} idna = ">=2.8" sniffio = ">=1.1" [package.extras] -doc = ["Sphinx", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme (>=1.2.2)", "sphinxcontrib-jquery"] -test = ["anyio[trio]", "coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "mock (>=4)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] -trio = ["trio (<0.22)"] +doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)"] +test = ["anyio[trio]", "coverage[toml] (>=7)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] +trio = ["trio (>=0.22)"] [[package]] name = "astor" @@ -499,13 +499,13 @@ flake8 = ">5" [[package]] name = "flake8-bugbear" -version = "23.7.10" +version = "23.9.16" description = "A plugin for flake8 finding likely bugs and design problems in your program. Contains warnings that don't belong in pyflakes and pycodestyle." optional = false python-versions = ">=3.8.1" files = [ - {file = "flake8-bugbear-23.7.10.tar.gz", hash = "sha256:0ebdc7d8ec1ca8bd49347694562381f099f4de2f8ec6bda7a7dca65555d9e0d4"}, - {file = "flake8_bugbear-23.7.10-py3-none-any.whl", hash = "sha256:d99d005114020fbef47ed5e4aebafd22f167f9a0fbd0d8bf3c9e90612cb25c34"}, + {file = "flake8-bugbear-23.9.16.tar.gz", hash = "sha256:90cf04b19ca02a682feb5aac67cae8de742af70538590509941ab10ae8351f71"}, + {file = "flake8_bugbear-23.9.16-py3-none-any.whl", hash = "sha256:b182cf96ea8f7a8595b2f87321d7d9b28728f4d9c3318012d896543d19742cb5"}, ] [package.dependencies] @@ -591,13 +591,12 @@ flake8 = ">5" [[package]] name = "flake8-isort" -version = "6.0.0" +version = "6.1.0" description = "flake8 plugin that integrates isort ." optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "flake8-isort-6.0.0.tar.gz", hash = "sha256:537f453a660d7e903f602ecfa36136b140de279df58d02eb1b6a0c84e83c528c"}, - {file = "flake8_isort-6.0.0-py3-none-any.whl", hash = "sha256:aa0cac02a62c7739e370ce6b9c31743edac904bae4b157274511fc8a19c75bbc"}, + {file = "flake8-isort-6.1.0.tar.gz", hash = "sha256:d4639343bac540194c59fb1618ac2c285b3e27609f353bef6f50904d40c1643e"}, ] [package.dependencies] @@ -693,20 +692,20 @@ files = [ [[package]] name = "gitpython" -version = "3.1.36" +version = "3.1.37" description = "GitPython is a Python library used to interact with Git repositories" optional = false python-versions = ">=3.7" files = [ - {file = "GitPython-3.1.36-py3-none-any.whl", hash = "sha256:8d22b5cfefd17c79914226982bb7851d6ade47545b1735a9d010a2a4c26d8388"}, - {file = "GitPython-3.1.36.tar.gz", hash = "sha256:4bb0c2a6995e85064140d31a33289aa5dce80133a23d36fcd372d716c54d3ebf"}, + {file = "GitPython-3.1.37-py3-none-any.whl", hash = "sha256:5f4c4187de49616d710a77e98ddf17b4782060a1788df441846bddefbb89ab33"}, + {file = "GitPython-3.1.37.tar.gz", hash = "sha256:f9b9ddc0761c125d5780eab2d64be4873fc6817c2899cbcb34b02344bdc7bc54"}, ] [package.dependencies] gitdb = ">=4.0.1,<5" [package.extras] -test = ["black", "coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mypy", "pre-commit", "pytest", "pytest-cov", "pytest-sugar", "virtualenv"] +test = ["black", "coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mypy", "pre-commit", "pytest", "pytest-cov", "pytest-sugar"] [[package]] name = "graphlib-backport" @@ -721,13 +720,13 @@ files = [ [[package]] name = "identify" -version = "2.5.28" +version = "2.5.29" description = "File identification library for Python" optional = false python-versions = ">=3.8" files = [ - {file = "identify-2.5.28-py2.py3-none-any.whl", hash = "sha256:87816de144bf46d161bd5b3e8f5596b16cade3b80be537087334b26bc5c177f3"}, - {file = "identify-2.5.28.tar.gz", hash = "sha256:94bb59643083ebd60dc996d043497479ee554381fbc5307763915cda49b0e78f"}, + {file = "identify-2.5.29-py2.py3-none-any.whl", hash = "sha256:24437fbf6f4d3fe6efd0eb9d67e24dd9106db99af5ceb27996a5f7895f24bf1b"}, + {file = "identify-2.5.29.tar.gz", hash = "sha256:d43d52b86b15918c137e3a74fff5224f60385cd0e9c38e99d07c257f02f151a5"}, ] [package.extras] @@ -1104,18 +1103,18 @@ files = [ [[package]] name = "pydantic" -version = "2.3.0" +version = "2.4.0" description = "Data validation using Python type hints" optional = false python-versions = ">=3.7" files = [ - {file = "pydantic-2.3.0-py3-none-any.whl", hash = "sha256:45b5e446c6dfaad9444819a293b921a40e1db1aa61ea08aede0522529ce90e81"}, - {file = "pydantic-2.3.0.tar.gz", hash = "sha256:1607cc106602284cd4a00882986570472f193fde9cb1259bceeaedb26aa79a6d"}, + {file = "pydantic-2.4.0-py3-none-any.whl", hash = "sha256:909b2b7d7be775a890631218e8c4b6b5418c9b6c57074ae153e5c09b73bf06a3"}, + {file = "pydantic-2.4.0.tar.gz", hash = "sha256:54216ccb537a606579f53d7f6ed912e98fffce35aff93b25cd80b1c2ca806fc3"}, ] [package.dependencies] annotated-types = ">=0.4.0" -pydantic-core = "2.6.3" +pydantic-core = "2.10.0" typing-extensions = ">=4.6.1" [package.extras] @@ -1123,117 +1122,117 @@ email = ["email-validator (>=2.0.0)"] [[package]] name = "pydantic-core" -version = "2.6.3" +version = "2.10.0" description = "" optional = false python-versions = ">=3.7" files = [ - {file = "pydantic_core-2.6.3-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:1a0ddaa723c48af27d19f27f1c73bdc615c73686d763388c8683fe34ae777bad"}, - {file = "pydantic_core-2.6.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5cfde4fab34dd1e3a3f7f3db38182ab6c95e4ea91cf322242ee0be5c2f7e3d2f"}, - {file = "pydantic_core-2.6.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5493a7027bfc6b108e17c3383959485087d5942e87eb62bbac69829eae9bc1f7"}, - {file = "pydantic_core-2.6.3-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:84e87c16f582f5c753b7f39a71bd6647255512191be2d2dbf49458c4ef024588"}, - {file = "pydantic_core-2.6.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:522a9c4a4d1924facce7270c84b5134c5cabcb01513213662a2e89cf28c1d309"}, - {file = "pydantic_core-2.6.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:aaafc776e5edc72b3cad1ccedb5fd869cc5c9a591f1213aa9eba31a781be9ac1"}, - {file = "pydantic_core-2.6.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a750a83b2728299ca12e003d73d1264ad0440f60f4fc9cee54acc489249b728"}, - {file = "pydantic_core-2.6.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9e8b374ef41ad5c461efb7a140ce4730661aadf85958b5c6a3e9cf4e040ff4bb"}, - {file = "pydantic_core-2.6.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b594b64e8568cf09ee5c9501ede37066b9fc41d83d58f55b9952e32141256acd"}, - {file = "pydantic_core-2.6.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2a20c533cb80466c1d42a43a4521669ccad7cf2967830ac62c2c2f9cece63e7e"}, - {file = "pydantic_core-2.6.3-cp310-none-win32.whl", hash = "sha256:04fe5c0a43dec39aedba0ec9579001061d4653a9b53a1366b113aca4a3c05ca7"}, - {file = "pydantic_core-2.6.3-cp310-none-win_amd64.whl", hash = "sha256:6bf7d610ac8f0065a286002a23bcce241ea8248c71988bda538edcc90e0c39ad"}, - {file = "pydantic_core-2.6.3-cp311-cp311-macosx_10_7_x86_64.whl", hash = "sha256:6bcc1ad776fffe25ea5c187a028991c031a00ff92d012ca1cc4714087e575973"}, - {file = "pydantic_core-2.6.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:df14f6332834444b4a37685810216cc8fe1fe91f447332cd56294c984ecbff1c"}, - {file = "pydantic_core-2.6.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0b7486d85293f7f0bbc39b34e1d8aa26210b450bbd3d245ec3d732864009819"}, - {file = "pydantic_core-2.6.3-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a892b5b1871b301ce20d40b037ffbe33d1407a39639c2b05356acfef5536d26a"}, - {file = "pydantic_core-2.6.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:883daa467865e5766931e07eb20f3e8152324f0adf52658f4d302242c12e2c32"}, - {file = "pydantic_core-2.6.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d4eb77df2964b64ba190eee00b2312a1fd7a862af8918ec70fc2d6308f76ac64"}, - {file = "pydantic_core-2.6.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1ce8c84051fa292a5dc54018a40e2a1926fd17980a9422c973e3ebea017aa8da"}, - {file = "pydantic_core-2.6.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:22134a4453bd59b7d1e895c455fe277af9d9d9fbbcb9dc3f4a97b8693e7e2c9b"}, - {file = "pydantic_core-2.6.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:02e1c385095efbd997311d85c6021d32369675c09bcbfff3b69d84e59dc103f6"}, - {file = "pydantic_core-2.6.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d79f1f2f7ebdb9b741296b69049ff44aedd95976bfee38eb4848820628a99b50"}, - {file = "pydantic_core-2.6.3-cp311-none-win32.whl", hash = "sha256:430ddd965ffd068dd70ef4e4d74f2c489c3a313adc28e829dd7262cc0d2dd1e8"}, - {file = "pydantic_core-2.6.3-cp311-none-win_amd64.whl", hash = "sha256:84f8bb34fe76c68c9d96b77c60cef093f5e660ef8e43a6cbfcd991017d375950"}, - {file = "pydantic_core-2.6.3-cp311-none-win_arm64.whl", hash = "sha256:5a2a3c9ef904dcdadb550eedf3291ec3f229431b0084666e2c2aa8ff99a103a2"}, - {file = "pydantic_core-2.6.3-cp312-cp312-macosx_10_7_x86_64.whl", hash = "sha256:8421cf496e746cf8d6b677502ed9a0d1e4e956586cd8b221e1312e0841c002d5"}, - {file = "pydantic_core-2.6.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:bb128c30cf1df0ab78166ded1ecf876620fb9aac84d2413e8ea1594b588c735d"}, - {file = "pydantic_core-2.6.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37a822f630712817b6ecc09ccc378192ef5ff12e2c9bae97eb5968a6cdf3b862"}, - {file = "pydantic_core-2.6.3-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:240a015102a0c0cc8114f1cba6444499a8a4d0333e178bc504a5c2196defd456"}, - {file = "pydantic_core-2.6.3-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f90e5e3afb11268628c89f378f7a1ea3f2fe502a28af4192e30a6cdea1e7d5e"}, - {file = "pydantic_core-2.6.3-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:340e96c08de1069f3d022a85c2a8c63529fd88709468373b418f4cf2c949fb0e"}, - {file = "pydantic_core-2.6.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1480fa4682e8202b560dcdc9eeec1005f62a15742b813c88cdc01d44e85308e5"}, - {file = "pydantic_core-2.6.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f14546403c2a1d11a130b537dda28f07eb6c1805a43dae4617448074fd49c282"}, - {file = "pydantic_core-2.6.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:a87c54e72aa2ef30189dc74427421e074ab4561cf2bf314589f6af5b37f45e6d"}, - {file = "pydantic_core-2.6.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:f93255b3e4d64785554e544c1c76cd32f4a354fa79e2eeca5d16ac2e7fdd57aa"}, - {file = "pydantic_core-2.6.3-cp312-none-win32.whl", hash = "sha256:f70dc00a91311a1aea124e5f64569ea44c011b58433981313202c46bccbec0e1"}, - {file = "pydantic_core-2.6.3-cp312-none-win_amd64.whl", hash = "sha256:23470a23614c701b37252618e7851e595060a96a23016f9a084f3f92f5ed5881"}, - {file = "pydantic_core-2.6.3-cp312-none-win_arm64.whl", hash = "sha256:1ac1750df1b4339b543531ce793b8fd5c16660a95d13aecaab26b44ce11775e9"}, - {file = "pydantic_core-2.6.3-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:a53e3195f134bde03620d87a7e2b2f2046e0e5a8195e66d0f244d6d5b2f6d31b"}, - {file = "pydantic_core-2.6.3-cp37-cp37m-macosx_11_0_arm64.whl", hash = "sha256:f2969e8f72c6236c51f91fbb79c33821d12a811e2a94b7aa59c65f8dbdfad34a"}, - {file = "pydantic_core-2.6.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:672174480a85386dd2e681cadd7d951471ad0bb028ed744c895f11f9d51b9ebe"}, - {file = "pydantic_core-2.6.3-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:002d0ea50e17ed982c2d65b480bd975fc41086a5a2f9c924ef8fc54419d1dea3"}, - {file = "pydantic_core-2.6.3-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3ccc13afee44b9006a73d2046068d4df96dc5b333bf3509d9a06d1b42db6d8bf"}, - {file = "pydantic_core-2.6.3-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:439a0de139556745ae53f9cc9668c6c2053444af940d3ef3ecad95b079bc9987"}, - {file = "pydantic_core-2.6.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d63b7545d489422d417a0cae6f9898618669608750fc5e62156957e609e728a5"}, - {file = "pydantic_core-2.6.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b44c42edc07a50a081672e25dfe6022554b47f91e793066a7b601ca290f71e42"}, - {file = "pydantic_core-2.6.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:1c721bfc575d57305dd922e6a40a8fe3f762905851d694245807a351ad255c58"}, - {file = "pydantic_core-2.6.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:5e4a2cf8c4543f37f5dc881de6c190de08096c53986381daebb56a355be5dfe6"}, - {file = "pydantic_core-2.6.3-cp37-none-win32.whl", hash = "sha256:d9b4916b21931b08096efed090327f8fe78e09ae8f5ad44e07f5c72a7eedb51b"}, - {file = "pydantic_core-2.6.3-cp37-none-win_amd64.whl", hash = "sha256:a8acc9dedd304da161eb071cc7ff1326aa5b66aadec9622b2574ad3ffe225525"}, - {file = "pydantic_core-2.6.3-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:5e9c068f36b9f396399d43bfb6defd4cc99c36215f6ff33ac8b9c14ba15bdf6b"}, - {file = "pydantic_core-2.6.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:e61eae9b31799c32c5f9b7be906be3380e699e74b2db26c227c50a5fc7988698"}, - {file = "pydantic_core-2.6.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d85463560c67fc65cd86153a4975d0b720b6d7725cf7ee0b2d291288433fc21b"}, - {file = "pydantic_core-2.6.3-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9616567800bdc83ce136e5847d41008a1d602213d024207b0ff6cab6753fe645"}, - {file = "pydantic_core-2.6.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9e9b65a55bbabda7fccd3500192a79f6e474d8d36e78d1685496aad5f9dbd92c"}, - {file = "pydantic_core-2.6.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f468d520f47807d1eb5d27648393519655eadc578d5dd862d06873cce04c4d1b"}, - {file = "pydantic_core-2.6.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9680dd23055dd874173a3a63a44e7f5a13885a4cfd7e84814be71be24fba83db"}, - {file = "pydantic_core-2.6.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9a718d56c4d55efcfc63f680f207c9f19c8376e5a8a67773535e6f7e80e93170"}, - {file = "pydantic_core-2.6.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8ecbac050856eb6c3046dea655b39216597e373aa8e50e134c0e202f9c47efec"}, - {file = "pydantic_core-2.6.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:788be9844a6e5c4612b74512a76b2153f1877cd845410d756841f6c3420230eb"}, - {file = "pydantic_core-2.6.3-cp38-none-win32.whl", hash = "sha256:07a1aec07333bf5adebd8264047d3dc518563d92aca6f2f5b36f505132399efc"}, - {file = "pydantic_core-2.6.3-cp38-none-win_amd64.whl", hash = "sha256:621afe25cc2b3c4ba05fff53525156d5100eb35c6e5a7cf31d66cc9e1963e378"}, - {file = "pydantic_core-2.6.3-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:813aab5bfb19c98ae370952b6f7190f1e28e565909bfc219a0909db168783465"}, - {file = "pydantic_core-2.6.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:50555ba3cb58f9861b7a48c493636b996a617db1a72c18da4d7f16d7b1b9952b"}, - {file = "pydantic_core-2.6.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19e20f8baedd7d987bd3f8005c146e6bcbda7cdeefc36fad50c66adb2dd2da48"}, - {file = "pydantic_core-2.6.3-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:b0a5d7edb76c1c57b95df719af703e796fc8e796447a1da939f97bfa8a918d60"}, - {file = "pydantic_core-2.6.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f06e21ad0b504658a3a9edd3d8530e8cea5723f6ea5d280e8db8efc625b47e49"}, - {file = "pydantic_core-2.6.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ea053cefa008fda40f92aab937fb9f183cf8752e41dbc7bc68917884454c6362"}, - {file = "pydantic_core-2.6.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:171a4718860790f66d6c2eda1d95dd1edf64f864d2e9f9115840840cf5b5713f"}, - {file = "pydantic_core-2.6.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5ed7ceca6aba5331ece96c0e328cd52f0dcf942b8895a1ed2642de50800b79d3"}, - {file = "pydantic_core-2.6.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:acafc4368b289a9f291e204d2c4c75908557d4f36bd3ae937914d4529bf62a76"}, - {file = "pydantic_core-2.6.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1aa712ba150d5105814e53cb141412217146fedc22621e9acff9236d77d2a5ef"}, - {file = "pydantic_core-2.6.3-cp39-none-win32.whl", hash = "sha256:44b4f937b992394a2e81a5c5ce716f3dcc1237281e81b80c748b2da6dd5cf29a"}, - {file = "pydantic_core-2.6.3-cp39-none-win_amd64.whl", hash = "sha256:9b33bf9658cb29ac1a517c11e865112316d09687d767d7a0e4a63d5c640d1b17"}, - {file = "pydantic_core-2.6.3-pp310-pypy310_pp73-macosx_10_7_x86_64.whl", hash = "sha256:d7050899026e708fb185e174c63ebc2c4ee7a0c17b0a96ebc50e1f76a231c057"}, - {file = "pydantic_core-2.6.3-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:99faba727727b2e59129c59542284efebbddade4f0ae6a29c8b8d3e1f437beb7"}, - {file = "pydantic_core-2.6.3-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5fa159b902d22b283b680ef52b532b29554ea2a7fc39bf354064751369e9dbd7"}, - {file = "pydantic_core-2.6.3-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:046af9cfb5384f3684eeb3f58a48698ddab8dd870b4b3f67f825353a14441418"}, - {file = "pydantic_core-2.6.3-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:930bfe73e665ebce3f0da2c6d64455098aaa67e1a00323c74dc752627879fc67"}, - {file = "pydantic_core-2.6.3-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:85cc4d105747d2aa3c5cf3e37dac50141bff779545ba59a095f4a96b0a460e70"}, - {file = "pydantic_core-2.6.3-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:b25afe9d5c4f60dcbbe2b277a79be114e2e65a16598db8abee2a2dcde24f162b"}, - {file = "pydantic_core-2.6.3-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:e49ce7dc9f925e1fb010fc3d555250139df61fa6e5a0a95ce356329602c11ea9"}, - {file = "pydantic_core-2.6.3-pp37-pypy37_pp73-macosx_10_7_x86_64.whl", hash = "sha256:2dd50d6a1aef0426a1d0199190c6c43ec89812b1f409e7fe44cb0fbf6dfa733c"}, - {file = "pydantic_core-2.6.3-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c6595b0d8c8711e8e1dc389d52648b923b809f68ac1c6f0baa525c6440aa0daa"}, - {file = "pydantic_core-2.6.3-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4ef724a059396751aef71e847178d66ad7fc3fc969a1a40c29f5aac1aa5f8784"}, - {file = "pydantic_core-2.6.3-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3c8945a105f1589ce8a693753b908815e0748f6279959a4530f6742e1994dcb6"}, - {file = "pydantic_core-2.6.3-pp37-pypy37_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:c8c6660089a25d45333cb9db56bb9e347241a6d7509838dbbd1931d0e19dbc7f"}, - {file = "pydantic_core-2.6.3-pp37-pypy37_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:692b4ff5c4e828a38716cfa92667661a39886e71136c97b7dac26edef18767f7"}, - {file = "pydantic_core-2.6.3-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:f1a5d8f18877474c80b7711d870db0eeef9442691fcdb00adabfc97e183ee0b0"}, - {file = "pydantic_core-2.6.3-pp38-pypy38_pp73-macosx_10_7_x86_64.whl", hash = "sha256:3796a6152c545339d3b1652183e786df648ecdf7c4f9347e1d30e6750907f5bb"}, - {file = "pydantic_core-2.6.3-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:b962700962f6e7a6bd77e5f37320cabac24b4c0f76afeac05e9f93cf0c620014"}, - {file = "pydantic_core-2.6.3-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:56ea80269077003eaa59723bac1d8bacd2cd15ae30456f2890811efc1e3d4413"}, - {file = "pydantic_core-2.6.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75c0ebbebae71ed1e385f7dfd9b74c1cff09fed24a6df43d326dd7f12339ec34"}, - {file = "pydantic_core-2.6.3-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:252851b38bad3bfda47b104ffd077d4f9604a10cb06fe09d020016a25107bf98"}, - {file = "pydantic_core-2.6.3-pp38-pypy38_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:6656a0ae383d8cd7cc94e91de4e526407b3726049ce8d7939049cbfa426518c8"}, - {file = "pydantic_core-2.6.3-pp38-pypy38_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:d9140ded382a5b04a1c030b593ed9bf3088243a0a8b7fa9f071a5736498c5483"}, - {file = "pydantic_core-2.6.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:d38bbcef58220f9c81e42c255ef0bf99735d8f11edef69ab0b499da77105158a"}, - {file = "pydantic_core-2.6.3-pp39-pypy39_pp73-macosx_10_7_x86_64.whl", hash = "sha256:c9d469204abcca28926cbc28ce98f28e50e488767b084fb3fbdf21af11d3de26"}, - {file = "pydantic_core-2.6.3-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:48c1ed8b02ffea4d5c9c220eda27af02b8149fe58526359b3c07eb391cb353a2"}, - {file = "pydantic_core-2.6.3-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b2b1bfed698fa410ab81982f681f5b1996d3d994ae8073286515ac4d165c2e7"}, - {file = "pydantic_core-2.6.3-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf9d42a71a4d7a7c1f14f629e5c30eac451a6fc81827d2beefd57d014c006c4a"}, - {file = "pydantic_core-2.6.3-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4292ca56751aebbe63a84bbfc3b5717abb09b14d4b4442cc43fd7c49a1529efd"}, - {file = "pydantic_core-2.6.3-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:7dc2ce039c7290b4ef64334ec7e6ca6494de6eecc81e21cb4f73b9b39991408c"}, - {file = "pydantic_core-2.6.3-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:615a31b1629e12445c0e9fc8339b41aaa6cc60bd53bf802d5fe3d2c0cda2ae8d"}, - {file = "pydantic_core-2.6.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:1fa1f6312fb84e8c281f32b39affe81984ccd484da6e9d65b3d18c202c666149"}, - {file = "pydantic_core-2.6.3.tar.gz", hash = "sha256:1508f37ba9e3ddc0189e6ff4e2228bd2d3c3a4641cbe8c07177162f76ed696c7"}, + {file = "pydantic_core-2.10.0-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:daea90360d99ad06a3f686b3e628222ac3aa953b1982f13be5b69b2648c5e6bb"}, + {file = "pydantic_core-2.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5f76cb8d68d87fd05e56aba392c841d98eeb3ad378bcf5331b42bac7afee0d66"}, + {file = "pydantic_core-2.10.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e816d042f80dd630aaedbc75c21084da9e1d7ea5918619b8089c7edaedd57e8"}, + {file = "pydantic_core-2.10.0-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7192492b09c1e4ad103e5cb98eb397f9b61a9037fce03e94cafe3238404dbe0f"}, + {file = "pydantic_core-2.10.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:312831c5bf50d9d432c11baf9bbd8d8961740608ccbc66fb1290d532aff21b18"}, + {file = "pydantic_core-2.10.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:873db84afcbcf3f1ed0040ed9c5534bc1af5d647d13c04be12f3568421f5dd3e"}, + {file = "pydantic_core-2.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0aa8bdc2d78afadd191148726f094be81d5e4b76011f8fa9300f317e06a1b732"}, + {file = "pydantic_core-2.10.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7cbf77664099345a25932ebe25d7bf9a330fc29acd9a909e8751ac0c42097fb3"}, + {file = "pydantic_core-2.10.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a537e87ca600e59e532fbc770a60f9f3a5ebcff9bae8c60aceeec5beb326e1b8"}, + {file = "pydantic_core-2.10.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ed5f8d6cb834c80fb813d233f9bfb60d3453b7450c80c0814b8e78c23d1ea8bf"}, + {file = "pydantic_core-2.10.0-cp310-none-win32.whl", hash = "sha256:0e210107faf47d5965fcebc294c41891573adab36e5cf70731c57d0068fc7c5c"}, + {file = "pydantic_core-2.10.0-cp310-none-win_amd64.whl", hash = "sha256:9527cf9c25fd655617620c8d6cb43216c0ce5779871ab7f83175421267b85199"}, + {file = "pydantic_core-2.10.0-cp311-cp311-macosx_10_7_x86_64.whl", hash = "sha256:ab2d56dfa13244164f0ba8125d8315c799fa0150459b88fc42ed5c1e3c04d47a"}, + {file = "pydantic_core-2.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d1e79893a20207ff671f13f5562c1f0aaece030e6e30252683f536286ba89864"}, + {file = "pydantic_core-2.10.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:030ba2f59e78c8732445d8c9f093579674f2b5b93b3960945face14ec2e82682"}, + {file = "pydantic_core-2.10.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:705fad71297dfedc5c9e3c935702864aa0cc7812be11ac544f152677ba6ea430"}, + {file = "pydantic_core-2.10.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:394a8ce4a7495af8dbf33038daf57a6170be15f8d1d92a7b63c6f2211527d950"}, + {file = "pydantic_core-2.10.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:19c7aa3c0ff08ddc91597d8af08f8c4de59b27fe752b3bd1db9a67f6f08c4020"}, + {file = "pydantic_core-2.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fb204346d3eda4e0c63cbeeec6398a52682ac51f9cf7379a13505863e47d3186"}, + {file = "pydantic_core-2.10.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b1fefe63baa04f1d9dd5b4564b1e73d133e1c745589933d7ef9718235915cc81"}, + {file = "pydantic_core-2.10.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:fa4bd88165d860111e860e8b43efd97afd137a9165cf24eb3cfb2371f57452bf"}, + {file = "pydantic_core-2.10.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e21ab9c49cc58282c228ff89fb4a5e4b447233ccd53acb7f333d1cde58df37b"}, + {file = "pydantic_core-2.10.0-cp311-none-win32.whl", hash = "sha256:2a6f28e2b2a5cef3b52b5ac6c6d64fe810ca51ec57081554f447c818778eea09"}, + {file = "pydantic_core-2.10.0-cp311-none-win_amd64.whl", hash = "sha256:f94539aa4265ab5528d8c3dc4505a19369083c29d0713b8ed536f93b9bc1e94f"}, + {file = "pydantic_core-2.10.0-cp311-none-win_arm64.whl", hash = "sha256:2352f7cb8ef0cd21fbc582abe2a14105d7e8400f97a551ca2e3b05dee77525d2"}, + {file = "pydantic_core-2.10.0-cp312-cp312-macosx_10_7_x86_64.whl", hash = "sha256:c2a126c7271a9421005a0f57cf71294ad49c375e4d0a9198b93665796f49e7f7"}, + {file = "pydantic_core-2.10.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7440933341f655a64456065211cf7657c3cf3524d5b0b02f5d9b63ef5a7e0d49"}, + {file = "pydantic_core-2.10.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:85d8225cd08aacb8a2843cf0a0a72f1c403c6ac6f18d4cfeecabe050f80c9ea3"}, + {file = "pydantic_core-2.10.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:573e89b3da5908f564ae54b6284e20b490158681e91e1776a59dfda17ec0a6a8"}, + {file = "pydantic_core-2.10.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b0061965942489e6da23f0399b1136fd10eff0a4f0cefae13369eba1776e22a6"}, + {file = "pydantic_core-2.10.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:725f0276402773a6b61b6f67bf9562f37ba08a8bfebdfb9990eea786ed5711b2"}, + {file = "pydantic_core-2.10.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25cacd12689b1a357ae6212c7f5980ebf487720db5bbf1bb5d91085226b6a962"}, + {file = "pydantic_core-2.10.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e70c6c882ab101a72010c8f91e87db211fa2aaf6aa51acc7160fe5649630ed75"}, + {file = "pydantic_core-2.10.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:e079540fd4c45c23de4465cafb20cddcd8befe3b5f46505a2eb28e49b9d13ee2"}, + {file = "pydantic_core-2.10.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:98474284adb71c8738e5efb71ccb1382d8d66f042ad0875018c78bcb38ac0f47"}, + {file = "pydantic_core-2.10.0-cp312-none-win32.whl", hash = "sha256:ab1fa046ef9058ceef941b576c5e7711bab3d99be00a304fb4726cf4b94e05ff"}, + {file = "pydantic_core-2.10.0-cp312-none-win_amd64.whl", hash = "sha256:b4df023610af081d6da85328411fed7aacf19e939fe955bb31f29212f8dcf306"}, + {file = "pydantic_core-2.10.0-cp312-none-win_arm64.whl", hash = "sha256:f1a70f99d1a7270d4f321a8824e87d5b88acd64c2af6049915b7fd8215437e04"}, + {file = "pydantic_core-2.10.0-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:f622778eb180cf7eba25e65d2fe37a57a0eadd8403df4c44606b56d204f686de"}, + {file = "pydantic_core-2.10.0-cp37-cp37m-macosx_11_0_arm64.whl", hash = "sha256:fb513fc74bdf5f649e6e855fc87ed9b81ee8b0be96717190f9e00683244f0616"}, + {file = "pydantic_core-2.10.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82c3f0752547f928e4fcfb00151d6deb9124be7d35e012c567429fe93ec71b71"}, + {file = "pydantic_core-2.10.0-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:100bbd622433d9d7ca8ee4fa63dfae90f9f38358558955173aed6ed56c573db8"}, + {file = "pydantic_core-2.10.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8f919d17581fdf6e71ff3d3fe4b02ed32aaa0429e0b4346798de7a1361e098ef"}, + {file = "pydantic_core-2.10.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f32df1d8d383e1b729674ad1053d8f43f7ed79848496d3cb6ca81a906318317b"}, + {file = "pydantic_core-2.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ab4d279c480e83c516e4e0b7b1f882f168f614d9c62e18ab779edef0cd13aaa9"}, + {file = "pydantic_core-2.10.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c394e9ed6f9e6f4af3618c34bc15f2af4237f7d1989b7f45588f8e855bc10e08"}, + {file = "pydantic_core-2.10.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:bc0a33779fded534ff0b5d8ef766a1c94d3e740877ea8adab65cbf1878ba03b4"}, + {file = "pydantic_core-2.10.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c1041d8fcd313c68b77dec6a16bf1d690008270b50eec11e96d89e1b4ba756b1"}, + {file = "pydantic_core-2.10.0-cp37-none-win32.whl", hash = "sha256:68992f78507e95ed63ca87b8b177785d9806cde34ca3a9f98382188dd11d8720"}, + {file = "pydantic_core-2.10.0-cp37-none-win_amd64.whl", hash = "sha256:aa45f0846773cb142252ccef66b096d917bb76c6ef9da1aa747e6b44aa318192"}, + {file = "pydantic_core-2.10.0-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:a04054b91afc41282a0a7426147654849136b37a41da86412d4ff5ba51b9cd2f"}, + {file = "pydantic_core-2.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1c1bfa2ca352bf43d34b7099f8ed675deb88113bd36c76880f4ca18fc0d3af50"}, + {file = "pydantic_core-2.10.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba288fa675b2951e7898ebfdd8defa0e958e514d4d1cc7a5f6a8d627378c0c47"}, + {file = "pydantic_core-2.10.0-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fbba90179672707ab69ad19ef7d3c3f0a8e2f0a0579f0eb79649ffcdacf476d0"}, + {file = "pydantic_core-2.10.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7c6915a9b3dd16e016dba7e76070e667eca50530f957daa5b78c73abbf281b25"}, + {file = "pydantic_core-2.10.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9e72c1e06a20c10b9c5f7a3fe09ec46e0e208c65a69d2efb92a3e1b64443e6c3"}, + {file = "pydantic_core-2.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b50848d1a614093c05c97d0fdf841ef547d8c087fbd06f6eafe8ef1d836d6c1"}, + {file = "pydantic_core-2.10.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ad7b5f4352f3dfcc481b008bce3b3931a485a93112deaa0a25bee2817d3f7b98"}, + {file = "pydantic_core-2.10.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:66c0169457733a4dfe72be51dd359414eddd0738b15dda07827f18a10e9f6ab7"}, + {file = "pydantic_core-2.10.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e24d92d3a60d6eb19a1bd0f1f259369f478e0f34412a33e794da6cdaa36218be"}, + {file = "pydantic_core-2.10.0-cp38-none-win32.whl", hash = "sha256:30c5df611afc5a9f2ad48babe2192f9cf0d12ed6c0dd5eb57b3538491c113737"}, + {file = "pydantic_core-2.10.0-cp38-none-win_amd64.whl", hash = "sha256:d72a561d7c0738ae5d05a709c739b2953d05e18151539750ca9622f3438de041"}, + {file = "pydantic_core-2.10.0-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:7cecd7669b1ebee8ae90f5aa7d459770b6e79db7b95983aacc5b7392a050b9ab"}, + {file = "pydantic_core-2.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:923000ea46def1bdded511b5792ec19866909797a05dc8f75342c6a9cacb2d66"}, + {file = "pydantic_core-2.10.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:729a2fc4bc1564d164258eaf138ab4c03baa2080a5e3f91a9b3cb2d758248b8f"}, + {file = "pydantic_core-2.10.0-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6930eaf3aa2ba660ed3f64206902a534f454f9954e5de06354e20d890bebbd8a"}, + {file = "pydantic_core-2.10.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d0b17e8d08a1c94efb91d8d389ec76a32fc3f85ba06626b5ef0c2d6bffcbe066"}, + {file = "pydantic_core-2.10.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c61755149ba534123ae08e6aa814aa34f47c6ba45a622ea98ddd7860b5312767"}, + {file = "pydantic_core-2.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:22b126893f53c789ad2253c9288a59362171a5bafbb865190c43d430dc805edb"}, + {file = "pydantic_core-2.10.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:776eee60ca8ca3de83add0fb95a0034ac965a12590bb22ec09b05c87870ba401"}, + {file = "pydantic_core-2.10.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b1496f38e49c7960461002768c5f4c9ba9720fe259cd5c8b229cd0b3b0861844"}, + {file = "pydantic_core-2.10.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:cd175beab2ac845a90d31bb4ea8e6c1e8be12efaf14b9918d0ab4828dd3c916b"}, + {file = "pydantic_core-2.10.0-cp39-none-win32.whl", hash = "sha256:391805e8a4ad731e729a22d8e14bad2d724915d28618be6c66dc7ccb421a13a0"}, + {file = "pydantic_core-2.10.0-cp39-none-win_amd64.whl", hash = "sha256:7e2360b86b21e2aab8d4f1ce2551e2b731bc30610b7cc9324ea7517af4375b08"}, + {file = "pydantic_core-2.10.0-pp310-pypy310_pp73-macosx_10_7_x86_64.whl", hash = "sha256:b40221d1490f2c6e488d2576773a574d42436b5aba1faed91f59a9feb82c384b"}, + {file = "pydantic_core-2.10.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:9f3b25201efe20d182f3bd6fe8d99685f4ed01cac67b79c017c9cf688b747263"}, + {file = "pydantic_core-2.10.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34a45943bb14275e9681fd4abafbe3acae1e7dac7248bebf38ac5bde492e00f7"}, + {file = "pydantic_core-2.10.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc5be7a29a6b25a186941e9e2b5f9281c05723628e1fdb244f429f4c1682ff49"}, + {file = "pydantic_core-2.10.0-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:17460ffd8f8e49ca52711b4926fefe2b336d01b63dc27aee432a576c2147c8ce"}, + {file = "pydantic_core-2.10.0-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:c1ab3701d660bd136a22e1ca95292bfed50245eb869adaee2e08f29d4dd5e360"}, + {file = "pydantic_core-2.10.0-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:09ac18617199704327d99c85893d697b8442c18b8c2db1ea636ba83313223541"}, + {file = "pydantic_core-2.10.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:e3f69d48191103587950981cf47c936064c808b6c18f57e745ed130a305c73a6"}, + {file = "pydantic_core-2.10.0-pp37-pypy37_pp73-macosx_10_7_x86_64.whl", hash = "sha256:792af9e4f78d6f1d0aabfb95162c5ed56b5369b25350eaa68b1495e8f675d4d9"}, + {file = "pydantic_core-2.10.0-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1ecd28fb4c98c97836046d092029017bcc35e060ea547484aa1234b8a592de17"}, + {file = "pydantic_core-2.10.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a622a8abf656cc51960766fa4d194504e8a9f85ae48032f87fb42c79462c7b8"}, + {file = "pydantic_core-2.10.0-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:52eb5c61de017bfee422f6aa9a3e76de5aa5a9189ba808bba63b9de67e55c4ca"}, + {file = "pydantic_core-2.10.0-pp37-pypy37_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:69772dcdcf90b677d0d2ecedafe4c6a610572f1fad15912cde28a6f8eb5654fd"}, + {file = "pydantic_core-2.10.0-pp37-pypy37_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:12470a4de172aaa1bbadb45744de4a9b0298fa8f974eb508314c3b5da0cb4aed"}, + {file = "pydantic_core-2.10.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:f9f2c70257f03db712658d4138e2b892bdd7c71472783eaebc2813a47fd29ef3"}, + {file = "pydantic_core-2.10.0-pp38-pypy38_pp73-macosx_10_7_x86_64.whl", hash = "sha256:8a5323d6778931ab1b3b22bac05fb7c961786d3b04a6c84f7c0ffcc331b4b998"}, + {file = "pydantic_core-2.10.0-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:5f00e83aa9aebbfd4382695a5ed94e6282ac01455fbb1a37d99d2effa29df30f"}, + {file = "pydantic_core-2.10.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c871820c60fc863c7b3f660612af6ce5bb8f5f69d6364f208e29d2ca7992d154"}, + {file = "pydantic_core-2.10.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1bcb1b9b33573eeef218ffb3a2910c57fedc8831caf3c942e68a2222481d2cc"}, + {file = "pydantic_core-2.10.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d122a46c360c8069f7ac39c6f2c29cf99436baa48ba1e28ea5443336e9bbb838"}, + {file = "pydantic_core-2.10.0-pp38-pypy38_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:3ffb2a3462bb7905c4d849b95f536ac1f3948e92f5e0fc7e65bd3f3b0d132cf4"}, + {file = "pydantic_core-2.10.0-pp38-pypy38_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:b5d4eec8aba25b163a4d9dcc6be8354bc8f939040bc15a6400cbd62ba0511a5f"}, + {file = "pydantic_core-2.10.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:5cbfe4cd608cf6d032374961e4e07d0506acfaec7b1a69beade1d5f98dce00fd"}, + {file = "pydantic_core-2.10.0-pp39-pypy39_pp73-macosx_10_7_x86_64.whl", hash = "sha256:02b3d546342e7f583bf58f4a4618c7e97f44426db2358789393537dd4e9a921d"}, + {file = "pydantic_core-2.10.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:7820faf076216654ae54ad8a8443a296faaac9057a49ff404ce92ab85c9518a3"}, + {file = "pydantic_core-2.10.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f114130c44ae52b3bd2450dac8e1d3e1e92a92baecb24dbcdb6de2d2fc15bdb5"}, + {file = "pydantic_core-2.10.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f6f70680c15876c583a24bd476e49004327e87392be0282aedbc65773519ea8"}, + {file = "pydantic_core-2.10.0-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3f230d70be54447e12fcd0f1c2319dac74341244fafd2350d5675aa194f6c3f4"}, + {file = "pydantic_core-2.10.0-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:96b3007451863b46e8138f8096ef31aea6f7721a9910843b0554ce4ae17024a2"}, + {file = "pydantic_core-2.10.0-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:b196c4ace34be6c2953c6ec3906d1af88c418b93325d612d7f900ed30bf1e0ac"}, + {file = "pydantic_core-2.10.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:5958b1af7acd7b4a629e9758ce54a31c1910695e85e0ef847ba3daa4f25a0a08"}, + {file = "pydantic_core-2.10.0.tar.gz", hash = "sha256:8fe66506700efdfc699c613ccc4974ac7d8fceed8c74983e55ec380504db2e05"}, ] [package.dependencies] @@ -1570,13 +1569,13 @@ docutils = ">=0.11,<1.0" [[package]] name = "rich" -version = "13.5.2" +version = "13.5.3" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" optional = false python-versions = ">=3.7.0" files = [ - {file = "rich-13.5.2-py3-none-any.whl", hash = "sha256:146a90b3b6b47cac4a73c12866a499e9817426423f57c5a66949c086191a8808"}, - {file = "rich-13.5.2.tar.gz", hash = "sha256:fb9d6c0a0f643c99eed3875b5377a184132ba9be4d61516a55273d3554d75a39"}, + {file = "rich-13.5.3-py3-none-any.whl", hash = "sha256:9257b468badc3d347e146a4faa268ff229039d4c2d176ab0cffb4c4fbc73d5d9"}, + {file = "rich-13.5.3.tar.gz", hash = "sha256:87b43e0543149efa1253f485cd845bb7ee54df16c9617b8a893650ab84b4acb6"}, ] [package.dependencies] @@ -1616,13 +1615,13 @@ files = [ [[package]] name = "smmap" -version = "5.0.0" +version = "5.0.1" description = "A pure Python implementation of a sliding window memory map manager" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" files = [ - {file = "smmap-5.0.0-py3-none-any.whl", hash = "sha256:2aba19d6a040e78d8b09de5c57e96207b09ed71d8e55ce0959eeee6c8e190d94"}, - {file = "smmap-5.0.0.tar.gz", hash = "sha256:c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"}, + {file = "smmap-5.0.1-py3-none-any.whl", hash = "sha256:e6d8668fa5f93e706934a62d7b4db19c8d9eb8cf2adbb75ef1b675aa332b69da"}, + {file = "smmap-5.0.1.tar.gz", hash = "sha256:dceeb6c0028fdb6734471eb07c0cd2aae706ccaecab45965ee83f11c8d3b1f62"}, ] [[package]] @@ -1663,13 +1662,13 @@ pbr = ">=2.0.0,<2.1.0 || >2.1.0" [[package]] name = "taskiq-dependencies" -version = "1.4.0" +version = "1.4.2" description = "FastAPI like dependency injection implementation" optional = false python-versions = ">=3.8.1,<4.0.0" files = [ - {file = "taskiq_dependencies-1.4.0-py3-none-any.whl", hash = "sha256:f6886e10fc764d346c732d233a2fe8fd66c2de6cf40512f8f188d60230993e47"}, - {file = "taskiq_dependencies-1.4.0.tar.gz", hash = "sha256:c815db1da073743e740627a07cc9cf67372e31f6920cab0a34ab499f8149d216"}, + {file = "taskiq_dependencies-1.4.2-py3-none-any.whl", hash = "sha256:743b3550d5afa59fd8c3a6ee0677d4866dded8f7da1a4d3238d6ba31cda2faae"}, + {file = "taskiq_dependencies-1.4.2.tar.gz", hash = "sha256:4a4195eac74aa50fe3ab4f8e0c840eca7750c40f2d518c4db9c338c15effd790"}, ] [package.dependencies] @@ -1737,13 +1736,13 @@ files = [ [[package]] name = "types-pytz" -version = "2023.3.0.1" +version = "2023.3.1.1" description = "Typing stubs for pytz" optional = false python-versions = "*" files = [ - {file = "types-pytz-2023.3.0.1.tar.gz", hash = "sha256:1a7b8d4aac70981cfa24478a41eadfcd96a087c986d6f150d77e3ceb3c2bdfab"}, - {file = "types_pytz-2023.3.0.1-py3-none-any.whl", hash = "sha256:65152e872137926bb67a8fe6cc9cfd794365df86650c5d5fdc7b167b0f38892e"}, + {file = "types-pytz-2023.3.1.1.tar.gz", hash = "sha256:cc23d0192cd49c8f6bba44ee0c81e4586a8f30204970fc0894d209a6b08dab9a"}, + {file = "types_pytz-2023.3.1.1-py3-none-any.whl", hash = "sha256:1999a123a3dc0e39a2ef6d19f3f8584211de9e6a77fe7a0259f04a524e90a5cf"}, ] [[package]] @@ -1762,13 +1761,13 @@ types-pytz = "*" [[package]] name = "typing-extensions" -version = "4.7.1" -description = "Backported and Experimental Type Hints for Python 3.7+" +version = "4.8.0" +description = "Backported and Experimental Type Hints for Python 3.8+" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "typing_extensions-4.7.1-py3-none-any.whl", hash = "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36"}, - {file = "typing_extensions-4.7.1.tar.gz", hash = "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"}, + {file = "typing_extensions-4.8.0-py3-none-any.whl", hash = "sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0"}, + {file = "typing_extensions-4.8.0.tar.gz", hash = "sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef"}, ] [[package]] @@ -1954,17 +1953,17 @@ tokenize-rt = ">=2.1" [[package]] name = "zipp" -version = "3.16.2" +version = "3.17.0" description = "Backport of pathlib-compatible object wrapper for zip files" optional = false python-versions = ">=3.8" files = [ - {file = "zipp-3.16.2-py3-none-any.whl", hash = "sha256:679e51dd4403591b2d6838a48de3d283f3d188412a9782faadf845f298736ba0"}, - {file = "zipp-3.16.2.tar.gz", hash = "sha256:ebc15946aa78bd63458992fc81ec3b6f7b1e92d51c35e6de1c3804e73b799147"}, + {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, + {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, ] [package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] [extras] @@ -1976,4 +1975,4 @@ zmq = ["pyzmq"] [metadata] lock-version = "2.0" python-versions = "^3.8.1" -content-hash = "431ad22a8584008ae45b89610b742bef245e281223f9b09f18dbe7b098f826a4" +content-hash = "98427bfbfa49d833975db7af2b59455d68934a3d3f6a4306fe9b0217e3b68e9b" diff --git a/pyproject.toml b/pyproject.toml index 1e99594..3691849 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "taskiq" -version = "0.9.0" +version = "0.9.1" description = "Distributed task queue with full async support" authors = ["Pavel Kirilin "] maintainers = ["Pavel Kirilin "] @@ -32,7 +32,7 @@ pydantic = ">=1.0,<=3.0" importlib-metadata = "*" pycron = "^3.0.0" taskiq_dependencies = "^1" -anyio = "^3" +anyio = ">=3" packaging = ">=19" # For prometheus metrics prometheus_client = { version = "^0", optional = true } diff --git a/taskiq/abc/broker.py b/taskiq/abc/broker.py index 8c93a18..b8de37c 100644 --- a/taskiq/abc/broker.py +++ b/taskiq/abc/broker.py @@ -11,6 +11,7 @@ AsyncGenerator, Awaitable, Callable, + ClassVar, DefaultDict, Dict, List, @@ -68,7 +69,7 @@ class AsyncBroker(ABC): in async mode. """ - available_tasks: Dict[str, AsyncTaskiqDecoratedTask[Any, Any]] = {} + global_task_registry: ClassVar[Dict[str, AsyncTaskiqDecoratedTask[Any, Any]]] = {} def __init__( self, @@ -98,6 +99,7 @@ def __init__( self.decorator_class = AsyncTaskiqDecoratedTask self.formatter: "TaskiqFormatter" = JSONFormatter() self.id_generator = task_id_generator + self.local_task_registry: Dict[str, AsyncTaskiqDecoratedTask[Any, Any]] = {} # Every event has a list of handlers. # Every handler is a function which takes state as a first argument. # And handler can be either sync or async. @@ -112,6 +114,41 @@ def __init__( # True only if broker runs in scheduler process. self.is_scheduler_process: bool = False + def find_task(self, task_name: str) -> Optional[AsyncTaskiqDecoratedTask[Any, Any]]: + """ + Returns task by name. + + This method should be used to get task by name. + Instead of accessing `available_tasks` or `local_available_tasks` directly. + + It searches task by name in dict of tasks that + were registered for this broker directly. + If it fails, it checks global dict of all available tasks. + + :param task_name: name of a task. + :returns: found task or None. + """ + return self.local_task_registry.get( + task_name, + ) or self.global_task_registry.get( + task_name, + ) + + def get_all_tasks(self) -> Dict[str, AsyncTaskiqDecoratedTask[Any, Any]]: + """ + Method to fetch all tasks available in broker. + + This method returns all tasks, globally and locally + available in broker. With local tasks having higher priority. + + So, if you have two tasks with the same name, + one registered in global registry and one registered + in local registry, then local task will be returned. + + :return: dict of all tasks. Keys are task names, values are tasks. + """ + return {**self.global_task_registry, **self.local_task_registry} + def add_dependency_context(self, new_ctx: Dict[Any, Any]) -> None: """ Add first-level dependencies. @@ -279,7 +316,10 @@ def inner( os.path.sep, ), ) - inner_task_name = f"{fmodule}:{func.__name__}" # noqa: WPS442 + fname = func.__name__ + if fname == "": + fname = f"lambda_{uuid4().hex}" + inner_task_name = f"{fmodule}:{fname}" # noqa: WPS442 wrapper = wraps(func) decorated_task = wrapper( @@ -291,7 +331,7 @@ def inner( ), ) - self.available_tasks[decorated_task.task_name] = decorated_task + self._register_task(decorated_task.task_name, decorated_task) return decorated_task @@ -309,6 +349,28 @@ def inner( inner_labels=labels or {}, ) + def register_task( + self, + func: Callable[_FuncParams, _ReturnType], + task_name: Optional[str] = None, + **labels: Any, + ) -> AsyncTaskiqDecoratedTask[_FuncParams, _ReturnType]: + """ + API for registering tasks programmatically. + + This function is basically the same as `task` decorator, + but it doesn't decorate function, it just registers it + and returns AsyncTaskiqDecoratedTask object, that can + be called later. + + :param func: function to register. + :param task_name: custom name of a task, defaults to qualified function's name. + :param labels: some addition labels for task. + + :returns: registered task. + """ + return self.task(task_name=task_name, **labels)(func) + def on_event(self, *events: TaskiqEvents) -> Callable[[EventHandler], EventHandler]: """ Adds event handler. @@ -416,3 +478,19 @@ def with_event_handlers( """ self.event_handlers[event].extend(handlers) return self + + def _register_task( + self, + task_name: str, + task: AsyncTaskiqDecoratedTask[Any, Any], + ) -> None: + """ + Mehtod is used to register tasks. + + By default we register tasks in local task registry. + But this behaviour can be changed in subclasses. + + :param task_name: Name of a task. + :param task: Decorated task. + """ + self.local_task_registry[task_name] = task diff --git a/taskiq/api/__init__.py b/taskiq/api/__init__.py new file mode 100644 index 0000000..75b26f9 --- /dev/null +++ b/taskiq/api/__init__.py @@ -0,0 +1,11 @@ +""" +Package to run some taskiq functions programmatically. + +This package is useful for managing dynamically created brokers and +scheduler instances. +""" + +from taskiq.api.receiver import run_receiver_task +from taskiq.api.scheduler import run_scheduler_task + +__all__ = ["run_receiver_task", "run_scheduler_task"] diff --git a/taskiq/api/receiver.py b/taskiq/api/receiver.py new file mode 100644 index 0000000..55bf5a5 --- /dev/null +++ b/taskiq/api/receiver.py @@ -0,0 +1,84 @@ +import asyncio +from concurrent.futures import ThreadPoolExecutor +from logging import getLogger +from typing import Type + +from taskiq.abc.broker import AsyncBroker +from taskiq.receiver.receiver import Receiver + +logger = getLogger("taskiq.receiver") + + +async def run_receiver_task( # noqa: WPS211 + broker: AsyncBroker, + receiver_cls: Type[Receiver] = Receiver, + sync_workers: int = 4, + validate_params: bool = True, + max_async_tasks: int = 100, + max_prefetch: int = 0, + propagate_exceptions: bool = True, + run_startup: bool = False, +) -> None: + """ + Function to run receiver programmatically. + + This function helps people to dynamically define brokers + and start listening to them within their own code, + without using taskiq worker command. + + This command is less robust and it doesn't have + multiprocessing support. Because it's not always + possible to use daemon processes in some environments. + Because daemon processes can't spawn their own children. + + To use it, you can create an asyncio task and run it + in background. + + + :param broker: current broker instance. + :param receiver_cls: receiver class to use. + :param sync_workers: number of threads of a threadpool that runs sync tasks. + :param validate_params: whether to validate params or not. + :param max_async_tasks: maximum number of simultaneous async tasks. + :param max_prefetch: maximum number of tasks to prefetch. + :param propagate_exceptions: whether to propagate exceptions in generators or not. + :param run_startup: whether to run startup function or not. + + :raises asyncio.CancelledError: if the task was cancelled. + """ + + def on_exit(_: Receiver) -> None: + """ + Function for compatibility with older versions of anyio. + + On older versions taskgroup doesn't throw CancelledError + when any task within the group was cancelled. + + :raises CancelledError: always. + """ + raise asyncio.CancelledError + + with ThreadPoolExecutor(max_workers=sync_workers) as executor: + broker.is_worker_process = True + while True: + try: + receiver = receiver_cls( + broker=broker, + executor=executor, + run_starup=run_startup, + validate_params=validate_params, + max_async_tasks=max_async_tasks, + max_prefetch=max_prefetch, + propagate_exceptions=propagate_exceptions, + on_exit=on_exit, + ) + await receiver.listen() + except asyncio.CancelledError: + logger.warning("The listenig task was cancelled.") + raise + except Exception as exc: + logger.warning( + "Exception found while listening to the broker. %s", + exc, + exc_info=True, + ) diff --git a/taskiq/api/scheduler.py b/taskiq/api/scheduler.py new file mode 100644 index 0000000..78433d5 --- /dev/null +++ b/taskiq/api/scheduler.py @@ -0,0 +1,23 @@ +from taskiq.cli.scheduler.run import run_scheduler_loop +from taskiq.scheduler import TaskiqScheduler + + +async def run_scheduler_task( + scheduler: TaskiqScheduler, + run_startup: bool = False, +) -> None: + """ + Run scheduler task. + + This task runs scheduler loop and starts all sources. + Use this function to run scheduler programmatically. + + :param scheduler: scheduler instance. + :param run_startup: whether to run startup function or not. + """ + for source in scheduler.sources: + await source.startup() + if run_startup: + await scheduler.startup() + while True: # noqa: WPS457 + await run_scheduler_loop(scheduler) diff --git a/taskiq/brokers/inmemory_broker.py b/taskiq/brokers/inmemory_broker.py index 23f900d..35cee3a 100644 --- a/taskiq/brokers/inmemory_broker.py +++ b/taskiq/brokers/inmemory_broker.py @@ -120,7 +120,7 @@ async def kick(self, message: BrokerMessage) -> None: :raises TaskiqError: if someone wants to kick unknown task. """ - target_task = self.available_tasks.get(message.task_name) + target_task = self.find_task(message.task_name) if target_task is None: raise TaskiqError("Unknown task.") diff --git a/taskiq/brokers/shared_broker.py b/taskiq/brokers/shared_broker.py index 7916252..6dc4213 100644 --- a/taskiq/brokers/shared_broker.py +++ b/taskiq/brokers/shared_broker.py @@ -1,4 +1,4 @@ -from typing import AsyncGenerator, Optional, TypeVar +from typing import Any, AsyncGenerator, Optional, TypeVar from typing_extensions import ParamSpec @@ -71,5 +71,13 @@ async def listen(self) -> AsyncGenerator[bytes, None]: # type: ignore """ raise TaskiqError("Shared broker cannot listen") + def _register_task( + self, + task_name: str, + task: AsyncTaskiqDecoratedTask[Any, Any], + ) -> None: + self.global_task_registry[task_name] = task + async_shared_broker = AsyncSharedBroker() +shared_task = async_shared_broker.task diff --git a/taskiq/cli/scheduler/run.py b/taskiq/cli/scheduler/run.py index 24f2339..e0bdf0c 100644 --- a/taskiq/cli/scheduler/run.py +++ b/taskiq/cli/scheduler/run.py @@ -32,6 +32,7 @@ def to_tz_aware(time: datetime) -> datetime: async def schedules_updater( scheduler: TaskiqScheduler, current_schedules: List[ScheduledTask], + event: asyncio.Event, ) -> None: """ Periodic update to schedules. @@ -42,6 +43,7 @@ async def schedules_updater( :param scheduler: current scheduler. :param current_schedules: list of schedules. + :param event: event when schedules are updated. """ while True: # noqa: WPS457 logger.debug("Started schedule update.") @@ -61,6 +63,7 @@ async def schedules_updater( current_schedules.clear() current_schedules.extend(new_schedules) + event.set() await asyncio.sleep(scheduler.refresh_delay) @@ -120,7 +123,7 @@ async def delayed_send( await scheduler.on_ready(task) -async def _run_loop(scheduler: TaskiqScheduler) -> None: +async def run_scheduler_loop(scheduler: TaskiqScheduler) -> None: # noqa: WPS210 """ Runs scheduler loop. @@ -131,10 +134,19 @@ async def _run_loop(scheduler: TaskiqScheduler) -> None: """ loop = asyncio.get_event_loop() tasks: "List[ScheduledTask]" = [] - loop.create_task(schedules_updater(scheduler, tasks)) - logger.info("Starting scheduler.") - await scheduler.startup() - logger.info("Startup completed.") + + current_task = asyncio.current_task() + first_update_event = asyncio.Event() + updater_task = loop.create_task( + schedules_updater( + scheduler, + tasks, + first_update_event, + ), + ) + if current_task is not None: + current_task.add_done_callback(lambda _: updater_task.cancel()) + await first_update_event.wait() while True: # noqa: WPS457 for task in tasks: try: @@ -190,8 +202,12 @@ async def run_scheduler(args: SchedulerArgs) -> None: # noqa: WPS213 for source in scheduler.sources: await source.startup() + logger.info("Starting scheduler.") + await scheduler.startup() + logger.info("Startup completed.") + try: - await _run_loop(scheduler) + await run_scheduler_loop(scheduler) except asyncio.CancelledError: logger.warning("Shutting down scheduler.") await scheduler.shutdown() diff --git a/taskiq/cli/worker/run.py b/taskiq/cli/worker/run.py index f9d13a2..1809959 100644 --- a/taskiq/cli/worker/run.py +++ b/taskiq/cli/worker/run.py @@ -73,10 +73,9 @@ def start_listen(args: WorkerArgs, event: Event) -> None: # noqa: WPS210, WPS21 This function starts actual listening process. It imports broker and all tasks. - Since tasks registers themselves in a global set, - it's easy to just import module where you have decorated - function and they will be available in broker's `available_tasks` - field. + Since tasks auto registeres themselves in a broker, + we don't need to do anything else other than importing. + :param args: CLI arguments. :param event: Event for notification. @@ -127,7 +126,7 @@ def interrupt_handler(signum: int, _frame: Any) -> None: import_tasks(args.modules, args.tasks_pattern, args.fs_discover) receiver_type = get_receiver_type(args) - receiver_args = dict(args.receiver_arg) + receiver_kwargs = dict(args.receiver_arg) loop = asyncio.get_event_loop() @@ -141,7 +140,7 @@ def interrupt_handler(signum: int, _frame: Any) -> None: max_async_tasks=args.max_async_tasks, max_prefetch=args.max_prefetch, propagate_exceptions=not args.no_propagate_errors, - **receiver_args, + **receiver_kwargs, # type: ignore ) loop.run_until_complete(receiver.listen()) except KeyboardInterrupt: diff --git a/taskiq/receiver/__init__.py b/taskiq/receiver/__init__.py index e4445c2..c6a7e66 100644 --- a/taskiq/receiver/__init__.py +++ b/taskiq/receiver/__init__.py @@ -1,6 +1,5 @@ """Package for message receiver.""" + from taskiq.receiver.receiver import Receiver -__all__ = [ - "Receiver", -] +__all__ = ["Receiver"] diff --git a/taskiq/receiver/receiver.py b/taskiq/receiver/receiver.py index db23bbe..9ffe7d6 100644 --- a/taskiq/receiver/receiver.py +++ b/taskiq/receiver/receiver.py @@ -52,15 +52,19 @@ def __init__( # noqa: WPS211 max_async_tasks: "Optional[int]" = None, max_prefetch: int = 0, propagate_exceptions: bool = True, + run_starup: bool = True, + on_exit: Optional[Callable[["Receiver"], None]] = None, ) -> None: self.broker = broker self.executor = executor + self.run_startup = run_starup self.validate_params = validate_params self.task_signatures: Dict[str, inspect.Signature] = {} self.task_hints: Dict[str, Dict[str, Any]] = {} self.dependency_graphs: Dict[str, DependencyGraph] = {} self.propagate_exceptions = propagate_exceptions - for task in self.broker.available_tasks.values(): + self.on_exit = on_exit + for task in self.broker.get_all_tasks().values(): self.task_signatures[task.task_name] = inspect.signature(task.original_func) self.task_hints[task.task_name] = get_type_hints(task.original_func) self.dependency_graphs[task.task_name] = DependencyGraph(task.original_func) @@ -106,7 +110,8 @@ async def callback( # noqa: C901, WPS213, WPS217 ) return logger.debug(f"Received message: {taskiq_msg}") - if taskiq_msg.task_name not in self.broker.available_tasks: + task = self.broker.find_task(taskiq_msg.task_name) + if task is None: logger.warning( 'task "%s" is not found. Maybe you forgot to import it?', taskiq_msg.task_name, @@ -135,7 +140,7 @@ async def callback( # noqa: C901, WPS213, WPS217 await maybe_awaitable(message.ack()) result = await self.run_task( - target=self.broker.available_tasks[taskiq_msg.task_name].original_func, + target=task.original_func, message=taskiq_msg, ) @@ -295,7 +300,8 @@ async def listen(self) -> None: # pragma: no cover It uses listen() method of an AsyncBroker to get new messages from queues. """ - await self.broker.startup() + if self.run_startup: + await self.broker.startup() logger.info("Listening started.") queue: "asyncio.Queue[Union[bytes, AckableMessage]]" = asyncio.Queue() @@ -303,6 +309,9 @@ async def listen(self) -> None: # pragma: no cover gr.start_soon(self.prefetcher, queue) gr.start_soon(self.runner, queue) + if self.on_exit is not None: + self.on_exit(self) + async def prefetcher( self, queue: "asyncio.Queue[Union[bytes, AckableMessage]]", @@ -319,7 +328,8 @@ async def prefetcher( await self.sem_prefetch.acquire() message = await iterator.__anext__() # noqa: WPS609 await queue.put(message) - + except asyncio.CancelledError: + break except StopAsyncIteration: break @@ -367,7 +377,8 @@ def task_cb(task: "asyncio.Task[Any]") -> None: # We want the task to remove itself from the set when it's done. # - # Because python's GC can silently cancel task - # and it considered to be Hisenbug. + # Because if we won't save it anywhere, + # python's GC can silently cancel task + # and this behaviour considered to be a Hisenbug. # https://textual.textualize.io/blog/2023/02/11/the-heisenbug-lurking-in-your-async-code/ task.add_done_callback(task_cb) diff --git a/taskiq/schedule_sources/label_based.py b/taskiq/schedule_sources/label_based.py index 86b4253..3d585ee 100644 --- a/taskiq/schedule_sources/label_based.py +++ b/taskiq/schedule_sources/label_based.py @@ -27,7 +27,7 @@ async def get_schedules(self) -> List["ScheduledTask"]: :return: list of schedules. """ schedules = [] - for task_name, task in self.broker.available_tasks.items(): + for task_name, task in self.broker.get_all_tasks().items(): if task.broker != self.broker: continue for schedule in task.labels.get("schedule", []): @@ -61,7 +61,7 @@ def post_send(self, scheduled_task: ScheduledTask) -> None: if scheduled_task.cron or not scheduled_task.time: return # it's scheduled task with cron label, do not remove this trigger. - for task_name, task in self.broker.available_tasks.items(): + for task_name, task in self.broker.get_all_tasks().items(): if task.broker != self.broker or scheduled_task.task_name != task_name: continue diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/api/test_receiver_task.py b/tests/api/test_receiver_task.py new file mode 100644 index 0000000..bad5988 --- /dev/null +++ b/tests/api/test_receiver_task.py @@ -0,0 +1,57 @@ +import asyncio + +import pytest + +from taskiq.api import run_receiver_task +from tests.utils import AsyncQueueBroker + + +@pytest.mark.anyio +async def test_successful() -> None: + broker = AsyncQueueBroker() + kicked = 0 + desired_kicked = 3 + + @broker.task + def test_func() -> None: + nonlocal kicked + kicked += 1 + + receiver_task = asyncio.create_task(run_receiver_task(broker)) + + for _ in range(desired_kicked): + await test_func.kiq() + + await broker.wait_tasks() + receiver_task.cancel() + assert kicked == desired_kicked + + +@pytest.mark.anyio +async def test_cancelation() -> None: + broker = AsyncQueueBroker() + kicked = 0 + + @broker.task + def test_func() -> None: + nonlocal kicked + kicked += 1 + + receiver_task = asyncio.create_task(run_receiver_task(broker)) + + await test_func.kiq() + await broker.wait_tasks() + assert kicked == 1 + + receiver_task.cancel() + try: + await receiver_task + except asyncio.CancelledError: + pass + + assert receiver_task.cancelled() + + await test_func.kiq() + with pytest.raises(asyncio.TimeoutError): + await asyncio.wait_for(broker.wait_tasks(), 0.2) + assert kicked == 1 diff --git a/tests/api/test_scheduler.py b/tests/api/test_scheduler.py new file mode 100644 index 0000000..aecba80 --- /dev/null +++ b/tests/api/test_scheduler.py @@ -0,0 +1,48 @@ +import asyncio +from datetime import datetime, timedelta + +import pytest + +from taskiq import TaskiqScheduler +from taskiq.api import run_scheduler_task +from taskiq.schedule_sources import LabelScheduleSource +from tests.utils import AsyncQueueBroker + + +@pytest.mark.anyio +async def test_successful() -> None: + broker = AsyncQueueBroker() + scheduler = TaskiqScheduler(broker, sources=[LabelScheduleSource(broker)]) + scheduler_task = asyncio.create_task(run_scheduler_task(scheduler)) + + @broker.task(schedule=[{"time": datetime.utcnow() - timedelta(seconds=1)}]) + def _() -> None: + ... + + msg = await asyncio.wait_for(broker.queue.get(), 0.3) + assert msg + + scheduler_task.cancel() + + +@pytest.mark.anyio +async def test_cancelation() -> None: + broker = AsyncQueueBroker() + scheduler = TaskiqScheduler(broker, sources=[LabelScheduleSource(broker)]) + + @broker.task(schedule=[{"time": datetime.utcnow()}]) + def _() -> None: + ... + + scheduler_task = asyncio.create_task(run_scheduler_task(scheduler)) + + msg = await asyncio.wait_for(broker.queue.get(), 0.3) + assert msg + + scheduler_task.cancel() + try: + await scheduler_task + except asyncio.CancelledError: + pass + + assert scheduler_task.cancelled() diff --git a/tests/conftest.py b/tests/conftest.py index 32f510c..15649f7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -27,7 +27,7 @@ def reset_broker() -> Generator[None, None, None]: broker variables to default state. """ yield - AsyncBroker.available_tasks = {} + AsyncBroker.global_task_registry = {} AsyncBroker.is_worker_process = False AsyncBroker.is_scheduler_process = False diff --git a/tests/test_serialization.py b/tests/test_serialization.py index 118e6de..282bea9 100644 --- a/tests/test_serialization.py +++ b/tests/test_serialization.py @@ -264,7 +264,9 @@ def test_exception_to_python_when_type_error(self) -> None: result_exc = exception_to_python(test_exception) # type: ignore del taskiq.TestParamException # type: ignore - assert str(result_exc) == "(())" + assert ( + str(result_exc) == "(())" + ) class Test_serialization: diff --git a/tests/utils.py b/tests/utils.py new file mode 100644 index 0000000..5f04326 --- /dev/null +++ b/tests/utils.py @@ -0,0 +1,31 @@ +import asyncio +from typing import AsyncGenerator + +from taskiq import AsyncBroker, BrokerMessage + + +class AsyncQueueBroker(AsyncBroker): + """ + Broker for testing. + + It simply puts all tasks in asyncio.Queue + and returns them in listen method. + """ + + def __init__(self) -> None: + self.queue: "asyncio.Queue[bytes]" = asyncio.Queue() + super().__init__(None, None) + + async def kick(self, message: BrokerMessage) -> None: + await self.queue.put(message.message) + + async def wait_tasks(self) -> None: + """Small method to wait for all tasks to be processed.""" + await self.queue.join() + + async def listen(self) -> AsyncGenerator[bytes, None]: + while True: + task = await self.queue.get() + yield task + # Notify that task is done. + self.queue.task_done() diff --git a/tox.ini b/tox.ini index aa5d282..209e011 100644 --- a/tox.ini +++ b/tox.ini @@ -12,5 +12,4 @@ allowlist_externals = poetry commands_pre = poetry install commands = - pre-commit run --all-files - poetry run pytest -vv + poetry run pytest -vv -n auto