Merge branch 'main' into dmontagu/add-experiment-metadata

Author: DouweM

.github/workflows/ci.yml

@@ -160,6 +160,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          prune-cache: false
 
       - uses: denoland/setup-deno@v2
         with:
@@ -174,7 +175,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.cache/huggingface
-          key: hf-${{ runner.os }}-${{ hashFiles('**/pyproject.toml') }}
+          key: hf-${{ runner.os }}-${{ hashFiles('**/uv.lock') }}
           restore-keys: |
             hf-${{ runner.os }}-
 
@@ -207,6 +208,7 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          prune-cache: false
 
       - uses: denoland/setup-deno@v2
         with:
@@ -220,7 +222,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.cache/huggingface
-          key: hf-${{ runner.os }}-${{ hashFiles('**/pyproject.toml') }}
+          key: hf-${{ runner.os }}-${{ hashFiles('**/uv.lock') }}
           restore-keys: |
             hf-${{ runner.os }}-
 
@@ -256,12 +258,13 @@ jobs:
       - uses: astral-sh/setup-uv@v5
         with:
           enable-cache: true
+          prune-cache: false
 
       - name: cache HuggingFace models
         uses: actions/cache@v4
         with:
           path: ~/.cache/huggingface
-          key: hf-${{ runner.os }}-${{ hashFiles('**/pyproject.toml') }}
+          key: hf-${{ runner.os }}-${{ hashFiles('**/uv.lock') }}
           restore-keys: |
             hf-${{ runner.os }}-
 

pydantic_graph/pydantic_graph/beta/graph.py

@@ -7,6 +7,7 @@
 
 from __future__ import annotations as _annotations
 
+import sys
 import uuid
 from collections.abc import AsyncGenerator, AsyncIterable, AsyncIterator, Iterable, Sequence
 from contextlib import AbstractContextManager, ExitStack, asynccontextmanager, contextmanager
@@ -18,7 +19,6 @@
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from typing_extensions import TypeVar, assert_never
 
-from pydantic_ai.exceptions import ExceptionGroup
 from pydantic_graph import exceptions
 from pydantic_graph._utils import AbstractSpan, get_traceparent, infer_obj_name, logfire_span
 from pydantic_graph.beta.decision import Decision
@@ -43,6 +43,11 @@
 from pydantic_graph.beta.util import unpack_type_expression
 from pydantic_graph.nodes import BaseNode, End
 
+if sys.version_info < (3, 11):
+    from exceptiongroup import ExceptionGroup as ExceptionGroup  # pragma: lax no cover
+else:
+    ExceptionGroup = ExceptionGroup  # pragma: lax no cover
+
 if TYPE_CHECKING:
     from pydantic_graph.beta.mermaid import StateDiagramDirection