python-ort 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

ort/models/package_curation_data.py

@@ -7,7 +7,7 @@ from pydantic import AnyUrl, BaseModel, ConfigDict, Field
 
 from .hash import Hash
 from .source_code_origin import SourceCodeOrigin
-from .vcsinfo import VcsInfo
+from .vcsinfo_curation_data import VcsInfoCurationData
 
 
 class CurationArtifact(BaseModel):
@@ -28,7 +28,7 @@ class PackageCurationData(BaseModel):
     homepage_url: str | None = None
     binary_artifact: CurationArtifact | None = None
     source_artifact: CurationArtifact | None = None
-    vcs: VcsInfo | None = None
+    vcs: VcsInfoCurationData | None = None
     is_metadata_only: bool | None = None
     is_modified: bool | None = None
     declared_license_mapping: dict[str, Any] = Field(default_factory=dict)

ort/models/vcsinfo_curation_data.py

@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: 2025 Helio Chissini de Castro <heliocastro@gmail.com>
+# SPDX-License-Identifier: MIT
+
+from pydantic import AnyUrl, BaseModel, Field
+
+from .vcstype import VcsType
+
+
+class VcsInfoCurationData(BaseModel):
+    """
+    Bundles general Version Control System information.
+
+    Attributes:
+        type(VcsType): The type of the VCS, for example Git, GitRepo, Mercurial, etc.
+        url(AnyUrl): The URL to the VCS repository.
+        revision(str): The VCS-specific revision (tag, branch, SHA1) that the version of the package maps to.
+        path(str): The path inside the VCS to take into account.
+            If the VCS supports checking out only a subdirectory, only this path is checked out.
+    """
+
+    type: VcsType | None = Field(
+        default=None,
+        description="The type of the VCS, for example Git, GitRepo, Mercurial, etc.",
+    )
+    url: AnyUrl | None = Field(
+        default=None,
+        description="The URL to the VCS repository.",
+    )
+    revision: str | None = Field(
+        default=None,
+        description="The VCS-specific revision (tag, branch, SHA1) that the version of the package maps to.",
+    )
+    path: str | None = Field(
+        default=None,
+        description="The path inside the VCS to take into account."
+        "If the VCS supports checking out only a subdirectory, only this path is checked out.",
+    )

ort/models/vcstype.py

@@ -3,6 +3,14 @@
 
 from pydantic import BaseModel, Field, model_validator
 
+# Define known VCS types as constants
+GIT = ["Git", "GitHub", "GitLab"]
+GIT_REPO = ["GitRepo", "git-repo", "repo"]
+MERCURIAL = ["Mercurial", "hg"]
+SUBVERSION = ["Subversion", "svn"]
+
+KNOWN_TYPES = GIT + GIT_REPO + MERCURIAL + SUBVERSION
+
 
 class VcsType(BaseModel):
     """
@@ -12,35 +20,26 @@ class VcsType(BaseModel):
     alias for the string representation.
 
     Attributes:
-        aliases(list[str]): Primary name and aliases
+        name(str): Primary name and aliases
     """
 
-    aliases: list[str] = Field(default_factory=list, description="Primary name and aliases")
-
-    @model_validator(mode="after")
-    def ensure_non_empty(self):
-        """Ensure the aliases list is never empty."""
-        if not self.aliases:
-            self.aliases = [""]
-        return self
-
-    def __str__(self):
-        return self.aliases[0] if self.aliases else ""
+    name: str = Field(default_factory=str)
 
+    @model_validator(mode="before")
     @classmethod
-    def for_name(cls, name: str) -> "VcsType":
-        """Lookup known type by name, or create a new instance."""
-        for t in KNOWN_TYPES:
-            if any(alias.lower() == name.lower() for alias in t.aliases):
-                return t
-        return cls(aliases=[name])
-
-
-# Define known VCS types as constants
-GIT = VcsType(aliases=["Git", "GitHub", "GitLab"])
-GIT_REPO = VcsType(aliases=["GitRepo", "git-repo", "repo"])
-MERCURIAL = VcsType(aliases=["Mercurial", "hg"])
-SUBVERSION = VcsType(aliases=["Subversion", "svn"])
-UNKNOWN = VcsType(aliases=[""])
-
-KNOWN_TYPES = [GIT, GIT_REPO, MERCURIAL, SUBVERSION]
+    def _forName(cls, value):
+        # Allow direct string input (e.g., "Git" or "gitlab")
+        if isinstance(value, str):
+            if any(item.lower() == value.lower() for item in KNOWN_TYPES):
+                return {"name": value}
+            else:
+                # Not a known type → default to empty string
+                return {"name": ""}
+        # Allow dict input or existing model
+        elif isinstance(value, dict):
+            name = value.get("name", "")
+            if any(item.lower() == name.lower() for item in KNOWN_TYPES):
+                return value
+            else:
+                return {"name": ""}
+        return {"name": ""}

{python_ort-0.3.0.dist-info → python_ort-0.3.1.dist-info}/METADATA

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

{python_ort-0.3.0.dist-info → python_ort-0.3.1.dist-info}/RECORD

@@ -8,14 +8,15 @@ ort/models/hash.py,sha256=UnWw5yuXp2HUwX8xcCOI-rxpmjEhYSDWlJrB_ULcVMw,661
 ort/models/hash_algorithm.py,sha256=7P-Y0-PmaQ28kqgJSOvo8VeQwL3RvYW2LvDZfGIEbZQ,1510
 ort/models/ort_configuration.py,sha256=eleVGknw7grLOTaPOZbI2_HrD9KoEhRFEGyqg25mVws,10975
 ort/models/package_curation.py,sha256=_F1GF7D_lgeCQs9j3Ft5ImSPO9RdBjepdEBo2JxuNPY,356
-ort/models/package_curation_data.py,sha256=DBux1UT5dY6q2j3yXPBEDxFAmQscqJnBIx9H3HtOZ5M,1106
+ort/models/package_curation_data.py,sha256=71Exs5COPSFlS-OGQLhtpf6OjJ4P99TGiC9kFlu-FJE,1144
 ort/models/package_managers.py,sha256=qyShJ-IOQZFWOPmvylj413vVNMjBZ0xPlXtHU8V68Uk,1364
 ort/models/repository_configuration.py,sha256=d1kyn_nIrnrrNqWbTK-v1RafuJjE6xP710r8GTicYKE,10702
 ort/models/resolutions.py,sha256=3OuCC9yYMu5Ovt2UD04ms9zJuWBXtBDjof-8fRzErlw,3423
 ort/models/source_code_origin.py,sha256=gyEQaR4AjrWDDpDwEO8RHAHyFmnZK3plZzbvWf5o9do,208
 ort/models/vcsinfo.py,sha256=Hrf-S_ZKCKtZF-ImY7ytqzd3onJA7YbEHaE2sPDi_B8,1293
-ort/models/vcstype.py,sha256=RffAlJ9Ow_sOe8mJklwTKIpH9dn1NGH1Z_fvPhjkP9I,1625
-python_ort-0.3.0.dist-info/licenses/LICENSE,sha256=koFhbHMglt1BNVuMKdBBlrQcgQsWLgo4pZW6cCtyGvA,1081
-python_ort-0.3.0.dist-info/WHEEL,sha256=5w2T7AS2mz1-rW9CNagNYWRCaB0iQqBMYLwKdlgiR4Q,78
-python_ort-0.3.0.dist-info/METADATA,sha256=NGUiVxIosmp-zS4n82MRA1OsZPtvC1wdhQnM7O5E5NE,851
-python_ort-0.3.0.dist-info/RECORD,,
+ort/models/vcsinfo_curation_data.py,sha256=HC3ObAGv9-Ff1i0gf3CzzkuA1CQGtshdpSA6zrNGv70,1384
+ort/models/vcstype.py,sha256=o85RmCiSz9d9AT2PV-J0JK-NkAme1sSttxLMa3ztGuw,1609
+python_ort-0.3.1.dist-info/licenses/LICENSE,sha256=koFhbHMglt1BNVuMKdBBlrQcgQsWLgo4pZW6cCtyGvA,1081
+python_ort-0.3.1.dist-info/WHEEL,sha256=5w2T7AS2mz1-rW9CNagNYWRCaB0iQqBMYLwKdlgiR4Q,78
+python_ort-0.3.1.dist-info/METADATA,sha256=7xnmoJZVts4K0qJdpA2DLpKiBxf6xZEHCx1K_AdYF4I,851
+python_ort-0.3.1.dist-info/RECORD,,