refactor: implement DB-level UUIDv7 generation and fix filter_validity return type

- Replace Python uuidv7() with cross-database GenerateUUIDv7 Func for native UUIDv7.
- Change filter_validity in OpenIMISHistoryMixin to return a list of Q objects.
- Update imports in history_model.py and openimis_model.py.

Author: delcroip

core/models/history_model.py

@@ -5,7 +5,7 @@
 from django.db import models, transaction
 from django.db.models import F
 from dirtyfields import DirtyFieldsMixin
-from core.utils import CachedManager, CachedModelMixin, uuidv7
+from core.utils import CachedManager, CachedModelMixin, uuidv7  # , GenerateUUIDv7
 from simple_history.utils import bulk_update_with_history, bulk_create_with_history
 from django.db.models import (
     DateTimeField, Model, IntegerField,
@@ -50,7 +50,11 @@ class HistoryModel(DirtyFieldsMixin, CachedModelMixin, Model):
     version = IntegerField(default=1)
 
     id = models.UUIDField(
-        primary_key=True, db_column="UUID", default=None, editable=False
+        primary_key=True,
+        db_column="UUID",
+        # db_default=GenerateUUIDv7(),need django 5
+        default=None,
+        editable=False
     )
     objects = HistoryModelManager()
     is_deleted = models.BooleanField(db_column="isDeleted", default=False)

core/models/openimis_model.py

@@ -6,7 +6,7 @@
     Q, UUIDField, DateTimeField, BooleanField, Model, IntegerField, BigAutoField, JSONField,
 )
 from simple_history.models import HistoricalRecords
-from core.utils import CachedManager, CachedModelMixin, filter_validity as core_filter_validity, uuidv7
+from core.utils import CachedManager, CachedModelMixin, filter_validity as core_filter_validity, uuidv7  # , GenerateUUIDv7
 from simple_history.utils import get_history_manager_for_model
 import datetime as base_datetime
 
@@ -158,9 +158,9 @@ def copy(self, exclude_fields=["id", "uuid"]):
     def filter_validity(arg="validity", prefix="", **kwargs):
         validity = kwargs.get(arg, None)
         if not validity:
-            return Q(active=True)
+            return [Q(active=True)]
         else:
-            return Q(active=False) | Q(date_deactivated__gte=validity)
+            return [Q(active=False) | Q(date_deactivated__gte=validity)]
 
     class Meta:
         abstract = True

core/utils.py

@@ -24,15 +24,14 @@
 import threading
 from django.db import transaction
 # from simple_history.utils import update_change_reason
-import time
-import os
-
+from django.db.models import Func, UUIDField
+from django.db import db_connection
+from uuid6 import uuid7 as uuidv7  # noqa: F401
 try:
     from simple_history.models import HistoricalRecords
 except Exception:
     HistoricalRecords = None
 
-
 _request_local = threading.local()
 
 logger = logging.getLogger(__file__)
@@ -603,29 +602,72 @@ def clean_fk(instance):
     return field_values
 
 
-def uuidv7() -> uuid.UUID:
+class GenerateUUIDv7(Func):
     """
-    Generate a UUIDv7.
-    """
-    # random bytes
-    value = bytearray(os.urandom(16))
+    Cross-database UUIDv7 generator.
 
-    # current timestamp in ms
-    timestamp = int(time.time() * 1000)
+    Usage:
+        from yourapp.db_functions import GenerateUUIDv7
 
-    # timestamp
-    value[0] = (timestamp >> 40) & 0xFF
-    value[1] = (timestamp >> 32) & 0xFF
-    value[2] = (timestamp >> 24) & 0xFF
-    value[3] = (timestamp >> 16) & 0xFF
-    value[4] = (timestamp >> 8) & 0xFF
-    value[5] = timestamp & 0xFF
+        class YourModel(models.Model):
+            id = models.UUIDField(
+                primary_key=True,
+                db_default=GenerateUUIDv7(),
+                editable=False,
+            )
+    """
+    output_field = UUIDField()
+    template = '%(function)s()'
+
+    def as_sql(self, compiler, connection, **extra_context):
+        vendor = db_connection.vendor
+
+        if vendor == 'postgresql':
+            # PostgreSQL 18+ has native uuidv7()
+            # Older versions use our custom uuid_generate_v7()
+            pg_version = getattr(connection, 'pg_version', 0)
+            if pg_version >= 180000:
+                function = 'uuidv7'
+            else:
+                function = 'uuid_generate_v7'
 
-    # version and variant
-    value[6] = (value[6] & 0x0F) | 0x70
-    value[8] = (value[8] & 0x3F) | 0x80
+        elif vendor == 'microsoft':
+            # SQL Server - uses our custom function
+            # Change to 'dbo.uuid_v8mssql' if you want the optimized version
+            # for better clustered index performance
+            function = 'dbo.uuid_v7'
 
-    return uuid.UUID(bytes=bytes(value))
+        else:
+            # Fallback for other databases (or raise error)
+            function = 'uuid_generate_v7'
+
+        extra_context['function'] = function
+        return super().as_sql(compiler, connection, **extra_context)
+
+
+class RandomUUID(Func):
+    """Cross-database random UUID for Django 4.2"""
+    function = None  # Will be overridden per backend
+    output_field = UUIDField()
+    arity = 0
+
+    def as_postgresql(self, compiler, connection, **extra_context):
+        # PostgreSQL 13+ has gen_random_uuid() built-in
+        return self.as_sql(compiler, connection, function='gen_random_uuid', **extra_context)
+
+    def as_microsoft(self, compiler, connection, **extra_context):  # MSSQL
+        return self.as_sql(compiler, connection, function='NEWID', **extra_context)
+
+    # Optional: fallback for other DBs (e.g. SQLite for dev)
+    def as_sql(self, compiler, connection, **extra_context):
+        # if connection.vendor == 'postgresql':
+        #     return self.as_postgresql(compiler, connection, **extra_context)
+        # elif connection.vendor in ('microsoft', 'mssql'):
+        #     return self.as_microsoft(compiler, connection, **extra_context)
+        if extra_context.get('function', self.function) is None:
+            # You can raise or use a default
+            raise NotImplementedError(f"RandomUUID not supported on {connection.vendor}")
+        return super().as_sql(compiler, connection, **extra_context)
 
 
 class CachedModelMixin:

setup.py

@@ -33,6 +33,7 @@
         "zxcvbn",
         "django-ratelimit",
         "pandas",
+        "uuid6",
     ],
     classifiers=[
         "Environment :: Web Environment",