PR 11 finished

Author: DoDiODev

backend/python/plugins/azuredevops/azuredevops/models.py

@@ -30,26 +30,26 @@
 
 class AzureDevOpsConnection(Connection):
     token: SecretStr
-    organization: Optional[str]
+    organization: Optional[str] = None
 
 
 class GitRepositoryConfig(ScopeConfig):
-    refdiff: Optional[RefDiffOptions]
-    deployment_pattern: Optional[re.Pattern]
-    production_pattern: Optional[re.Pattern]
+    refdiff: Optional[RefDiffOptions] = None
+    deployment_pattern: Optional[re.Pattern] = None
+    production_pattern: Optional[re.Pattern] = None
     # Optional pattern with capture group to extract environment name from job/stage names
     # Example: r'(?:deploy|predeploy)[_-](.+?)(?:[_-](?:helm|terraform))?$' extracts 'xxxx-prod' from 'deploy_xxxx-prod_helm'
-    environment_pattern: Optional[re.Pattern]
+    environment_pattern: Optional[re.Pattern] = None
 
 
 class GitRepository(ToolScope, table=True):
     url: str
-    remote_url: Optional[str]
-    default_branch: Optional[str]
+    remote_url: Optional[str] = None
+    default_branch: Optional[str] = None
     project_id: str
     org_id: str
     parent_repository_url: Optional[str] = Field(source='/parentRepository/url')
-    provider: Optional[str]
+    provider: Optional[str] = None
     updated_date: datetime.datetime = Field(source='/project/lastUpdateTime')
 
     def is_external(self):
@@ -63,20 +63,20 @@ class PRStatus(Enum):
         Completed = "completed"
 
     pull_request_id: int = Field(primary_key=True)
-    description: Optional[str]
+    description: Optional[str] = None
     status: PRStatus
     created_by_id: str = Field(source='/createdBy/id')
     created_by_name: str = Field(source='/createdBy/displayName')
     creation_date: datetime.datetime
-    closed_date: Optional[datetime.datetime]
+    closed_date: Optional[datetime.datetime] = None
     source_commit_sha: str = Field(source='/lastMergeSourceCommit/commitId')
     target_commit_sha: str = Field(source='/lastMergeTargetCommit/commitId')
     merge_commit_sha: Optional[str] = Field(source='/lastMergeCommit/commitId')
-    url: Optional[str]
+    url: Optional[str] = None
     type: Optional[str] = Field(source='/labels/0/name')  # TODO: Add regex to scope config
-    title: Optional[str]
-    target_ref_name: Optional[str]
-    source_ref_name: Optional[str]
+    title: Optional[str] = None
+    target_ref_name: Optional[str] = None
+    source_ref_name: Optional[str] = None
     fork_repo_id: Optional[str] = Field(source='/forkSource/repository/id')
 
 
@@ -112,10 +112,10 @@ def __str__(self) -> str:
     id: int = Field(primary_key=True)
     name: str = Field(source='/definition/name')
     queue_time: Optional[datetime.datetime] = Field(source='/queueTime')
-    start_time: Optional[datetime.datetime]
-    finish_time: Optional[datetime.datetime]
+    start_time: Optional[datetime.datetime] = None
+    finish_time: Optional[datetime.datetime] = None
     status: BuildStatus
-    result: Optional[BuildResult]
+    result: Optional[BuildResult] = None
     source_branch: str
     source_version: str
     display_title: Optional[str] = Field(source='/triggerInfo/ci.message')
@@ -145,10 +145,10 @@ def __str__(self) -> str:
     id: str = Field(primary_key=True)
     build_id: str = Field(primary_key=True)
     name: str
-    start_time: Optional[datetime.datetime]
-    finish_time: Optional[datetime.datetime]
+    start_time: Optional[datetime.datetime] = None
+    finish_time: Optional[datetime.datetime] = None
     state: JobState
-    result: Optional[JobResult]
-    identifier: Optional[str]
-    type: Optional[str]
+    result: Optional[JobResult] = None
+    identifier: Optional[str] = None
+    type: Optional[str] = None
     parent_id: Optional[str] = Field(source='/parentId')

backend/python/pydevlake/pydevlake/domain_layer/code.py

@@ -33,11 +33,11 @@ class PullRequest(DomainModel, table=True):
     url: str
     author_name: str
     author_id: str
-    parent_pr_id: Optional[str]
+    parent_pr_id: Optional[str] = None
     pull_request_key: int
     created_date: datetime
-    merged_date: Optional[datetime]
-    closed_date: Optional[datetime]
+    merged_date: Optional[datetime] = None
+    closed_date: Optional[datetime] = None
     type: str
     component: str
     merge_commit_sha: str
@@ -78,8 +78,8 @@ class Commit(NoPKModel, table=True):
     __tablename__ = 'commits'
     sha: str = Field(primary_key=True)
     additions: str
-    deletions: Optional[str]
-    dev_eq: Optional[str]
+    deletions: Optional[str] = None
+    dev_eq: Optional[str] = None
     message: str
     author_name: str
     author_email: int
@@ -144,12 +144,12 @@ class Repo(DomainScope, table=True):
     __tablename__ = "repos"
     name: str
     url: str
-    description: Optional[str]
-    owner_id: Optional[str]
-    language: Optional[str]
-    forked_from: Optional[str]
-    created_date: Optional[datetime]
-    updated_date: Optional[datetime]
+    description: Optional[str] = None
+    owner_id: Optional[str] = None
+    language: Optional[str] = None
+    forked_from: Optional[str] = None
+    created_date: Optional[datetime] = None
+    updated_date: Optional[datetime] = None
     deleted: bool
 
 

backend/python/pydevlake/pydevlake/domain_layer/devops.py

@@ -51,26 +51,26 @@ class CICDPipeline(DomainModel, table=True):
     __tablename__ = 'cicd_pipelines'
 
     name: str
-    cicd_scope_id: Optional[str]
+    cicd_scope_id: Optional[str] = None
 
-    status: Optional[CICDStatus]
-    result: Optional[CICDResult]
-    original_status: Optional[str]
-    original_result: Optional[str]
+    status: Optional[CICDStatus] = None
+    result: Optional[CICDResult] = None
+    original_status: Optional[str] = None
+    original_result: Optional[str] = None
 
-    created_date: Optional[datetime]
-    started_date: Optional[datetime]
-    queued_date: Optional[datetime]
-    finished_date: Optional[datetime]
+    created_date: Optional[datetime] = None
+    started_date: Optional[datetime] = None
+    queued_date: Optional[datetime] = None
+    finished_date: Optional[datetime] = None
 
-    duration_sec: Optional[float]
-    queued_duration_sec: Optional[float]
+    duration_sec: Optional[float] = None
+    queued_duration_sec: Optional[float] = None
 
-    type: Optional[CICDType]
-    environment: Optional[CICDEnvironment]
+    type: Optional[CICDType] = None
+    environment: Optional[CICDEnvironment] = None
 
-    display_title: Optional[str]
-    url: Optional[str]
+    display_title: Optional[str] = None
+    url: Optional[str] = None
 
 
 class CiCDPipelineCommit(NoPKModel, table=True):
@@ -80,17 +80,17 @@ class CiCDPipelineCommit(NoPKModel, table=True):
     branch: str
     repo_id: str
     repo_url: str
-    display_title: Optional[str]
-    url: Optional[str]
+    display_title: Optional[str] = None
+    url: Optional[str] = None
 
 
 class CicdScope(DomainScope):
     __tablename__ = 'cicd_scopes'
     name: str
-    description: Optional[str]
-    url: Optional[str]
-    createdDate: Optional[datetime]
-    updatedDate: Optional[datetime]
+    description: Optional[str] = None
+    url: Optional[str] = None
+    createdDate: Optional[datetime] = None
+    updatedDate: Optional[datetime] = None
 
 
 class CICDTask(DomainModel, table=True):
@@ -100,18 +100,18 @@ class CICDTask(DomainModel, table=True):
     pipeline_id: str
     cicd_scope_id: str
 
-    result: Optional[CICDResult]
-    status: Optional[CICDStatus]
-    original_status: Optional[str]
-    original_result: Optional[str]
+    result: Optional[CICDResult] = None
+    status: Optional[CICDStatus] = None
+    original_status: Optional[str] = None
+    original_result: Optional[str] = None
 
-    type: Optional[CICDType]
-    environment: Optional[CICDEnvironment]
+    type: Optional[CICDType] = None
+    environment: Optional[CICDEnvironment] = None
 
-    created_date: Optional[datetime]
-    queued_date: Optional[datetime]
-    started_date: Optional[datetime]
-    finished_date: Optional[datetime]
+    created_date: Optional[datetime] = None
+    queued_date: Optional[datetime] = None
+    started_date: Optional[datetime] = None
+    finished_date: Optional[datetime] = None
 
     duration_sec: float
-    queued_duration_sec: Optional[float]
+    queued_duration_sec: Optional[float] = None

backend/python/pydevlake/pydevlake/extractor.py

@@ -81,4 +81,7 @@ class DummyModel(ToolModel):
             alias = field_info.alias
             value = json.get(field_name) or json.get(alias) if alias else json.get(field_name)
         attributes[field_name] = value
-    return model_cls(**attributes)
+    # Use model_validate so values are coerced (e.g. str -> datetime/Enum).
+    # SQLModel table=True models skip validation on __init__, which would leave
+    # raw strings uncoerced under Pydantic v2, so validate explicitly here.
+    return model_cls.model_validate(attributes)

backend/python/pydevlake/pydevlake/model.py

@@ -161,7 +161,7 @@ def primary_keys(self) -> Iterable[object]:
 
 
 class DomainModel(NoPKModel):
-    id: Optional[str] = Field(primary_key=True)
+    id: Optional[str] = Field(default=None, primary_key=True)
 
 
 class ToolScope(ToolModel):
@@ -214,5 +214,5 @@ class SubtaskRun(SQLModel, table=True):
     subtask_name: str
     connection_id: int
     started: datetime
-    completed: Optional[datetime]
+    completed: Optional[datetime] = None
     state: str = Field(sa_type=Text())  # JSON encoded dict of atomic values

backend/python/pydevlake/pydevlake/testing/testing.py

@@ -63,6 +63,15 @@ def make_context(connection, scope, scope_config):
     )
 
 
+def _revalidate(model):
+    # Under Pydantic v2, SQLModel table models don't coerce field values on
+    # construction. Expected models built from raw values (e.g. date strings)
+    # therefore keep their raw type, while converted results are already
+    # coerced. Re-validating normalizes the field types on both sides so the
+    # comparison behaves like it did under Pydantic v1.
+    return type(model).model_validate(model.model_dump(warnings=False))
+
+
 def assert_stream_convert(plugin: Union[Plugin, Type[Plugin]], stream_name: str,
                    raw: dict, expected: Union[DomainModel, Iterable[DomainModel]],
                    ctx=None):
@@ -82,7 +91,7 @@ def assert_stream_convert(plugin: Union[Plugin, Type[Plugin]], stream_name: str,
                 hasattr(exp, "__getitem__") and exp[0] == "updated_at"):
             pass
         else:
-            assert res == exp
+            assert _revalidate(res) == _revalidate(exp)
 
 
 def assert_stream_run(stream: Stream, connection: Connection, scope: ToolScope, scope_config: ScopeConfig):

backend/python/test/fakeplugin/fakeplugin/models.py

@@ -42,6 +42,6 @@ class State(Enum):
         SUCCESS = "success"
 
     id: str = Field(primary_key=True)
-    started_at: Optional[datetime]
-    finished_at: Optional[datetime]
+    started_at: Optional[datetime] = None
+    finished_at: Optional[datetime] = None
     state: State