nshutils 0.4.0__tar.gz → 0.5.1__tar.gz

{nshutils-0.4.0 → nshutils-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nshutils
-Version: 0.4.0
+Version: 0.5.1
 Summary: 
 Author: Nima Shoghi
 Author-email: nimashoghi@gmail.com

{nshutils-0.4.0 → nshutils-0.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nshutils"
-version = "0.4.0"
+version = "0.5.1"
 description = ""
 authors = ["Nima Shoghi <nimashoghi@gmail.com>"]
 readme = "README.md"

{nshutils-0.4.0 → nshutils-0.5.1}/src/nshutils/logging.py

@@ -7,6 +7,7 @@ def init_python_logging(
     lovely_tensors: bool = False,
     lovely_numpy: bool = False,
     rich: bool = False,
+    rich_tracebacks: bool = False,
     log_level: int | str | None = logging.INFO,
     log_save_dir: Path | None = None,
 ):
@@ -40,7 +41,7 @@ def init_python_logging(
         try:
             from rich.logging import RichHandler
 
-            log_handlers.append(RichHandler())
+            log_handlers.append(RichHandler(rich_tracebacks=rich_tracebacks))
         except ImportError:
             logging.warning(
                 "Failed to import rich. Falling back to default Python logging."
@@ -61,6 +62,7 @@ def pretty(
     log_level: int | str | None = logging.INFO,
     log_save_dir: Path | None = None,
     rich_log_handler: bool = True,
+    rich_tracebacks: bool = True,
 ):
     init_python_logging(
         lovely_tensors=lovely_tensors,
@@ -68,6 +70,7 @@ def pretty(
         rich=rich_log_handler,
         log_level=log_level,
         log_save_dir=log_save_dir,
+        rich_tracebacks=rich_tracebacks,
     )
 
 
@@ -78,6 +81,7 @@ def lovely(
     log_level: int | str | None = logging.INFO,
     log_save_dir: Path | None = None,
     rich_log_handler: bool = True,
+    rich_tracebacks: bool = True,
 ):
     pretty(
         lovely_tensors=lovely_tensors,
@@ -85,4 +89,5 @@ def lovely(
         log_level=log_level,
         log_save_dir=log_save_dir,
         rich_log_handler=rich_log_handler,
+        rich_tracebacks=rich_tracebacks,
     )

{nshutils-0.4.0 → nshutils-0.5.1}/src/nshutils/snoop.py

@@ -16,18 +16,26 @@ try:
     import warnings
     from contextlib import nullcontext
 
-    import lovely_numpy as lo
-    import lovely_tensors as lt
-    import numpy
     import pysnooper
     import pysnooper.utils
-    import torch
     from pkg_resources import DistributionNotFound, get_distribution
 
+    try:
+        import torch
+    except ImportError:
+        torch = None
+
+    try:
+        import numpy
+    except ImportError:
+        numpy = None
+
     FLOATING_POINTS = set()
     for i in ["float", "double", "half", "complex128", "complex32", "complex64"]:
-        if hasattr(torch, i):  # older version of PyTorch do not have complex dtypes
-            FLOATING_POINTS.add(getattr(torch, i))
+        # older version of PyTorch do not have complex dtypes
+        if torch is not None and not hasattr(torch, i):
+            continue
+        FLOATING_POINTS.add(getattr(torch, i))
 
     try:
         __version__ = get_distribution(__name__).version
@@ -37,13 +45,19 @@ try:
 
     def default_format(x):
         try:
-            formatted = str(lt.lovely(x))
-            return formatted
+            import lovely_tensors as lt
+
+            return = str(lt.lovely(x))
         except BaseException:
             return str(x.shape)
 
     def default_numpy_format(x):
-        return str(lo.lovely(x))
+        try:
+            import lovely_numpy as lo
+
+            return str(lo.lovely(x))
+        except BaseException:
+            return str(x.shape)
 
     class TorchSnooper(pysnooper.tracer.Tracer):
         def __init__(
@@ -155,9 +169,9 @@ try:
 
         def compute_repr(self, x):
             orig_repr_func = pysnooper.utils.get_repr_function(x, self.orig_custom_repr)
-            if torch.is_tensor(x):
+            if torch is not None and torch.is_tensor(x):
                 return self.tensor_format(x)
-            if isinstance(x, numpy.ndarray):
+            if numpy is not None and isinstance(x, numpy.ndarray):
                 return self.numpy_format(x)
             if self.is_return_types(x):
                 return self.return_types_repr(x)