telegrinder 0.4.0__tar.gz → 0.4.1__tar.gz

{telegrinder-0.4.0 → telegrinder-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: telegrinder
-Version: 0.4.0
+Version: 0.4.1
 Summary: Modern visionary telegram bot framework.
 License: MIT License
          
@@ -51,7 +51,6 @@ Requires-Dist: fntypes (>=0.1.4.post3,<0.2.0)
 Requires-Dist: loguru (>=0.7.0) ; extra == "all"
 Requires-Dist: loguru (>=0.7.0) ; extra == "loguru"
 Requires-Dist: msgspec (>=0.19.0,<0.20.0)
-Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: typing-extensions (>=4.12.2,<5.0.0)
 Requires-Dist: uvloop (>=0.21.0) ; extra == "all"
 Requires-Dist: uvloop (>=0.21.0) ; extra == "fast"

{telegrinder-0.4.0 → telegrinder-0.4.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 [project]
 requires-python = ">=3.12,<4.0"
 name = "telegrinder"
-version = "0.4.0"
+version = "0.4.1"
 description = "Modern visionary telegram bot framework."
 authors = [
   {name = "timoniq", email = "tesseradecades@mail.ru"}
@@ -47,7 +47,6 @@ dependencies = [
     "vbml (>=1.1.post1,<2.0)",
     "choicelib (>=0.1.5,<0.2.0)",
     "envparse (>=0.2.0,<0.3.0)",
-    "pyyaml (>=6.0.2,<7.0.0)",
     "certifi (>=2025.1.31)",
     "msgspec (>=0.19.0,<0.20.0)",
     "typing-extensions (>=4.12.2,<5.0.0)",
@@ -80,7 +79,7 @@ package-mode = true
 [tool.poetry.group.dev.dependencies]
 pre-commit = ">=4.1.0,<5.0"
 ruff = "^0.9.2"
-basedpyright = "^1.26.0"
+basedpyright = "^1.28.1"
 requests = "^2.28.1"
 sort-all = "^1.2.0"
 libcst = "^1.4.0"
@@ -161,4 +160,3 @@ pythonPlatform = "All"
 pythonVersion = "3.12"
 reportMissingImports = true
 reportMissingTypeStubs = false
-enableExperimentalFeatures = true

{telegrinder-0.4.0 → telegrinder-0.4.1}/telegrinder/bot/cute_types/base.py

@@ -76,7 +76,7 @@ else:
                 continue
             if orig_arg in (Variative, Some, Option):
                 return _get_cute_from_generic(typing.get_args(arg))
-            if issubclass(arg, BaseCute):
+            if issubclass(orig_arg, BaseCute):
                 return arg
 
         return None

{telegrinder-0.4.0 → telegrinder-0.4.1}/telegrinder/msgspec_utils.py

@@ -261,7 +261,7 @@ class Decoder:
                     f"Unknown type `{repr_type(origin_type)}`. You can implement decode hook for this type."
                 )
             dec_hook_func = self.dec_hooks[origin_type]
-            kwargs = magic_bundle(dec_hook_func, context or {}, start_idx=2, bundle_ctx=False)
+            kwargs = magic_bundle(dec_hook_func, context or {}, start_idx=2)
             return dec_hook_func(tp, obj, **kwargs)
 
         return inner
@@ -400,7 +400,7 @@ class Encoder:
                     f"Not implemented encode hook for object of type `{repr_type(origin_type)}`.",
                 )
             enc_hook_func = self.enc_hooks[origin_type]
-            kwargs = magic_bundle(enc_hook_func, context or {}, start_idx=1, bundle_ctx=False)
+            kwargs = magic_bundle(enc_hook_func, context or {}, start_idx=1)
             return enc_hook_func(obj, **kwargs)
 
         return inner

{telegrinder-0.4.0 → telegrinder-0.4.1}/telegrinder/node/polymorphic.py

@@ -10,7 +10,7 @@ from telegrinder.modules import logger
 from telegrinder.node.base import ComposeError, Node, get_nodes
 from telegrinder.node.composer import CONTEXT_STORE_NODES_KEY, NodeSession, compose_nodes
 from telegrinder.node.scope import NodeScope
-from telegrinder.tools.magic import get_impls, impl, magic_bundle
+from telegrinder.tools.magic import get_polymorphic_implementations, impl, magic_bundle
 from telegrinder.types.objects import Update
 
 
@@ -26,7 +26,7 @@ class Polymorphic(Node):
             Update: raw_update,
         }
 
-        for i, impl_ in enumerate(get_impls(cls)):
+        for i, impl_ in enumerate(get_polymorphic_implementations(cls)):
             logger.debug("Checking impl {!r}...", impl_.__name__)
             node_collection = None
 

{telegrinder-0.4.0 → telegrinder-0.4.1}/telegrinder/tools/__init__.py

@@ -95,7 +95,7 @@ from .magic import (
     get_cached_translation,
     get_default_args,
     get_func_parameters,
-    get_impls,
+    get_polymorphic_implementations,
     impl,
     magic_bundle,
     resolve_arg_names,
@@ -165,7 +165,7 @@ __all__ = (
     "get_cached_translation",
     "get_default_args",
     "get_func_parameters",
-    "get_impls",
+    "get_polymorphic_implementations",
     "impl",
     "italic",
     "link",

{telegrinder-0.4.0 → telegrinder-0.4.1}/telegrinder/tools/magic.py

@@ -4,11 +4,10 @@ import asyncio
 import dataclasses
 import enum
 import inspect
-import types
-import typing
 from collections import OrderedDict
 from functools import wraps
 
+import typing_extensions as typing
 from fntypes import Result
 
 from telegrinder.model import get_params
@@ -18,56 +17,67 @@ if typing.TYPE_CHECKING:
     from telegrinder.node.polymorphic import Polymorphic
 
 type Impl = type[classmethod]
-type FuncType = types.FunctionType | typing.Callable[..., typing.Any]
-
+type Function = typing.Callable[..., typing.Any]
 type Executor[T] = typing.Callable[
     [T, str, dict[str, typing.Any]],
     typing.Awaitable[Result[typing.Any, typing.Any]],
 ]
 
 TRANSLATIONS_KEY: typing.Final[str] = "_translations"
+MORPH_IMPLEMENTATIONS_KEY = "__morph_implementations__"
 IMPL_MARK: typing.Final[str] = "_is_impl"
+CONTEXT_KEYS: typing.Final[tuple[str, ...]] = ("ctx", "context")
+
+
+class FuncParams(typing.TypedDict, total=True):
+    args: list[tuple[str, typing.Any | inspect.Parameter.empty]]
+    kwargs: list[tuple[str, typing.Any | inspect.Parameter.empty]]
+    var_args: typing.NotRequired[str]
+    var_kwargs: typing.NotRequired[str]
 
 
 @dataclasses.dataclass(slots=True, frozen=True)
 class Shortcut[T]:
     method_name: str
     executor: Executor[T] | None = dataclasses.field(default=None, kw_only=True)
-    custom_params: set[str] = dataclasses.field(default_factory=lambda: set(), kw_only=True)
+    custom_params: set[str] = dataclasses.field(default_factory=lambda: set[str](), kw_only=True)
 
 
 def cache_magic_value(mark_key: str, /):
     def inner[Func: typing.Callable[..., typing.Any]](func: Func) -> Func:
         @wraps(func)
-        def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.Any:
-            if mark_key not in args[0].__dict__:
-                args[0].__dict__[mark_key] = func(*args, **kwargs)
-            return args[0].__dict__[mark_key]
+        def wrapper(
+            f: Function | None = None,
+            /,
+            *args: typing.Any,
+            **kwargs: typing.Any,
+        ) -> typing.Any:
+            if f is not None and mark_key not in f.__dict__:
+                f.__dict__[mark_key] = func(f, *args, **kwargs)
+            return f.__dict__[mark_key]
 
         return wrapper  # type: ignore
 
     return inner
 
 
-def resolve_arg_names(func: FuncType, start_idx: int = 1) -> tuple[str, ...]:
+def resolve_arg_names(func: Function, start_idx: int = 1) -> tuple[str, ...]:
     return func.__code__.co_varnames[start_idx : func.__code__.co_argcount]
 
 
-@cache_magic_value("__default_args__")
-def get_default_args(func: FuncType) -> dict[str, typing.Any]:
-    kwdefaults = func.__kwdefaults__
-    if kwdefaults:
-        return kwdefaults
-
+@cache_magic_value("__default_arguments__")
+def get_default_args(func: Function, /) -> dict[str, typing.Any]:
     defaults = func.__defaults__
+    kwdefaults = {} if not func.__kwdefaults__ else func.__kwdefaults__.copy()
     if not defaults:
-        return {}
-
-    return {k: defaults[i] for i, k in enumerate(resolve_arg_names(func, start_idx=0)[-len(defaults) :])}
+        return kwdefaults
+    return {
+        k: defaults[i] for i, k in enumerate(resolve_arg_names(func, start_idx=0)[-len(defaults) :])
+    } | kwdefaults
 
 
-@cache_magic_value("__func_parameters__")
-def get_func_parameters(func: FuncType, /) -> FuncParams:
+@cache_magic_value("__function_parameters__")
+def get_func_parameters(func: Function, /) -> FuncParams:
     func_params: FuncParams = {"args": [], "kwargs": []}
 
     for k, p in inspect.signature(func).parameters.items():
@@ -87,8 +97,8 @@ def get_func_parameters(func: FuncType, /) -> FuncParams:
     return func_params
 
 
-def get_annotations(func: FuncType, *, return_type: bool = False) -> dict[str, typing.Any]:
-    annotations = func.__annotations__
+def get_annotations(func: Function, *, return_type: bool = False) -> dict[str, typing.Any]:
+    annotations = func.__annotations__.copy()
     if not return_type:
         annotations.pop("return", None)
     return annotations
@@ -101,49 +111,66 @@ def to_str(s: str | enum.Enum) -> str:
 
 
 @typing.overload
-def magic_bundle(function: FuncType, kw: dict[str, typing.Any]) -> dict[str, typing.Any]: ...
+def magic_bundle(
+    function: Function,
+    kw: dict[str, typing.Any],
+    *,
+    start_idx: int = 1,
+    omit_defaults: bool = False,
+) -> dict[str, typing.Any]: ...
 
 
 @typing.overload
-def magic_bundle(function: FuncType, kw: dict[enum.Enum, typing.Any]) -> dict[str, typing.Any]: ...
+def magic_bundle(
+    function: Function,
+    kw: dict[enum.Enum, typing.Any],
+    *,
+    start_idx: int = 1,
+    omit_defaults: bool = False,
+) -> dict[str, typing.Any]: ...
 
 
 @typing.overload
 def magic_bundle(
-    function: FuncType,
+    function: Function,
     kw: dict[str, typing.Any],
     *,
     start_idx: int = 1,
-    bundle_ctx: bool = True,
+    bundle_ctx: bool = False,
+    omit_defaults: bool = False,
 ) -> dict[str, typing.Any]: ...
 
 
 @typing.overload
 def magic_bundle(
-    function: FuncType,
+    function: Function,
     kw: dict[enum.Enum, typing.Any],
     *,
     start_idx: int = 1,
-    bundle_ctx: bool = True,
+    bundle_ctx: bool = False,
+    omit_defaults: bool = False,
 ) -> dict[str, typing.Any]: ...
 
 
 @typing.overload
 def magic_bundle(
-    function: FuncType,
+    function: Function,
     kw: dict[type[typing.Any], typing.Any],
     *,
+    start_idx: int = 1,
     typebundle: typing.Literal[True] = True,
+    omit_defaults: bool = False,
 ) -> dict[str, typing.Any]: ...
 
 
 def magic_bundle(
-    function: FuncType,
+    function: Function,
     kw: dict[typing.Any, typing.Any],
     *,
     start_idx: int = 1,
-    bundle_ctx: bool = True,
+    bundle_ctx: bool = False,
     typebundle: bool = False,
+    omit_defaults: bool = False,
 ) -> dict[str, typing.Any]:
     # Bundle considering the function annotations
     if typebundle:
@@ -154,10 +181,16 @@ def magic_bundle(
     if "var_kwargs" in get_func_parameters(function) and not names:
         return {to_str(k): v for k, v in kw.items()}
 
-    # Bundle considering the function parameters and defaults
-    args = get_default_args(function) | {n: v for k, v in kw.items() if (n := to_str(k)) in names}
-    if "ctx" in names and bundle_ctx:
-        args["ctx"] = kw
+    # Bundle considering the function parameters and defaults (if do not omit defaults)
+    defaults = {} if omit_defaults else get_default_args(function)
+    args = defaults | {n: v for k, v in kw.items() if (n := to_str(k)) in names}
+
+    # Bundle a context if context key specified in `names`
+    if bundle_ctx:
+        for key in CONTEXT_KEYS:
+            if key in names:
+                args[key] = kw
+                break
 
     return args
 
@@ -189,30 +222,23 @@ def impl(method: typing.Callable[..., typing.Any]):
     return classmethod(method)
 
 
-def get_impls(cls: type[Polymorphic]) -> list[typing.Callable[..., typing.Any]]:
-    moprh_impls = getattr(cls, "__morph_impls__", None)
+def get_polymorphic_implementations(cls: type[Polymorphic], /) -> list[typing.Callable[..., typing.Any]]:
+    moprh_impls = getattr(cls, MORPH_IMPLEMENTATIONS_KEY, None)
     if moprh_impls is not None:
         return moprh_impls
 
     impls = []
     for cls_ in cls.mro():
         impls += [
-            func.__func__
-            for func in vars(cls_).values()
-            if isinstance(func, classmethod) and getattr(func.__func__, IMPL_MARK, False)
+            obj.__func__
+            for obj in vars(cls_).values()
+            if isinstance(obj, classmethod) and getattr(obj.__func__, IMPL_MARK, False)
         ]
 
-    setattr(cls, "__morph_impls__", impls)
+    setattr(cls, MORPH_IMPLEMENTATIONS_KEY, impls)
     return impls
 
 
-class FuncParams(typing.TypedDict, total=True):
-    args: list[tuple[str, typing.Any | inspect.Parameter.empty]]
-    kwargs: list[tuple[str, typing.Any | inspect.Parameter.empty]]
-    var_args: typing.NotRequired[str]
-    var_kwargs: typing.NotRequired[str]
-
-
 def shortcut[T](
     method_name: str,
     *,
@@ -308,7 +334,7 @@ __all__ = (
     "get_default_args",
     "get_default_args",
     "get_func_parameters",
-    "get_impls",
+    "get_polymorphic_implementations",
     "impl",
     "join_dicts",
     "magic_bundle",