pelutils 3.8.1__tar.gz → 3.8.3__tar.gz

{pelutils-3.8.1 → pelutils-3.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pelutils
-Version: 3.8.1
+Version: 3.8.3
 Summary: The Swiss army knife of Python projects.
 Home-page: https://github.com/peleiden/pelutils
 Download-URL: https://pypi.org/project/pelutils/

{pelutils-3.8.1 → pelutils-3.8.3}/pelutils/__version__.py

@@ -1,2 +1,2 @@
 # Do not put anything else in this file
-__version__ = "3.8.1"
+__version__ = "3.8.3"

{pelutils-3.8.1 → pelutils-3.8.3}/pelutils/datastorage2/__init__.py

@@ -6,13 +6,13 @@ from typing import TypeVar
 
 from pydantic import BaseModel, ConfigDict
 
-from pelutils.datastorage2._pretty_json import _make_json_unsafe, _pretty_json  # pyright: ignore[reportPrivateUsage]
+from pelutils.datastorage2._pretty_json import _make_json_unsafe, _pickle_encode, _pretty_json  # pyright: ignore[reportPrivateUsage]
 
 _T = TypeVar("_T", bound="DataStorage2")
 
 
 class DataStorage2(BaseModel):
-    """Better version of DataStorage based on pydantic.
+    """Better version of DataStorage based on pydantic. It makes any class fully JSON serialisable.
 
     Usage is very similar to DataStorage, but it has a few key advantages:
     - Allows saving and loading of nested objects.
@@ -35,15 +35,18 @@ class DataStorage2(BaseModel):
     ) -> Path:
         """Save the instance to a json file in the directory. The path to the file is returned.
 
-        If save_name is None, the path is <directory>/<class name>.json, otherwise it is <directory>/<save_name>.json.
+        If save_name is None, the path is <directory>/<class name>.json, otherwise it is <directory>/<filename>.json.
         """
         savepath = self._resolve_save_file(directory, filename)
-        self_dict = self.model_dump()
+        savepath.parent.mkdir(parents=True, exist_ok=True)
+        self_dict = self.model_dump(mode="json", fallback=_pickle_encode)
         savepath.write_text(
             _pretty_json(
                 self_dict,
                 max_line_length=max_line_length,
                 indent=indent,
+                # Safe should not be needed here, as the fallback function in model_dump should ensure no issues
+                # However, it is kept for good measure in case there unforeseen edge cases
                 safe=True,
             ),
             encoding=encoding,

{pelutils-3.8.1 → pelutils-3.8.3}/pelutils/logging/__init__.py

@@ -4,7 +4,7 @@ import os
 import traceback as tb
 from collections.abc import Generator, Iterable
 from pathlib import Path
-from typing import Optional
+from typing import Any, Optional
 
 from pelutils import OS, UnsupportedOS, get_repo, get_timestamp
 from pelutils.format import RichString
@@ -135,7 +135,7 @@ class Logger:
 
     def _log(
         self,
-        *tolog: str,
+        *tolog: Any,  # pyright: ignore[reportExplicitAny]
         level: LogLevels = LogLevels.INFO,
         with_info: bool = True,
         sep: str | None = None,
@@ -276,34 +276,39 @@ class Logger:
             raise UnsupportedOS("Log collecting is not supported on windows")
         return _CollectLogs(self)
 
-    def section(self, *tolog: str, with_info: bool = True, sep: str | None = None, with_print: bool | None = None, newline: bool = True):
+    def section(self, *tolog: Any, with_info: bool = True, sep: str | None = None, with_print: bool | None = None, newline: bool = True):  # pyright: ignore[reportExplicitAny]
         """Log at SECTION level. See .log method for argument descriptions."""
         if newline:
             self._log("")
         self._log(*tolog, with_info=with_info, sep=sep, with_print=with_print, level=LogLevels.SECTION)
 
-    def critical(self, *tolog: str, with_info: bool = True, sep: str | None = None, with_print: bool | None = None):
+    def critical(self, *tolog: Any, with_info: bool = True, sep: str | None = None, with_print: bool | None = None):  # pyright: ignore[reportExplicitAny]
         """Log at CRITICAL level. See .log method for argument descriptions."""
         self._log(*tolog, with_info=with_info, sep=sep, with_print=with_print, level=LogLevels.CRITICAL)
 
-    def error(self, *tolog: str, with_info: bool = True, sep: str | None = None, with_print: bool | None = None):
+    def error(self, *tolog: Any, with_info: bool = True, sep: str | None = None, with_print: bool | None = None):  # pyright: ignore[reportExplicitAny]
         """Log at ERROR level. See .log method for argument descriptions."""
         self._log(*tolog, with_info=with_info, sep=sep, with_print=with_print, level=LogLevels.ERROR)
 
-    def warning(self, *tolog: str, with_info: bool = True, sep: str | None = None, with_print: bool | None = None):
+    def warning(self, *tolog: Any, with_info: bool = True, sep: str | None = None, with_print: bool | None = None):  # pyright: ignore[reportExplicitAny]
         """Log at WARNING level. See .log method for argument descriptions."""
         self._log(*tolog, with_info=with_info, sep=sep, with_print=with_print, level=LogLevels.WARNING)
 
-    def info(self, *tolog: str, with_info: bool = True, sep: str | None = None, with_print: bool | None = None):
+    def info(self, *tolog: Any, with_info: bool = True, sep: str | None = None, with_print: bool | None = None):  # pyright: ignore[reportExplicitAny]
         """Log at INFO level. See .log method for argument descriptions."""
         self._log(*tolog, with_info=with_info, sep=sep, with_print=with_print, level=LogLevels.INFO)
 
-    def debug(self, *tolog: str, with_info: bool = True, sep: str | None = None, with_print: bool | None = None):
+    def debug(self, *tolog: Any, with_info: bool = True, sep: str | None = None, with_print: bool | None = None):  # pyright: ignore[reportExplicitAny]
         """Log at DEBUG level. See .log method for argument descriptions."""
         self._log(*tolog, with_info=with_info, sep=sep, with_print=with_print, level=LogLevels.DEBUG)
 
     def __call__(
-        self, *tolog: str, level: LogLevels = LogLevels.INFO, with_info: bool = True, sep: str | None = None, with_print: bool | None = None
+        self,
+        *tolog: Any,  # pyright: ignore[reportExplicitAny]
+        level: LogLevels = LogLevels.INFO,
+        with_info: bool = True,
+        sep: str | None = None,
+        with_print: bool | None = None,
     ):
         """Shorthand for specific logging methods where level is specified as an argument."""
         self._log(*tolog, level=level, with_info=with_info, sep=sep, with_print=with_print)

{pelutils-3.8.1 → pelutils-3.8.3}/pelutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pelutils
-Version: 3.8.1
+Version: 3.8.3
 Summary: The Swiss army knife of Python projects.
 Home-page: https://github.com/peleiden/pelutils
 Download-URL: https://pypi.org/project/pelutils/