🔀 merge branch master

Author: yanyongyu

.github/actions/setup-python/action.yml

@@ -14,7 +14,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: astral-sh/setup-uv@v6
+    - uses: astral-sh/setup-uv@v7
       with:
         python-version: ${{ inputs.python-version }}
         cache-suffix: ${{ inputs.env-group }}

.github/workflows/codecov.yml

@@ -32,7 +32,7 @@ jobs:
       PYDANTIC_VERSION: ${{ matrix.env }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Python environment
         uses: ./.github/actions/setup-python
@@ -56,7 +56,7 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Upload coverage report
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@v6
         with:
           env_vars: OS,PYTHON_VERSION,PYDANTIC_VERSION
           files: ./coverage.xml

.github/workflows/docs.yml

@@ -11,14 +11,14 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Setup Python environment
         uses: ./.github/actions/setup-python
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         with:
           key: mkdocs-material-${{ hashfiles('.cache/**') }}
           path: .cache
@@ -36,7 +36,7 @@ jobs:
           MKDOCS_GIT_COMMITTERS_APIKEY: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload to GitHub Pages
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v5
         with:
           path: site
 
@@ -54,4 +54,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

.github/workflows/pyright.yml

@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Python environment
         uses: ./.github/actions/setup-python
@@ -42,7 +42,7 @@ jobs:
         shell: bash
 
       - name: Run Pyright
-        uses: jakebailey/pyright-action@v2
+        uses: jakebailey/pyright-action@v3
         with:
           pylance-version: latest-release
           extra-args: githubkit
@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Python environment
         uses: ./.github/actions/setup-python
@@ -62,7 +62,7 @@ jobs:
         shell: bash
 
       - name: Run Pyright
-        uses: jakebailey/pyright-action@v2
+        uses: jakebailey/pyright-action@v3
         with:
           working-directory: ./codegen
           pylance-version: latest-release

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
       id-token: write
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Python
         uses: ./.github/actions/setup-python

.github/workflows/ruff.yml

@@ -11,7 +11,7 @@ jobs:
     name: Ruff Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Run Ruff Lint
         uses: astral-sh/ruff-action@v3

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ ci:
   autoupdate_commit_msg: ":arrow_up: auto update by pre-commit hooks"
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.7
+    rev: v0.15.11
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]

codegen/parser/__init__.py

@@ -56,7 +56,7 @@ def parse_openapi_spec(source: "Source", override: "Override") -> OpenAPIData:
     for path, new_schema in override.schema_overrides.items():
         ref = str(httpx.URL(fragment=path))
         logger.info(f"Applying schema override for {ref!r}")
-        merge_inplace(source.resolve_ref(ref).data, new_schema)
+        merge_inplace(source.resolve_ref(ref), new_schema)
 
     _ot = _override_config.set(override)
     _st = _schemas.set({})

codegen/parser/data.py

@@ -1,5 +1,7 @@
 from collections import defaultdict
 from dataclasses import dataclass, field
+from functools import cached_property
+import re
 from typing import Literal
 
 from .schemas import ModelSchema, Property, SchemaData, UnionSchema
@@ -84,7 +86,7 @@ def get_raw_definition(self) -> str:
             required=self.required,
             schema_data=self.body_schema,
         )
-        return prop.get_param_defination()
+        return prop.get_param_definition()
 
     def get_endpoint_definition(self) -> str:
         prop = Property(
@@ -93,7 +95,7 @@ def get_endpoint_definition(self) -> str:
             required=not bool(self.allowed_models),
             schema_data=self.body_schema,
         )
-        return prop.get_param_defination()
+        return prop.get_param_definition()
 
 
 @dataclass(kw_only=True)
@@ -139,6 +141,17 @@ def name(self) -> str:
             self.method, self.path.replace("{", "").replace("}", "").replace("/", "_")
         )
 
+    @cached_property
+    def eval_path(self) -> str:
+        """Actual string used to construct the path with param names"""
+        params_in_path = re.findall(r"\{([^\}]+)\}", self.path)
+        param_name_map = {param.name: param.prop_name for param in self.path_params}
+        path = self.path
+        for param in params_in_path:
+            if param in param_name_map:
+                path = path.replace(f"{{{param}}}", f"{{{param_name_map[param]}}}")
+        return path
+
     @property
     def path_params(self) -> list[Parameter]:
         return [param for param in self.parameters if param.param_in == "path"]