Merge branch 'main' into main

Author: ajac-zero

.github/workflows/ci.yml

@@ -18,7 +18,16 @@ permissions:
 
 jobs:
   lint:
+    name: lint on ${{ matrix.python-version }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # Typecheck both Python 3.10 and 3.13. We've had issues due to not checking against both.
+        python-version: ["3.10", "3.13"]
+    env:
+      UV_PYTHON: ${{ matrix.python-version }}
+      PYRIGHT_PYTHON: ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v4
 
@@ -129,7 +138,7 @@ jobs:
   test:
     name: test on ${{ matrix.python-version }} (${{ matrix.install.name }})
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
@@ -174,7 +183,7 @@ jobs:
   test-lowest-versions:
     name: test on ${{ matrix.python-version }} (lowest-versions)
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:

Makefile

@@ -36,8 +36,9 @@ lint: ## Lint the code
 
 .PHONY: typecheck-pyright
 typecheck-pyright:
+	@# To typecheck for a specific version of python, run 'make install-all-python' then set environment variable PYRIGHT_PYTHON=3.10 or similar
 	@# PYRIGHT_PYTHON_IGNORE_WARNINGS avoids the overhead of making a request to github on every invocation
-	PYRIGHT_PYTHON_IGNORE_WARNINGS=1 uv run pyright
+	PYRIGHT_PYTHON_IGNORE_WARNINGS=1 uv run pyright $(if $(PYRIGHT_PYTHON),--pythonversion $(PYRIGHT_PYTHON))
 
 .PHONY: typecheck-mypy
 typecheck-mypy:
@@ -51,7 +52,8 @@ typecheck-both: typecheck-pyright typecheck-mypy
 
 .PHONY: test
 test: ## Run tests and collect coverage data
-	uv run coverage run -m pytest -n auto --dist=loadgroup --durations=20
+	@# To test using a specific version of python, run 'make install-all-python' then set environment variable PYTEST_PYTHON=3.10 or similar
+	$(if $(PYTEST_PYTHON),UV_PROJECT_ENVIRONMENT=.venv$(subst .,,$(PYTEST_PYTHON))) uv run $(if $(PYTEST_PYTHON),--python $(PYTEST_PYTHON)) coverage run -m pytest -n auto --dist=loadgroup --durations=20
 	@uv run coverage combine
 	@uv run coverage report
 

docs/api/pydantic_graph/beta.md

@@ -0,0 +1,3 @@
+# `pydantic_graph.beta`
+
+::: pydantic_graph.beta

docs/api/pydantic_graph/beta_decision.md

@@ -0,0 +1,3 @@
+# `pydantic_graph.beta.decision`
+
+::: pydantic_graph.beta.decision

docs/api/pydantic_graph/beta_graph.md

@@ -0,0 +1,3 @@
+# `pydantic_graph.beta.graph`
+
+::: pydantic_graph.beta.graph

docs/api/pydantic_graph/beta_graph_builder.md

@@ -0,0 +1,3 @@
+# `pydantic_graph.beta.graph_builder`
+
+::: pydantic_graph.beta.graph_builder

docs/api/pydantic_graph/beta_join.md

@@ -0,0 +1,3 @@
+# `pydantic_graph.beta.join`
+
+::: pydantic_graph.beta.join

docs/api/pydantic_graph/beta_node.md

@@ -0,0 +1,3 @@
+# `pydantic_graph.beta.node`
+
+::: pydantic_graph.beta.node

docs/api/pydantic_graph/beta_step.md

@@ -0,0 +1,3 @@
+# `pydantic_graph.beta.step`
+
+::: pydantic_graph.beta.step

docs/api/toolsets.md

@@ -14,3 +14,5 @@
         - PreparedToolset
         - WrapperToolset
         - ToolsetFunc
+
+::: pydantic_ai.toolsets.fastmcp