Merge pull request #178 from 15r10nk/pydantic_ai_fixes

Pydantic ai fixes

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
         python-version: ${{matrix.python-version}}
 
     - run: |
-        uv run ${{matrix.extra_deps}} --extra black -m ${{ matrix.os == 'ubuntu-latest' && 'coverage run -m' || '' }} pytest -n=auto -vv
+        uv run ${{matrix.extra_deps}} --extra black --extra dirty-equals -m ${{ matrix.os == 'ubuntu-latest' && 'coverage run -m' || '' }} pytest -n=auto -vv
     - run: |
         uv run -m coverage combine
         mv .coverage .coverage.${{ matrix.python-version }}-${{matrix.os}}-${{strategy.job-index}}

changelog.d/20250112_121000_15r10nk-git_pydantic_ai_fixes.md

@@ -0,0 +1,13 @@
+### Fixed
+
+- snapshots with pydantic models can now be compared multiple times
+
+    ``` python
+    class A(BaseModel):
+        a: int
+
+
+    def test_something():
+        for _ in [1, 2]:
+            assert A(a=1) == snapshot(A(a=1))
+    ```

changelog.d/20250112_213028_15r10nk-git_pydantic_ai_fixes.md

@@ -0,0 +1,3 @@
+### Added
+
+- added the optional `inline-snapshot[dirty-equals]` dependency to depend on the dirty-equals version which works in combination with inline-snapshot.

docs/eq_snapshot.md

@@ -120,6 +120,7 @@ Example:
 
 The date can be replaced with the [dirty-equals](https://dirty-equals.helpmanual.io/latest/) expression `IsDatetime()`.
 
+
 Example:
 
 === "using IsDatetime()"
@@ -195,6 +196,12 @@ Example:
         )
     ```
 
+!!! note
+    Use the optional *dirty-equals* dependency to install the version that works best in combination with inline-snapshot.
+    ``` sh
+    pip install inline-snapshot[dirty-equals]
+    ```
+
 ### Is(...)
 
 `Is()` can be used to put runtime values inside snapshots.

docs/outsource.md

@@ -27,7 +27,7 @@ Example:
 
 === "--inline-snapshot=create"
     <!-- inline-snapshot: create outcome-passed=1 -->
-    ``` python hl_lines="2 3 7 8 9"
+    ``` python hl_lines="3 4 7 8 9"
     from inline_snapshot import snapshot, outsource
 
     from inline_snapshot import external
@@ -55,7 +55,7 @@ The `external` object can be used inside other data structures.
 
 === "--inline-snapshot=create"
     <!-- inline-snapshot: create outcome-passed=1 -->
-    ``` python hl_lines="2 3 9 10 11 12 13 14 15"
+    ``` python hl_lines="3 4 9 10 11 12 13 14 15"
     from inline_snapshot import snapshot, outsource
 
     from inline_snapshot import external

pyproject.toml

@@ -41,6 +41,9 @@ black = [
   "black>=23.3.0",
   "click>=8.1.4"
 ]
+dirty-equals =[
+    "dirty-equals>=0.9.0",
+]
 
 [dependency-groups]
 dev = [
@@ -54,7 +57,6 @@ dev = [
     "coverage[toml]>=7.6.1",
     "coverage-enable-subprocess>=1.0",
     "pytest>=8",
-    "dirty-equals>=0.7.0",
     "attrs>=24.3.0",
     "pydantic>=1",
 ]
@@ -134,8 +136,8 @@ matrix.extra-deps.dependencies = [
 
 [tool.hatch.envs.hatch-test]
 extra-dependencies = [
-  "inline-snapshot[black]",
-  "dirty-equals>=0.7.0",
+  "inline-snapshot[black,dirty-equals]",
+  "dirty-equals>=0.9.0",
   "hypothesis>=6.75.5",
   "mypy>=1.2.0",
   "pyright>=1.1.359",
@@ -153,7 +155,7 @@ cov-report=["coverage report","coverage html"]
 
 [tool.hatch.envs.types]
 extra-dependencies = [
-  "inline-snapshot[black]",
+  "inline-snapshot[black,dirty-equals]",
   "mypy>=1.0.0",
   "pytest",
   "hypothesis>=6.75.5",

src/inline_snapshot/_adapter/generic_call_adapter.py

@@ -76,14 +76,24 @@ def map(cls, value, map_function):
         )
 
     def items(self, value, node):
-        assert isinstance(node, ast.Call)
-        assert not node.args
-        assert all(kw.arg for kw in node.keywords)
+        new_args, new_kwargs = self.arguments(value)
+
+        if node is not None:
+            assert isinstance(node, ast.Call)
+            assert not node.args
+            assert all(kw.arg for kw in node.keywords)
+            kw_arg_node = {kw.arg: kw.value for kw in node.keywords if kw.arg}.get
+            pos_arg_node = lambda pos: node.args[pos]
+        else:
+            kw_arg_node = lambda _: None
+            pos_arg_node = lambda _: None
 
         return [
-            Item(value=self.argument(value, kw.arg), node=kw.value)
-            for kw in node.keywords
-            if kw.arg
+            Item(value=arg.value, node=pos_arg_node(i))
+            for i, arg in enumerate(new_args)
+        ] + [
+            Item(value=kw.value, node=kw_arg_node(name))
+            for name, kw in new_kwargs.items()
         ]
 
     def assign(self, old_value, old_node, new_value):

src/inline_snapshot/_align.py

@@ -3,6 +3,32 @@
 
 def align(seq_a, seq_b) -> str:
 
+    start = 0
+
+    for a, b in zip(seq_a, seq_b):
+        if a == b:
+            start += 1
+        else:
+            break
+
+    if start == len(seq_a) == len(seq_b):
+        return "m" * start
+
+    end = 0
+
+    for a, b in zip(reversed(seq_a[start:]), reversed(seq_b[start:])):
+        if a == b:
+            end += 1
+        else:
+            break
+
+    diff = nw_align(seq_a[start : len(seq_a) - end], seq_b[start : len(seq_b) - end])
+
+    return "m" * start + diff + "m" * end
+
+
+def nw_align(seq_a, seq_b) -> str:
+
     matrix: list = [[(0, "e")] + [(0, "i")] * len(seq_b)]
 
     for a in seq_a:

src/inline_snapshot/_code_repr.py

@@ -88,7 +88,8 @@ def mocked_code_repr(obj):
 
 
 def value_code_repr(obj):
-    if not type(obj) == type(obj):
+    if not type(obj) == type(obj):  # pragma: no cover
+        # this was caused by https://github.com/samuelcolvin/dirty-equals/issues/104
         # dispatch will not work in cases like this
         return (
             f"HasRepr({repr(type(obj))}, '< type(obj) can not be compared with == >')"

src/inline_snapshot/_is.py

@@ -1,6 +1,18 @@
-class Is:
-    def __init__(self, value):
-        self.value = value
+import typing
+from typing import TYPE_CHECKING
 
-    def __eq__(self, other):
-        return self.value == other
+if TYPE_CHECKING:
+
+    T = typing.TypeVar("T")
+
+    def Is(v: T) -> T:
+        return v
+
+else:
+
+    class Is:
+        def __init__(self, value):
+            self.value = value
+
+        def __eq__(self, other):
+            return self.value == other

src/inline_snapshot/_unmanaged.py

@@ -43,6 +43,9 @@ def __eq__(self, other):
 
         return self.value == other
 
+    def __repr__(self):
+        return repr(self.value)
+
 
 def map_unmanaged(value):
     if is_unmanaged(value):

tests/test_dirty_equals.py

@@ -1,7 +1,9 @@
+import pytest
 from inline_snapshot._inline_snapshot import snapshot
 from inline_snapshot.testing._example import Example
 
 
+@pytest.mark.xfail
 def test_dirty_equals_repr():
     Example(
         """\

tests/test_pydantic.py

@@ -117,3 +117,21 @@ def test_something():
             }
         ),
     )
+
+
+def test_pydantic_evaluate_twice():
+    Example(
+        """\
+from inline_snapshot import snapshot
+from pydantic import BaseModel
+
+class A(BaseModel):
+    a:int
+
+def test_something():
+    for _ in [1,2]:
+        assert A(a=1) == snapshot(A(a=1))
+"""
+    ).run_pytest(
+        changed_files=snapshot({}),
+    )