Migrate rest of pydantic v1 imports

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

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

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
 

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
 

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):

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

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):

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

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
 

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