sqliter-py 0.7.0__tar.gz → 0.8.0__tar.gz

{sqliter_py-0.7.0 → sqliter_py-0.8.0}/.gitignore

@@ -220,3 +220,5 @@ pyrightconfig.json
 repopack-output.xml
 .envrc
 demo-db
+.planning
+.aider*

{sqliter_py-0.7.0 → sqliter_py-0.8.0}/LICENSE.txt

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2024 Grant Ramsay
+Copyright (c) 2024-2025 Grant Ramsay
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{sqliter_py-0.7.0 → sqliter_py-0.8.0}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: sqliter-py
-Version: 0.7.0
+Version: 0.8.0
 Summary: Interact with SQLite databases using Python and Pydantic
+Project-URL: Homepage, http://sqliter.grantramsay.dev
 Project-URL: Pull Requests, https://github.com/seapagan/sqliter-py/pulls
 Project-URL: Bug Tracker, https://github.com/seapagan/sqliter-py/issues
 Project-URL: Changelog, https://github.com/seapagan/sqliter-py/blob/main/CHANGELOG.md
@@ -18,6 +19,8 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Database :: Front-Ends
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
@@ -47,8 +50,7 @@ time).
 The ideal use case is more for Python CLI tools that need to store data in a
 database-like format without needing to learn SQL or use a full ORM.
 
-Full documentation is available on the [Documentation
-Website](https://sqliter.grantramsay.dev)
+Full documentation is available on the [Website](https://sqliter.grantramsay.dev)
 
 > [!CAUTION]
 > This project is still in the early stages of development and is lacking some
@@ -57,11 +59,6 @@ Website](https://sqliter.grantramsay.dev)
 > minimum and the releases and documentation will be very clear about any
 > breaking changes.
 >
-> Also, structures like `list`, `dict`, `set` etc are not supported **at this
-> time** as field types, since SQLite does not have a native column type for
-> these. This is the **next planned enhancement**. These will need to be
-> `pickled` first then stored as a BLOB in the database.
->
 > See the [TODO](TODO.md) for planned features and improvements.
 
 - [Features](#features)
@@ -74,7 +71,8 @@ Website](https://sqliter.grantramsay.dev)
 ## Features
 
 - Table creation based on Pydantic models
-- Supports `date` and `datetime` fields. List/Dict/Set fields are planned.
+- Supports `date` and `datetime` fields
+- Support for complex data types (`list`, `dict`, `set`, `tuple`) stored as BLOBs
 - Automatic primary key generation
 - User defined indexes on any field
 - Set any field as UNIQUE
@@ -159,8 +157,11 @@ for user in results:
 new_user.age = 31
 db.update(new_user)
 
-# Delete a record
+# Delete a record by primary key
 db.delete(User, new_user.pk)
+
+# Delete all records returned from a query:
+delete_count = db.select(User).filter(age__gt=30).delete()
 ```
 
 See the [Usage](https://sqliter.grantramsay.dev/usage) section of the documentation
@@ -180,7 +181,7 @@ which you can read in the [CODE_OF_CONDUCT](CODE_OF_CONDUCT.md) file.
 This project is licensed under the MIT License.
 
 ```pre
-Copyright (c) 2024 Grant Ramsay
+Copyright (c) 2024-2025 Grant Ramsay
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{sqliter_py-0.7.0 → sqliter_py-0.8.0}/README.md

@@ -19,8 +19,7 @@ time).
 The ideal use case is more for Python CLI tools that need to store data in a
 database-like format without needing to learn SQL or use a full ORM.
 
-Full documentation is available on the [Documentation
-Website](https://sqliter.grantramsay.dev)
+Full documentation is available on the [Website](https://sqliter.grantramsay.dev)
 
 > [!CAUTION]
 > This project is still in the early stages of development and is lacking some
@@ -29,11 +28,6 @@ Website](https://sqliter.grantramsay.dev)
 > minimum and the releases and documentation will be very clear about any
 > breaking changes.
 >
-> Also, structures like `list`, `dict`, `set` etc are not supported **at this
-> time** as field types, since SQLite does not have a native column type for
-> these. This is the **next planned enhancement**. These will need to be
-> `pickled` first then stored as a BLOB in the database.
->
 > See the [TODO](TODO.md) for planned features and improvements.
 
 - [Features](#features)
@@ -46,7 +40,8 @@ Website](https://sqliter.grantramsay.dev)
 ## Features
 
 - Table creation based on Pydantic models
-- Supports `date` and `datetime` fields. List/Dict/Set fields are planned.
+- Supports `date` and `datetime` fields
+- Support for complex data types (`list`, `dict`, `set`, `tuple`) stored as BLOBs
 - Automatic primary key generation
 - User defined indexes on any field
 - Set any field as UNIQUE
@@ -131,8 +126,11 @@ for user in results:
 new_user.age = 31
 db.update(new_user)
 
-# Delete a record
+# Delete a record by primary key
 db.delete(User, new_user.pk)
+
+# Delete all records returned from a query:
+delete_count = db.select(User).filter(age__gt=30).delete()
 ```
 
 See the [Usage](https://sqliter.grantramsay.dev/usage) section of the documentation
@@ -152,7 +150,7 @@ which you can read in the [CODE_OF_CONDUCT](CODE_OF_CONDUCT.md) file.
 This project is licensed under the MIT License.
 
 ```pre
-Copyright (c) 2024 Grant Ramsay
+Copyright (c) 2024-2025 Grant Ramsay
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{sqliter_py-0.7.0 → sqliter_py-0.8.0}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = "sqliter-py"
-version = "0.7.0"
+version = "0.8.0"
 description = "Interact with SQLite databases using Python and Pydantic"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -21,6 +21,8 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Topic :: Database :: Front-Ends",
   "Topic :: Software Development",
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
@@ -29,7 +31,7 @@ classifiers = [
 extras = ["inflect==7.0.0"]
 
 [project.urls]
-# "HomeHage" = "https://xxxxxx"
+"Homepage" = "http://sqliter.grantramsay.dev"
 "Pull Requests" = "https://github.com/seapagan/sqliter-py/pulls"
 "Bug Tracker" = "https://github.com/seapagan/sqliter-py/issues"
 "Changelog" = "https://github.com/seapagan/sqliter-py/blob/main/CHANGELOG.md"
@@ -100,12 +102,11 @@ changelog.help = "Generate a changelog"
 line-length = 80
 lint.select = ["ALL"] # we are being very strict!
 lint.ignore = [
-  "ANN101",
-  "ANN102",
   "PGH003",
   "FBT002",
   "FBT003",
   "B006",
+  "S301",   # in this library we use 'pickle' for saving and loading list etc
 ] # These rules are too strict even for us 😝
 lint.extend-ignore = [
   "COM812",

{sqliter_py-0.7.0 → sqliter_py-0.8.0}/sqliter/constants.py

@@ -10,7 +10,6 @@ import datetime
 
 # A dictionary mapping SQLiter filter operators to their corresponding SQL
 # operators.
-
 OPERATOR_MAPPING = {
     "__lt": "<",
     "__lte": "<=",
@@ -39,4 +38,8 @@ SQLITE_TYPE_MAPPING = {
     bytes: "BLOB",
     datetime.datetime: "INTEGER",  # Store as Unix timestamp
     datetime.date: "INTEGER",  # Store as Unix timestamp
+    list: "BLOB",
+    dict: "BLOB",
+    set: "BLOB",
+    tuple: "BLOB",
 }

{sqliter_py-0.7.0 → sqliter_py-0.8.0}/sqliter/model/__init__.py

@@ -8,4 +8,4 @@ define unique constraints on model fields.
 from .model import BaseDBModel, SerializableField
 from .unique import Unique
 
-__all__ = ["BaseDBModel", "Unique", "SerializableField"]
+__all__ = ["BaseDBModel", "SerializableField", "Unique"]

{sqliter_py-0.7.0 → sqliter_py-0.8.0}/sqliter/model/model.py

@@ -10,6 +10,7 @@ in SQLiter applications.
 from __future__ import annotations
 
 import datetime
+import pickle
 import re
 from typing import (
     Any,
@@ -58,7 +59,7 @@ class BaseDBModel(BaseModel):
     model_config = ConfigDict(
         extra="ignore",
         populate_by_name=True,
-        validate_assignment=False,
+        validate_assignment=True,
         from_attributes=True,
     )
 
@@ -181,7 +182,9 @@ class BaseDBModel(BaseModel):
         """
         if isinstance(value, (datetime.datetime, datetime.date)):
             return to_unix_timestamp(value)
-        return value  # Return value as-is for non-datetime fields
+        if isinstance(value, (list, dict, set, tuple)):
+            return pickle.dumps(value)
+        return value  # Return value as-is for other fields
 
     # Deserialization after fetching from the database
 
@@ -205,12 +208,31 @@ class BaseDBModel(BaseModel):
             A datetime or date object if the field type is datetime or date,
             otherwise returns the value as-is.
         """
-        field_type = cls.__annotations__.get(field_name)
+        if value is None:
+            return None
 
-        if field_type in (datetime.datetime, datetime.date) and isinstance(
-            value, int
+        # Get field type if it exists in model_fields
+        field_info = cls.model_fields.get(field_name)
+        if field_info is None:
+            # If field doesn't exist in model, return value as-is
+            return value
+
+        field_type = field_info.annotation
+
+        if (
+            isinstance(field_type, type)
+            and issubclass(field_type, (datetime.datetime, datetime.date))
+            and isinstance(value, int)
         ):
             return from_unix_timestamp(
                 value, field_type, localize=return_local_time
             )
-        return value  # Return value as-is for non-datetime fields
+
+        origin_type = get_origin(field_type) or field_type
+        if origin_type in (list, dict, set, tuple) and isinstance(value, bytes):
+            try:
+                return pickle.loads(value)
+            except pickle.UnpicklingError:
+                return value
+
+        return value

{sqliter_py-0.7.0 → sqliter_py-0.8.0}/sqliter/query/query.py

@@ -28,6 +28,7 @@ from sqliter.exceptions import (
     InvalidFilterError,
     InvalidOffsetError,
     InvalidOrderError,
+    RecordDeletionError,
     RecordFetchError,
 )
 
@@ -728,3 +729,34 @@ class QueryBuilder:
             True if at least one result exists, False otherwise.
         """
         return self.count() > 0
+
+    def delete(self) -> int:
+        """Delete records that match the current query conditions.
+
+        Returns:
+            The number of records deleted.
+
+        Raises:
+            RecordDeletionError: If there's an error deleting the records.
+        """
+        sql = f'DELETE FROM "{self.table_name}"'  # noqa: S608 # nosec
+
+        # Build the WHERE clause with special handling for None (NULL in SQL)
+        values, where_clause = self._parse_filter()
+
+        if self.filters:
+            sql += f" WHERE {where_clause}"
+
+        # Print the raw SQL and values if debug is enabled
+        if self.db.debug:
+            self.db._log_sql(sql, values)  # noqa: SLF001
+
+        try:
+            with self.db.connect() as conn:
+                cursor = conn.cursor()
+                cursor.execute(sql, values)
+                deleted_count = cursor.rowcount
+                self.db._maybe_commit()  # noqa: SLF001
+                return deleted_count
+        except sqlite3.Error as exc:
+            raise RecordDeletionError(self.table_name) from exc

{sqliter_py-0.7.0 → sqliter_py-0.8.0}/sqliter/sqliter.py

@@ -503,7 +503,13 @@ class SqliterDB:
             raise RecordInsertionError(table_name) from exc
         else:
             data.pop("pk", None)
-            return model_class(pk=cursor.lastrowid, **data)
+            # Deserialize each field before creating the model instance
+            deserialized_data = {}
+            for field_name, value in data.items():
+                deserialized_data[field_name] = model_class.deserialize_field(
+                    field_name, value, return_local_time=self.return_local_time
+                )
+            return model_class(pk=cursor.lastrowid, **deserialized_data)
 
     def get(
         self, model_class: type[BaseDBModel], primary_key_value: int
@@ -540,7 +546,17 @@ class SqliterDB:
                     field: result[idx]
                     for idx, field in enumerate(model_class.model_fields)
                 }
-                return model_class(**result_dict)
+                # Deserialize each field before creating the model instance
+                deserialized_data = {}
+                for field_name, value in result_dict.items():
+                    deserialized_data[field_name] = (
+                        model_class.deserialize_field(
+                            field_name,
+                            value,
+                            return_local_time=self.return_local_time,
+                        )
+                    )
+                return model_class(**deserialized_data)
         except sqlite3.Error as exc:
             raise RecordFetchError(table_name) from exc
         else: