wiederverwendbar 0.8.5__py3-none-any.whl → 0.8.6__py3-none-any.whl

wiederverwendbar/__init__.py

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

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/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/sqlalchemy/base.py

@@ -260,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
@@ -292,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,
@@ -300,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
@@ -364,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/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/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/warnings.py

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

{wiederverwendbar-0.8.5.dist-info → wiederverwendbar-0.8.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wiederverwendbar
-Version: 0.8.5
+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

{wiederverwendbar-0.8.5.dist-info → wiederverwendbar-0.8.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
-wiederverwendbar-0.8.5.dist-info/METADATA,sha256=_Rv2S2NNzn3-vzHy6EQZpS9668alPFZHtDRWdNS2sKU,2012
-wiederverwendbar-0.8.5.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-wiederverwendbar-0.8.5.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-wiederverwendbar/__init__.py,sha256=rI0baW27B0s4avXRykXayN0cZK4x2ItpEvLEkLDLSm4,156
+wiederverwendbar-0.8.6.dist-info/METADATA,sha256=zQ-6Wgc3BqZMgcz_hVwr-wmVw8AH3T18Y1vYAPQmVIo,2012
+wiederverwendbar-0.8.6.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+wiederverwendbar-0.8.6.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+wiederverwendbar/__init__.py,sha256=_HswkZyK44st-yq5YH55yG3k1EjhaE6FRMN3MVgy_uc,156
 wiederverwendbar/before_after_wrap.py,sha256=8rjyRrDpwbzrsKkY7vbIgtitgLjlF8Lwx8YNvcJWwgY,10425
 wiederverwendbar/default.py,sha256=MQBBpJMh8Tz4FUwxszVm7M3j6qbW2JH-5jKSjbvsUUk,49
 wiederverwendbar/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -60,7 +60,7 @@ wiederverwendbar/logger/handlers/rich_console_handler.py,sha256=C2bFR0-yc4NqMCU-
 wiederverwendbar/logger/handlers/stream_console_handler.py,sha256=-mPYV3d3xKx9CizdEaIEgLh6_OABbsj8SJ6cBm8P99Q,573
 wiederverwendbar/logger/handlers/tar_rotating_file_handler.py,sha256=Ci2f4Mvy9f1DacNJiA_P0loWwI4y4oEW9fP0D1iMd8w,2500
 wiederverwendbar/logger/helper.py,sha256=bI3Qi6aCugmmRkuB5dJGSkKxpr-0bX8TaZtwdk6IS4c,1292
-wiederverwendbar/logger/log_levels.py,sha256=DIr1xN3GIvOZajsGNrUKo39f3h7OHq7wP3K0jtB-psY,212
+wiederverwendbar/logger/log_levels.py,sha256=M8NOL8nRRtin2fOhAzaJL5XdPP03GCfBHHGp-BTzeVM,322
 wiederverwendbar/logger/logger.py,sha256=yb-0aD3_mYHdwC-xnbg3oPegM_q4H0S-q14mlVedfVA,2860
 wiederverwendbar/logger/settings.py,sha256=w2gGbx447UsnjB1uZ5hjt_J28PGrnMNxQp5qveVmifo,5876
 wiederverwendbar/logger/singleton.py,sha256=3FWKLSIF7aGOUR2TlBHfO2BHFwYvzGa5hrtsD6Im2GE,3260
@@ -88,7 +88,7 @@ wiederverwendbar/mongoengine/settings.py,sha256=Kgc2VTWvXa5CcZdxOsVBx9HdcaWeOLG3
 wiederverwendbar/mongoengine/singleton.py,sha256=xeh0OQM8q79ffn9Yz8tyNcjzZg68TD6xpfIZRT_M0mU,183
 wiederverwendbar/post_init.py,sha256=7w1iQbOlRpydDJT3Ti0v8_OmjwjVTIQjOZUVPEIvrpw,474
 wiederverwendbar/pydantic/__init__.py,sha256=lQRcyAOXBZfq-jTd-n7zpzC9HxsbiLgMvU8bKuFbSW8,335
-wiederverwendbar/pydantic/file_config.py,sha256=DCiCFK8FZm9lurwKtbR8GfAkzd4Yv0O9AAlrW2jN3Mw,2157
+wiederverwendbar/pydantic/file_config.py,sha256=qX5wVS7TvNGjyzo9wRzBK92c73ux8X75pIoMUyPoRgA,2794
 wiederverwendbar/pydantic/indexable_model.py,sha256=o9Ej9Z0oVWxYOJQdqJsik0C3LWi0dnLjoDB00VMs24g,775
 wiederverwendbar/pydantic/printable_settings.py,sha256=CSN8n1NUnviOMc6wgnvIdcQlbti71oCTAq8fbFLjP_4,879
 wiederverwendbar/pydantic/security/__init__.py,sha256=l-DRf-vueyP-M4pePTzQgCYZcBMb_0Fg5flwN-0dBWc,83
@@ -97,7 +97,7 @@ wiederverwendbar/pydantic/singleton.py,sha256=4YMBcKiTik2KmuN97CUCmy_ldhfyeDzrsU
 wiederverwendbar/route.py,sha256=moYlZ5IvV_uDroSggxe80-sR3_nlNsl9Bp69CcCfK8Y,12061
 wiederverwendbar/singleton.py,sha256=6QqeQpzx4UhBZnvto5_yUs7hpmzt_-dyE169RuwsTa8,6866
 wiederverwendbar/sqlalchemy/__init__.py,sha256=gkt99fc9wIxaSjrl1xNhmPLrlJNZhrY-sJ5yIezREGM,888
-wiederverwendbar/sqlalchemy/base.py,sha256=q_wiVyiAK4c-z3InFIy4TEN140Rp8MjEQqhxhL2bvaw,15030
+wiederverwendbar/sqlalchemy/base.py,sha256=wNL0vnDuCwM7bLm8imLGAtGxz5uWWsg4d9n64HZZKT4,15057
 wiederverwendbar/sqlalchemy/db.py,sha256=u3nHJh8pxnOMALldp72sohe1XZ-ZfksZZVpE5qIxHgc,9610
 wiederverwendbar/sqlalchemy/raise_has_not_attr.py,sha256=GdmbSC8EoBCkpuZQGLp3zzQ0iScsj2XfFZC9OZtWbkA,403
 wiederverwendbar/sqlalchemy/settings.py,sha256=RM-bFg_Ga0AUko4JWOvCZLcfoB91kKpn1TqVzgxAm_k,2579
@@ -158,8 +158,8 @@ wiederverwendbar/starlette_admin/settings/admin.py,sha256=moEgCDUpf2eQ2o7e2SaeMk
 wiederverwendbar/starlette_admin/settings/settings.py,sha256=3T1EcFNATDI45o99MIlzmfs-1XYzUWB6p9C7L4zvJ0A,7378
 wiederverwendbar/task_manger/__init__.py,sha256=A46SQ_MJiMdcZ7HU2ePEsv0xGdek9gnW1X4Q1QXtB7E,354
 wiederverwendbar/task_manger/singleton.py,sha256=HQ6XwVmBmCEVAzTLeloMU-vf3JnctBUXDGC2SaEL2vw,183
-wiederverwendbar/task_manger/task.py,sha256=ZCT6EFGlJzVCgHNHm-xAdgwDHGc2cp10SUdF5d_-piU,3043
-wiederverwendbar/task_manger/task_manager.py,sha256=UNY1MAqw6m3uUvCkfDT0a0QJwJgepVjr7yxnSrLkMTE,6992
+wiederverwendbar/task_manger/task.py,sha256=NanEdg28Bn6JwG6mwrL0qLZIcGI6XQzVbctwXa0-j14,2961
+wiederverwendbar/task_manger/task_manager.py,sha256=FuB0Lf2ff4KaVtPp7G585uF7GjjMFszY7oGGNSOIfSI,6871
 wiederverwendbar/task_manger/trigger.py,sha256=biTQv3_S7d14CkPXKjDQxL6XbTet7-PVRwofsCBs3Wc,9906
 wiederverwendbar/threading/__init__.py,sha256=jFeP8mQws_JVwxL8W1fCsWPUcFqO-l39yQ8d9P3AqtQ,508
 wiederverwendbar/threading/extended_thread.py,sha256=CJi2fmpHBZD9jo5B8_85Ax8jo1pM5n9cjEVuG6Guxg8,23409
@@ -168,4 +168,5 @@ wiederverwendbar/typer/typer_resolve_defaults.py,sha256=2KD09rxKaur2TbJ3BCcLxbrc
 wiederverwendbar/uvicorn/__init__.py,sha256=9F7gT-8QyxS41xWKEIHMLUBV9ZTBKZJj8tHPqhMzoHA,126
 wiederverwendbar/uvicorn/server.py,sha256=04WpB8AUtVkYhoS6qsBVJHOtTNkISQVg_mLVtYmK-1Y,5657
 wiederverwendbar/uvicorn/settings.py,sha256=IAjlpWR-KH7098jIgH_t46yG17YPbH8MoEmMdn0hgNo,2217
-wiederverwendbar-0.8.5.dist-info/RECORD,,
+wiederverwendbar/warnings.py,sha256=6P1wn-OkrDCo5zg_hL28nt5b9w4ZXo4qXwlpW9B_QWI,110
+wiederverwendbar-0.8.6.dist-info/RECORD,,