🐛 Fix: field name same as type cause pydantic error (#261)

Author: yanyongyu

codegen/parser/schemas/schema.py

@@ -292,7 +292,8 @@ def _get_field_args(self) -> dict[str, str]:
 
 @dataclass(kw_only=True)
 class DateTimeSchema(SchemaData):
-    _type_string: ClassVar[str] = "datetime"
+    # avoid conflict with field name which will cause pydantic analyze error
+    _type_string: ClassVar[str] = "_dt.datetime"
 
     @override
     def get_response_type_string(self) -> str:
@@ -303,37 +304,38 @@ def get_response_type_string(self) -> str:
     @override
     def get_model_imports(self) -> set[str]:
         imports = super().get_model_imports()
-        imports.add("from datetime import datetime")
+        imports.add("import datetime as _dt")
         return imports
 
     @override
     def get_type_imports(self) -> set[str]:
         imports = super().get_type_imports()
-        imports.add("from datetime import datetime")
+        imports.add("import datetime as _dt")
         return imports
 
     @override
     def get_param_imports(self) -> set[str]:
         imports = super().get_param_imports()
-        imports.add("from datetime import datetime")
+        imports.add("import datetime as _dt")
         return imports
 
     @override
     def get_using_imports(self) -> set[str]:
         imports = super().get_using_imports()
-        imports.add("from datetime import datetime")
+        imports.add("import datetime as _dt")
         return imports
 
     @override
     def get_response_imports(self) -> set[str]:
         imports = super().get_response_imports()
-        imports.add("from datetime import datetime")
+        imports.add("import datetime as _dt")
         return imports
 
 
 @dataclass(kw_only=True)
 class DateSchema(SchemaData):
-    _type_string: ClassVar[str] = "date"
+    # avoid conflict with field name which will cause pydantic analyze error
+    _type_string: ClassVar[str] = "_dt.date"
 
     @override
     def get_response_type_string(self) -> str:
@@ -344,31 +346,31 @@ def get_response_type_string(self) -> str:
     @override
     def get_model_imports(self) -> set[str]:
         imports = super().get_model_imports()
-        imports.add("from datetime import date")
+        imports.add("import datetime as _dt")
         return imports
 
     @override
     def get_type_imports(self) -> set[str]:
         imports = super().get_type_imports()
-        imports.add("from datetime import date")
+        imports.add("import datetime as _dt")
         return imports
 
     @override
     def get_param_imports(self) -> set[str]:
         imports = super().get_param_imports()
-        imports.add("from datetime import date")
+        imports.add("import datetime as _dt")
         return imports
 
     @override
     def get_using_imports(self) -> set[str]:
         imports = super().get_using_imports()
-        imports.add("from datetime import date")
+        imports.add("import datetime as _dt")
         return imports
 
     @override
     def get_response_imports(self) -> set[str]:
         imports = super().get_response_imports()
-        imports.add("from datetime import date")
+        imports.add("import datetime as _dt")
         return imports
 
 

githubkit/versions/ghec_v2022_11_28/models/group_0004.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+import datetime as _dt
 from typing import Annotated, Literal, Union
 
 from pydantic import Field
@@ -55,19 +55,19 @@ class GlobalAdvisory(GitHubModel):
     )
     identifiers: Union[list[GlobalAdvisoryPropIdentifiersItems], None] = Field()
     references: Union[list[str], None] = Field()
-    published_at: datetime = Field(
+    published_at: _dt.datetime = Field(
         description="The date and time of when the advisory was published, in ISO 8601 format."
     )
-    updated_at: datetime = Field(
+    updated_at: _dt.datetime = Field(
         description="The date and time of when the advisory was last updated, in ISO 8601 format."
     )
-    github_reviewed_at: Union[datetime, None] = Field(
+    github_reviewed_at: Union[_dt.datetime, None] = Field(
         description="The date and time of when the advisory was reviewed by GitHub, in ISO 8601 format."
     )
-    nvd_published_at: Union[datetime, None] = Field(
+    nvd_published_at: Union[_dt.datetime, None] = Field(
         description="The date and time when the advisory was published in the National Vulnerability Database, in ISO 8601 format.\nThis field is only populated when the advisory is imported from the National Vulnerability Database."
     )
-    withdrawn_at: Union[datetime, None] = Field(
+    withdrawn_at: Union[_dt.datetime, None] = Field(
         description="The date and time of when the advisory was withdrawn, in ISO 8601 format."
     )
     vulnerabilities: Union[list[Vulnerability], None] = Field(

githubkit/versions/ghec_v2022_11_28/models/group_0008.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+import datetime as _dt
 from typing import Union
 
 from pydantic import Field
@@ -36,8 +36,8 @@ class Enterprise(GitHubModel):
     node_id: str = Field()
     name: str = Field(description="The name of the enterprise.")
     slug: str = Field(description="The slug url identifier for the enterprise.")
-    created_at: Union[datetime, None] = Field()
-    updated_at: Union[datetime, None] = Field()
+    created_at: Union[_dt.datetime, None] = Field()
+    updated_at: Union[_dt.datetime, None] = Field()
     avatar_url: str = Field()
 
 

githubkit/versions/ghec_v2022_11_28/models/group_0010.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+import datetime as _dt
 from typing import Union
 
 from pydantic import Field
@@ -43,8 +43,8 @@ class actors within GitHub.
     description: Union[str, None] = Field()
     external_url: str = Field()
     html_url: str = Field()
-    created_at: datetime = Field()
-    updated_at: datetime = Field()
+    created_at: _dt.datetime = Field()
+    updated_at: _dt.datetime = Field()
     permissions: IntegrationPropPermissions = Field(
         description="The set of permissions for the GitHub app"
     )

githubkit/versions/ghec_v2022_11_28/models/group_0012.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+import datetime as _dt
 from typing import Union
 
 from pydantic import Field
@@ -29,7 +29,7 @@ class HookDeliveryItem(GitHubModel):
     guid: str = Field(
         description="Unique identifier for the event (shared with all deliveries for all webhooks that subscribe to this event)."
     )
-    delivered_at: datetime = Field(
+    delivered_at: _dt.datetime = Field(
         description="Time when the webhook delivery occurred."
     )
     redelivery: bool = Field(
@@ -50,7 +50,7 @@ class HookDeliveryItem(GitHubModel):
     repository_id: Union[int, None] = Field(
         description="The id of the repository associated with this event."
     )
-    throttled_at: Missing[Union[datetime, None]] = Field(
+    throttled_at: Missing[Union[_dt.datetime, None]] = Field(
         default=UNSET, description="Time when the webhook delivery was throttled."
     )
 

githubkit/versions/ghec_v2022_11_28/models/group_0015.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+import datetime as _dt
 from typing import Union
 
 from pydantic import Field
@@ -29,7 +29,9 @@ class HookDelivery(GitHubModel):
     guid: str = Field(
         description="Unique identifier for the event (shared with all deliveries for all webhooks that subscribe to this event)."
     )
-    delivered_at: datetime = Field(description="Time when the delivery was delivered.")
+    delivered_at: _dt.datetime = Field(
+        description="Time when the delivery was delivered."
+    )
     redelivery: bool = Field(description="Whether the delivery is a redelivery.")
     duration: float = Field(description="Time spent delivering.")
     status: str = Field(
@@ -46,7 +48,7 @@ class HookDelivery(GitHubModel):
     repository_id: Union[int, None] = Field(
         description="The id of the repository associated with this event."
     )
-    throttled_at: Missing[Union[datetime, None]] = Field(
+    throttled_at: Missing[Union[_dt.datetime, None]] = Field(
         default=UNSET, description="Time when the webhook delivery was throttled."
     )
     url: Missing[str] = Field(

githubkit/versions/ghec_v2022_11_28/models/group_0016.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+import datetime as _dt
 from typing import Union
 
 from pydantic import Field
@@ -32,7 +32,7 @@ class IntegrationInstallationRequest(GitHubModel):
     node_id: Missing[str] = Field(default=UNSET)
     account: Union[SimpleUser, Enterprise] = Field()
     requester: SimpleUser = Field(title="Simple User", description="A GitHub user.")
-    created_at: datetime = Field()
+    created_at: _dt.datetime = Field()
 
 
 model_rebuild(IntegrationInstallationRequest)

githubkit/versions/ghec_v2022_11_28/models/group_0018.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+import datetime as _dt
 from typing import Literal, Union
 
 from pydantic import Field
@@ -48,14 +48,14 @@ class Installation(GitHubModel):
         description="The permissions granted to the user access token.",
     )
     events: list[str] = Field()
-    created_at: datetime = Field()
-    updated_at: datetime = Field()
+    created_at: _dt.datetime = Field()
+    updated_at: _dt.datetime = Field()
     single_file_name: Union[str, None] = Field()
     has_multiple_single_files: Missing[bool] = Field(default=UNSET)
     single_file_paths: Missing[list[str]] = Field(default=UNSET)
     app_slug: str = Field()
     suspended_by: Union[None, SimpleUser] = Field()
-    suspended_at: Union[datetime, None] = Field()
+    suspended_at: Union[_dt.datetime, None] = Field()
     contact_email: Missing[Union[str, None]] = Field(default=UNSET)
 
 

githubkit/versions/ghec_v2022_11_28/models/group_0020.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+import datetime as _dt
 from typing import Literal, Union
 
 from pydantic import Field
@@ -121,9 +121,9 @@ class Repository(GitHubModel):
         default=UNSET,
         description="The repository visibility: public, private, or internal.",
     )
-    pushed_at: Union[datetime, None] = Field()
-    created_at: Union[datetime, None] = Field()
-    updated_at: Union[datetime, None] = Field()
+    pushed_at: Union[_dt.datetime, None] = Field()
+    created_at: Union[_dt.datetime, None] = Field()
+    updated_at: Union[_dt.datetime, None] = Field()
     allow_rebase_merge: Missing[bool] = Field(
         default=UNSET, description="Whether to allow rebase merges for pull requests."
     )

githubkit/versions/ghec_v2022_11_28/models/group_0023.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from datetime import datetime
+import datetime as _dt
 from typing import Union
 
 from pydantic import Field
@@ -39,12 +39,12 @@ class Authorization(GitHubModel):
     app: AuthorizationPropApp = Field()
     note: Union[str, None] = Field()
     note_url: Union[str, None] = Field()
-    updated_at: datetime = Field()
-    created_at: datetime = Field()
+    updated_at: _dt.datetime = Field()
+    created_at: _dt.datetime = Field()
     fingerprint: Union[str, None] = Field()
     user: Missing[Union[None, SimpleUser]] = Field(default=UNSET)
     installation: Missing[Union[None, ScopedInstallation]] = Field(default=UNSET)
-    expires_at: Union[datetime, None] = Field()
+    expires_at: Union[_dt.datetime, None] = Field()
 
 
 class AuthorizationPropApp(GitHubModel):