database-wrapper 0.2.9__py3-none-any.whl → 0.2.13__py3-none-any.whl

database_wrapper/config.py

@@ -3,7 +3,7 @@ from typing import Any
 CONFIG: dict[str, Any] = {
     # These are supposed to be set automatically by a git pre-compile script
     # They are one git commit hash behind, if used automatically
-    "git_commit_hash": "aba940d794c0b9d2390f87bd32a86c13769311d7",
-    "git_commit_date": "10.10.2025 01:49",
-    "app_version": "0.2.9",
+    "git_commit_hash": "450d82cbaaf0997ef1aba44a809ce8358e3b1ccd",
+    "git_commit_date": "06.01.2026 04:31",
+    "app_version": "0.2.13",
 }

database_wrapper/db_data_model.py

@@ -91,23 +91,23 @@ class DBDataModel:
     # Id should be readonly by default and should be always present if record exists
     id: int = field(
         default=0,
-        metadata={
-            "db_field": ("id", "bigint"),
-            "store": False,
-            "update": False,
-        },
+        metadata=MetadataDict(
+            db_field=("id", "bigint"),
+            store=False,
+            update=False,
+        ),
     )
     """id is readonly by default"""
 
     # Raw data
     raw_data: dict[str, Any] = field(
         default_factory=dict,
-        metadata={
-            "db_field": ("raw_data", "jsonb"),
-            "exclude": True,
-            "store": False,
-            "update": False,
-        },
+        metadata=MetadataDict(
+            db_field=("raw_data", "jsonb"),
+            exclude=True,
+            store=False,
+            update=False,
+        ),
     )
     """This is for storing temporary raw data"""
 
@@ -366,63 +366,140 @@ class DBDefaultsDataModel(DBDataModel):
     ### Default fields ###
     ######################
 
+#
     created_at: datetime.datetime = field(
         default_factory=datetime.datetime.now,
-        metadata={
-            "db_field": ("created_at", "timestamptz"),
-            "store": True,
-            "update": False,
-            "serialize": SerializeType.DATETIME,
-        },
+        metadata=MetadataDict(
+            db_field=("created_at", "timestamptz"),
+            store=True,
+            update=False,
+            serialize=SerializeType.DATETIME,
+        ),
     )
     """created_at is readonly by default and should be present in all tables"""
 
+#
     updated_at: datetime.datetime = field(
         default_factory=datetime.datetime.now,
-        metadata={
-            "db_field": ("updated_at", "timestamptz"),
-            "store": True,
-            "update": True,
-            "serialize": SerializeType.DATETIME,
-        },
+        metadata=MetadataDict(
+            db_field=("updated_at", "timestamptz"),
+            store=True,
+            update=True,
+            serialize=SerializeType.DATETIME,
+        ),
     )
     """updated_at should be present in all tables and is updated automatically"""
 
+# full
     disabled_at: datetime.datetime = field(
         default_factory=datetime.datetime.now,
-        metadata={
-            "db_field": ("disabled_at", "timestamptz"),
-            "store": False,
-            "update": False,
-            "serialize": SerializeType.DATETIME,
-        },
+        metadata=MetadataDict(
+            db_field=("disabled_at", "timestamptz"),
+            store=False,
+            update=False,
+            serialize=SerializeType.DATETIME,
+        ),
     )
 
+#
     deleted_at: datetime.datetime = field(
         default_factory=datetime.datetime.now,
-        metadata={
-            "db_field": ("deleted_at", "timestamptz"),
-            "store": False,
-            "update": False,
-            "serialize": SerializeType.DATETIME,
-        },
+        metadata=MetadataDict(
+            db_field=("deleted_at", "timestamptz"),
+            store=False,
+            update=False,
+            serialize=SerializeType.DATETIME,
+        ),
     )
 
     enabled: bool = field(
         default=True,
-        metadata={
-            "db_field": ("enabled", "boolean"),
-            "store": False,
-            "update": False,
-        },
+        metadata=MetadataDict(
+            db_field=("enabled", "boolean"),
+            store=False,
+            update=False,
+        ),
     )
     deleted: bool = field(
         default=False,
-        metadata={
-            "db_field": ("deleted", "boolean"),
-            "store": False,
-            "update": False,
-        },
+        metadata=MetadataDict(
+            db_field=("deleted", "boolean"),
+            store=False,
+            update=False,
+        ),
+    )
+
+    def update_data(self) -> dict[str, Any] | None:
+        """
+        Update data to database
+        """
+
+        # Update updated_at
+        self.updated_at = datetime.datetime.now(datetime.UTC)
+
+        return super().update_data()
+
+
+@dataclass
+class DBDefaultsDataModelV2(DBDataModel):
+    """
+    This class includes default fields for all database models.
+
+    Attributes:
+    - created_at (datetime.datetime): The timestamp of when the instance was created.
+    - updated_at (datetime.datetime): The timestamp of when the instance was last updated.
+    - enabled (bool): Whether the instance is enabled or not.
+    - deleted (bool): Whether the instance is deleted or not.
+    """
+
+    ######################
+    ### Default fields ###
+    ######################
+
+#
+    created_at: datetime.datetime = field(
+        default_factory=datetime.datetime.now,
+        metadata=MetadataDict(
+            db_field=("created_at", "timestamptz"),
+            store=True,
+            update=False,
+            serialize=SerializeType.DATETIME,
+        ),
+    )
+    """created_at is readonly by default and should be present in all tables"""
+
+#
+    updated_at: datetime.datetime = field(
+        default_factory=datetime.datetime.now,
+        metadata=MetadataDict(
+            db_field=("updated_at", "timestamptz"),
+            store=True,
+            update=True,
+            serialize=SerializeType.DATETIME,
+        ),
+    )
+    """updated_at should be present in all tables and is updated automatically"""
+
+#
+    disabled_at: datetime.datetime = field(
+        default_factory=datetime.datetime.now,
+        metadata=MetadataDict(
+            db_field=("disabled_at", "timestamptz"),
+            store=True,
+            update=True,
+            serialize=SerializeType.DATETIME,
+        ),
+    )
+
+#
+    deleted_at: datetime.datetime = field(
+        default_factory=datetime.datetime.now,
+        metadata=MetadataDict(
+            db_field=("deleted_at", "timestamptz"),
+            store=True,
+            update=True,
+            serialize=SerializeType.DATETIME,
+        ),
     )
 
     def update_data(self) -> dict[str, Any] | None:

database_wrapper/db_introspector.py

@@ -134,9 +134,7 @@ class DBIntrospector:
             # Default value choice
             default = None
             default_factory = None
-            if c.is_nullable:
-                default = None
-            else:
+            if c.is_nullable == False:
                 # give some sane defaults for common not-nullables that aren't id/serial
                 if py_type is bool:
                     default = False
@@ -370,7 +368,7 @@ class DBIntrospector:
 
         return "\n".join(lines)
 
-    def save_to_file(self, class_model_source: str, filepath: str, overwrite: bool) -> str:
+    def save_to_file(self, class_model_source: str, filepath: str | Path, overwrite: bool) -> str:
         """
         Render `cls` to a Python source file and save it to `filepath`.
 

database_wrapper/db_wrapper.py

@@ -281,6 +281,21 @@ class DBWrapper(DBWrapperMixin):
 
         return status
 
+    def insert_data(
+        self,
+        record: DBDataModel,
+        store_data: dict[str, Any],
+    ) -> tuple[int, int]:
+        status = self._insert(
+            record,
+            record.schema_name,
+            record.table_name,
+            store_data,
+            record.id_key,
+        )
+
+        return status
+
     def _update(
         self,
         empty_data_class: DBDataModel,
@@ -308,9 +323,7 @@ class DBWrapper(DBWrapperMixin):
 
         table_identifier = self.make_identifier(schema_name, table_name)
         update_key = self.make_identifier(empty_data_class.table_alias, id_key)
-        update_query = self._format_update_query(
-            table_identifier, update_key, update_data
-        )
+        update_query = self._format_update_query(table_identifier, update_key, update_data)
 
         # Log
         self.log_query(self.db_cursor, update_query, tuple(values))

database_wrapper/db_wrapper_async.py

@@ -41,7 +41,7 @@ class DBWrapperAsync(DBWrapperMixin):
             raise ValueError("Id value is not set")
 
         # Get the record
-        res = self.fetch_all_records(
+        res = self.get_all(
             empty_data_class,
             id_key,
             id_value,
@@ -73,7 +73,7 @@ class DBWrapperAsync(DBWrapperMixin):
             DataModelType | None: The result of the query.
         """
         # Get the record
-        res = self.fetch_all_records(
+        res = self.get_all(
             empty_data_class,
             id_key,
             id_value,
@@ -85,7 +85,7 @@ class DBWrapperAsync(DBWrapperMixin):
         else:
             return None
 
-    async def fetch_all_records(
+    async def get_all(
         self,
         empty_data_class: DataModelType,
         id_key: str | None = None,
@@ -283,6 +283,20 @@ class DBWrapperAsync(DBWrapperMixin):
 
         return status
 
+    async def insert_data(
+        self,
+        record: DBDataModel,
+        store_data: dict[str, Any],
+    ) -> tuple[int, int]:
+        status = await self._insert(
+            record,
+            record.schema_name,
+            record.table_name,
+            store_data,
+            record.id_key,
+        )
+        return status
+
     async def _update(
         self,
         empty_data_class: DBDataModel,
@@ -310,9 +324,7 @@ class DBWrapperAsync(DBWrapperMixin):
 
         table_identifier = self.make_identifier(schema_name, table_name)
         update_key = self.make_identifier(empty_data_class.table_alias, id_key)
-        update_query = self._format_update_query(
-            table_identifier, update_key, update_data
-        )
+        update_query = self._format_update_query(table_identifier, update_key, update_data)
 
         # Log
         self.log_query(self.db_cursor, update_query, tuple(values))
@@ -330,9 +342,7 @@ class DBWrapperAsync(DBWrapperMixin):
     @overload
     async def update(self, records: list[DataModelType]) -> list[int]: ...
 
-    async def update(
-        self, records: DataModelType | list[DataModelType]
-    ) -> int | list[int]:
+    async def update(self, records: DataModelType | list[DataModelType]) -> int | list[int]:
         """
         Updates a record or a list of records in the database.
 
@@ -438,9 +448,7 @@ class DBWrapperAsync(DBWrapperMixin):
     @overload
     async def delete(self, records: list[DataModelType]) -> list[int]: ...
 
-    async def delete(
-        self, records: DataModelType | list[DataModelType]
-    ) -> int | list[int]:
+    async def delete(self, records: DataModelType | list[DataModelType]) -> int | list[int]:
         """
         Deletes a record or a list of records from the database.
 

{database_wrapper-0.2.9.dist-info → database_wrapper-0.2.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: database_wrapper
-Version: 0.2.9
+Version: 0.2.13
 Summary: A Different Approach to Database Wrappers in Python
 Author-email: Gints Murans <gm@gm.lv>
 License: GNU General Public License v3.0 (GPL-3.0)
@@ -33,15 +33,15 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Provides-Extra: pgsql
-Requires-Dist: database_wrapper_pgsql==0.2.9; extra == "pgsql"
+Requires-Dist: database_wrapper_pgsql==0.2.13; extra == "pgsql"
 Provides-Extra: mysql
-Requires-Dist: database_wrapper_mysql==0.2.9; extra == "mysql"
+Requires-Dist: database_wrapper_mysql==0.2.13; extra == "mysql"
 Provides-Extra: mssql
-Requires-Dist: database_wrapper_mssql==0.2.9; extra == "mssql"
+Requires-Dist: database_wrapper_mssql==0.2.13; extra == "mssql"
 Provides-Extra: sqlite
-Requires-Dist: database_wrapper_sqlite==0.2.9; extra == "sqlite"
+Requires-Dist: database_wrapper_sqlite==0.2.13; extra == "sqlite"
 Provides-Extra: redis
-Requires-Dist: database_wrapper_redis==0.2.9; extra == "redis"
+Requires-Dist: database_wrapper_redis==0.2.13; extra == "redis"
 Provides-Extra: all
 Requires-Dist: database_wrapper[mssql,mysql,pgsql,redis,sqlite]; extra == "all"
 Provides-Extra: dev

database_wrapper-0.2.13.dist-info/RECORD

@@ -0,0 +1,18 @@
+database_wrapper/__init__.py,sha256=cGqsWr7imdMOO7vrcGye8FVul_v3-32mw4wgrfxnhJA,1320
+database_wrapper/abc.py,sha256=JiQo6Yfv7xALrrHeICJCSgmyP2gHrp16Ov83mPBTGbE,2058
+database_wrapper/common.py,sha256=fsxe28o_4xCrotPbB274dmzQ9rOyes0sBtcHog-9RVc,258
+database_wrapper/config.py,sha256=y4Y2g4sEbD1kgqLNpxsfkDqXHurMFfaJQiellYs09PE,334
+database_wrapper/db_backend.py,sha256=pV_XGu0tR5naz7Ni6BvpqcmN9U7TdQ0bRkg7YiNZlO0,7928
+database_wrapper/db_data_model.py,sha256=zhD_c1H5YV2f29DjBTQ5Oln99iO8hWdtcf-ijelWQnA,17000
+database_wrapper/db_introspector.py,sha256=8sWNmBeumCE0D-cbpBvpMSTbCU6dpDLxCPB8HaNf6KA,15463
+database_wrapper/db_wrapper.py,sha256=x6xsMW0epCOaj3RWWi9mj1EE1JmqM27PyS_Khvsxdvo,15231
+database_wrapper/db_wrapper_async.py,sha256=ud7kCDfsfrbp3FHfRS7FjbsVTnnf87sHsxctpNWuhnk,15500
+database_wrapper/db_wrapper_mixin.py,sha256=QCB9qjWLxeFY5f2_apJVL1rtp75spvZ1HuEApBkzID8,10071
+database_wrapper/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+database_wrapper/serialization.py,sha256=Tti1-nA7H4g3hzqr3mE2WurxOnEjFaxBJZTOR3ONZSo,2906
+database_wrapper/utils/__init__.py,sha256=uC8YaJqfyFIZIeNdTRTbZwcOUVhmnS5eyOG-9gMs70c,96
+database_wrapper/utils/dataclass_addons.py,sha256=Og98FTL8_m07AjpAsbIdSkHQO099xt9asD3W2QasypY,759
+database_wrapper-0.2.13.dist-info/METADATA,sha256=sD36XRl-81M6pJOM8QESSUVgQd7SrkPg4n9Bfvms1Pw,3615
+database_wrapper-0.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+database_wrapper-0.2.13.dist-info/top_level.txt,sha256=QcnS4ocJygxcKE5eoOqriuja306oVu-zJRn6yjRRhBw,17
+database_wrapper-0.2.13.dist-info/RECORD,,

database_wrapper-0.2.9.dist-info/RECORD

@@ -1,18 +0,0 @@
-database_wrapper/__init__.py,sha256=cGqsWr7imdMOO7vrcGye8FVul_v3-32mw4wgrfxnhJA,1320
-database_wrapper/abc.py,sha256=JiQo6Yfv7xALrrHeICJCSgmyP2gHrp16Ov83mPBTGbE,2058
-database_wrapper/common.py,sha256=fsxe28o_4xCrotPbB274dmzQ9rOyes0sBtcHog-9RVc,258
-database_wrapper/config.py,sha256=ETbnBY7XXHlIiseyafmCP59I6DBYCFZdk4JO2v2fldQ,333
-database_wrapper/db_backend.py,sha256=pV_XGu0tR5naz7Ni6BvpqcmN9U7TdQ0bRkg7YiNZlO0,7928
-database_wrapper/db_data_model.py,sha256=6yMArPQPfbiFn9GvfRKYQzEh67LfaUn7JqkKTTCc7W8,14888
-database_wrapper/db_introspector.py,sha256=OsQDPr4Bp0SkekrIHIyKh4QX_bLrk7SOq4rbvzicKjE,15496
-database_wrapper/db_wrapper.py,sha256=zwaA-5BfUhBTG3eI-Im4BKztbKN0DQLg5heIR-rbQCo,14928
-database_wrapper/db_wrapper_async.py,sha256=EnF66zOJ9BEH2tQF-5v8hywEHl8KiryDM9l610ES7O0,15244
-database_wrapper/db_wrapper_mixin.py,sha256=QCB9qjWLxeFY5f2_apJVL1rtp75spvZ1HuEApBkzID8,10071
-database_wrapper/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-database_wrapper/serialization.py,sha256=Tti1-nA7H4g3hzqr3mE2WurxOnEjFaxBJZTOR3ONZSo,2906
-database_wrapper/utils/__init__.py,sha256=uC8YaJqfyFIZIeNdTRTbZwcOUVhmnS5eyOG-9gMs70c,96
-database_wrapper/utils/dataclass_addons.py,sha256=Og98FTL8_m07AjpAsbIdSkHQO099xt9asD3W2QasypY,759
-database_wrapper-0.2.9.dist-info/METADATA,sha256=8chFSBLQVJN7072NkmVtC0rO4Fp9L6KIe6veVsjQBcw,3609
-database_wrapper-0.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-database_wrapper-0.2.9.dist-info/top_level.txt,sha256=QcnS4ocJygxcKE5eoOqriuja306oVu-zJRn6yjRRhBw,17
-database_wrapper-0.2.9.dist-info/RECORD,,