From 4c25c688b4d7f110f60fddcaf7e584ab6ce5fdc8 Mon Sep 17 00:00:00 2001 From: Carol Jung Date: Thu, 30 Jan 2025 11:50:35 -0800 Subject: [PATCH] Migrate rest of pydantic v1 imports --- src/codegen/cli/api/schemas.py | 13 +++++++------ src/codegen/cli/utils/count_functions.py | 3 ++- src/codegen/git/models/codemod_context.py | 3 ++- src/codegen/git/models/pull_request_context.py | 10 +++++----- src/codegen/runner/models/codemod.py | 2 +- src/codegen/runner/models/configs.py | 3 ++- .../sdk/code_generation/doc_utils/schemas.py | 3 ++- src/codegen/sdk/codebase/config.py | 4 +++- src/codegen/sdk/output/ast.py | 2 +- src/codegen/sdk/output/placeholder.py | 3 ++- 10 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/codegen/cli/api/schemas.py b/src/codegen/cli/api/schemas.py index 9fffd418e..c2c024942 100644 --- a/src/codegen/cli/api/schemas.py +++ b/src/codegen/cli/api/schemas.py @@ -1,7 +1,8 @@ from enum import Enum from typing import TypeVar -from pydantic import BaseModel, Field +from pydantic import BaseModel +from pydantic.fields import Field from codegen.cli.utils.constants import ProgrammingLanguage from codegen.cli.utils.schema import SafeBaseModel @@ -64,8 +65,8 @@ class AskExpertResponse(SafeBaseModel): class SerializedExample(SafeBaseModel): - name: str | None - description: str | None + name: str | None = None + description: str | None = None source: str language: ProgrammingLanguage docstring: str = "" @@ -123,11 +124,11 @@ class User(SafeBaseModel): auth_user_id: str created_at: str email: str - is_contractor: str | None + is_contractor: str | None = None github_username: str - full_name: str | None + full_name: str | None = None id: int - last_updated_at: str | None + last_updated_at: str | None = None auth_context: AuthContext user: User diff --git a/src/codegen/cli/utils/count_functions.py b/src/codegen/cli/utils/count_functions.py index 014c28a60..f02f82a53 100644 --- a/src/codegen/cli/utils/count_functions.py +++ b/src/codegen/cli/utils/count_functions.py @@ -1,4 +1,5 @@ -from pydantic import BaseModel, Field +from pydantic import BaseModel +from pydantic.fields import Field import codegen.cli.sdk.decorator from codegen.cli.utils.count_functions_2 import NumberType diff --git a/src/codegen/git/models/codemod_context.py b/src/codegen/git/models/codemod_context.py index 36204b8d4..1de03c6ad 100644 --- a/src/codegen/git/models/codemod_context.py +++ b/src/codegen/git/models/codemod_context.py @@ -1,7 +1,8 @@ import logging from typing import Any -from pydantic import BaseModel, Field +from pydantic import BaseModel +from pydantic.fields import Field from codegen.git.models.pull_request_context import PullRequestContext diff --git a/src/codegen/git/models/pull_request_context.py b/src/codegen/git/models/pull_request_context.py index 5bad57a4b..1621abb6b 100644 --- a/src/codegen/git/models/pull_request_context.py +++ b/src/codegen/git/models/pull_request_context.py @@ -19,11 +19,11 @@ class PullRequestContext(BaseModel): draft: bool head: PRPartContext base: PRPartContext - merged: bool | None - merged_by: dict | None - additions: int | None - deletions: int | None - changed_files: int | None + merged: bool | None = None + merged_by: dict | None = None + additions: int | None = None + deletions: int | None = None + changed_files: int | None = None github_type: GithubType | None = None webhook_data: dict | None = None diff --git a/src/codegen/runner/models/codemod.py b/src/codegen/runner/models/codemod.py index dbfb6f925..94f2668ce 100644 --- a/src/codegen/runner/models/codemod.py +++ b/src/codegen/runner/models/codemod.py @@ -49,7 +49,7 @@ class CodemodRunResult(BaseModel): class CreatedBranch(BaseModel): base_branch: str - head_ref: str | None + head_ref: str | None = None class SandboxRunnerTag(BaseModel): diff --git a/src/codegen/runner/models/configs.py b/src/codegen/runner/models/configs.py index 7d27596c9..a2e4f92fa 100644 --- a/src/codegen/runner/models/configs.py +++ b/src/codegen/runner/models/configs.py @@ -1,7 +1,8 @@ import base64 import os -from pydantic import BaseModel, ConfigDict +from pydantic import BaseModel +from pydantic.config import ConfigDict from codegen.git.schemas.repo_config import RepoConfig from codegen.runner.constants.envvars import FEATURE_FLAGS_BASE64, REPO_CONFIG_BASE64 diff --git a/src/codegen/sdk/code_generation/doc_utils/schemas.py b/src/codegen/sdk/code_generation/doc_utils/schemas.py index 77b39d58a..de71e1828 100644 --- a/src/codegen/sdk/code_generation/doc_utils/schemas.py +++ b/src/codegen/sdk/code_generation/doc_utils/schemas.py @@ -1,6 +1,7 @@ from typing import Literal -from pydantic import BaseModel, Field +from pydantic import BaseModel +from pydantic.fields import Field class ParameterDoc(BaseModel): diff --git a/src/codegen/sdk/codebase/config.py b/src/codegen/sdk/codebase/config.py index 7fc0fbaac..f54353ff9 100644 --- a/src/codegen/sdk/codebase/config.py +++ b/src/codegen/sdk/codebase/config.py @@ -1,7 +1,9 @@ import os from typing import Self -from pydantic import BaseModel, ConfigDict, Field +from pydantic import BaseModel +from pydantic.config import ConfigDict +from pydantic.fields import Field from codegen.git.repo_operator.local_repo_operator import LocalRepoOperator from codegen.git.repo_operator.repo_operator import RepoOperator diff --git a/src/codegen/sdk/output/ast.py b/src/codegen/sdk/output/ast.py index da23005a7..3f9fae898 100644 --- a/src/codegen/sdk/output/ast.py +++ b/src/codegen/sdk/output/ast.py @@ -1,7 +1,7 @@ from typing import Self from openai import BaseModel -from pydantic import ConfigDict +from pydantic.config import ConfigDict from codegen.sdk.codebase.span import Span diff --git a/src/codegen/sdk/output/placeholder.py b/src/codegen/sdk/output/placeholder.py index f12b3516b..b6bbfc9a0 100644 --- a/src/codegen/sdk/output/placeholder.py +++ b/src/codegen/sdk/output/placeholder.py @@ -1,4 +1,5 @@ -from pydantic import BaseModel, ConfigDict +from pydantic import BaseModel +from pydantic.config import ConfigDict from codegen.sdk.codebase.span import Span