python-ort 0.6.4__tar.gz → 0.6.6__tar.gz

{python_ort-0.6.4 → python_ort-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-ort
-Version: 0.6.4
+Version: 0.6.6
 Summary: A Python Ort model serialization library
 License-Expression: MIT
 License-File: LICENSE

{python_ort-0.6.4 → python_ort-0.6.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "python-ort"
-version = "0.6.4"
+version = "0.6.6"
 description = "A Python Ort model serialization library"
 readme = "README.md"
 license = "MIT"
@@ -159,9 +159,3 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 quote-style = "double"
 indent-style = "space"
 skip-magic-trailing-comma = false
-
-[tool.pyrefly]
-project_includes = [
-    "src/ort/**",
-    "tests/**",
-]

{python_ort-0.6.4 → python_ort-0.6.6}/src/ort/models/config/issue_resolution.py

@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: MIT
 
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, field_validator
+
+from ort.utils import convert_enum
 
 from .issue_resolution_reason import IssueResolutionReason
 
@@ -30,3 +32,8 @@ class IssueResolution(BaseModel):
     comment: str = Field(
         description="A comment to further explain why the [reason] is applicable here.",
     )
+
+    @field_validator("reason", mode="before")
+    @classmethod
+    def validate_reason(cls, value):
+        return convert_enum(IssueResolutionReason, value)

{python_ort-0.6.4 → python_ort-0.6.6}/src/ort/models/config/repository_configuration.py

@@ -11,7 +11,7 @@ from .license_choice import LicenseChoice
 from .package_configuration import PackageConfiguration
 from .repository_analyzer_configuration import RepositoryAnalyzerConfiguration
 from .resolutions import Resolutions
-from .snippet.snippet_choice import SnippetChoice
+from .snippet_choices import SnippetChoices
 
 
 class RepositoryConfiguration(BaseModel):
@@ -60,7 +60,7 @@ class RepositoryConfiguration(BaseModel):
         None,
         description="A configuration to select a license from a multi-licensed package.",
     )
-    snippet_choices: list[SnippetChoice] = Field(
+    snippet_choices: list[SnippetChoices] = Field(
         default_factory=list,
         description="A configuration to select a snippet from a package with multiple snippet findings.",
     )

{python_ort-0.6.4 → python_ort-0.6.6}/src/ort/models/config/snippet/snippet_choice.py

@@ -1,7 +1,9 @@
 # SPDX-FileCopyrightText: 2026 Helio Chissini de Castro <heliocastro@gmail.com>
 # SPDX-License-Identifier: MIT
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, field_validator
+
+from ort.utils import convert_enum
 
 from ....types.purl_type import PurlType
 from ...text_location import TextLocation
@@ -44,6 +46,11 @@ class Choice(BaseModel):
         description="An optional comment describing the snippet choice.",
     )
 
+    @field_validator("reason", mode="before")
+    @classmethod
+    def validate_reason(cls, value):
+        return convert_enum(SnippetChoiceReason, value)
+
 
 class SnippetChoice(BaseModel):
     """
@@ -61,3 +68,12 @@ class SnippetChoice(BaseModel):
         ...,
         description="The snippet criteria to make the snippet choice.",
     )
+
+    # @model_validator(mode="before")
+    # @classmethod
+    # def validate_snippet_choice(cls, v):
+    #     print(v)
+    #     breakpoint()
+    #     if not isinstance(v, dict):
+    #         raise ValueError("SnippetChoice must be a dictionary.")
+    #     return v

python_ort-0.6.4/src/ort/models/config/snippet/Provenance.py → python_ort-0.6.6/src/ort/models/config/snippet/snippet_provenance.py

@@ -1,9 +1,10 @@
 # SPDX-FileCopyrightText: 2026 Helio Chissini de Castro <heliocastro@gmail.com>
 # SPDX-License-Identifier: MIT
+#
 from pydantic import AnyUrl, BaseModel, ConfigDict, Field
 
 
-class Provenance(BaseModel):
+class SnippetProvenance(BaseModel):
     """
     The URL of the [RepositoryProvenance] the snippet choice applies to.
     """

python_ort-0.6.6/src/ort/models/config/snippet_choices.py

@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2026 Helio Chissini de Castro <heliocastro@gmail.com>
+# SPDX-License-Identifier: MIT
+
+from pydantic import BaseModel, ConfigDict, Field
+
+from .snippet.snippet_choice import SnippetChoice
+from .snippet.snippet_provenance import SnippetProvenance
+
+
+class SnippetChoices(BaseModel):
+    """
+    A collection of snippet choices for a given provenance.
+    """
+
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    provenance: SnippetProvenance = Field(
+        ...,
+        description="The source file for which the snippet choice is made.",
+    )
+    choices: list[SnippetChoice] = Field(
+        ...,
+        description="The snippet choice for the given source file.",
+    )

{python_ort-0.6.4 → python_ort-0.6.6}/src/ort/models/config/vulnerability_resolution.py

@@ -2,7 +2,9 @@
 # SPDX-License-Identifier: MIT
 
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, field_validator
+
+from ort.utils import convert_enum
 
 from .vulnerability_resolution_reason import VulnerabilityResolutionReason
 
@@ -29,3 +31,8 @@ class VulnerabilityResolution(BaseModel):
     comment: str = Field(
         description="A comment to further explain why the [reason] is applicable here.",
     )
+
+    @field_validator("reason", mode="before")
+    @classmethod
+    def validate_reason(cls, value):
+        return convert_enum(VulnerabilityResolutionReason, value)

python_ort-0.6.6/src/ort/models/provenance.py

@@ -0,0 +1,85 @@
+# SPDX-FileCopyrightText: 2026 Helio Chissini de Castro <heliocastro@gmail.com>
+# SPDX-License-Identifier: MIT
+
+from pydantic import BaseModel, ConfigDict, Field, model_validator
+
+from .remote_artifact import RemoteArtifact
+from .vcsinfo import VcsInfo
+
+
+class SnippetProvenance(BaseModel):
+    """
+    Provenance information about the origin of source code.
+
+    This is a union type that can be one of the following:
+    - UnknownProvenance: No provenance information is available.
+    - ArtifactProvenance: Provenance information for a source artifact.
+    - RepositoryProvenance: Provenance information for a Version Control System location.
+    """
+
+    model_config = ConfigDict(extra="allow")
+
+    @model_validator(mode="before")
+    @classmethod
+    def validate_provenance(cls, v):
+        print(v)
+        breakpoint()
+        if not isinstance(v, dict):
+            raise ValueError("Provenance must be a dictionary.")
+        if "source_artifact" in v:
+            return ArtifactProvenance(**v)
+        elif "vcs_info" in v and "resolved_revision" in v:
+            return RepositoryProvenance(**v)
+        else:
+            return UnknownProvenance()
+
+
+class UnknownProvenance(BaseModel):
+    """
+    Provenance information about the origin of source code.
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+
+class KnownProvenance(BaseModel):
+    """
+    Provenance information about the origin of source code.
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+
+class RemoteProvenance(KnownProvenance):
+    """
+    Provenance information about the origin of source code.
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+
+class ArtifactProvenance(RemoteProvenance):
+    """
+    Provenance information for a source artifact.
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+    source_artifact: RemoteArtifact = Field(
+        description="The source artifact that was downloaded.",
+    )
+
+
+class RepositoryProvenance(BaseModel):
+    """
+    Provenance information for a Version Control System location.
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+    vcs_info: VcsInfo = Field(
+        description="VCS info used to resolve the revision. May still contain a moving revision like a branch.",
+    )
+    resolved_revision: str = Field(
+        description="Resolved fixed VCS revision, not blank and not moving (e.g. Git commit SHA1)."
+    )

{python_ort-0.6.4 → python_ort-0.6.6}/src/ort/models/scope.py

@@ -28,3 +28,11 @@ class Scope(BaseModel):
         "testing the product. But transitive dependencies would not be test dependencies of the test "
         "dependencies, but compile dependencies of test dependencies.",
     )
+
+    def __hash__(self) -> int:
+        return hash(self.name)
+
+    def __eq__(self, other) -> bool:
+        if not isinstance(other, Scope):
+            return NotImplemented
+        return self.name == other.name