aiogram_tool 1.0.0__tar.gz → 1.0.1__tar.gz

{aiogram_tool-1.0.0 → aiogram_tool-1.0.1}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.3
 Name: aiogram_tool
-Version: 1.0.0
+Version: 1.0.1
 Summary: Tools which doing work with aiogram simple
-License: LICENSE.md
+License: MIT
+Keywords: aiogram,rate,throttling,limit,dependency-injection,depends,cooldown,delay
 Author: Vlad_shayzi1
 Author-email: tecnomega@mail.ru
 Requires-Python: >=3.10
-Classifier: License :: Other/Proprietary License
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11

{aiogram_tool-1.0.0 → aiogram_tool-1.0.1}/aiogram_tool/depend/components/filter.py

@@ -1,4 +1,5 @@
 from typing import Any
+from contextlib import AsyncExitStack
 
 from aiogram.filters import Filter
 from aiogram import Dispatcher
@@ -20,9 +21,11 @@ class DependFilter(Filter):
           dependency_override: dict[str, Depend] = dispatcher.workflow_data.get("dependency_override", {})
           
           kwargs.update({"event": args[0]})
-          depend_kwargs = await inject_parametrs(
-               callback=handler_object.callback,
-               dependency_override=dependency_override,
-               middleware_data=kwargs
-          )
-          return depend_kwargs
+          async with AsyncExitStack() as stack:
+               depend_kwargs = await inject_parametrs(
+                    callback=handler_object.callback,
+                    dependency_override=dependency_override,
+                    middleware_data=kwargs,
+                    stack=stack
+               )
+               return depend_kwargs

{aiogram_tool-1.0.0 → aiogram_tool-1.0.1}/aiogram_tool/depend/components/middleware.py

@@ -1,4 +1,5 @@
 from typing import Any, Callable, Awaitable
+from contextlib import AsyncExitStack
 
 from aiogram.dispatcher.middlewares.base import BaseMiddleware
 from aiogram.types.base import TelegramObject
@@ -27,10 +28,12 @@ class DependMiddleware(BaseMiddleware):
           dependency_override: dict[str, Depend] = dispatcher.workflow_data.get("dependency_override", {})
           
           data.update({"event": event})
-          inject = await inject_parametrs(
-               callback=handler_object.callback,
-               dependency_override=dependency_override,
-               middleware_data=data
-          )
-          data.update(inject)
-          return await handler(event, data)
+          async with AsyncExitStack() as stack:
+               inject = await inject_parametrs(
+                    callback=handler_object.callback,
+                    dependency_override=dependency_override,
+                    middleware_data=data,
+                    stack=stack
+               )
+               data.update(inject)
+               return await handler(event, data)

{aiogram_tool-1.0.0 → aiogram_tool-1.0.1}/aiogram_tool/depend/depend.py

@@ -2,7 +2,8 @@ import inspect
 
 from contextlib import (
      asynccontextmanager, 
-     contextmanager
+     contextmanager,
+     AsyncExitStack
 )
 from typing import (
      Callable, 
@@ -56,7 +57,7 @@ class Depend:
 
                     for type_ in types:
                          name = getattr(type_, "__name__", None)
-                         if name == "_AsyncGeneratorContextManager":
+                         if name in "_AsyncGeneratorContextManager":
                               self.isasync = True
                               self.isgenerator = True
                               
@@ -71,33 +72,33 @@ class Depend:
                
                if isinstance(annotation.annotation, _AnnotatedAlias):
                     types = getattr(annotation.annotation, "__metadata__")
-                    for type_ in types:
-                         if isinstance(type_, Depend):
-                              self.arguments[key] = type_
+                    for dep in types:
+                         if isinstance(dep, Depend):
+                              self.arguments[key] = dep
                               
                elif isinstance(default_value, Depend):
                     self.arguments[key] = default_value
                     
                else:
                     self.arguments[key] = annotation.annotation
-                    
-                    
-     async def call(self, middleware_data: dict[str, Any]) -> Any:
+                 
+     async def call(
+          self, 
+          middleware_data: dict[str, Any],
+          stack: AsyncExitStack
+     ) -> Any:
           kwargs = {}
           for key, value in self.arguments.items():
                if isinstance(value, Depend):
-                    kwargs[key] = await value.call(middleware_data)
+                    kwargs[key] = await value.call(middleware_data, stack)
                else:
                     kwargs[key] = middleware_data.get(key)
-
+                    
           if self.isasync is False:
                if self.isgenerator is True:
-                    with self.obj(**kwargs) as value:
-                         return value
+                    return stack.enter_context(self.obj(**kwargs))
                return self.obj(**kwargs)
-               
           else:
                if self.isgenerator is True:
-                    async with self.obj(**kwargs) as asvalue:
-                         return asvalue
+                    return await stack.enter_async_context(self.obj(**kwargs))
                return await self.obj(**kwargs)

aiogram_tool-1.0.1/aiogram_tool/depend/utils/inject.py

@@ -0,0 +1,56 @@
+import inspect
+
+from contextlib import AsyncExitStack
+from typing import (
+     Any, 
+     Callable, 
+     _AnnotatedAlias 
+)
+
+from ..depend import Depend
+
+
+
+async def depend_call(
+     depend: Depend, 
+     dependency_override: dict[str, Any],
+     middleware_data: dict[str, Any],
+     stack: AsyncExitStack
+) -> Any:
+     call_object = depend
+     if depend.obj_name in dependency_override.keys():
+          call_object = dependency_override.get(depend.obj_name)
+     return await call_object.call(middleware_data, stack)
+          
+     
+
+async def inject_parametrs(
+     callback: Callable,
+     stack: AsyncExitStack,
+     middleware_data: dict[str, Any],
+     dependency_override: dict[str, Depend] = {},
+) -> dict[str, Any]:
+     data = {}
+     signature = inspect.signature(callback)
+     for key, annotation in signature.parameters.items():
+          default_value = annotation.default
+               
+          if isinstance(annotation.annotation, _AnnotatedAlias):
+               types = getattr(annotation.annotation, "__metadata__")
+               for dep in types:
+                    if isinstance(dep, Depend):
+                         data[key] = await depend_call(
+                              depend=dep,
+                              dependency_override=dependency_override,
+                              middleware_data=middleware_data,
+                              stack=stack
+                         )
+                         
+          elif isinstance(default_value, Depend):
+               data[key] = await depend_call(
+                    depend=default_value,
+                    dependency_override=dependency_override,
+                    middleware_data=middleware_data,
+                    stack=stack
+               )
+     return data

{aiogram_tool-1.0.0 → aiogram_tool-1.0.1}/aiogram_tool/limit/setup.py

@@ -1,7 +1,7 @@
 import inspect
 
 from typing import Callable, Awaitable
-from aiogram.types import Message
+from aiogram.types.base import TelegramObject
 from aiogram import Dispatcher
 
 from datetime import datetime, timedelta
@@ -14,7 +14,7 @@ from .storage import MemoryStorage
 def setup_limit_tool(
      dispatcher: Dispatcher,
      storage: AbstractStorage = MemoryStorage(),
-     answer_callback: Callable[[Message, timedelta, datetime], Awaitable] | None = None
+     answer_callback: Callable[[TelegramObject, timedelta, datetime], Awaitable] | None = None
 ) -> None:
      if not issubclass(type(storage), AbstractStorage):
           raise TypeError(f"Invalid type for storage")

{aiogram_tool-1.0.0 → aiogram_tool-1.0.1}/pyproject.toml

@@ -1,16 +1,26 @@
 [project]
 name = "aiogram_tool"
-version = "1.0.0"
+version = "1.0.1"
 description = "Tools which doing work with aiogram simple"
 authors = [
     {name = "Vlad_shayzi1",email = "tecnomega@mail.ru"}
 ]
-license = "LICENSE.md"
+license = "MIT"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "aiogram (>=3.21.0,<4.0.0)",
-    "redis (>=6.2.0,<7.0.0)"
+    "redis (>=6.2.0,<7.0.0)",
+    "aiogram (>=3.21.0,<4.0.0)"
+]
+keywords = [
+    "aiogram",
+    "rate",
+    "throttling",
+    "limit",
+    "dependency-injection",
+    "depends",
+    "cooldown",
+    "delay"
 ]
 
 

aiogram_tool-1.0.0/aiogram_tool/depend/utils/inject.py

@@ -1,33 +0,0 @@
-import inspect
-
-from typing import Any, Callable, _AnnotatedAlias
-
-from ..depend import Depend
-
-
-
-async def inject_parametrs(
-     callback: Callable,
-     middleware_data: dict[str, Any],
-     dependency_override: dict[str, Depend] = {},
-) -> dict[str, Any]:
-     data = {}
-     signature = inspect.signature(callback)
-     for key, annotation in signature.parameters.items():
-          default_value = annotation.default
-               
-          if isinstance(annotation.annotation, _AnnotatedAlias):
-               types = getattr(annotation.annotation, "__metadata__")
-               for type_ in types:
-                    if isinstance(type_, Depend):
-                         if type_.obj_name in dependency_override.keys():
-                              data[key] = await dependency_override[type_.obj_name].call(middleware_data)
-                         else:
-                              data[key] = await type_.call(middleware_data)
-               
-          elif isinstance(default_value, Depend):
-               if default_value.obj_name in dependency_override.keys():
-                    data[key] = await dependency_override[default_value.obj_name].call(middleware_data)
-               else:
-                    data[key] = await default_value.call(middleware_data)
-     return data