wiederverwendbar 0.8.4__tar.gz → 0.8.6__tar.gz

{wiederverwendbar-0.8.4 → wiederverwendbar-0.8.6}/PKG-INFO

@@ -1,49 +1,49 @@
 Metadata-Version: 2.1
 Name: wiederverwendbar
-Version: 0.8.4
+Version: 0.8.6
 Summary: A collection of scripts, classes and tools they are \"wiederverwendbar\".
 Author-Email: Julius Koenig <info@bastelquartier.de>
 License: GPL-3.0
 Requires-Python: >=3.9
-Requires-Dist: pydantic>=2.11.4
+Requires-Dist: pydantic>=2.11.5
 Requires-Dist: pydantic-settings>=2.9.1
 Requires-Dist: devtools>=0.12.2
 Provides-Extra: full
 Requires-Dist: rich>=14.0.0; extra == "full"
-Requires-Dist: typer>=0.15.3; extra == "full"
+Requires-Dist: typer>=0.16.0; extra == "full"
 Requires-Dist: pythonping>=1.1.4; extra == "full"
 Requires-Dist: mongoengine>=0.29.1; extra == "full"
-Requires-Dist: nicegui>=2.17.0; extra == "full"
-Requires-Dist: uvicorn>=0.34.2; extra == "full"
+Requires-Dist: nicegui>=2.19.0; extra == "full"
+Requires-Dist: uvicorn>=0.34.3; extra == "full"
 Requires-Dist: fastapi>=0.115.12; extra == "full"
-Requires-Dist: starlette-admin[i18n]>=0.14.1; extra == "full"
+Requires-Dist: starlette-admin[i18n]>=0.15.1; extra == "full"
 Requires-Dist: pillow>=11.2.1; extra == "full"
 Requires-Dist: blinker>=1.9.0; extra == "full"
-Requires-Dist: kombu>=5.5.3; extra == "full"
+Requires-Dist: kombu>=5.5.4; extra == "full"
 Requires-Dist: nest-asyncio>=1.6.0; extra == "full"
-Requires-Dist: sqlalchemy>=2.0.40; extra == "full"
+Requires-Dist: sqlalchemy>=2.0.41; extra == "full"
 Provides-Extra: rich
 Requires-Dist: rich>=14.0.0; extra == "rich"
 Provides-Extra: typer
-Requires-Dist: typer>=0.15.3; extra == "typer"
+Requires-Dist: typer>=0.16.0; extra == "typer"
 Provides-Extra: mongoengine
 Requires-Dist: mongoengine>=0.29.1; extra == "mongoengine"
 Requires-Dist: blinker>=1.9.0; extra == "mongoengine"
 Provides-Extra: uvicorn
-Requires-Dist: uvicorn>=0.34.2; extra == "uvicorn"
+Requires-Dist: uvicorn>=0.34.3; extra == "uvicorn"
 Provides-Extra: fastapi
 Requires-Dist: fastapi>=0.115.12; extra == "fastapi"
 Provides-Extra: nicegui
-Requires-Dist: nicegui>=2.17.0; extra == "nicegui"
+Requires-Dist: nicegui>=2.19.0; extra == "nicegui"
 Provides-Extra: starlette-admin
-Requires-Dist: starlette-admin[i18n]>=0.14.1; extra == "starlette-admin"
+Requires-Dist: starlette-admin[i18n]>=0.15.1; extra == "starlette-admin"
 Requires-Dist: pillow>=11.2.1; extra == "starlette-admin"
-Requires-Dist: kombu>=5.5.3; extra == "starlette-admin"
+Requires-Dist: kombu>=5.5.4; extra == "starlette-admin"
 Requires-Dist: nest-asyncio>=1.6.0; extra == "starlette-admin"
 Provides-Extra: fuctions
 Requires-Dist: pythonping>=1.1.4; extra == "fuctions"
 Provides-Extra: sqlalchemy
-Requires-Dist: sqlalchemy>=2.0.40; extra == "sqlalchemy"
+Requires-Dist: sqlalchemy>=2.0.41; extra == "sqlalchemy"
 Description-Content-Type: text/markdown
 
 # wiederverwendbar

{wiederverwendbar-0.8.4 → wiederverwendbar-0.8.6}/pyproject.toml

@@ -6,13 +6,13 @@ authors = [
     { name = "Julius Koenig", email = "info@bastelquartier.de" },
 ]
 dependencies = [
-    "pydantic>=2.11.4",
+    "pydantic>=2.11.5",
     "pydantic-settings>=2.9.1",
     "devtools>=0.12.2",
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "0.8.4"
+version = "0.8.6"
 
 [project.license]
 text = "GPL-3.0"
@@ -20,49 +20,49 @@ text = "GPL-3.0"
 [project.optional-dependencies]
 full = [
     "rich>=14.0.0",
-    "typer>=0.15.3",
+    "typer>=0.16.0",
     "pythonping>=1.1.4",
     "mongoengine>=0.29.1",
-    "nicegui>=2.17.0",
-    "uvicorn>=0.34.2",
+    "nicegui>=2.19.0",
+    "uvicorn>=0.34.3",
     "fastapi>=0.115.12",
-    "starlette-admin[i18n]>=0.14.1",
+    "starlette-admin[i18n]>=0.15.1",
     "pillow>=11.2.1",
     "blinker>=1.9.0",
-    "kombu>=5.5.3",
+    "kombu>=5.5.4",
     "nest-asyncio>=1.6.0",
-    "sqlalchemy>=2.0.40",
+    "sqlalchemy>=2.0.41",
 ]
 rich = [
     "rich>=14.0.0",
 ]
 typer = [
-    "typer>=0.15.3",
+    "typer>=0.16.0",
 ]
 mongoengine = [
     "mongoengine>=0.29.1",
     "blinker>=1.9.0",
 ]
 uvicorn = [
-    "uvicorn>=0.34.2",
+    "uvicorn>=0.34.3",
 ]
 fastapi = [
     "fastapi>=0.115.12",
 ]
 nicegui = [
-    "nicegui>=2.17.0",
+    "nicegui>=2.19.0",
 ]
 starlette-admin = [
-    "starlette-admin[i18n]>=0.14.1",
+    "starlette-admin[i18n]>=0.15.1",
     "pillow>=11.2.1",
-    "kombu>=5.5.3",
+    "kombu>=5.5.4",
     "nest-asyncio>=1.6.0",
 ]
 fuctions = [
     "pythonping>=1.1.4",
 ]
 sqlalchemy = [
-    "sqlalchemy>=2.0.40",
+    "sqlalchemy>=2.0.41",
 ]
 
 [build-system]

{wiederverwendbar-0.8.4 → wiederverwendbar-0.8.6}/src/wiederverwendbar/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.8.4"
+__version__ = "0.8.6"
 TITLE = "wiederverwendbar"
 VERSION = __version__
 AUTHOR = "Julius Koenig"

wiederverwendbar-0.8.6/src/wiederverwendbar/functions/get_pretty_str.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+def get_pretty_str(value):
+    if type(value) is str:
+        return f"'{value}'"
+    elif isinstance(value, Enum):
+        return get_pretty_str(value.value)
+    return f"{value}"

{wiederverwendbar-0.8.4 → wiederverwendbar-0.8.6}/src/wiederverwendbar/logger/log_levels.py

@@ -1,3 +1,4 @@
+import logging
 from enum import Enum
 
 
@@ -12,3 +13,7 @@ class LogLevels(str, Enum):
     WARNING = "WARNING"
     INFO = "INFO"
     DEBUG = "DEBUG"
+
+    @property
+    def logging_level(self) -> int:
+        return getattr(logging, self.value)

{wiederverwendbar-0.8.4 → wiederverwendbar-0.8.6}/src/wiederverwendbar/pydantic/file_config.py

@@ -1,15 +1,19 @@
 import json
+import sys
+from warnings import warn
 from pathlib import Path
-from typing import Any, Union
+from typing import Any, Union, Literal
 
 from pydantic import BaseModel, create_model
 
+from wiederverwendbar.warnings import FileNotFoundWarning
+
 
 class FileConfig(BaseModel):
     def __init__(self,
                  file_path: Union[Path, str, None] = None,
                  file_postfix: str = ".json",
-                 file_must_exist: bool = False,
+                 file_must_exist: Union[bool, Literal["yes_print", "yes_warn", "yes_raise", "no"]] = "no",
                  **overwrite_data: Any):
         if file_path is None:
             file_path = Path(Path.cwd() / self.__class__.__name__.lower()).with_suffix(file_postfix)
@@ -17,6 +21,7 @@ class FileConfig(BaseModel):
             file_path = Path(file_path)
             if file_path.suffix == "":
                 file_path = file_path.with_suffix(file_postfix)
+        file_path = file_path.absolute()
 
         # read data from file
         if file_path.is_file():
@@ -25,8 +30,19 @@ class FileConfig(BaseModel):
         elif file_path.is_dir():
             raise ValueError(f"{self.__class__.__name__} file path '{file_path}' is a directory.")
         else:
-            if file_must_exist:
-                raise FileNotFoundError(f"{self.__class__.__name__} file '{file_path}' not found.")
+            if file_must_exist is True:
+                file_must_exist = "yes_raise"
+            elif file_must_exist is False:
+                file_must_exist = "no"
+            msg = f"{self.__class__.__name__} file '{file_path}' not found."
+            if file_must_exist == "yes_print":
+                print(msg)
+                sys.exit(1)
+            elif file_must_exist == "yes_warn":
+                warn(msg, FileNotFoundWarning)
+                sys.exit(1)
+            elif file_must_exist == "yes_raise":
+                raise FileNotFoundError(msg)
             data = {}
 
         # overwrite data

{wiederverwendbar-0.8.4 → wiederverwendbar-0.8.6}/src/wiederverwendbar/sqlalchemy/base.py

@@ -1,3 +1,4 @@
+import warnings
 from typing import Any, Optional, Callable, Union, TYPE_CHECKING
 
 from sqlalchemy import inspect
@@ -6,6 +7,7 @@ from sqlalchemy.orm import Session, QueryableAttribute
 from sqlalchemy.orm.exc import DetachedInstanceError
 
 from wiederverwendbar.default import Default
+from wiederverwendbar.functions.get_pretty_str import get_pretty_str
 from wiederverwendbar.sqlalchemy.raise_has_not_attr import raise_has_not_attr
 
 if TYPE_CHECKING:
@@ -141,7 +143,18 @@ class Base:
         super().__init__(*args, **kwargs)
 
     def __str__(self):
-        return f"{self.__class__.__name__}({', '.join([f'{column_name}={getattr(self, column_name)}' for column_name in self.__str_columns__])})"
+        out = f"{self.__class__.__name__}("
+        for attr_name in self.__str_columns__:
+            if type(attr_name) is tuple:
+                attr_view_name = attr_name[0]
+                attr_name = attr_name[1]
+            else:
+                attr_view_name = attr_name
+            if not hasattr(self, attr_name):
+                warnings.warn(f"Attribute '{attr_name}' is not set for {self}.")
+            out += f"{attr_view_name}={get_pretty_str(getattr(self, attr_name))}, "
+        out = out[:-2] + ")"
+        return out
 
     def __repr__(self):
         return self.__str__()
@@ -247,7 +260,7 @@ class Base:
     @classmethod
     def new(cls,
             session: Optional[Session] = None,
-            **kwargs) -> "Base":
+            **kwargs) -> Union["Base", Any]:
         session_created, session = cls.session(session=session)
 
         # noinspection PyArgumentList
@@ -279,7 +292,7 @@ class Base:
     @classmethod
     def get_all(cls,
                 *criterion: Union[ColumnExpressionArgument[bool], bool],
-                order_by: Union[str, QueryableAttribute, None] = None,
+                order_by: Union[str, QueryableAttribute, Any, None] = None,
                 order_desc: bool = False,
                 rows_per_page: Optional[int] = None,
                 page: int = 1,
@@ -287,7 +300,7 @@ class Base:
                 as_dict: bool = False,
                 dict_columns: Union[list[DictColumn], Default] = Default(),
                 session: Optional[Session] = None,
-                **kwargs: Any) -> list[Union["Base", None, dict[str, Any]]]:
+                **kwargs: Any) -> list[Union["Base", None, dict[str, Any], Any]]:
         session_created, session = cls.session(session=session)
 
         # get order by
@@ -351,7 +364,7 @@ class Base:
             as_dict: bool = False,
             dict_columns: Union[list[DictColumn], Default] = Default(),
             session: Optional[Session] = None,
-            **kwargs: Any) -> Union["Base", None, dict[str, Any]]:
+            **kwargs: Any) -> Union["Base", None, dict[str, Any], Any]:
         session_created, session = cls.session(session=session)
 
         if criterion:

{wiederverwendbar-0.8.4 → wiederverwendbar-0.8.6}/src/wiederverwendbar/sqlalchemy/db.py

@@ -42,7 +42,9 @@ class SqlalchemyDb:
                  username: Optional[str] = None,
                  password: Optional[str] = None,
                  echo: Optional[bool] = None,
-                 sqlite_handle_foreign_keys: bool = True,
+                 test_on_startup: Optional[bool] = None,
+                 sqlite_check_if_file_exist: Optional[bool] = None,
+                 sqlite_handle_foreign_keys: Optional[bool] = None,
                  settings: Optional[SqlalchemySettings] = None):
         """
         Create a new Sqlalchemy Database
@@ -54,6 +56,8 @@ class SqlalchemyDb:
         :param username: User to connect to database
         :param password: Password to connect to database
         :param echo: Echo SQL queries to console
+        :param test_on_startup: Test the database connection on startup.
+        :param sqlite_check_if_file_exist: Check if SQLite file exists before connecting to it.
         :param sqlite_handle_foreign_keys: Enable SQLite Foreign Keys
         :param settings: Sqlalchemy Settings
         """
@@ -67,16 +71,24 @@ class SqlalchemyDb:
         self._username: Optional[str] = username or self.settings.db_username
         self._password: Optional[str] = password or self.settings.db_password
         self._echo: bool = echo or self.settings.db_echo
+        self._test_on_startup: bool = test_on_startup or self.settings.db_test_on_startup
+        self._sqlite_check_if_file_exist: bool = sqlite_check_if_file_exist or self.settings.db_sqlite_check_if_file_exist
         self._sqlite_handle_foreign_keys: bool = sqlite_handle_foreign_keys or self.settings.db_sqlite_handle_foreign_keys
 
         logger.debug(f"Create {self}")
 
         self.engine = create_engine(self.connection_string, echo=self.echo)
-        if self.protocol == "sqlite" and self.sqlite_handle_foreign_keys:
-            self.listen("connect", self._sqlite_set_handle_foreign_keys)
-        self.session_maker = sessionmaker(bind=self.engine)
-        self.Base: DeclarativeMeta = declarative_base(metaclass=DeclarativeMeta)
-        self.session_maker.configure(binds={self.Base: self.engine})
+        if self.protocol == "sqlite":
+            if self.sqlite_check_if_file_exist:
+                self.listen("connect", self._sqlite_check_if_file_exist_func)
+            if self.sqlite_handle_foreign_keys:
+                self.listen("connect", self._sqlite_handle_foreign_keys_func)
+        self._session_maker = sessionmaker(bind=self.engine)
+        self._Base: DeclarativeMeta = declarative_base(metaclass=DeclarativeMeta)
+        self.session_maker.configure(binds={self._Base: self.engine})
+
+        if self.test_on_startup:
+            self.test()
 
     def __str__(self):
         return f"{self.__class__.__name__}({self.connection_string_printable})"
@@ -117,10 +129,27 @@ class SqlalchemyDb:
     def echo(self) -> bool:
         return self._echo
 
+    @property
+    def test_on_startup(self) -> bool:
+        return self._test_on_startup
+
+    @property
+    def sqlite_check_if_file_exist(self) -> bool:
+        return self._sqlite_check_if_file_exist
+
     @property
     def sqlite_handle_foreign_keys(self) -> bool:
         return self._sqlite_handle_foreign_keys
 
+    @property
+    def session_maker(self) -> sessionmaker:
+        return self._session_maker
+
+    # noinspection PyPep8Naming
+    @property
+    def Base(self) -> Any:
+        return self._Base
+
     def get_connection_string(self, printable: bool = False) -> str:
         """
         Get the Connection String
@@ -173,6 +202,10 @@ class SqlalchemyDb:
 
         return self.get_connection_string(printable=True)
 
+    def test(self):
+        self.engine.connect()
+        print()
+
     def create_all(self,
                    tables: Optional[Sequence[Table]] = None,
                    check_first: bool = True) -> None:
@@ -231,8 +264,13 @@ class SqlalchemyDb:
 
         return event.listens_for(self.engine, identifier, *args, **kw)
 
-    @classmethod
-    def _sqlite_set_handle_foreign_keys(cls, connection, _connection_record):
+    def _sqlite_check_if_file_exist_func(self, connection, _connection_record):
+        if self.file is not None:
+            if not self.file.is_file():
+                raise FileNotFoundError(f"Database file does not exist: {self.file}")
+
+    # noinspection PyMethodMayBeStatic
+    def _sqlite_handle_foreign_keys_func(self, connection, _connection_record):
         if not isinstance(connection, sqlite3.Connection):
             raise RuntimeError(f"Connection is not a sqlite3.Connection: {connection}")
         cursor = connection.cursor()

{wiederverwendbar-0.8.4 → wiederverwendbar-0.8.6}/src/wiederverwendbar/sqlalchemy/settings.py

@@ -34,6 +34,12 @@ class SqlalchemySettings(PrintableSettings):
     db_echo: bool = Field(default=False,
                           title="Database echo.",
                           description="Echo SQL queries to console")
+    db_test_on_startup: bool = Field(default=True,
+                                 title="Test Database on Startup",
+                                 description="Test database connection on startup")
+    db_sqlite_check_if_file_exist: bool = Field(default=True,
+                                                title="Database SQLite Check If File Exist",
+                                                description="Check if file exists in SQLite")
     db_sqlite_handle_foreign_keys: bool = Field(default=True,
                                                 title="Database SQLite Handle Foreign Keys",
                                                 description="Handle foreign keys in SQLite")

{wiederverwendbar-0.8.4 → wiederverwendbar-0.8.6}/src/wiederverwendbar/task_manger/task.py

@@ -59,16 +59,13 @@ class Task:
                 raise ValueError("Manager object is required.")
             manager.add_task(self)
 
-    def __str__(self):
-        return f"{self.manager.name}.{self.name}"
-
     def init(self, manager):
         self.manager = manager
         self.trigger.init(manager)
         self.set_next_run()
 
         # log task creation
-        self.manager.logger.debug(f"{self}: Task created.")
+        self.manager.logger.debug(f"Task created.")
 
     @property
     def last_run(self) -> Optional[datetime]:

{wiederverwendbar-0.8.4 → wiederverwendbar-0.8.6}/src/wiederverwendbar/task_manger/task_manager.py

@@ -8,9 +8,6 @@ from typing import Any, Optional
 from wiederverwendbar.task_manger.task import Task
 from wiederverwendbar.task_manger.trigger import Trigger
 
-LOGGER = logging.getLogger(__name__)
-
-
 class TaskManager:
     lock = threading.Lock()
 
@@ -20,7 +17,8 @@ class TaskManager:
                  daemon: bool = False,
                  keep_done_tasks: bool = False,
                  loop_delay: Optional[float] = None,
-                 logger: Optional[logging.Logger] = None):
+                 logger: Optional[logging.Logger] = None,
+                 log_self: bool = True):
         if name is None:
             name = self.__class__.__name__
         self.name = name
@@ -29,7 +27,7 @@ class TaskManager:
         self._stopped: bool = False
         self._creation_time: datetime = datetime.now()
         self._keep_done_tasks = keep_done_tasks
-        self.logger = logger or LOGGER
+        self.logger = logger or logging.getLogger(self.name)
 
         # create workers
         if worker_count is None:
@@ -48,9 +46,6 @@ class TaskManager:
                 loop_delay = 0.001
         self._loop_delay = loop_delay
 
-    def __str__(self):
-        return f"{self.__class__.__name__}({self.name})"
-
     def __del__(self):
         if not self.stopped:
             self.stop()
@@ -96,14 +91,14 @@ class TaskManager:
         :return: None
         """
 
-        self.logger.debug(f"{self}: Starting manager ...")
+        self.logger.debug(f"Starting manager ...")
 
         # start workers
         for worker in self._workers:
-            self.logger.debug(f"{self}: Starting worker '{worker.name}' ...")
+            self.logger.debug(f"Starting worker '{worker.name}' ...")
             worker.start()
 
-        self.logger.debug(f"{self}: Manager started.")
+        self.logger.debug(f"Manager started.")
 
     def stop(self) -> None:
         """
@@ -112,7 +107,7 @@ class TaskManager:
         :return: None
         """
 
-        self.logger.debug(f"{self}: Stopping manager ...")
+        self.logger.debug(f"Stopping manager ...")
 
         # set stopped flag
         with self.lock:
@@ -121,10 +116,10 @@ class TaskManager:
         # wait for workers to finish
         for worker in self._workers:
             if worker.is_alive():
-                self.logger.debug(f"{self}: Waiting for worker '{worker.name}' to finish ...")
+                self.logger.debug(f"Waiting for worker '{worker.name}' to finish ...")
                 worker.join()
 
-        self.logger.debug(f"{self}: Manager stopped.")
+        self.logger.debug(f"Manager stopped.")
 
     def loop(self, stay_in_loop: Optional[bool] = None) -> None:
         """
@@ -155,7 +150,7 @@ class TaskManager:
                     time.sleep(loop_delay)
                 continue
 
-            self.logger.debug(f"{self}: Running task '{current_task}' ...")
+            self.logger.debug(f"Running task '{current_task.name}' ...")
 
             with self.lock:
                 if current_task.time_measurement_before_run:
@@ -165,7 +160,7 @@ class TaskManager:
             # run task
             current_task.payload()
 
-            self.logger.debug(f"{self}: Task '{current_task}' successfully run.")
+            self.logger.debug(f"Task '{current_task.name}' successfully run.")
 
             with self.lock:
                 if not current_task.time_measurement_before_run:
@@ -174,7 +169,7 @@ class TaskManager:
                 if not current_task.is_done:
                     self._tasks.append(current_task)
                 else:
-                    self.logger.debug(f"{self}: Task '{current_task}' is done.")
+                    self.logger.debug(f"Task '{current_task.name}' is done.")
                     if self._keep_done_tasks:
                         self._tasks.append(current_task)
 
@@ -192,7 +187,7 @@ class TaskManager:
         task.init(self)
         with self.lock:
             self._tasks.append(task)
-        self.logger.debug(f"{self}: Task '{task}' added.")
+        self.logger.debug(f"Task '{task.name}' added.")
 
     def remove_task(self, task: Task):
         """
@@ -204,7 +199,7 @@ class TaskManager:
 
         with self.lock:
             self._tasks.remove(task)
-        self.logger.debug(f"{self}: Task '{task}' removed.")
+        self.logger.debug(f"Task '{task.name}' removed.")
 
     def task(self,
              name: Optional[str] = None,

wiederverwendbar-0.8.6/src/wiederverwendbar/warnings.py

@@ -0,0 +1,6 @@
+class WiederverwendbarWarning(Warning):
+    ...
+
+
+class FileNotFoundWarning(WiederverwendbarWarning):
+    ...