nshutils 0.17.0__tar.gz → 0.19.0__tar.gz

{nshutils-0.17.0 → nshutils-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: nshutils
-Version: 0.17.0
+Version: 0.19.0
 Summary: 
 Author: Nima Shoghi
 Author-email: nimashoghi@gmail.com
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: extra
 Requires-Dist: beartype
 Requires-Dist: jaxtyping
@@ -20,7 +21,7 @@ Requires-Dist: rich ; extra == "extra"
 Requires-Dist: treescope ; extra == "extra"
 Requires-Dist: typing-extensions
 Requires-Dist: uuid7
-Project-URL: homepage, https://github.com/nimashoghi/nshutils
+Project-URL: Homepage, https://github.com/nimashoghi/nshutils
 Description-Content-Type: text/markdown
 
 # nshutils

nshutils-0.19.0/pyproject.toml

@@ -0,0 +1,40 @@
+[project]
+name = "nshutils"
+version = "0.19.0"
+description = ""
+authors = [{ name = "Nima Shoghi", email = "nimashoghi@gmail.com" }]
+requires-python = ">=3.10,<4.0"
+readme = "README.md"
+
+dependencies = ["numpy", "jaxtyping", "typing-extensions", "beartype", "uuid7"]
+
+[project.optional-dependencies]
+extra = ["pysnooper", "lovely-numpy", "lovely-tensors", "rich", "treescope"]
+
+[project.urls]
+homepage = "https://github.com/nimashoghi/nshutils"
+
+[tool.poetry.group.dev.dependencies]
+basedpyright = "*"
+ruff = "*"
+ipykernel = "*"
+ipywidgets = "*"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.basedpyright]
+typeCheckingMode = "standard"
+deprecateTypingAliases = true
+strictListInference = true
+strictDictionaryInference = true
+strictSetInference = true
+reportPrivateImportUsage = false
+
+[tool.ruff.lint]
+select = ["FA102", "FA100"]
+ignore = ["F722", "F821", "E731", "E741"]
+
+[tool.ruff.lint.isort]
+required-imports = ["from __future__ import annotations"]

{nshutils-0.17.0 → nshutils-0.19.0}/src/nshutils/__init__.py

@@ -1,8 +1,11 @@
+from __future__ import annotations
+
 from . import actsave as actsave
 from . import typecheck as typecheck
-from ._display import display as display
 from .actsave import ActLoad as ActLoad
 from .actsave import ActSave as ActSave
+from .collections import apply_to_collection as apply_to_collection
+from .display import display as display
 from .logging import init_python_logging as init_python_logging
 from .logging import lovely as lovely
 from .logging import pretty as pretty

{nshutils-0.17.0 → nshutils-0.19.0}/src/nshutils/actsave/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from ._loader import ActLoad as ActLoad
 from ._saver import Activation as Activation
 from ._saver import ActSave as ActSave

{nshutils-0.17.0 → nshutils-0.19.0}/src/nshutils/actsave/_loader.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import pprint
 from dataclasses import dataclass, field
 from functools import cached_property

{nshutils-0.17.0 → nshutils-0.19.0}/src/nshutils/actsave/_saver.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import fnmatch
 import tempfile

{nshutils-0.17.0 → nshutils-0.19.0}/src/nshutils/collections.py

@@ -2,6 +2,8 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
+from __future__ import annotations
+
 import dataclasses
 from collections import OrderedDict, defaultdict
 from collections.abc import Callable, Mapping, Sequence

nshutils-0.17.0/src/nshutils/_display.py → nshutils-0.19.0/src/nshutils/display.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import importlib.util
 from functools import cache
 from typing import Any
@@ -25,7 +27,7 @@ def _rich_installed():
 
 def display(*args: Any):
     """
-        Display the given arguments in the current environment.
+    Display the given arguments in the current environment.
 
     If executed in an IPython environment, the display will be handled
     by treescope if installed, or rich if available. If neither are

{nshutils-0.17.0 → nshutils-0.19.0}/src/nshutils/logging.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 from pathlib import Path
 
@@ -7,7 +9,7 @@ def init_python_logging(
     lovely_tensors: bool = False,
     lovely_numpy: bool = False,
     treescope: bool = False,
-    treescope_autovisualize_arrays: bool = True,
+    treescope_autovisualize_arrays: bool = False,
     rich: bool = False,
     rich_tracebacks: bool = False,
     log_level: int | str | None = logging.INFO,
@@ -81,8 +83,8 @@ def pretty(
     *,
     lovely_tensors: bool = True,
     lovely_numpy: bool = True,
-    treescope: bool = True,
-    treescope_autovisualize_arrays: bool = True,
+    treescope: bool = False,
+    treescope_autovisualize_arrays: bool = False,
     log_level: int | str | None = logging.INFO,
     log_save_dir: Path | None = None,
     rich_log_handler: bool = False,
@@ -104,8 +106,8 @@ def lovely(
     *,
     lovely_tensors: bool = True,
     lovely_numpy: bool = True,
-    treescope: bool = True,
-    treescope_autovisualize_arrays: bool = True,
+    treescope: bool = False,
+    treescope_autovisualize_arrays: bool = False,
     log_level: int | str | None = logging.INFO,
     log_save_dir: Path | None = None,
     rich_log_handler: bool = False,

{nshutils-0.17.0 → nshutils-0.19.0}/src/nshutils/snoop.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import importlib.metadata
 from typing import Any, Protocol, cast
@@ -13,6 +15,7 @@ class SnoopConstructor(Protocol):
     def disable(self) -> contextlib.AbstractContextManager: ...
 
 
+snoop: SnoopConstructor
 try:
     import warnings
     from contextlib import nullcontext
@@ -201,7 +204,7 @@ try:
         disable = nullcontext
         __call__ = TorchSnooper
 
-    snoop: SnoopConstructor = cast(Any, _Snoop())
+    snoop = cast(Any, _Snoop())
 
 except ImportError:
     import warnings
@@ -227,4 +230,4 @@ except ImportError:
 
             return super().__enter__()
 
-    snoop: SnoopConstructor = cast(Any, _snoop_cls)
+    snoop = cast(Any, _snoop_cls)

{nshutils-0.17.0 → nshutils-0.19.0}/src/nshutils/typecheck.py

@@ -1,6 +1,10 @@
+from __future__ import annotations
+
 import os
+import sys
 from collections.abc import Sequence
 from logging import getLogger
+from types import FrameType as _FrameType
 from typing import Any
 
 from jaxtyping import BFloat16 as BFloat16
@@ -76,6 +80,21 @@ def typecheck_modules(modules: Sequence[str]):
     log.critical(f"Type checking the following modules: {modules}")
 
 
+def _get_frame_package_name_or_none(frame: _FrameType) -> str | None:
+    # Taken from `beartype._util.func.utilfuncframe.get_frame_package_name_or_none`.
+    assert isinstance(frame, _FrameType), f"{repr(frame)} not stack frame."
+
+    # Fully-qualified name of the parent package of the child module declaring
+    # the callable whose code object is that of this stack frame's if that
+    # module declares its name *OR* the empty string otherwise (e.g., if that
+    # module is either a top-level module or script residing outside any parent
+    # package structure).
+    frame_package_name = frame.f_globals.get("__package__")
+
+    # Return the name of this parent package.
+    return frame_package_name
+
+
 def typecheck_this_module(additional_modules: Sequence[str] = ()):
     """
     Typecheck the calling module and any additional modules using `jaxtyping`.
@@ -86,13 +105,11 @@ def typecheck_this_module(additional_modules: Sequence[str] = ()):
     # Get the calling module's name.
     # Here, we can just use beartype's internal implementation behind
     # `beartype_this_package`.
-    from beartype._util.func.utilfuncframe import get_frame, get_frame_package_name
 
     # Get the calling module's name.
-    assert get_frame is not None, "get_frame is None"
-    frame = get_frame(1)
+    frame = sys._getframe(1)
     assert frame is not None, "frame is None"
-    calling_module_name = get_frame_package_name(frame)
+    calling_module_name = _get_frame_package_name_or_none(frame)
     assert calling_module_name is not None, "calling_module_name is None"
 
     # Typecheck the calling module + any additional modules.

nshutils-0.17.0/pyproject.toml

@@ -1,46 +0,0 @@
-[tool.poetry]
-name = "nshutils"
-version = "0.17.0"
-description = ""
-authors = ["Nima Shoghi <nimashoghi@gmail.com>"]
-readme = "README.md"
-
-[tool.poetry.urls]
-homepage = "https://github.com/nimashoghi/nshutils"
-
-[tool.poetry.dependencies]
-python = "^3.10"
-numpy = "*"
-jaxtyping = "*"
-typing-extensions = "*"
-beartype = "*"
-uuid7 = "*"
-treescope = { version = "*", optional = true }
-lovely-numpy = { version = "*", optional = true }
-lovely-tensors = { version = "*", optional = true }
-pysnooper = { version = "*", optional = true }
-rich = { version = "*", optional = true }
-
-[tool.poetry.group.dev.dependencies]
-pyright = "^1.1.373"
-ruff = "^0.5.4"
-ipykernel = "^6.29.5"
-ipywidgets = "^8.1.3"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.pyright]
-typeCheckingMode = "standard"
-deprecateTypingAliases = true
-strictListInference = true
-strictDictionaryInference = true
-strictSetInference = true
-reportPrivateImportUsage = false
-
-[tool.ruff.lint]
-ignore = ["F722", "F821", "E731", "E741"]
-
-[tool.poetry.extras]
-extra = ["pysnooper", "lovely-numpy", "lovely-tensors", "rich", "treescope"]