From 5b4cc75f30b86c4b89eef44d7058095078bba9dd Mon Sep 17 00:00:00 2001 From: Ju4tCode <42488585+yanyongyu@users.noreply.github.com> Date: Wed, 22 May 2024 03:59:58 +0000 Subject: [PATCH] :bug: fix codegen model group bug --- codegen/parser/data.py | 3 ++- githubkit/versions/ghec_v2022_11_28/models/group_0586.py | 3 ++- githubkit/versions/ghec_v2022_11_28/types/group_0586.py | 3 ++- githubkit/versions/v2022_11_28/models/group_0553.py | 3 ++- githubkit/versions/v2022_11_28/types/group_0553.py | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/codegen/parser/data.py b/codegen/parser/data.py index ace511fb3..8c94cd15c 100644 --- a/codegen/parser/data.py +++ b/codegen/parser/data.py @@ -26,7 +26,8 @@ def model_dependencies(self) -> list[ModelSchema]: def get_dependency_by_model(self, model: ModelSchema) -> "ModelGroup": """Get the group that contains the model.""" for group in self.group_dependencies: - if model in group.models: + # do not use `in` operator to avoid __eq__ + if id(model) in map(id, group.models): return group raise ValueError(f"Model {model.class_name} not found in any group dependency.") diff --git a/githubkit/versions/ghec_v2022_11_28/models/group_0586.py b/githubkit/versions/ghec_v2022_11_28/models/group_0586.py index 41ab04417..1af5c5b31 100644 --- a/githubkit/versions/ghec_v2022_11_28/models/group_0586.py +++ b/githubkit/versions/ghec_v2022_11_28/models/group_0586.py @@ -17,12 +17,13 @@ from githubkit.typing import Missing from githubkit.compat import GitHubModel, model_rebuild +from .group_0416 import WebhooksLabel +from .group_0421 import WebhooksIssue from .group_0400 import EnterpriseWebhooks from .group_0401 import SimpleInstallation from .group_0403 import RepositoryWebhooks from .group_0404 import SimpleUserWebhooks from .group_0402 import OrganizationSimpleWebhooks -from .group_0421 import WebhooksIssue, WebhooksLabel class WebhookIssuesUnlabeled(GitHubModel): diff --git a/githubkit/versions/ghec_v2022_11_28/types/group_0586.py b/githubkit/versions/ghec_v2022_11_28/types/group_0586.py index 5a5483b37..be327164c 100644 --- a/githubkit/versions/ghec_v2022_11_28/types/group_0586.py +++ b/githubkit/versions/ghec_v2022_11_28/types/group_0586.py @@ -12,12 +12,13 @@ from typing import Literal from typing_extensions import TypedDict, NotRequired +from .group_0416 import WebhooksLabelType +from .group_0421 import WebhooksIssueType from .group_0400 import EnterpriseWebhooksType from .group_0401 import SimpleInstallationType from .group_0403 import RepositoryWebhooksType from .group_0404 import SimpleUserWebhooksType from .group_0402 import OrganizationSimpleWebhooksType -from .group_0421 import WebhooksIssueType, WebhooksLabelType class WebhookIssuesUnlabeledType(TypedDict): diff --git a/githubkit/versions/v2022_11_28/models/group_0553.py b/githubkit/versions/v2022_11_28/models/group_0553.py index 2779a9258..ff9bd5d48 100644 --- a/githubkit/versions/v2022_11_28/models/group_0553.py +++ b/githubkit/versions/v2022_11_28/models/group_0553.py @@ -17,12 +17,13 @@ from githubkit.typing import Missing from githubkit.compat import GitHubModel, model_rebuild +from .group_0383 import WebhooksLabel +from .group_0388 import WebhooksIssue from .group_0367 import EnterpriseWebhooks from .group_0368 import SimpleInstallation from .group_0370 import RepositoryWebhooks from .group_0371 import SimpleUserWebhooks from .group_0369 import OrganizationSimpleWebhooks -from .group_0388 import WebhooksIssue, WebhooksLabel class WebhookIssuesUnlabeled(GitHubModel): diff --git a/githubkit/versions/v2022_11_28/types/group_0553.py b/githubkit/versions/v2022_11_28/types/group_0553.py index e6d515b33..e225730b8 100644 --- a/githubkit/versions/v2022_11_28/types/group_0553.py +++ b/githubkit/versions/v2022_11_28/types/group_0553.py @@ -12,12 +12,13 @@ from typing import Literal from typing_extensions import TypedDict, NotRequired +from .group_0383 import WebhooksLabelType +from .group_0388 import WebhooksIssueType from .group_0367 import EnterpriseWebhooksType from .group_0368 import SimpleInstallationType from .group_0370 import RepositoryWebhooksType from .group_0371 import SimpleUserWebhooksType from .group_0369 import OrganizationSimpleWebhooksType -from .group_0388 import WebhooksIssueType, WebhooksLabelType class WebhookIssuesUnlabeledType(TypedDict):