fix(typechecker): Type fixes

Signed-off-by: Helio Chissini de Castro <dev@heliocastro.info>

Author: heliocastro

examples/repo_config.py

@@ -10,7 +10,7 @@
 from pydantic import ValidationError
 from rich.pretty import pprint
 
-from ort import OrtRepositoryConfiguration
+from ort import RepositoryConfiguration
 
 logger = logging.getLogger()
 
@@ -21,7 +21,7 @@ def main(datafile: str) -> None:
     try:
         with Path(datafile).open() as fd:
             data = yaml.safe_load(fd)
-        parsed = OrtRepositoryConfiguration(**data)
+        parsed = RepositoryConfiguration(**data)
         pprint(parsed)
     except ValidationError as e:
         logger.error(e)

src/ort/models/advisor_summary.py

@@ -3,7 +3,7 @@
 
 from datetime import datetime
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 from .issue import Issue
 
@@ -29,3 +29,10 @@ class AdvisorSummary(BaseModel):
         description="The list of issues that occurred during the advisor run."
         "This property is not serialized if the list is empty to reduce the size of the result file.",
     )
+
+    @field_validator("start_time", "end_time", mode="before")
+    @classmethod
+    def transform_date(cls, v):
+        if isinstance(v, str):
+            return datetime.fromisoformat(v.replace("Z", "+00:00"))
+        return v

src/ort/models/remote_artifact.py

@@ -17,5 +17,6 @@ class RemoteArtifact(BaseModel):
         description="The URL of the remote artifact.",
     )
     hash: Hash | None = Field(
+        default=None,
         description="The hash of the remote artifact.",
     )

tests/test_advisor_details.py

@@ -12,7 +12,7 @@ def test_details_from_string_capabilities():
     """Test that AdvisorDetails converts string capabilities to enum values."""
     details = AdvisorDetails(
         name="VulnerableCode",
-        capabilities=["VULNERABILITIES"],
+        capabilities={AdvisorCapability.VULNERABILITIES},
     )
     if details.name != "VulnerableCode":
         pytest.fail(f"Expected name 'VulnerableCode', got '{details.name}'")
@@ -24,7 +24,7 @@ def test_details_from_multiple_string_capabilities():
     """Test that AdvisorDetails converts multiple string capabilities."""
     details = AdvisorDetails(
         name="OSV",
-        capabilities=["DEFECTS", "VULNERABILITIES"],
+        capabilities={AdvisorCapability.DEFECTS, AdvisorCapability.VULNERABILITIES},
     )
     if details.capabilities != {AdvisorCapability.DEFECTS, AdvisorCapability.VULNERABILITIES}:
         pytest.fail(f"Expected {{DEFECTS, VULNERABILITIES}}, got {details.capabilities}")
@@ -34,7 +34,7 @@ def test_details_from_int_capabilities():
     """Test that AdvisorDetails accepts integer capability values."""
     details = AdvisorDetails(
         name="TestAdvisor",
-        capabilities=[1, 2],
+        capabilities=[1, 2],  # ty: ignore[invalid-argument-type]
     )
     if details.capabilities != {AdvisorCapability.DEFECTS, AdvisorCapability.VULNERABILITIES}:
         pytest.fail(f"Expected {{DEFECTS, VULNERABILITIES}}, got {details.capabilities}")
@@ -44,7 +44,7 @@ def test_details_from_mixed_capabilities():
     """Test that AdvisorDetails handles a mix of string and int capabilities."""
     details = AdvisorDetails(
         name="TestAdvisor",
-        capabilities=["DEFECTS", 2],
+        capabilities=["DEFECTS", 2],  # ty: ignore[invalid-argument-type]
     )
     if details.capabilities != {AdvisorCapability.DEFECTS, AdvisorCapability.VULNERABILITIES}:
         pytest.fail(f"Expected {{DEFECTS, VULNERABILITIES}}, got {details.capabilities}")
@@ -55,7 +55,7 @@ def test_details_invalid_capability_string():
     with pytest.raises(ValidationError):
         AdvisorDetails(
             name="TestAdvisor",
-            capabilities=["INVALID"],
+            capabilities=["INVALID"],  # ty: ignore[invalid-argument-type]
         )
 
 
@@ -64,18 +64,18 @@ def test_details_extra_field_forbidden():
     with pytest.raises(ValidationError):
         AdvisorDetails(
             name="TestAdvisor",
-            capabilities=["VULNERABILITIES"],
-            unknown_field="value",
+            capabilities={AdvisorCapability.VULNERABILITIES},
+            unknown_field="value",  # ty: ignore[unknown-argument]
         )
 
 
 def test_details_missing_name():
     """Test that missing 'name' field raises a ValidationError."""
     with pytest.raises(ValidationError):
-        AdvisorDetails(capabilities=["VULNERABILITIES"])
+        AdvisorDetails(capabilities={AdvisorCapability.VULNERABILITIES})  # ty: ignore[missing-argument]
 
 
 def test_details_missing_capabilities():
     """Test that missing 'capabilities' field raises a ValidationError."""
     with pytest.raises(ValidationError):
-        AdvisorDetails(name="TestAdvisor")
+        AdvisorDetails(name="TestAdvisor")  # ty: ignore[missing-argument]

tests/test_advisor_result.py

@@ -1,10 +1,13 @@
 # SPDX-FileCopyrightText: 2026 Helio Chissini de Castro <heliocastro@gmail.com>
 # SPDX-License-Identifier: MIT
 
+from datetime import datetime, timezone
+
 import pytest
 from pydantic import ValidationError
 
 from ort.models.advisor_capability import AdvisorCapability
+from ort.models.advisor_details import AdvisorDetails
 from ort.models.advisor_result import AdvisorResult
 from ort.models.advisor_summary import AdvisorSummary
 from tests.utils.load_yaml_config import load_yaml_config
@@ -69,14 +72,14 @@ def test_advisor_result_with_defects_from_yaml():
 def test_advisor_result_minimal():
     """Test creating a minimal AdvisorResult programmatically."""
     result = AdvisorResult(
-        advisor={
-            "name": "TestAdvisor",
-            "capabilities": ["VULNERABILITIES"],
-        },
-        summary={
-            "start_time": "2024-01-01T00:00:00Z",
-            "end_time": "2024-01-01T00:01:00Z",
-        },
+        advisor=AdvisorDetails(
+            name="TestAdvisor",
+            capabilities={AdvisorCapability.VULNERABILITIES},
+        ),
+        summary=AdvisorSummary(
+            start_time=datetime(2024, 1, 1, 0, 0, 0, tzinfo=timezone.utc),
+            end_time=datetime(2024, 1, 1, 0, 1, 0, tzinfo=timezone.utc),
+        ),
     )
     if result.advisor.name != "TestAdvisor":
         pytest.fail(f"Expected advisor name 'TestAdvisor', got '{result.advisor.name}'")
@@ -90,29 +93,29 @@ def test_advisor_result_missing_advisor():
     """Test that missing advisor field raises ValidationError."""
     with pytest.raises(ValidationError):
         AdvisorResult(
-            summary={
-                "start_time": "2024-01-01T00:00:00Z",
-                "end_time": "2024-01-01T00:01:00Z",
-            },
-        )
+            summary=AdvisorSummary(
+                start_time=datetime(2024, 1, 1, 0, 0, 0, tzinfo=timezone.utc),
+                end_time=datetime(2024, 1, 1, 0, 1, 0, tzinfo=timezone.utc),
+            ),
+        )  # ty: ignore[missing-argument]
 
 
 def test_advisor_result_missing_summary():
     """Test that missing summary field raises ValidationError."""
     with pytest.raises(ValidationError):
         AdvisorResult(
-            advisor={
-                "name": "TestAdvisor",
-                "capabilities": ["VULNERABILITIES"],
-            },
-        )
+            advisor=AdvisorDetails(
+                name="TestAdvisor",
+                capabilities={AdvisorCapability.VULNERABILITIES},
+            ),
+        )  #  ty: ignore[missing-argument]
 
 
 def test_advisor_summary_timestamps():
     """Test AdvisorSummary timestamp parsing."""
     summary = AdvisorSummary(
-        start_time="2024-06-01T10:00:00Z",
-        end_time="2024-06-01T10:05:00Z",
+        start_time=datetime(2024, 6, 1, 10, 0, 0, tzinfo=timezone.utc),
+        end_time=datetime(2024, 6, 1, 10, 5, 0, tzinfo=timezone.utc),
     )
     if summary.start_time.year != 2024:
         pytest.fail(f"Expected year 2024, got {summary.start_time.year}")

tests/test_vulnerability_reference.py

@@ -58,7 +58,7 @@ def test_extra_field_forbidden(self):
         with pytest.raises(ValidationError):
             VulnerabilityReference(
                 url="https://example.com",
-                unknown="value",
+                unknown="value",  # ty: ignore[unknown-argument]
             )