fix: type annotations were erroneous

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
   #   rev: v1.7.1
   #   hooks:
   #     - id: mypy
-  #       additional_dependencies: [types-all, pydantic]
+  #       additional_dependencies: [types-all]
   #       args: [--config-file=./pyproject.toml]
   #       files: ^src/
   #       entry: mypy src/

pyproject.toml

@@ -131,7 +131,7 @@ ci = {shell = """ \
 
 
 [tool.mypy]
-plugins = ["pydantic.mypy"]
+# plugins = ["pydantic.mypy"]
 disallow_any_unimported = false
 ignore_missing_imports = true
 pretty = true
@@ -143,10 +143,10 @@ warn_unused_ignores = false
 files = ["src/**/*.py"]
 exclude = ["tests/**/*.py", "docs/**/*.py"]
 
-[tool.pydantic-mypy]
-init_forbid_extra = true
-init_typed = true
-warn_required_dynamic_aliases = true
+# [tool.pydantic-mypy]
+# init_forbid_extra = true
+# init_typed = true
+# warn_required_dynamic_aliases = true
 
 [tool.coverage.run]
 source = ["src/ornaments"]

src/ornaments/invariants/only_called_once.py

@@ -7,7 +7,7 @@
 from ..scopes import CLASS_SCOPE, OBJECT_SCOPE, SESSION_SCOPE
 
 
-def only_called_once(scope="object", enforce: bool = False) -> Callable[..., Callable[..., Any]]:
+def only_called_once(scope: str = "object", enforce: bool = False) -> Callable[..., Any]:
     """
     Decorator that ensures a function is only called once in a given scope.
 
@@ -21,9 +21,9 @@ def my_function() -> str:
     ```
     """
 
-    def decorator(func: Callable) -> Callable:
+    def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
         @wraps(wrapped=func)
-        def wrapper(*args, **kwargs) -> Any:
+        def wrapper(*args: Any, **kwargs: Any) -> Any:
             if scope in OBJECT_SCOPE:
                 # Use the id of the instance for object scope
                 call_scope = (id(args[0]), func)
@@ -34,7 +34,7 @@ def wrapper(*args, **kwargs) -> Any:
                 call_scope = (args[0].__class__, func)
             elif scope in SESSION_SCOPE:  # session scope
                 # Use the function itself as identifier for session scope
-                call_scope = (func,)
+                call_scope = (id(func), func)
             else:
                 raise ValueError(f"Invalid scope. Must be one of {OBJECT_SCOPE | CLASS_SCOPE | SESSION_SCOPE}.")
 

src/ornaments/scopes.py

@@ -1,6 +1,6 @@
 from typing import Final
 
-CLASS_SCOPE: Final[set] = {"class"}
-SESSION_SCOPE: Final[set] = {"session"}
-OBJECT_SCOPE: Final[set] = {"instance", "object"}
-ALL_SCOPES: Final[set] = CLASS_SCOPE | SESSION_SCOPE | OBJECT_SCOPE
+CLASS_SCOPE: Final[set[str]] = {"class"}
+SESSION_SCOPE: Final[set[str]] = {"session"}
+OBJECT_SCOPE: Final[set[str]] = {"instance", "object"}
+ALL_SCOPES: Final[set[str]] = CLASS_SCOPE | SESSION_SCOPE | OBJECT_SCOPE