🐛 fix url eval param name error

Author: yanyongyu

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
@@ -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"]

codegen/templates/rest/_request.py.jinja

@@ -4,7 +4,7 @@
 
 {% macro build_path(endpoint) %}
 {% if endpoint.path_params %}
-url = f"{{ endpoint.path }}"
+url = f"{{ endpoint.eval_path }}"
 {% else %}
 url = "{{ endpoint.path }}"
 {% endif %}

githubkit/rest/__init__.py

@@ -14,17 +14,17 @@
 from githubkit.compat import GitHubModel, model_rebuild
 
 
-class ActionsCacheUsageOrgEnterprise(GitHubModel):
-    """ActionsCacheUsageOrgEnterprise"""
+class EnterpriseAccessRestrictions(GitHubModel):
+    """Enterprise Access Restrictions
 
-    total_active_caches_count: int = Field(
-        description="The count of active caches across all repositories of an enterprise or an organization."
-    )
-    total_active_caches_size_in_bytes: int = Field(
-        description="The total size in bytes of all active cache items across all repositories of an enterprise or an organization."
-    )
+    Information about the enterprise access restrictions proxy header.
+    """
 
+    message: str = Field(description="The message returned for the request.")
+    header_name: str = Field(description="The name of the proxy header.")
+    header_value: str = Field(description="The value of the proxy header.")
 
-model_rebuild(ActionsCacheUsageOrgEnterprise)
 
-__all__ = ("ActionsCacheUsageOrgEnterprise",)
+model_rebuild(EnterpriseAccessRestrictions)
+
+__all__ = ("EnterpriseAccessRestrictions",)

githubkit/versions/ghec_v2022_11_28/models/__init__.py

@@ -14,22 +14,17 @@
 from githubkit.compat import GitHubModel, model_rebuild
 
 
-class ActionsHostedRunnerMachineSpec(GitHubModel):
-    """Github-owned VM details.
+class ActionsCacheUsageOrgEnterprise(GitHubModel):
+    """ActionsCacheUsageOrgEnterprise"""
 
-    Provides details of a particular machine spec.
-    """
-
-    id: str = Field(
-        description="The ID used for the `size` parameter when creating a new runner."
+    total_active_caches_count: int = Field(
+        description="The count of active caches across all repositories of an enterprise or an organization."
     )
-    cpu_cores: int = Field(description="The number of cores.")
-    memory_gb: int = Field(description="The available RAM for the machine spec.")
-    storage_gb: int = Field(
-        description="The available SSD storage for the machine spec."
+    total_active_caches_size_in_bytes: int = Field(
+        description="The total size in bytes of all active cache items across all repositories of an enterprise or an organization."
     )
 
 
-model_rebuild(ActionsHostedRunnerMachineSpec)
+model_rebuild(ActionsCacheUsageOrgEnterprise)
 
-__all__ = ("ActionsHostedRunnerMachineSpec",)
+__all__ = ("ActionsCacheUsageOrgEnterprise",)

githubkit/versions/ghec_v2022_11_28/models/group_0029.py

@@ -9,95 +9,27 @@
 
 from __future__ import annotations
 
-from datetime import datetime
-from typing import Literal, Union
-
 from pydantic import Field
 
 from githubkit.compat import GitHubModel, model_rebuild
-from githubkit.typing import Missing
-from githubkit.utils import UNSET
-
-from .group_0030 import ActionsHostedRunnerMachineSpec
-
-
-class ActionsHostedRunner(GitHubModel):
-    """GitHub-hosted hosted runner
-
-    A Github-hosted hosted runner.
-    """
-
-    id: int = Field(description="The unique identifier of the hosted runner.")
-    name: str = Field(description="The name of the hosted runner.")
-    runner_group_id: Missing[int] = Field(
-        default=UNSET,
-        description="The unique identifier of the group that the hosted runner belongs to.",
-    )
-    image_details: Union[None, ActionsHostedRunnerPoolImage] = Field()
-    machine_size_details: ActionsHostedRunnerMachineSpec = Field(
-        title="Github-owned VM details.",
-        description="Provides details of a particular machine spec.",
-    )
-    status: Literal["Ready", "Provisioning", "Shutdown", "Deleting", "Stuck"] = Field(
-        description="The status of the runner."
-    )
-    platform: str = Field(description="The operating system of the image.")
-    maximum_runners: Missing[int] = Field(
-        default=UNSET,
-        description="The maximum amount of hosted runners. Runners will not scale automatically above this number. Use this setting to limit your cost.",
-    )
-    public_ip_enabled: bool = Field(
-        description="Whether public IP is enabled for the hosted runners."
-    )
-    public_ips: Missing[list[PublicIp]] = Field(
-        default=UNSET,
-        description="The public IP ranges when public IP is enabled for the hosted runners.",
-    )
-    last_active_on: Missing[Union[datetime, None]] = Field(
-        default=UNSET,
-        description="The time at which the runner was last used, in ISO 8601 format.",
-    )
 
 
-class ActionsHostedRunnerPoolImage(GitHubModel):
-    """GitHub-hosted runner image details.
+class ActionsHostedRunnerMachineSpec(GitHubModel):
+    """Github-owned VM details.
 
-    Provides details of a hosted runner image
+    Provides details of a particular machine spec.
     """
 
     id: str = Field(
-        description="The ID of the image. Use this ID for the `image` parameter when creating a new larger runner."
-    )
-    size_gb: int = Field(description="Image size in GB.")
-    display_name: str = Field(description="Display name for this image.")
-    source: Literal["github", "partner", "custom"] = Field(
-        description="The image provider."
-    )
-
-
-class PublicIp(GitHubModel):
-    """Public IP for a GitHub-hosted larger runners.
-
-    Provides details of Public IP for a GitHub-hosted larger runners
-    """
-
-    enabled: Missing[bool] = Field(
-        default=UNSET, description="Whether public IP is enabled."
-    )
-    prefix: Missing[str] = Field(
-        default=UNSET, description="The prefix for the public IP."
+        description="The ID used for the `size` parameter when creating a new runner."
     )
-    length: Missing[int] = Field(
-        default=UNSET, description="The length of the IP prefix."
+    cpu_cores: int = Field(description="The number of cores.")
+    memory_gb: int = Field(description="The available RAM for the machine spec.")
+    storage_gb: int = Field(
+        description="The available SSD storage for the machine spec."
     )
 
 
-model_rebuild(ActionsHostedRunner)
-model_rebuild(ActionsHostedRunnerPoolImage)
-model_rebuild(PublicIp)
+model_rebuild(ActionsHostedRunnerMachineSpec)
 
-__all__ = (
-    "ActionsHostedRunner",
-    "ActionsHostedRunnerPoolImage",
-    "PublicIp",
-)
+__all__ = ("ActionsHostedRunnerMachineSpec",)

githubkit/versions/ghec_v2022_11_28/models/group_0030.py

@@ -9,14 +9,57 @@
 
 from __future__ import annotations
 
-from typing import Literal
+from datetime import datetime
+from typing import Literal, Union
 
 from pydantic import Field
 
 from githubkit.compat import GitHubModel, model_rebuild
+from githubkit.typing import Missing
+from githubkit.utils import UNSET
 
+from .group_0031 import ActionsHostedRunnerMachineSpec
 
-class ActionsHostedRunnerCuratedImage(GitHubModel):
+
+class ActionsHostedRunner(GitHubModel):
+    """GitHub-hosted hosted runner
+
+    A Github-hosted hosted runner.
+    """
+
+    id: int = Field(description="The unique identifier of the hosted runner.")
+    name: str = Field(description="The name of the hosted runner.")
+    runner_group_id: Missing[int] = Field(
+        default=UNSET,
+        description="The unique identifier of the group that the hosted runner belongs to.",
+    )
+    image_details: Union[None, ActionsHostedRunnerPoolImage] = Field()
+    machine_size_details: ActionsHostedRunnerMachineSpec = Field(
+        title="Github-owned VM details.",
+        description="Provides details of a particular machine spec.",
+    )
+    status: Literal["Ready", "Provisioning", "Shutdown", "Deleting", "Stuck"] = Field(
+        description="The status of the runner."
+    )
+    platform: str = Field(description="The operating system of the image.")
+    maximum_runners: Missing[int] = Field(
+        default=UNSET,
+        description="The maximum amount of hosted runners. Runners will not scale automatically above this number. Use this setting to limit your cost.",
+    )
+    public_ip_enabled: bool = Field(
+        description="Whether public IP is enabled for the hosted runners."
+    )
+    public_ips: Missing[list[PublicIp]] = Field(
+        default=UNSET,
+        description="The public IP ranges when public IP is enabled for the hosted runners.",
+    )
+    last_active_on: Missing[Union[datetime, None]] = Field(
+        default=UNSET,
+        description="The time at which the runner was last used, in ISO 8601 format.",
+    )
+
+
+class ActionsHostedRunnerPoolImage(GitHubModel):
     """GitHub-hosted runner image details.
 
     Provides details of a hosted runner image
@@ -25,14 +68,36 @@ class ActionsHostedRunnerCuratedImage(GitHubModel):
     id: str = Field(
         description="The ID of the image. Use this ID for the `image` parameter when creating a new larger runner."
     )
-    platform: str = Field(description="The operating system of the image.")
     size_gb: int = Field(description="Image size in GB.")
     display_name: str = Field(description="Display name for this image.")
     source: Literal["github", "partner", "custom"] = Field(
         description="The image provider."
     )
 
 
-model_rebuild(ActionsHostedRunnerCuratedImage)
+class PublicIp(GitHubModel):
+    """Public IP for a GitHub-hosted larger runners.
+
+    Provides details of Public IP for a GitHub-hosted larger runners
+    """
+
+    enabled: Missing[bool] = Field(
+        default=UNSET, description="Whether public IP is enabled."
+    )
+    prefix: Missing[str] = Field(
+        default=UNSET, description="The prefix for the public IP."
+    )
+    length: Missing[int] = Field(
+        default=UNSET, description="The length of the IP prefix."
+    )
+
+
+model_rebuild(ActionsHostedRunner)
+model_rebuild(ActionsHostedRunnerPoolImage)
+model_rebuild(PublicIp)
 
-__all__ = ("ActionsHostedRunnerCuratedImage",)
+__all__ = (
+    "ActionsHostedRunner",
+    "ActionsHostedRunnerPoolImage",
+    "PublicIp",
+)

githubkit/versions/ghec_v2022_11_28/models/group_0031.py

@@ -9,38 +9,30 @@
 
 from __future__ import annotations
 
+from typing import Literal
+
 from pydantic import Field
 
 from githubkit.compat import GitHubModel, model_rebuild
 
 
-class ActionsHostedRunnerLimits(GitHubModel):
-    """ActionsHostedRunnerLimits"""
-
-    public_ips: ActionsHostedRunnerLimitsPropPublicIps = Field(
-        title="Static public IP Limits for GitHub-hosted Hosted Runners.",
-        description="Provides details of static public IP limits for GitHub-hosted Hosted Runners",
-    )
-
-
-class ActionsHostedRunnerLimitsPropPublicIps(GitHubModel):
-    """Static public IP Limits for GitHub-hosted Hosted Runners.
+class ActionsHostedRunnerCuratedImage(GitHubModel):
+    """GitHub-hosted runner image details.
 
-    Provides details of static public IP limits for GitHub-hosted Hosted Runners
+    Provides details of a hosted runner image
     """
 
-    maximum: int = Field(
-        description="The maximum number of static public IP addresses that can be used for Hosted Runners."
+    id: str = Field(
+        description="The ID of the image. Use this ID for the `image` parameter when creating a new larger runner."
     )
-    current_usage: int = Field(
-        description="The current number of static public IP addresses in use by Hosted Runners."
+    platform: str = Field(description="The operating system of the image.")
+    size_gb: int = Field(description="Image size in GB.")
+    display_name: str = Field(description="Display name for this image.")
+    source: Literal["github", "partner", "custom"] = Field(
+        description="The image provider."
     )
 
 
-model_rebuild(ActionsHostedRunnerLimits)
-model_rebuild(ActionsHostedRunnerLimitsPropPublicIps)
+model_rebuild(ActionsHostedRunnerCuratedImage)
 
-__all__ = (
-    "ActionsHostedRunnerLimits",
-    "ActionsHostedRunnerLimitsPropPublicIps",
-)
+__all__ = ("ActionsHostedRunnerCuratedImage",)

githubkit/versions/ghec_v2022_11_28/models/group_0032.py

@@ -12,19 +12,35 @@
 from pydantic import Field
 
 from githubkit.compat import GitHubModel, model_rebuild
-from githubkit.typing import Missing
-from githubkit.utils import UNSET
 
 
-class ActionsOidcCustomIssuerPolicyForEnterprise(GitHubModel):
-    """ActionsOidcCustomIssuerPolicyForEnterprise"""
+class ActionsHostedRunnerLimits(GitHubModel):
+    """ActionsHostedRunnerLimits"""
 
-    include_enterprise_slug: Missing[bool] = Field(
-        default=UNSET,
-        description="Whether the enterprise customer requested a custom issuer URL.",
+    public_ips: ActionsHostedRunnerLimitsPropPublicIps = Field(
+        title="Static public IP Limits for GitHub-hosted Hosted Runners.",
+        description="Provides details of static public IP limits for GitHub-hosted Hosted Runners",
     )
 
 
-model_rebuild(ActionsOidcCustomIssuerPolicyForEnterprise)
+class ActionsHostedRunnerLimitsPropPublicIps(GitHubModel):
+    """Static public IP Limits for GitHub-hosted Hosted Runners.
 
-__all__ = ("ActionsOidcCustomIssuerPolicyForEnterprise",)
+    Provides details of static public IP limits for GitHub-hosted Hosted Runners
+    """
+
+    maximum: int = Field(
+        description="The maximum number of static public IP addresses that can be used for Hosted Runners."
+    )
+    current_usage: int = Field(
+        description="The current number of static public IP addresses in use by Hosted Runners."
+    )
+
+
+model_rebuild(ActionsHostedRunnerLimits)
+model_rebuild(ActionsHostedRunnerLimitsPropPublicIps)
+
+__all__ = (
+    "ActionsHostedRunnerLimits",
+    "ActionsHostedRunnerLimitsPropPublicIps",
+)