Merge pull request #5 from daniel-makerx/merge-upstream

build: regenerate poetry.lock

Author: daniel-makerx

beaker/decorators.py

@@ -2,7 +2,7 @@
 from enum import Enum
 from functools import wraps
 from inspect import get_annotations, signature, Parameter
-from typing import Optional, Callable, Final, cast, Any, TypeVar
+from typing import Optional, Callable, Final, cast, Any, TypeVar, overload
 from types import FunctionType
 from algosdk.abi import Method
 from pyteal import (
@@ -32,6 +32,7 @@
 from beaker.state import AccountStateValue, ApplicationStateValue
 
 HandlerFunc = Callable[..., Expr]
+DecoratorFunc = Callable[[HandlerFunc], HandlerFunc]
 
 _handler_config_attr: Final[str] = "__handler_config__"
 
@@ -394,9 +395,23 @@ def _remove_self(fn: HandlerFunc) -> HandlerFunc:
     return fn
 
 
+@overload
 def internal(
-    return_type_or_handler: TealType | HandlerFunc,
+    return_type_or_handler: HandlerFunc,
 ) -> HandlerFunc:
+    ...
+
+
+@overload
+def internal(
+    return_type_or_handler: TealType,
+) -> DecoratorFunc:
+    ...
+
+
+def internal(
+    return_type_or_handler: TealType | HandlerFunc,
+) -> HandlerFunc | DecoratorFunc:
     """creates a subroutine to be called by logic internally
 
     Args:
@@ -433,24 +448,48 @@ def _impl(fn: HandlerFunc) -> HandlerFunc:
     if fn is not None:
         return _impl(fn)
 
-    return _impl  # type: ignore
+    return _impl
 
 
+@overload
 def external(
-    fn: HandlerFunc | None = None,
+    func: HandlerFunc,
     /,
     *,
     name: str | None = None,
     authorize: SubroutineFnWrapper | None = None,
     method_config: MethodConfig | None = None,
     read_only: bool = False,
 ) -> HandlerFunc:
+    ...
+
+
+@overload
+def external(
+    *,
+    name: str | None = None,
+    authorize: SubroutineFnWrapper | None = None,
+    method_config: MethodConfig | None = None,
+    read_only: bool = False,
+) -> DecoratorFunc:
+    ...
+
+
+def external(
+    func: HandlerFunc | None = None,
+    /,
+    *,
+    name: str | None = None,
+    authorize: SubroutineFnWrapper | None = None,
+    method_config: MethodConfig | None = None,
+    read_only: bool = False,
+) -> HandlerFunc | DecoratorFunc:
 
     """
     Add the method decorated to be handled as an ABI method for the Application
 
     Args:
-        fn: The function being wrapped.
+        func: The function being wrapped.
         name: Name of ABI method. If not set, name of the python method will be used.
             Useful for method overriding.
         authorize: a subroutine with input of ``Txn.sender()`` and output uint64
@@ -482,10 +521,10 @@ def _impl(fn: HandlerFunc) -> HandlerFunc:
 
         return fn
 
-    if fn is None:
-        return _impl  # type: ignore
+    if func is None:
+        return _impl
 
-    return _impl(fn)
+    return _impl(func)
 
 
 def bare_external(
@@ -554,13 +593,33 @@ def is_bare(fn: HandlerFunc) -> bool:
     )
 
 
+@overload
 def create(
-    fn: HandlerFunc | None = None,
+    fn: HandlerFunc,
     /,
     *,
     authorize: SubroutineFnWrapper | None = None,
     method_config: Optional[MethodConfig] | None = None,
 ) -> HandlerFunc:
+    ...
+
+
+@overload
+def create(
+    *,
+    authorize: SubroutineFnWrapper | None = None,
+    method_config: Optional[MethodConfig] | None = None,
+) -> DecoratorFunc:
+    ...
+
+
+def create(
+    fn: HandlerFunc | None = None,
+    /,
+    *,
+    authorize: SubroutineFnWrapper | None = None,
+    method_config: Optional[MethodConfig] | None = None,
+) -> HandlerFunc | DecoratorFunc:
     """set method to be handled by an application call with its :code:`OnComplete`
         set to :code:`NoOp` call and ApplicationId == 0
 
@@ -590,17 +649,29 @@ def _impl(fn: HandlerFunc) -> HandlerFunc:
         else:
             return external(method_config=MethodConfig(**mconfig), authorize=authorize)(
                 fn
-            )  # type: ignore
+            )
 
     if fn is None:
-        return _impl  # type: ignore
+        return _impl
 
     return _impl(fn)
 
 
+@overload
 def delete(
-    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+    fn: HandlerFunc, /, *, authorize: SubroutineFnWrapper | None = None
 ) -> HandlerFunc:
+    ...
+
+
+@overload
+def delete(*, authorize: SubroutineFnWrapper | None = None) -> DecoratorFunc:
+    ...
+
+
+def delete(
+    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+) -> HandlerFunc | DecoratorFunc:
     """set method to be handled by an application call with it's
         :code:`OnComplete` set to :code:`DeleteApplication` call
 
@@ -622,19 +693,29 @@ def _impl(fn: HandlerFunc) -> HandlerFunc:
             return external(
                 method_config=MethodConfig(delete_application=CallConfig.CALL),
                 authorize=authorize,
-            )(
-                fn
-            )  # type: ignore
+            )(fn)
 
     if fn is None:
-        return _impl  # type: ignore
+        return _impl
 
     return _impl(fn)
 
 
+@overload
 def update(
-    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+    fn: HandlerFunc, /, *, authorize: SubroutineFnWrapper | None = None
 ) -> HandlerFunc:
+    ...
+
+
+@overload
+def update(*, authorize: SubroutineFnWrapper | None = None) -> DecoratorFunc:
+    ...
+
+
+def update(
+    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+) -> HandlerFunc | DecoratorFunc:
     """set method to be handled by an application call with it's
         :code:`OnComplete` set to :code:`UpdateApplication` call
 
@@ -656,19 +737,29 @@ def _impl(fn: HandlerFunc) -> HandlerFunc:
             return external(
                 method_config=MethodConfig(update_application=CallConfig.CALL),
                 authorize=authorize,
-            )(
-                fn
-            )  # type: ignore
+            )(fn)
 
     if fn is None:
-        return _impl  # type: ignore
+        return _impl
 
     return _impl(fn)
 
 
+@overload
 def opt_in(
-    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+    fn: HandlerFunc, /, *, authorize: SubroutineFnWrapper | None = None
 ) -> HandlerFunc:
+    ...
+
+
+@overload
+def opt_in(*, authorize: SubroutineFnWrapper | None = None) -> DecoratorFunc:
+    ...
+
+
+def opt_in(
+    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+) -> HandlerFunc | DecoratorFunc:
     """set method to be handled by an application call with it's
            :code:`OnComplete` set to :code:`OptIn` call
 
@@ -689,19 +780,29 @@ def _impl(fn: HandlerFunc) -> HandlerFunc:
         else:
             return external(
                 method_config=MethodConfig(opt_in=CallConfig.CALL), authorize=authorize
-            )(
-                fn
-            )  # type: ignore
+            )(fn)
 
     if fn is None:
-        return _impl  # type: ignore
+        return _impl
 
     return _impl(fn)
 
 
+@overload
 def clear_state(
-    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+    fn: HandlerFunc, /, *, authorize: SubroutineFnWrapper | None = None
 ) -> HandlerFunc:
+    ...
+
+
+@overload
+def clear_state(*, authorize: SubroutineFnWrapper | None = None) -> DecoratorFunc:
+    ...
+
+
+def clear_state(
+    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+) -> HandlerFunc | DecoratorFunc:
     """set method to be handled by an application call with it'ws
         :code:`OnComplete` set to :code:`ClearState` call
 
@@ -723,19 +824,29 @@ def _impl(fn: HandlerFunc) -> HandlerFunc:
             return external(
                 method_config=MethodConfig(clear_state=CallConfig.CALL),
                 authorize=authorize,
-            )(
-                fn
-            )  # type: ignore
+            )(fn)
 
     if fn is None:
-        return _impl  # type: ignore
+        return _impl
 
     return _impl(fn)
 
 
+@overload
 def close_out(
-    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+    fn: HandlerFunc, /, *, authorize: SubroutineFnWrapper | None = None
 ) -> HandlerFunc:
+    ...
+
+
+@overload
+def close_out(*, authorize: SubroutineFnWrapper | None = None) -> DecoratorFunc:
+    ...
+
+
+def close_out(
+    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+) -> HandlerFunc | DecoratorFunc:
     """set method to be handled by an application call with it's
         :code:`OnComplete` set to :code:`CloseOut` call
 
@@ -757,19 +868,29 @@ def _impl(fn: HandlerFunc) -> HandlerFunc:
             return external(
                 method_config=MethodConfig(close_out=CallConfig.CALL),
                 authorize=authorize,
-            )(
-                fn
-            )  # type: ignore
+            )(fn)
 
     if fn is None:
-        return _impl  # type: ignore
+        return _impl
 
     return _impl(fn)
 
 
+@overload
 def no_op(
-    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+    fn: HandlerFunc, /, *, authorize: SubroutineFnWrapper | None = None
 ) -> HandlerFunc:
+    ...
+
+
+@overload
+def no_op(*, authorize: SubroutineFnWrapper | None = None) -> DecoratorFunc:
+    ...
+
+
+def no_op(
+    fn: HandlerFunc | None = None, /, *, authorize: SubroutineFnWrapper | None = None
+) -> HandlerFunc | DecoratorFunc:
     """set method to be handled by an application call with
         it's :code:`OnComplete` set to :code:`NoOp` call
 
@@ -790,11 +911,9 @@ def _impl(fn: HandlerFunc) -> HandlerFunc:
         else:
             return external(
                 method_config=MethodConfig(no_op=CallConfig.CALL), authorize=authorize
-            )(
-                fn
-            )  # type: ignore
+            )(fn)
 
     if fn is None:
-        return _impl  # type: ignore
+        return _impl
 
     return _impl(fn)

distribute.sh

@@ -10,5 +10,5 @@ echo "Building dist files"
 poetry build
 
 echo "Uploading to pypi"
-poetry publish
+poetry publish --username $PYPI_USERNAME --password $PYPI_PASSWORD