mindtrace-database 0.12.0__tar.gz → 0.14.0__tar.gz

{mindtrace_database-0.12.0/mindtrace_database.egg-info → mindtrace_database-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mindtrace-database
-Version: 0.12.0
+Version: 0.14.0
 Summary: Database functionality for Mindtrace
 Author: Mindtrace Team
 License-Expression: Apache-2.0
@@ -11,13 +11,13 @@ Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: beanie<2,>=1.29.0
-Requires-Dist: mindtrace-core>=0.12.0
+Requires-Dist: mindtrace-core>=0.14.0
 Requires-Dist: pydantic>=2.11.1
 Requires-Dist: redis>=4.0.0
 Requires-Dist: redis-om>=0.3.5
 Requires-Dist: motor>=3.3.0
 Requires-Dist: pymongo>=4.14.0
-Requires-Dist: mindtrace-registry>=0.12.0
+Requires-Dist: mindtrace-registry>=0.14.0
 Dynamic: license-file
 
 [![PyPI version](https://img.shields.io/pypi/v/mindtrace-database)](https://pypi.org/project/mindtrace-database/)

{mindtrace_database-0.12.0 → mindtrace_database-0.14.0}/mindtrace/database/backends/mongo_odm.py

@@ -438,15 +438,16 @@ class MongoMindtraceODM[T: MindtraceDocument](MindtraceODM):
         if "_id" in data:
             data.pop("_id")
 
+        # Caller ids were already stripped above; a model validator may mint a
+        # deterministic id here and it must survive to the write.
         doc = self.model_cls(**data)
-        doc.id = None
 
         try:
             if self._motor_routing:
                 raw = self._motor_model_dump(doc)
-                raw.pop("_id", None)
-                if raw.get("id") is None:
-                    raw.pop("id", None)
+                for key in ("_id", "id"):
+                    if raw.get(key) is None:
+                        raw.pop(key, None)
                 result = await self._motor_collection().insert_one(raw)
                 inserted = await self._motor_collection().find_one({"_id": result.inserted_id})
                 if inserted is None:
@@ -481,12 +482,12 @@ class MongoMindtraceODM[T: MindtraceDocument](MindtraceODM):
                 data = obj.model_dump(mode="python", by_alias=True, serialize_as_any=True)
             data.pop("id", None)
             data.pop("_id", None)
+            # Same as insert(): caller ids stripped above; minted ids survive.
             doc = self.model_cls(**data)
-            doc.id = None
             raw = self._motor_model_dump(doc)
-            raw.pop("_id", None)
-            if raw.get("id") is None:
-                raw.pop("id", None)
+            for key in ("_id", "id"):
+                if raw.get(key) is None:
+                    raw.pop(key, None)
             raw_docs.append(raw)
 
         try:

{mindtrace_database-0.12.0 → mindtrace_database-0.14.0}/mindtrace/database/backends/unified_odm.py

@@ -2,7 +2,7 @@ import asyncio
 from enum import Enum
 from typing import Dict, List, Optional, Type, TypeVar, Union
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 from redis_om.model.model import model_registry
 
 from mindtrace.database.backends.mindtrace_odm import InitMode, MindtraceODM
@@ -39,15 +39,11 @@ class UnifiedMindtraceDocument(BaseModel):
     # Optional ID field that can be used by both backends
     id: Optional[str] = Field(default=None, description="Document ID")
 
-    class Config:
-        """Common configuration for unified documents."""
-
-        # Allow arbitrary types for flexibility
-        arbitrary_types_allowed = True
-        # Use enum values for serialization
-        use_enum_values = True
-        # Validate assignment
-        validate_assignment = True
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+        use_enum_values=True,
+        validate_assignment=True,
+    )
 
     class Meta:
         """
@@ -209,10 +205,16 @@ class UnifiedMindtraceDocument(BaseModel):
             else:
                 annotations[field_name] = processed_type
 
+        # The generated class owns its id field
+        from beanie import PydanticObjectId
+
+        annotations["id"] = Optional[PydanticObjectId]
+
         # Create the class attributes dictionary
         class_dict = {
             "__annotations__": annotations,
             "__module__": cls.__module__,
+            "id": None,
         }
 
         # Add default values to class attributes

mindtrace_database-0.14.0/mindtrace/database/sample/user.py

@@ -0,0 +1,12 @@
+from datetime import datetime
+
+from pydantic import BaseModel, Field
+
+from mindtrace.core import utcnow
+
+
+class User(BaseModel):
+    name: str
+    id: int | None = None
+    created_at: datetime = Field(default_factory=utcnow)
+    updated_at: datetime = Field(default_factory=utcnow)

{mindtrace_database-0.12.0 → mindtrace_database-0.14.0}/mindtrace/database/testing/suites/mongo_crud.py

@@ -17,7 +17,7 @@ from mindtrace.core import (
     BenchSuiteConfig,
     BenchTestSuite,
     TaskSchema,
-    utc_now_iso,
+    utcnow_iso,
 )
 from mindtrace.database import MongoMindtraceODM
 from mindtrace.database.testing.suites._models import DatabaseBenchDocument
@@ -58,7 +58,7 @@ class DatabaseMongoCrudSmokeSuite(BenchTestSuite):
     )
 
     def execute_bench(self, config: BenchSuiteConfig, reporter: BenchReporter) -> BenchResult:
-        started = utc_now_iso()
+        started = utcnow_iso()
         mono = time.perf_counter()
         mongo_backend, mongo_uri, mongo_db_name = resolve_mongo_resources(config)
         odm = MongoMindtraceODM(model_cls=DatabaseBenchDocument, db_uri=mongo_uri, db_name=mongo_db_name)
@@ -95,7 +95,7 @@ class DatabaseMongoCrudSmokeSuite(BenchTestSuite):
             suite_id=config.suite_id,
             status="passed" if reporter.failures == 0 else "failed",
             started_at=started,
-            ended_at=utc_now_iso(),
+            ended_at=utcnow_iso(),
             duration_seconds=elapsed,
             operations=reporter.operations,
             successes=reporter.successes,

{mindtrace_database-0.12.0 → mindtrace_database-0.14.0}/mindtrace/database/testing/suites/mongo_insert.py

@@ -17,7 +17,7 @@ from mindtrace.core import (
     BenchSuiteConfig,
     BenchTestSuite,
     TaskSchema,
-    utc_now_iso,
+    utcnow_iso,
 )
 from mindtrace.database import MongoMindtraceODM
 from mindtrace.database.testing.suites._models import DatabaseBenchDocument
@@ -64,7 +64,7 @@ class DatabaseMongoInsertCeilingSuite(BenchTestSuite):
 
 
 async def _run_async(config: BenchSuiteConfig, reporter: BenchReporter) -> BenchResult:
-    started = utc_now_iso()
+    started = utcnow_iso()
     mono = time.perf_counter()
     mongo_backend, mongo_uri, mongo_db_name = resolve_mongo_resources(config)
     batch_size = int(config.parameters.get("batch_size", 100))
@@ -97,7 +97,7 @@ async def _run_async(config: BenchSuiteConfig, reporter: BenchReporter) -> Bench
         suite_id=config.suite_id,
         status="passed" if reporter.failures == 0 else "failed",
         started_at=started,
-        ended_at=utc_now_iso(),
+        ended_at=utcnow_iso(),
         duration_seconds=elapsed,
         operations=reporter.operations * batch_size,
         successes=reporter.successes * batch_size,

{mindtrace_database-0.12.0 → mindtrace_database-0.14.0}/mindtrace/database/testing/suites/mongo_read.py

@@ -18,7 +18,7 @@ from mindtrace.core import (
     BenchSuiteConfig,
     BenchTestSuite,
     TaskSchema,
-    utc_now_iso,
+    utcnow_iso,
 )
 from mindtrace.database import MongoMindtraceODM
 from mindtrace.database.testing.suites._models import DatabaseBenchDocument
@@ -71,7 +71,7 @@ class DatabaseMongoReadCeilingSuite(BenchTestSuite):
 
 
 async def _run_async(config: BenchSuiteConfig, reporter: BenchReporter) -> BenchResult:
-    started = utc_now_iso()
+    started = utcnow_iso()
     mono = time.perf_counter()
     mongo_backend, mongo_uri, mongo_db_name = resolve_mongo_resources(config)
     dataset_size = int(config.parameters.get("dataset_size", 1000))
@@ -115,7 +115,7 @@ async def _run_async(config: BenchSuiteConfig, reporter: BenchReporter) -> Bench
         suite_id=config.suite_id,
         status="passed" if reporter.failures == 0 else "failed",
         started_at=started,
-        ended_at=utc_now_iso(),
+        ended_at=utcnow_iso(),
         duration_seconds=elapsed,
         operations=reporter.operations,
         successes=reporter.successes,

{mindtrace_database-0.12.0 → mindtrace_database-0.14.0}/mindtrace/database/testing/suites/mongo_update.py

@@ -18,7 +18,7 @@ from mindtrace.core import (
     BenchSuiteConfig,
     BenchTestSuite,
     TaskSchema,
-    utc_now_iso,
+    utcnow_iso,
 )
 from mindtrace.database import MongoMindtraceODM
 from mindtrace.database.testing.suites._models import DatabaseBenchDocument
@@ -67,7 +67,7 @@ class DatabaseMongoUpdateCeilingSuite(BenchTestSuite):
 
 
 async def _run_async(config: BenchSuiteConfig, reporter: BenchReporter) -> BenchResult:
-    started = utc_now_iso()
+    started = utcnow_iso()
     mono = time.perf_counter()
     mongo_backend, mongo_uri, mongo_db_name = resolve_mongo_resources(config)
     dataset_size = int(config.parameters.get("dataset_size", 1000))
@@ -107,7 +107,7 @@ async def _run_async(config: BenchSuiteConfig, reporter: BenchReporter) -> Bench
         suite_id=config.suite_id,
         status="passed" if reporter.failures == 0 else "failed",
         started_at=started,
-        ended_at=utc_now_iso(),
+        ended_at=utcnow_iso(),
         duration_seconds=elapsed,
         operations=reporter.operations,
         successes=reporter.successes,

{mindtrace_database-0.12.0 → mindtrace_database-0.14.0/mindtrace_database.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mindtrace-database
-Version: 0.12.0
+Version: 0.14.0
 Summary: Database functionality for Mindtrace
 Author: Mindtrace Team
 License-Expression: Apache-2.0
@@ -11,13 +11,13 @@ Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: beanie<2,>=1.29.0
-Requires-Dist: mindtrace-core>=0.12.0
+Requires-Dist: mindtrace-core>=0.14.0
 Requires-Dist: pydantic>=2.11.1
 Requires-Dist: redis>=4.0.0
 Requires-Dist: redis-om>=0.3.5
 Requires-Dist: motor>=3.3.0
 Requires-Dist: pymongo>=4.14.0
-Requires-Dist: mindtrace-registry>=0.12.0
+Requires-Dist: mindtrace-registry>=0.14.0
 Dynamic: license-file
 
 [![PyPI version](https://img.shields.io/pypi/v/mindtrace-database)](https://pypi.org/project/mindtrace-database/)

{mindtrace_database-0.12.0 → mindtrace_database-0.14.0}/mindtrace_database.egg-info/requires.txt

@@ -1,8 +1,8 @@
 beanie<2,>=1.29.0
-mindtrace-core>=0.12.0
+mindtrace-core>=0.14.0
 pydantic>=2.11.1
 redis>=4.0.0
 redis-om>=0.3.5
 motor>=3.3.0
 pymongo>=4.14.0
-mindtrace-registry>=0.12.0
+mindtrace-registry>=0.14.0

{mindtrace_database-0.12.0 → mindtrace_database-0.14.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mindtrace-database"
-version = "0.12.0"
+version = "0.14.0"
 description = "Database functionality for Mindtrace"
 readme = "README.md"
 license = "Apache-2.0"
@@ -13,13 +13,13 @@ classifiers = [
 ]
 dependencies = [
     "beanie>=1.29.0, <2",
-    "mindtrace-core>=0.12.0",
+    "mindtrace-core>=0.14.0",
     "pydantic>=2.11.1",
     "redis>=4.0.0",
     "redis-om>=0.3.5",
     "motor>=3.3.0",
     "pymongo>=4.14.0",
-    "mindtrace-registry>=0.12.0",
+    "mindtrace-registry>=0.14.0",
 ]
 
 [project.entry-points."mindtrace.benchmark_suites"]

mindtrace_database-0.12.0/mindtrace/database/sample/user.py

@@ -1,10 +0,0 @@
-from datetime import datetime
-
-from pydantic import BaseModel, Field
-
-
-class User(BaseModel):
-    name: str
-    id: int | None = None
-    created_at: datetime = Field(default_factory=datetime.now)
-    updated_at: datetime = Field(default_factory=datetime.now)