matrx-orm 3.1.30__tar.gz → 3.1.31__tar.gz

{matrx_orm-3.1.30 → matrx_orm-3.1.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrx-orm
-Version: 3.1.30
+Version: 3.1.31
 Summary: Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching
 Project-URL: Homepage, https://github.com/AI-Matrix-Engine/aidream-current
 Project-URL: Repository, https://github.com/AI-Matrix-Engine/aidream-current

{matrx_orm-3.1.30 → matrx_orm-3.1.31}/matrx_orm/core/expressions.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from datetime import date, datetime
+from datetime import date, datetime, timedelta
 from decimal import Decimal
 from typing import TYPE_CHECKING, Any
 from uuid import UUID
@@ -174,7 +174,7 @@ class OrderBy:
 
     def __init__(
         self,
-        expression: "str | F | Func",
+        expression: str | F | Func,
         *,
         descending: bool = False,
         nulls: str | None = None,
@@ -228,7 +228,7 @@ class Q:
     OR = "OR"
     NOT = "NOT"
 
-    def __init__(self, *args: "Q", **kwargs: Any) -> None:
+    def __init__(self, *args: Q, **kwargs: Any) -> None:
         self.connector: str = self.AND
         self.negated: bool = False
         # Children is a list of (Q | None) for compound nodes, or kwargs for leaf nodes.
@@ -237,19 +237,19 @@ class Q:
 
     # -- Boolean operators --------------------------------------------------
 
-    def __and__(self, other: "Q") -> "Q":
+    def __and__(self, other: Q) -> Q:
         node = Q()
         node.connector = self.AND
         node.children = [self, other]
         return node
 
-    def __or__(self, other: "Q") -> "Q":
+    def __or__(self, other: Q) -> Q:
         node = Q()
         node.connector = self.OR
         node.children = [self, other]
         return node
 
-    def __invert__(self) -> "Q":
+    def __invert__(self) -> Q:
         node = Q(**self.kwargs)
         node.connector = self.connector
         node.children = list(self.children)
@@ -697,7 +697,7 @@ class Interval:
     def __init__(self, **parts: int | float) -> None:
         if not parts or not set(parts).issubset(self._UNITS):
             raise ValueError("Interval received an unsupported or empty unit set")
-        self.value = " ".join(f"{amount} {unit}" for unit, amount in parts.items())
+        self.value = timedelta(**parts)
 
     def as_sql(self, params: list[Any]) -> str:
         params.append(self.value)
@@ -1776,7 +1776,7 @@ class Window:
 
     def __init__(
         self,
-        expression: "Func | Aggregate",
+        expression: Func | Aggregate,
         *,
         partition_by: str | list[str] | None = None,
         order_by: str | list[str] | None = None,

{matrx_orm-3.1.30 → matrx_orm-3.1.31}/matrx_orm/operations/conflict.py

@@ -79,6 +79,7 @@ class ConflictTarget:
         *,
         coalesce: dict[str, Any] | None = None,
         lower: tuple[str, ...] = (),
+        md5: tuple[str, ...] = (),
         where_is_null: tuple[str, ...] = (),
         where_is_not_null: tuple[str, ...] = (),
         where_equals: dict[str, Any] | None = None,
@@ -93,6 +94,9 @@ class ConflictTarget:
         unknown_lower = set(lower) - set(columns)
         if unknown_lower:
             raise ValueError(f"lower columns are not in conflict target: {sorted(unknown_lower)}")
+        unknown_md5 = set(md5) - set(columns)
+        if unknown_md5:
+            raise ValueError(f"md5 columns are not in conflict target: {sorted(unknown_md5)}")
         expressions: list[str] = []
         for column in columns:
             rendered = _identifier(column)
@@ -100,6 +104,8 @@ class ConflictTarget:
                 rendered = f"COALESCE({rendered}, {_literal(coalesce[column])})"
             if column in lower:
                 rendered = f"lower({rendered})"
+            if column in md5:
+                rendered = f"md5({rendered})"
             expressions.append(rendered)
         predicates = [f"{_identifier(column)} IS NULL" for column in where_is_null]
         predicates.extend(f"{_identifier(column)} IS NOT NULL" for column in where_is_not_null)

{matrx_orm-3.1.30 → matrx_orm-3.1.31}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "3.1.30"
+version = "3.1.31"
 description = "Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching"
 readme = "README.md"
 license = { text = "MIT" }

{matrx_orm-3.1.30 → matrx_orm-3.1.31}/tests/level1/test_case_when.py

@@ -13,8 +13,9 @@ style of test_expression_primitives.py / test_join_and_aggregate.py.
 """
 from __future__ import annotations
 
+from datetime import timedelta
+
 import pytest
-from matrx_orm import ColumnComparison, F
 from matrx_orm.core.base import Model, ModelMeta
 from matrx_orm.core.expressions import (
     ArrayAny,
@@ -162,8 +163,8 @@ def _make_order_model():
 
 
 def test_case_in_annotate():
-    O = _make_order_model()
-    qb = O.filter().annotate(
+    Order = _make_order_model()
+    qb = Order.filter().annotate(
         tier=Case(When(Compare(F("amount"), ">=", 1000), then=Value("gold")), default=Value("standard"))
     )
     sql, params = QueryExecutor(qb._build_query())._build_query()
@@ -174,8 +175,8 @@ def test_case_in_annotate():
 
 
 def test_case_in_order_by():
-    O = _make_order_model()
-    qb = O.filter().order_by(
+    Order = _make_order_model()
+    qb = Order.filter().order_by(
         OrderBy(Case(When(Compare(F("status"), "=", "paid"), then=0), default=1)),
         "-amount",
     )
@@ -187,8 +188,8 @@ def test_case_in_order_by():
 def test_case_in_order_by_with_nulls_last():
     """Mirrors the real _entity_recall Step-1 ORDER BY: exact-match-first
     tiebreak, then confidence_avg DESC NULLS LAST."""
-    O = _make_order_model()
-    qb = O.filter().order_by(
+    Order = _make_order_model()
+    qb = Order.filter().order_by(
         OrderBy(Case(When(Compare(Lower(F("status")), "=", "paid"), then=0), default=1)),
         OrderBy("amount", descending=True, nulls="last"),
     )
@@ -405,7 +406,7 @@ def test_expression_branch_anchors_the_case_so_literals_are_not_cast():
         "CASE WHEN (w IS NULL OR w < (NOW() - $1::interval)) "
         "THEN $2 ELSE (daily_auto_rag_cost_used_usd + $3) END"
     )
-    assert params == ["24 hours", 0.42, 0.42]
+    assert params == [timedelta(hours=24), 0.42, 0.42]
 
 
 def test_column_branch_anchors_the_case_so_literals_are_not_cast():

{matrx_orm-3.1.30 → matrx_orm-3.1.31}/tests/level1/test_conflict_target.py

@@ -102,6 +102,16 @@ def test_typed_partial_target_rejects_non_identifier_columns() -> None:
         ConflictTarget.partial(["project_id; DROP TABLE x"])
 
 
+def test_typed_partial_target_renders_md5_expression() -> None:
+    target = ConflictTarget.partial(["source_id", "url"], md5=("url",))
+    assert target.expressions == ("source_id", "md5(url)")
+
+
+def test_typed_partial_target_rejects_unknown_md5_column() -> None:
+    with pytest.raises(ValueError, match="md5 columns are not in conflict target"):
+        ConflictTarget.partial(["source_id", "url"], md5=("missing",))
+
+
 # ── Executor SQL shape ───────────────────────────────────────────────────────
 
 

{matrx_orm-3.1.30 → matrx_orm-3.1.31}/tests/level1/test_typed_predicates.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from datetime import timedelta
 from typing import Any
 
 import pytest
@@ -193,6 +194,7 @@ def test_arrays_tuple_membership_constant_and_interval() -> None:
         ["a"],
         ["00000000-0000-0000-0000-000000000001"],
     ]
+    assert params[4] == timedelta(hours=24)
 
 
 def test_function_name_and_tuple_type_are_validated() -> None: