python-ort 0.3.0__tar.gz → 0.3.1__tar.gz

{python_ort-0.3.0 → python_ort-0.3.1}/PKG-INFO

@@ -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 → python_ort-0.3.1}/pyproject.toml

@@ -2,12 +2,9 @@
 requires = ["uv_build>=0.8.12,<0.10.0"]
 build-backend = "uv_build"
 
-[tool.hatch.build.targets.wheel]
-packages = ["src/ort"]
-
 [project]
 name = "python-ort"
-version = "0.3.0"
+version = "0.3.1"
 description = "A Python Ort model serialization library"
 readme = "README.md"
 license = "MIT"
@@ -39,6 +36,7 @@ dev = [
     "pycodestyle>=2.14.0",
     "pyrefly>=0.40.0",
     "pytest>=8.4.2",
+    "rich>=14.2.0",
     "ruff>=0.14.4",
     "types-pyyaml>=6.0.12.20250915",
 ]
@@ -47,7 +45,8 @@ dev = [
 addopts = ["--import-mode=importlib"]
 log_cli = true
 log_cli_level = "INFO"
-pythonpath = "src"
+pythonpath = ["src"]
+testpaths = ["tests"]
 
 [tool.pylint.messages_control]
 disable = [

{python_ort-0.3.0 → python_ort-0.3.1}/src/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)

python_ort-0.3.1/src/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.",
+    )

python_ort-0.3.1/src/ort/models/vcstype.py

@@ -0,0 +1,45 @@
+# SPDX-FileCopyrightText: 2025 Helio Chissini de Castro <heliocastro@gmail.com>
+# SPDX-License-Identifier: MIT
+
+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):
+    """
+    A class for Version Control System types. Each type has one or more [aliases] associated to it,
+    where the first alias is the definite name. This class is not implemented as an enum as
+    constructing from an unknown type should be supported while maintaining that type as the primary
+    alias for the string representation.
+
+    Attributes:
+        name(str): Primary name and aliases
+    """
+
+    name: str = Field(default_factory=str)
+
+    @model_validator(mode="before")
+    @classmethod
+    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/src/ort/models/vcstype.py

@@ -1,46 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Helio Chissini de Castro <heliocastro@gmail.com>
-# SPDX-License-Identifier: MIT
-
-from pydantic import BaseModel, Field, model_validator
-
-
-class VcsType(BaseModel):
-    """
-    A class for Version Control System types. Each type has one or more [aliases] associated to it,
-    where the first alias is the definite name. This class is not implemented as an enum as
-    constructing from an unknown type should be supported while maintaining that type as the primary
-    alias for the string representation.
-
-    Attributes:
-        aliases(list[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 ""
-
-    @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]