tensorneko-util 0.3.15__tar.gz → 0.3.17__tar.gz

{tensorneko_util-0.3.15 → tensorneko_util-0.3.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tensorneko_util
-Version: 0.3.15
+Version: 0.3.17
 Summary: The Utils for Library TensorNeko.
 Home-page: https://github.com/ControlNet/tensorneko
 Author: ControlNet
@@ -8,6 +8,9 @@ Author-email: smczx@hotmail.com
 License: UNKNOWN
 Project-URL: Bug Tracker, https://github.com/ControlNet/tensorneko/issues
 Project-URL: Source Code, https://github.com/ControlNet/tensorneko
+Description: 
+        The independent util library for TensorNeko. This library doesn't require PyTorch as a dependency.
+        
 Keywords: deep learning,pytorch,AI,data processing
 Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
@@ -24,9 +27,3 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Utilities
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
-License-File: LICENSE
-
-
-The independent util library for TensorNeko. This library doesn't require PyTorch as a dependency.
-
-

{tensorneko_util-0.3.15 → tensorneko_util-0.3.17}/README.md

@@ -25,8 +25,11 @@ Tensor Neural Engine Kompanion. An util library based on PyTorch and PyTorch Lig
 
 ## Install
 
+The tensorneko requires pytorch and pytorch-lightning (optional), and you can install it with below command.
+
 ```shell
-pip install tensorneko
+pip install tensorneko  # for PyTorch only
+pip install tensorneko[lightning]  # for PyTorch and Lightning
 ```
 
 To use the library without PyTorch and PyTorch Lightning, you can install the util library (support Python 3.7 ~ 3.12 with limited features) with following command.

{tensorneko_util-0.3.15 → tensorneko_util-0.3.17}/setup.py

@@ -5,9 +5,13 @@ with open("README.md", "r") as file:
     long_description = file.read()
 
 requirements = []
+extra_requirements = []
 with open("requirements.txt", "r") as file:
     for line in file:
-        requirements.append(line.strip())
+        if line.startswith("lightning") or line.startswith("tensorboard"):
+            extra_requirements.append(line.strip())
+        else:
+            requirements.append(line.strip())
 
 
 version = init.read_version()
@@ -37,6 +41,9 @@ setuptools.setup(
     },
     python_requires=">=3.8",
     install_requires=requirements,
+    extras_require={
+        "lightning": extra_requirements
+    },
     classifiers=[
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",

{tensorneko_util-0.3.15 → tensorneko_util-0.3.17}/src/tensorneko_util/io/json/json_writer.py

@@ -14,7 +14,7 @@ class JsonWriter:
                 json.dump(obj, file, indent=indent, ensure_ascii=ensure_ascii)
         else:
             import orjson
-            with open(path, "w", encoding=encoding) as file:
+            with open(path, "wb") as file:
                 if indent == 4:
                     warnings.warn("orjson does not support indent 4, will use indent 2 instead.")
                     option = orjson.OPT_INDENT_2

{tensorneko_util-0.3.15 → tensorneko_util-0.3.17}/src/tensorneko_util/util/misc.py

@@ -241,7 +241,8 @@ def load_py(path: str) -> ModuleType:
     return module
 
 
-def try_until_success(func: Callable[[Any], T], *args, max_trials: Optional[int] = None, sleep_time: int = 0,
+def try_until_success(func: Callable[..., T], *args, max_trials: Optional[int] = None, sleep_time: int = 0,
+    exception_callback: Optional[Callable[[Exception], None]] = None,
     exception_type: Union[Type[T_E], Tuple[T_E, ...]] = Exception, **kwargs
 ) -> T:
     """
@@ -251,6 +252,7 @@ def try_until_success(func: Callable[[Any], T], *args, max_trials: Optional[int]
         func (``(...) -> T``): The function to run.
         max_trials (``int``, optional): The max try times. None for unlimited. Default: None.
         sleep_time (``int``, optional): The sleep time between each try. Default: 0.
+        exception_callback (``(Exception) -> None``, optional): The callback function when exception occurs.
         exception_type (``Type[Exception] | (Type[Exception], ...)``, optional): The exception types to catch.
             Default: Exception.
         *args: The args for the function.
@@ -268,6 +270,8 @@ def try_until_success(func: Callable[[Any], T], *args, max_trials: Optional[int]
             return func(*args, **kwargs)
         except exception_type as e:
             trials += 1
+            if exception_callback is not None:
+                exception_callback(e)
             if max_trials is not None and trials > max_trials:
                 raise e
         if sleep_time > 0:

{tensorneko_util-0.3.15 → tensorneko_util-0.3.17}/src/tensorneko_util/util/registry.py

@@ -28,7 +28,7 @@ class Registry(Generic[T]):
     """
 
     def __init__(self):
-        self._registry: dict[str, T] = {}
+        self._registry: dict[str, Type[T]] = {}
 
     def register(self, name: str) -> Callable[[Type[T]], Type[T]]:
         def wrapper(cls):
@@ -37,7 +37,7 @@ class Registry(Generic[T]):
 
         return wrapper
 
-    def __getitem__(self, name: str) -> T:
+    def __getitem__(self, name: str) -> Type[T]:
         return self._registry[name]
 
     def items(self):

tensorneko_util-0.3.17/src/tensorneko_util/version.txt

@@ -0,0 +1 @@
+0.3.17