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

wiederverwendbar/__init__.py

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

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/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__()

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/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.dist-info → wiederverwendbar-0.8.5.dist-info}/METADATA

@@ -1,49 +1,49 @@
 Metadata-Version: 2.1
 Name: wiederverwendbar
-Version: 0.8.4
+Version: 0.8.5
 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.dist-info → wiederverwendbar-0.8.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
-wiederverwendbar-0.8.4.dist-info/METADATA,sha256=T6JVzGeHuwJbwBCimkkU-F4uaGLupwebmhfRowesHfw,2012
-wiederverwendbar-0.8.4.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-wiederverwendbar-0.8.4.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-wiederverwendbar/__init__.py,sha256=7tyTTIvtqm_RTzETKQ6VPMlU1JCLzUzZcHathL1jqvs,156
+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/before_after_wrap.py,sha256=8rjyRrDpwbzrsKkY7vbIgtitgLjlF8Lwx8YNvcJWwgY,10425
 wiederverwendbar/default.py,sha256=MQBBpJMh8Tz4FUwxszVm7M3j6qbW2JH-5jKSjbvsUUk,49
 wiederverwendbar/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -46,6 +46,7 @@ wiederverwendbar/functions/datetime.py,sha256=Wf7KJKerb5opdqgm06FjbRBC7ZVvr1WcW0
 wiederverwendbar/functions/download_file.py,sha256=vNpaNpQ_YL9-D81Leey_RYv_OcPsUEZM5gAgo48tzXQ,5487
 wiederverwendbar/functions/eval.py,sha256=zINxAfZ2mlNC4m36S2CQT2H4oTHyfBb-MJdZdgMfS0k,4537
 wiederverwendbar/functions/find_class_method.py,sha256=QAE66bf75gkRrwhiD5spnNG-cX1trdQh6pQhNir79bc,470
+wiederverwendbar/functions/get_pretty_str.py,sha256=pM4itXdiozjD3PQblAxhhkOLO7TY3pDYnmiqlZVJnWw,205
 wiederverwendbar/functions/run_command.py,sha256=7j9cE0mqNVmu0MOojw7plEMttYZqYMsUgc8kOYS2v5I,1902
 wiederverwendbar/functions/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wiederverwendbar/functions/security/hashed_password.py,sha256=8qNOzvf4g7Z7YHDfdq6YSq6ZpYkseDogbcU4sxi3GGQ,3470
@@ -96,10 +97,10 @@ 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=vocU5IjfyXhgQVTvyfm9pS5resjzceHj_zctGZSDD-Y,14553
-wiederverwendbar/sqlalchemy/db.py,sha256=jfjeyMsQu9K92ICS3q5OdBmQILsCGxwmm_QqPSHSSrM,8158
+wiederverwendbar/sqlalchemy/base.py,sha256=q_wiVyiAK4c-z3InFIy4TEN140Rp8MjEQqhxhL2bvaw,15030
+wiederverwendbar/sqlalchemy/db.py,sha256=u3nHJh8pxnOMALldp72sohe1XZ-ZfksZZVpE5qIxHgc,9610
 wiederverwendbar/sqlalchemy/raise_has_not_attr.py,sha256=GdmbSC8EoBCkpuZQGLp3zzQ0iScsj2XfFZC9OZtWbkA,403
-wiederverwendbar/sqlalchemy/settings.py,sha256=jJ6HeetHvofoB2Cppd5yCP94rwX0ltoBRtOrZXqhYCU,2128
+wiederverwendbar/sqlalchemy/settings.py,sha256=RM-bFg_Ga0AUko4JWOvCZLcfoB91kKpn1TqVzgxAm_k,2579
 wiederverwendbar/sqlalchemy/singleton.py,sha256=LVH1gRl1U1My-cx-Y1M4G-czgCWzAmuVyRz9EYWmGMM,179
 wiederverwendbar/sqlalchemy/types.py,sha256=1Hb2Y5QacH079iKpN0fV5XALxLYQj7CFYqs5tC3FlFM,1911
 wiederverwendbar/starlette_admin/__init__.py,sha256=SRuEMG5_2ns78Arw3KJsMMYg4N3RylCJmc5HfhBKAjg,3425
@@ -167,4 +168,4 @@ 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.4.dist-info/RECORD,,
+wiederverwendbar-0.8.5.dist-info/RECORD,,