Merge branch 'release/0.1.3'

Author: s3rius

docs/guide/state-and-deps.md

@@ -37,10 +37,13 @@ You can access the state from the context.
 
 ## Dependencies
 
-Using context directly is nice, but this way won't get completion.
+Using context directly is nice, but this way you won't get code-completion.
 
 That's why we suggest you try TaskiqDependencies. The implementation is very similar to FastApi's dependencies. You can use classes, functions, and generators as dependencies.
 
+We use the [taskiq-dependencies](https://pypi.org/project/taskiq-dependencies/) package to provide autocompetion.
+You can easily integrate it in your own project.
+
 ::: danger Cool alarm!
 
 FastAPI's `Depends` is not compatible with `TaskiqDepends`.

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "taskiq"
-version = "0.1.2"
+version = "0.1.3"
 description = "Distributed task queue with full async support"
 authors = ["Pavel Kirilin <[email protected]>"]
 maintainers = ["Pavel Kirilin <[email protected]>"]
@@ -54,6 +54,7 @@ mock = "^4.0.3"
 anyio = "^3.6.1"
 pytest-xdist = { version = "^2.5.0", extras = ["psutil"] }
 types-mock = "^4.0.15"
+taskiq_dependencies =  "~1.0.0"
 
 [tool.poetry.extras]
 zmq = ["pyzmq"]
@@ -82,6 +83,18 @@ warn_unused_ignores = false
 profile = "black"
 multi_line_output = 3
 
+[tool.coverage.run]
+omit = [
+    "taskiq/__main__.py",
+    "taskiq/abc/cmd.py",
+    "taskiq/cli/scheduler/args.py",
+    "taskiq/cli/scheduler/cmd.py",
+    "taskiq/cli/utils.py",
+    "taskiq/cli/worker/args.py",
+    "taskiq/cli/worker/async_task_runner.py",
+    "taskiq/cli/worker/cmd.py",
+]
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -1,4 +1,6 @@
 """Distributed task manager."""
+from taskiq_dependencies import Depends as TaskiqDepends
+
 from taskiq.abc.broker import AsyncBroker, AsyncTaskiqDecoratedTask
 from taskiq.abc.formatter import TaskiqFormatter
 from taskiq.abc.middleware import TaskiqMiddleware
@@ -8,7 +10,6 @@
 from taskiq.brokers.shared_broker import async_shared_broker
 from taskiq.brokers.zmq_broker import ZeroMQBroker
 from taskiq.context import Context
-from taskiq.dependencies import TaskiqDepends
 from taskiq.events import TaskiqEvents
 from taskiq.exceptions import TaskiqError
 from taskiq.funcs import gather

taskiq/__init__.py

@@ -7,7 +7,7 @@
 from taskiq.abc.cmd import TaskiqCMD
 
 
-def main() -> None:  # noqa: C901, WPS210
+def main() -> None:  # noqa: C901, WPS210  # pragma: no cover
     """
     Main entrypoint of the taskiq.
 
@@ -72,5 +72,5 @@ def main() -> None:  # noqa: C901, WPS210
     command.exec(sys.argv[1:])
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: no cover
     main()

taskiq/__main__.py

@@ -167,14 +167,15 @@ async def listen(
     def task(
         self,
         task_name: Callable[_FuncParams, _ReturnType],
+        **lavels: Any,
     ) -> AsyncTaskiqDecoratedTask[_FuncParams, _ReturnType]:  # pragma: no cover
         ...
 
     @overload
     def task(
         self,
         task_name: Optional[str] = None,
-        **labels: Union[str, int],
+        **labels: Any,
     ) -> Callable[
         [Callable[_FuncParams, _ReturnType]],
         AsyncTaskiqDecoratedTask[_FuncParams, _ReturnType],
@@ -184,7 +185,7 @@ def task(
     def task(  # type: ignore[misc]
         self,
         task_name: Optional[str] = None,
-        **labels: Union[str, int],
+        **labels: Any,
     ) -> Any:
         """
         Decorator that turns function into a task.
@@ -223,7 +224,7 @@ def inner(
                 if inner_task_name is None:
                     fmodule = func.__module__
                     if fmodule == "__main__":  # pragma: no cover
-                        fmodule = ".".join(  # noqa: WPS220
+                        fmodule = ".".join(
                             sys.argv[0]
                             .removesuffix(
                                 ".py",

taskiq/abc/broker.py

@@ -2,7 +2,7 @@
 from typing import Sequence
 
 
-class TaskiqCMD(ABC):
+class TaskiqCMD(ABC):  # pragma: no cover
     """Base class for new commands."""
 
     short_help = ""

taskiq/abc/cmd.py

@@ -8,17 +8,17 @@
 class ScheduleSource(ABC):
     """Abstract class for source of scheduled tasks."""
 
-    async def startup(self) -> None:
+    async def startup(self) -> None:  # noqa: B027
         """Action to execute during startup."""
 
-    async def shutdown(self) -> None:
+    async def shutdown(self) -> None:  # noqa: B027
         """Actions to execute during shutdown."""
 
     @abstractmethod
     async def get_schedules(self) -> List["ScheduledTask"]:
         """Get list of taskiq schedules."""
 
-    async def add_schedule(self, schedule: "ScheduledTask") -> None:
+    async def add_schedule(self, schedule: "ScheduledTask") -> None:  # noqa: B027
         """
         Add a new schedule.
 

taskiq/abc/schedule_source.py

@@ -2,11 +2,12 @@
 from collections import OrderedDict
 from typing import Any, Callable, Coroutine, Optional, TypeVar, get_type_hints
 
+from taskiq_dependencies import DependencyGraph
+
 from taskiq.abc.broker import AsyncBroker
 from taskiq.abc.result_backend import AsyncResultBackend, TaskiqResult
 from taskiq.cli.worker.args import WorkerArgs
 from taskiq.cli.worker.receiver import Receiver
-from taskiq.dependencies import DependencyGraph
 from taskiq.events import TaskiqEvents
 from taskiq.exceptions import TaskiqError
 from taskiq.message import BrokerMessage

taskiq/brokers/inmemory_broker.py

@@ -6,13 +6,14 @@
 from time import time
 from typing import Any, Callable, Dict, get_type_hints
 
+from taskiq_dependencies import DependencyGraph
+
 from taskiq.abc.broker import AsyncBroker
 from taskiq.abc.middleware import TaskiqMiddleware
 from taskiq.cli.worker.args import WorkerArgs
 from taskiq.cli.worker.log_collector import log_collector
 from taskiq.cli.worker.params_parser import parse_params
 from taskiq.context import Context
-from taskiq.dependencies import DependencyGraph
 from taskiq.message import BrokerMessage, TaskiqMessage
 from taskiq.result import TaskiqResult
 from taskiq.state import TaskiqState
@@ -164,7 +165,7 @@ async def run_task(  # noqa: C901, WPS210
             dep_ctx = None
             if dependency_graph:
                 # Create a context for dependency resolving.
-                dep_ctx = dependency_graph.ctx(
+                dep_ctx = dependency_graph.async_ctx(
                     {
                         Context: Context(message, self.broker),
                         TaskiqState: self.broker.state,