From bd991590be7ee74e03031f0c88d2bfc895ca2e14 Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Wed, 13 Nov 2024 10:28:24 +0000 Subject: [PATCH 1/9] docs improvements, and build with insiders --- Makefile | 16 ++++++++++++++++ docs/api/agent.md | 2 -- docs/api/models/{index.md => base.md} | 0 docs/api/result.md | 2 +- docs/index.md | 16 ++++++++-------- mkdocs.yml | 19 +++++++++---------- pydantic_ai/result.py | 17 +++++------------ pyproject.toml | 1 - uv.lock | 2 -- 9 files changed, 39 insertions(+), 36 deletions(-) rename docs/api/models/{index.md => base.md} (100%) diff --git a/Makefile b/Makefile index d10bd36c88..ea408ef346 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,22 @@ docs: docs-serve: uv run mkdocs serve --no-strict +# install insiders packages for docs +.docs-insiders-install: + uv add \ + --no-sync \ + --extra-index-url https://pydantic:${PPPR_TOKEN}@pppr.pydantic.dev/simple/ \ + --group docs \ + mkdocs-material mkdocstrings-python + +.PHONY: docs-insiders # Build the documentation using insiders packages +docs-insiders: .docs-insiders-install + uv run mkdocs build + +.PHONY: docs-serve-insiders # Build and serve the documentation using insiders packages +docs-serve-insiders: .docs-insiders-install + uv run mkdocs serve + .PHONY: cf-pages-build # Install uv, install dependencies and build the docs, used on CloudFlare Pages cf-pages-build: curl -LsSf https://astral.sh/uv/install.sh | sh diff --git a/docs/api/agent.md b/docs/api/agent.md index fe2f6e02b7..2152da3808 100644 --- a/docs/api/agent.md +++ b/docs/api/agent.md @@ -19,5 +19,3 @@ options: members: - KnownModelName - - ResultValidatorFunc - - SystemPromptFunc diff --git a/docs/api/models/index.md b/docs/api/models/base.md similarity index 100% rename from docs/api/models/index.md rename to docs/api/models/base.md diff --git a/docs/api/result.md b/docs/api/result.md index 477509b61f..83d61af813 100644 --- a/docs/api/result.md +++ b/docs/api/result.md @@ -2,9 +2,9 @@ ::: pydantic_ai.result options: + inherited_members: true members: - ResultData - RunResult - StreamedRunResult - - _BaseRunResult - Cost diff --git a/docs/index.md b/docs/index.md index 49854e19d1..d5cb58130c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -46,14 +46,14 @@ async def get_weather( async def main(): async with httpx.AsyncClient() as client: - result = await weather_agent.run( - 'What is the weather like in West London and in Wiltshire?', - deps=client, - ) # (8)! - print(result.data) # (9)! - # > 'The weather in West London is raining, while in Wiltshire it is sunny.' - - print(result.all_messages()) # (10)! + result = await weather_agent.run( # (8)! + 'What is the weather like in West London and in Wiltshire?', + deps=client, + ) + print(result.data) # (9)! + # > 'The weather in West London is raining, while in Wiltshire it is sunny.' + + print(result.all_messages()) # (10)! ``` 1. An agent that can tell users about the weather in a particular location. Agents combine a system prompt, a response type (here `str`) and "retrievers" (aka tools). diff --git a/mkdocs.yml b/mkdocs.yml index a4e5c51aa7..507102e28a 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -10,7 +10,7 @@ edit_uri: edit/main/docs/ copyright: © Pydantic Services Inc. 2024 to present nav: - - Getting Started: + - Introduction: - index.md - install.md - API Reference: @@ -19,12 +19,11 @@ nav: - api/messages.md - api/dependencies.md - api/exceptions.md - - "pydantic_ai.models": - - api/models/index.md - - api/models/openai.md - - api/models/gemini.md - - api/models/test.md - - api/models/function.md + - api/models/base.md + - api/models/openai.md + - api/models/gemini.md + - api/models/test.md + - api/models/function.md extra: # hide the "Made with Material for MkDocs" message @@ -61,14 +60,13 @@ theme: - content.code.annotate - content.code.copy - content.code.select + - navigation.path - navigation.expand - navigation.indexes - - navigation.path - - navigation.tabs - navigation.sections - navigation.tracking - - navigation.top # alternatively, we could do navigation.tabs.sticky - toc.follow +# - navigation.tabs # don't use navbar tabs # logo: "logo-white.svg" # favicon: "favicon.png" @@ -122,6 +120,7 @@ plugins: python: paths: [src/packages/pydantic_ai/pydantic_ai] options: + relative_crossrefs: true members_order: source separate_signature: true show_signature_annotations: true diff --git a/pydantic_ai/result.py b/pydantic_ai/result.py index 84c5183415..ee6de72b77 100644 --- a/pydantic_ai/result.py +++ b/pydantic_ai/result.py @@ -67,8 +67,7 @@ def __add__(self, other: Cost) -> Cost: class _BaseRunResult(ABC, Generic[ResultData]): """Base type for results. - You should not import or use this type directly, instead use its subclasses - [`RunResult`][pydantic_ai.result.RunResult] and [`StreamedRunResult`][pydantic_ai.result.StreamedRunResult] instead. + You should not import or use this type directly, instead use its subclasses `RunResult` and `StreamedRunResult`. """ _all_messages: list[messages.Message] @@ -80,7 +79,7 @@ def all_messages(self) -> list[messages.Message]: return self._all_messages def all_messages_json(self) -> bytes: - """Return all messages from [`all_messages`][pydantic_ai.result._BaseRunResult.all_messages] as JSON bytes.""" + """Return all messages from [`all_messages`][..all_messages] as JSON bytes.""" return messages.MessagesTypeAdapter.dump_json(self.all_messages()) def new_messages(self) -> list[messages.Message]: @@ -91,7 +90,7 @@ def new_messages(self) -> list[messages.Message]: return self.all_messages()[self._new_message_index :] def new_messages_json(self) -> bytes: - """Return new messages from [`new_messages`][pydantic_ai.result._BaseRunResult.new_messages] as JSON bytes.""" + """Return new messages from [`new_messages`][..new_messages] as JSON bytes.""" return messages.MessagesTypeAdapter.dump_json(self.new_messages()) @abstractmethod @@ -101,10 +100,7 @@ def cost(self) -> Cost: @dataclass class RunResult(_BaseRunResult[ResultData]): - """Result of a non-streamed run. - - See [`_BaseRunResult`][pydantic_ai.result._BaseRunResult] for other available methods. - """ + """Result of a non-streamed run.""" data: ResultData """Data from the final response in the run.""" @@ -117,10 +113,7 @@ def cost(self) -> Cost: @dataclass class StreamedRunResult(_BaseRunResult[ResultData], Generic[AgentDeps, ResultData]): - """Result of a streamed run that returns structured data via a tool call. - - See [`_BaseRunResult`][pydantic_ai.result._BaseRunResult] for other available methods. - """ + """Result of a streamed run that returns structured data via a tool call.""" cost_so_far: Cost """Cost of the run up until the last request.""" diff --git a/pyproject.toml b/pyproject.toml index ae0c96f8d8..791a7574f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,7 +72,6 @@ docs = [ "mkdocs", "mkdocs-material", "mkdocstrings-python", - "griffe", ] [tool.hatch.build.targets.wheel] diff --git a/uv.lock b/uv.lock index cd48588dcd..63b9160607 100644 --- a/uv.lock +++ b/uv.lock @@ -1243,7 +1243,6 @@ dev = [ { name = "ruff" }, ] docs = [ - { name = "griffe" }, { name = "mkdocs" }, { name = "mkdocs-material" }, { name = "mkdocstrings-python" }, @@ -1280,7 +1279,6 @@ dev = [ { name = "ruff", specifier = ">=0.6.9" }, ] docs = [ - { name = "griffe" }, { name = "mkdocs" }, { name = "mkdocs-material" }, { name = "mkdocstrings-python" }, From af59ac6d08760222ae63e697b322d7cbd2b852f3 Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Wed, 13 Nov 2024 10:38:44 +0000 Subject: [PATCH 2/9] tweaking command revert uv changes using secrets --- .github/workflows/ci.yml | 8 +++++++- .gitignore | 1 + Makefile | 18 ++++++++++-------- uv.lock | 2 ++ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b950efd1ff..28ddbd1506 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,13 @@ jobs: enable-cache: true - run: uv sync --python 3.12 --frozen --group docs - - run: uv run --frozen mkdocs build + - run: docs + if: github.repository_owner != 'pydantic' + + - run: make docs-insiders + if: github.repository_owner == 'pydantic' + env: + PPPR_TOKEN: ${{ secrets.PPPR_TOKEN }} test: name: test on ${{ matrix.python-version }} diff --git a/.gitignore b/.gitignore index 1fdae50508..29e3fadf8a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ env*/ /postgres-data/ .DS_Store /pydantic_ai_examples/.chat_app_messages.jsonl +.docs-insiders-install diff --git a/Makefile b/Makefile index ea408ef346..4a0e1a28a3 100644 --- a/Makefile +++ b/Makefile @@ -67,27 +67,29 @@ docs: docs-serve: uv run mkdocs serve --no-strict -# install insiders packages for docs +.PHONY: .docs-insiders-install # install insiders packages for docs .docs-insiders-install: - uv add \ - --no-sync \ - --extra-index-url https://pydantic:${PPPR_TOKEN}@pppr.pydantic.dev/simple/ \ - --group docs \ - mkdocs-material mkdocstrings-python + @echo 'installing insiders packages' + @uv pip install \ + --extra-index-url https://pydantic:${PPPR_TOKEN}@pppr.pydantic.dev/simple/ \ + mkdocs-material mkdocstrings-python .PHONY: docs-insiders # Build the documentation using insiders packages docs-insiders: .docs-insiders-install - uv run mkdocs build + uv run --no-sync mkdocs build .PHONY: docs-serve-insiders # Build and serve the documentation using insiders packages docs-serve-insiders: .docs-insiders-install - uv run mkdocs serve + uv run --no-sync mkdocs serve .PHONY: cf-pages-build # Install uv, install dependencies and build the docs, used on CloudFlare Pages cf-pages-build: curl -LsSf https://astral.sh/uv/install.sh | sh ${HOME}/.local/bin/uv python install 3.12 ${HOME}/.local/bin/uv sync --python 3.12 --frozen --group docs + ${HOME}/.local/bin/uv pip install \ + --extra-index-url https://pydantic:${PPPR_TOKEN}@pppr.pydantic.dev/simple/ \ + mkdocs-material mkdocstrings-python ${HOME}/.local/bin/uv run --no-sync mkdocs build .PHONY: all diff --git a/uv.lock b/uv.lock index 63b9160607..cd48588dcd 100644 --- a/uv.lock +++ b/uv.lock @@ -1243,6 +1243,7 @@ dev = [ { name = "ruff" }, ] docs = [ + { name = "griffe" }, { name = "mkdocs" }, { name = "mkdocs-material" }, { name = "mkdocstrings-python" }, @@ -1279,6 +1280,7 @@ dev = [ { name = "ruff", specifier = ">=0.6.9" }, ] docs = [ + { name = "griffe" }, { name = "mkdocs" }, { name = "mkdocs-material" }, { name = "mkdocstrings-python" }, From 3c6fb6223f675a4201779d459af167de07fe352a Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Wed, 13 Nov 2024 11:33:00 +0000 Subject: [PATCH 3/9] debugging --- .github/workflows/ci.yml | 2 ++ .gitignore | 1 - Makefile | 2 ++ uv.lock | 17 +++++++---------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28ddbd1506..62050885f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,6 +54,8 @@ jobs: env: PPPR_TOKEN: ${{ secrets.PPPR_TOKEN }} + - run: uv pip freeze + test: name: test on ${{ matrix.python-version }} runs-on: ubuntu-latest diff --git a/.gitignore b/.gitignore index 29e3fadf8a..1fdae50508 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,3 @@ env*/ /postgres-data/ .DS_Store /pydantic_ai_examples/.chat_app_messages.jsonl -.docs-insiders-install diff --git a/Makefile b/Makefile index 4a0e1a28a3..3f59ed845a 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,11 @@ cf-pages-build: curl -LsSf https://astral.sh/uv/install.sh | sh ${HOME}/.local/bin/uv python install 3.12 ${HOME}/.local/bin/uv sync --python 3.12 --frozen --group docs + ${HOME}/.local/bin/uv run python -c "import os;print(len(os.getenv('PPPR_TOKEN', '')))" ${HOME}/.local/bin/uv pip install \ --extra-index-url https://pydantic:${PPPR_TOKEN}@pppr.pydantic.dev/simple/ \ mkdocs-material mkdocstrings-python + ${HOME}/.local/bin/uv pip freeze ${HOME}/.local/bin/uv run --no-sync mkdocs build .PHONY: all diff --git a/uv.lock b/uv.lock index cd48588dcd..9bc662ad6d 100644 --- a/uv.lock +++ b/uv.lock @@ -837,13 +837,14 @@ wheels = [ [[package]] name = "mkdocs-material" -version = "9.5.44" -source = { registry = "https://pypi.org/simple" } +version = "9.5.32+insiders.4.53.12" +source = { registry = "https://pppr.pydantic.dev/simple/" } dependencies = [ { name = "babel" }, { name = "colorama" }, { name = "jinja2" }, { name = "markdown" }, + { name = "mergedeep" }, { name = "mkdocs" }, { name = "mkdocs-material-extensions" }, { name = "paginate" }, @@ -852,9 +853,8 @@ dependencies = [ { name = "regex" }, { name = "requests" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/f7/56/182d8121db9ab553cdf9bc58d5972b89833f60b63272f693c1f2b849b640/mkdocs_material-9.5.44.tar.gz", hash = "sha256:f3a6c968e524166b3f3ed1fb97d3ed3e0091183b0545cedf7156a2a6804c56c0", size = 3964306 } wheels = [ - { url = "https://files.pythonhosted.org/packages/ed/eb/a801d00e0e210d82184aacce596906ec065422c78a7319244ba0771c4ded/mkdocs_material-9.5.44-py3-none-any.whl", hash = "sha256:47015f9c167d58a5ff5e682da37441fc4d66a1c79334bfc08d774763cacf69ca", size = 8674509 }, + { url = "https://pppr.pydantic.dev/simple/mkdocs-material/mkdocs_material-9.5.32+insiders.4.53.12-py3-none-any.whl" }, ] [[package]] @@ -889,16 +889,15 @@ wheels = [ [[package]] name = "mkdocstrings-python" -version = "1.12.2" -source = { registry = "https://pypi.org/simple" } +version = "1.12.2.1.9.0" +source = { registry = "https://pppr.pydantic.dev/simple/" } dependencies = [ { name = "griffe" }, { name = "mkdocs-autorefs" }, { name = "mkdocstrings" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/23/ec/cb6debe2db77f1ef42b25b21d93b5021474de3037cd82385e586aee72545/mkdocstrings_python-1.12.2.tar.gz", hash = "sha256:7a1760941c0b52a2cd87b960a9e21112ffe52e7df9d0b9583d04d47ed2e186f3", size = 168207 } wheels = [ - { url = "https://files.pythonhosted.org/packages/5b/c1/ac524e1026d9580cbc654b5d19f5843c8b364a66d30f956372cd09fd2f92/mkdocstrings_python-1.12.2-py3-none-any.whl", hash = "sha256:7f7d40d6db3cb1f5d19dbcd80e3efe4d0ba32b073272c0c0de9de2e604eda62a", size = 111759 }, + { url = "https://pppr.pydantic.dev/simple/mkdocstrings-python/mkdocstrings_python-1.12.2.1.9.0-py3-none-any.whl" }, ] [[package]] @@ -1243,7 +1242,6 @@ dev = [ { name = "ruff" }, ] docs = [ - { name = "griffe" }, { name = "mkdocs" }, { name = "mkdocs-material" }, { name = "mkdocstrings-python" }, @@ -1280,7 +1278,6 @@ dev = [ { name = "ruff", specifier = ">=0.6.9" }, ] docs = [ - { name = "griffe" }, { name = "mkdocs" }, { name = "mkdocs-material" }, { name = "mkdocstrings-python" }, From 7a071781577861d2647a5e01e5c04ac9fba1d89e Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Wed, 13 Nov 2024 11:33:49 +0000 Subject: [PATCH 4/9] fix insideres install --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3f59ed845a..9c22a7c950 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ docs-serve: .PHONY: .docs-insiders-install # install insiders packages for docs .docs-insiders-install: @echo 'installing insiders packages' - @uv pip install \ + @uv pip install -U \ --extra-index-url https://pydantic:${PPPR_TOKEN}@pppr.pydantic.dev/simple/ \ mkdocs-material mkdocstrings-python From 2680551fc1bff159273144b2518fd0af68dfadc0 Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Wed, 13 Nov 2024 11:37:12 +0000 Subject: [PATCH 5/9] revert uv.lock --- uv.lock | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/uv.lock b/uv.lock index 9bc662ad6d..63b9160607 100644 --- a/uv.lock +++ b/uv.lock @@ -837,14 +837,13 @@ wheels = [ [[package]] name = "mkdocs-material" -version = "9.5.32+insiders.4.53.12" -source = { registry = "https://pppr.pydantic.dev/simple/" } +version = "9.5.44" +source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "babel" }, { name = "colorama" }, { name = "jinja2" }, { name = "markdown" }, - { name = "mergedeep" }, { name = "mkdocs" }, { name = "mkdocs-material-extensions" }, { name = "paginate" }, @@ -853,8 +852,9 @@ dependencies = [ { name = "regex" }, { name = "requests" }, ] +sdist = { url = "https://files.pythonhosted.org/packages/f7/56/182d8121db9ab553cdf9bc58d5972b89833f60b63272f693c1f2b849b640/mkdocs_material-9.5.44.tar.gz", hash = "sha256:f3a6c968e524166b3f3ed1fb97d3ed3e0091183b0545cedf7156a2a6804c56c0", size = 3964306 } wheels = [ - { url = "https://pppr.pydantic.dev/simple/mkdocs-material/mkdocs_material-9.5.32+insiders.4.53.12-py3-none-any.whl" }, + { url = "https://files.pythonhosted.org/packages/ed/eb/a801d00e0e210d82184aacce596906ec065422c78a7319244ba0771c4ded/mkdocs_material-9.5.44-py3-none-any.whl", hash = "sha256:47015f9c167d58a5ff5e682da37441fc4d66a1c79334bfc08d774763cacf69ca", size = 8674509 }, ] [[package]] @@ -889,15 +889,16 @@ wheels = [ [[package]] name = "mkdocstrings-python" -version = "1.12.2.1.9.0" -source = { registry = "https://pppr.pydantic.dev/simple/" } +version = "1.12.2" +source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "griffe" }, { name = "mkdocs-autorefs" }, { name = "mkdocstrings" }, ] +sdist = { url = "https://files.pythonhosted.org/packages/23/ec/cb6debe2db77f1ef42b25b21d93b5021474de3037cd82385e586aee72545/mkdocstrings_python-1.12.2.tar.gz", hash = "sha256:7a1760941c0b52a2cd87b960a9e21112ffe52e7df9d0b9583d04d47ed2e186f3", size = 168207 } wheels = [ - { url = "https://pppr.pydantic.dev/simple/mkdocstrings-python/mkdocstrings_python-1.12.2.1.9.0-py3-none-any.whl" }, + { url = "https://files.pythonhosted.org/packages/5b/c1/ac524e1026d9580cbc654b5d19f5843c8b364a66d30f956372cd09fd2f92/mkdocstrings_python-1.12.2-py3-none-any.whl", hash = "sha256:7f7d40d6db3cb1f5d19dbcd80e3efe4d0ba32b073272c0c0de9de2e604eda62a", size = 111759 }, ] [[package]] From 90d3c3e33c26f80c19e28162ce3ce499038926c8 Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Wed, 13 Nov 2024 11:41:59 +0000 Subject: [PATCH 6/9] fix cf build? --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9c22a7c950..ca02404e73 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,7 @@ cf-pages-build: ${HOME}/.local/bin/uv sync --python 3.12 --frozen --group docs ${HOME}/.local/bin/uv run python -c "import os;print(len(os.getenv('PPPR_TOKEN', '')))" ${HOME}/.local/bin/uv pip install \ - --extra-index-url https://pydantic:${PPPR_TOKEN}@pppr.pydantic.dev/simple/ \ + --extra-index-url https://pydantic:$(PPPR_URL)@pppr.pydantic.dev/simple/ \ mkdocs-material mkdocstrings-python ${HOME}/.local/bin/uv pip freeze ${HOME}/.local/bin/uv run --no-sync mkdocs build From 9e136489aa33d1d7e57b81a8c332ea5a8879692f Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Wed, 13 Nov 2024 11:43:15 +0000 Subject: [PATCH 7/9] fix cf build? take 2 --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ca02404e73..2ed410754d 100644 --- a/Makefile +++ b/Makefile @@ -87,8 +87,7 @@ cf-pages-build: curl -LsSf https://astral.sh/uv/install.sh | sh ${HOME}/.local/bin/uv python install 3.12 ${HOME}/.local/bin/uv sync --python 3.12 --frozen --group docs - ${HOME}/.local/bin/uv run python -c "import os;print(len(os.getenv('PPPR_TOKEN', '')))" - ${HOME}/.local/bin/uv pip install \ + ${HOME}/.local/bin/uv pip install -U \ --extra-index-url https://pydantic:$(PPPR_URL)@pppr.pydantic.dev/simple/ \ mkdocs-material mkdocstrings-python ${HOME}/.local/bin/uv pip freeze From 788715e862c3c0a2bc58820cd9ac165cc00986da Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Wed, 13 Nov 2024 11:45:09 +0000 Subject: [PATCH 8/9] fix cf build? take 3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2ed410754d..054cf6e07a 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ cf-pages-build: ${HOME}/.local/bin/uv python install 3.12 ${HOME}/.local/bin/uv sync --python 3.12 --frozen --group docs ${HOME}/.local/bin/uv pip install -U \ - --extra-index-url https://pydantic:$(PPPR_URL)@pppr.pydantic.dev/simple/ \ + --extra-index-url https://pydantic:${PPPR_TOKEN}@pppr.pydantic.dev/simple/ \ mkdocs-material mkdocstrings-python ${HOME}/.local/bin/uv pip freeze ${HOME}/.local/bin/uv run --no-sync mkdocs build From 3a8a98bf6ce1e602d7acb75fb4e2ed0867e500b9 Mon Sep 17 00:00:00 2001 From: Samuel Colvin Date: Wed, 13 Nov 2024 11:49:16 +0000 Subject: [PATCH 9/9] fix cf build? take 4 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 054cf6e07a..4a7c89b2a9 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ cf-pages-build: ${HOME}/.local/bin/uv python install 3.12 ${HOME}/.local/bin/uv sync --python 3.12 --frozen --group docs ${HOME}/.local/bin/uv pip install -U \ - --extra-index-url https://pydantic:${PPPR_TOKEN}@pppr.pydantic.dev/simple/ \ + --extra-index-url https://pydantic:$(PPPR_TOKEN)@pppr.pydantic.dev/simple/ \ mkdocs-material mkdocstrings-python ${HOME}/.local/bin/uv pip freeze ${HOME}/.local/bin/uv run --no-sync mkdocs build