python-ort 0.9.4__py3-none-any.whl → 0.10.0__py3-none-any.whl

ort/__init__.py

@@ -9,8 +9,8 @@ from .utils.yaml_loader import OrtYamlLoader, ort_yaml_load
 
 __all__ = [
     "AnalyzerResult",
+    "OrtResult",
     "OrtYamlLoader",
     "RepositoryConfiguration",
-    "OrtResult",
     "ort_yaml_load",
 ]

ort/models/__init__.py

@@ -47,10 +47,10 @@ __all__ = [
     "DependencyGraphEdge",
     "DependencyGraphNode",
     "DependencyReference",
+    "Excludes",
     "Hash",
     "Identifier",
     "Includes",
-    "Excludes",
     "Issue",
     "LicenseClassifications",
     "OrtResult",
@@ -59,10 +59,10 @@ __all__ = [
     "PackageCurationData",
     "PackageLinkage",
     "PackageReference",
-    "PathExcludeReason",
-    "PathIncludeReason",
     "PathExclude",
+    "PathExcludeReason",
     "PathInclude",
+    "PathIncludeReason",
     "Project",
     "RemoteArtifact",
     "Repository",

ort/models/config/scan_storage_configuration.py

@@ -38,7 +38,7 @@ class ScanStorageConfiguration(BaseModel):
     @classmethod
     def validate_provenance(cls, v):
         if not isinstance(v, dict):
-            raise ValueError("Config must be a dictionary.")
+            raise TypeError("Config must be a dictionary.")
         # Return the dict as-is; ScanStorageConfiguration with extra="allow"
         # will store all fields without needing to instantiate subclasses.
         return v

ort/models/identifier.py

@@ -64,7 +64,7 @@ class Identifier(BaseModel):
         raise TypeError("Identifier must be a dict or a string in the correct format")
 
     def __str__(self) -> str:
-        return ":".join([self.orttype, self.namespace, self.name, self.version])
+        return f"{self.orttype}:{self.namespace}:{self.name}:{self.version}"
 
     @model_serializer(mode="plain")
     def serialize(self) -> str:

ort/models/provenance.py

@@ -27,24 +27,18 @@ class UnknownProvenance(Provenance):
     Provenance information about the origin of source code.
     """
 
-    pass
-
 
 class KnownProvenance(Provenance):
     """
     Provenance information about the origin of source code.
     """
 
-    pass
-
 
 class RemoteProvenance(KnownProvenance):
     """
     Provenance information about the origin of source code.
     """
 
-    pass
-
 
 class ArtifactProvenance(RemoteProvenance):
     """

ort/models/vulnerabilities/vulnerability.py

@@ -37,3 +37,9 @@ class Vulnerability(BaseModel):
         ...,
         description="A list with detailed information for this vulnerability obtained from different sources.",
     )
+
+    first_fixed_versions: set[str] = Field(
+        default_factory=set,
+        description="The first package versions that contain a fix for this [Vulnerability]. There could be multiple"
+        "first versions in case vulnerability fixes are back-ported to distinct release branches.",
+    )

{python_ort-0.9.4.dist-info → python_ort-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-ort
-Version: 0.9.4
+Version: 0.10.0
 Summary: A Python Ort model serialization library
 License-Expression: MIT
 License-File: LICENSE
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: click>=8.4.1
+Requires-Dist: click>=8.4.2
 Requires-Dist: license-expression>=30.4.4
 Requires-Dist: packageurl-python>=0.17.6
 Requires-Dist: pydantic>=2.13.4

{python_ort-0.9.4.dist-info → python_ort-0.10.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ort/__init__.py,sha256=lwG8GVwXZCnL4yGOKgja1Tvrt_JeOCABZw3F8ckXuuU,469
-ort/models/__init__.py,sha256=v6jvd2vvIvuKIo_VN2EpyDvH_77M6LWuru-rLqQCk1I,2393
+ort/__init__.py,sha256=dO9diS6jtQimfoWDHYV0Wl4Mv22jwInt1RXL6rAFnBo,469
+ort/models/__init__.py,sha256=gI6oB1yLk50mE3TA6BBGUhq0-mdT4iKz2gjW366tb-U,2393
 ort/models/advisor_capability.py,sha256=u1-yQI66jVWgrOacZdIEZ_zcK_A_qZ8ma0umJs01V1o,839
 ort/models/advisor_details.py,sha256=wo5h3uKD_94ukw9nUGOBKGonCd8CF8YcPkcu7XoBR_I,754
 ort/models/advisor_result.py,sha256=LgfZRPdERNDVcIW7hRqCPyudbWXJvlSTlBLWuAONrlM,1317
@@ -38,7 +38,7 @@ ort/models/config/resolutions.py,sha256=FF1l6buB648qC70vOhaJFD1urXRLFTo-Id4Fi8r-
 ort/models/config/rule_violation_reason.py,sha256=y3K2uEGYAPGS1O4UoMdfikaTWkvymBihUNsJjbmMtTY,1281
 ort/models/config/rule_violation_resolution.py,sha256=OJFkqIKWOwC86EDIcEzxFBBUUA7WKJj7AQ6pTMBCWww,1073
 ort/models/config/s3_file_storage_configuration.py,sha256=YYhDFVXM1yfJjoZYTUvYGzPRvOyFFLdCNjN7R5oNvuY,1301
-ort/models/config/scan_storage_configuration.py,sha256=3aqEnussYT62xp8gtoLj4xdkvQAd2RBpTXvED_mJSjw,2627
+ort/models/config/scan_storage_configuration.py,sha256=5OEYK3H8l_7u8vLUvgbMu1H_7mYFkZPCtXl34q-NBtk,2626
 ort/models/config/scanner_configuration.py,sha256=BSFgjpWwxc8MpPgvx0N5q6dJ59ATH6JE8fGCPx06hbE,3747
 ort/models/config/scope_exclude.py,sha256=jcvJ6nBiSSIxERouesDVSxg8l7RNIuQHC9tdmK3mudM,765
 ort/models/config/scope_exclude_reason.py,sha256=lw2IzBMybAex3Ck4aqHSi-9gcw9RKV-Znej3qZ9-lbk,1958
@@ -59,7 +59,7 @@ ort/models/dependency_reference.py,sha256=9fuqrF38c8bBW63Cp6sTnot-h2D3sGdkEuXR8S
 ort/models/evaluator_run.py,sha256=LsJJ-GMQKqdvJNdj3wnHMJuKD7EqojJ5VQKAPTzPFzY,467
 ort/models/file_list.py,sha256=SKHqLNutldJefNIzt7jKo6_aAdF9hlUd_Z7cQxAj_H4,1627
 ort/models/hash.py,sha256=fE1pPgx98WkmGid-SK3AuTBHMZrD6No1SJEEudrbP80,1160
-ort/models/identifier.py,sha256=H3NvxZlHLZQDI2hQn8AphqieL5QBkfj5Y6JTxEItSNY,2637
+ort/models/identifier.py,sha256=UebjaTB-v5q5UWID77eEh497DhV60dqP0gxXhHyocC0,2633
 ort/models/issue.py,sha256=nUMKRABe8tF6pZzCdaPt2tjdYFf5zRgEipy-o68Ym5M,1153
 ort/models/license_finding.py,sha256=8vlnBV0LMb8cerOpZl6YH1eYwVuViuh0VseD6Sai_q0,1897
 ort/models/license_source.py,sha256=TY0HBFvOt0r9QxElpmobLF5SmjyA1wynGNPsqBxwHdo,727
@@ -73,7 +73,7 @@ ort/models/package_curation_data.py,sha256=aGHPlx22TSvtevkw9IIsdkBWbdp3JYw8WTJTJ
 ort/models/package_linkage.py,sha256=abwoEphvfvxaM0qtRWhEgQfY3RP6a7IxjmCgvtmsWX4,1074
 ort/models/package_reference.py,sha256=SE61OtGO6LVPCP_arLEUabBAv9gySFM-NwPfPGTerlk,1561
 ort/models/project.py,sha256=PEH2Vvij2ETuw78AezjH-NAvAYjypy9ADs_Ss1falPs,3347
-ort/models/provenance.py,sha256=4YIKRNFUyAhF8c9iWNK4gVTyrKaqku4_8WTP76pUmUU,3031
+ort/models/provenance.py,sha256=rYJWC83kGrQf6JvvqNXFVAL89Vy4BLxuWHveV6Doxi0,3001
 ort/models/provenance_resolution_result.py,sha256=NYYHtHYut8u73RhCgBOG8sAZ8S7rivSpCddbdokoO84,2157
 ort/models/remote_artifact.py,sha256=Pd7jx1lFYqHETxvDeZYLQNyqUdE6jvlpASHsz4B1bkA,503
 ort/models/repository.py,sha256=JCvVItWUmhZpSWUb8iqu-FnpVcp3xBgKz8A-xNGipwQ,1876
@@ -97,7 +97,7 @@ ort/models/vulnerabilities/__init__.py,sha256=r-Qn75Gtj7FkYwmhWFqO26CrtJjtTRrtng
 ort/models/vulnerabilities/cvss2_rating.py,sha256=VczUVzcN9658sXgo5ign8SUzatZJSkP0ahggCjBDWuQ,1150
 ort/models/vulnerabilities/cvss3_rating.py,sha256=MMgbCx5e2lvSSveZ2HqPlPd4oG9pPzk6e2Y_F8zIoys,1393
 ort/models/vulnerabilities/cvss4_rating.py,sha256=mOLU4MlRAgY4Sg40zG13l-ey5CiE60bENt_P8nSyP-M,1393
-ort/models/vulnerabilities/vulnerability.py,sha256=5i-8LgHKRUnO-fdeUYNIKmchCZi5ndjAqAhDHp1N_WQ,1170
+ort/models/vulnerabilities/vulnerability.py,sha256=IGfSDNCrrDAB5zKOMCwX7gAQYka1p9OUJo4pX1DKEFs,1468
 ort/models/vulnerabilities/vulnerability_reference.py,sha256=9VA_KMvxHXCnL-23HzeGpcOPTW70bh3AiHjMui8CRJ0,2984
 ort/severity.py,sha256=APhIQI9Mx9Y1gWFCX6okaSCYB6yRKxuLNXHkNV9W9WI,578
 ort/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -111,9 +111,9 @@ ort/utils/spdx/spdx_license_choice.py,sha256=hop1tcSAq1ZWMd-504tAaCJ8KxzX_fp9_-r
 ort/utils/validated_enum.py,sha256=UFAGP7BGzAx1nSBWEeMXn1X1teVb6507N-lfXBf5qGM,1643
 ort/utils/yaml_loader.py,sha256=kOiuRV93_q_ZUnAqHoNohAvqL7fkUn66WrvrdbgZKHs,1290
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/ort_validate.py,sha256=fjz0laU903mieeMwqeWsNPY8aEGPQw-xDfvEauZq4NE,1758
-python_ort-0.9.4.dist-info/licenses/LICENSE,sha256=koFhbHMglt1BNVuMKdBBlrQcgQsWLgo4pZW6cCtyGvA,1081
-python_ort-0.9.4.dist-info/WHEEL,sha256=8ZlpUMJ7mlDirmlHRhDirEx_nPnARrwDjeE92mlk68E,81
-python_ort-0.9.4.dist-info/entry_points.txt,sha256=v2_5_A1Rs4kGKx2g-6PZQoNwx_JlDy6pfWSjMNT_BMU,58
-python_ort-0.9.4.dist-info/METADATA,sha256=0wxvzLvkcM-beIAcpL6O9jGWG8O3jYdNfnC3KAUU4fw,1462
-python_ort-0.9.4.dist-info/RECORD,,
+tools/ort_validate.py,sha256=drVJo2rHO-o8UkFu0K8rRK0ZoOYvoRCP9nG2rkys4Qg,1934
+python_ort-0.10.0.dist-info/licenses/LICENSE,sha256=koFhbHMglt1BNVuMKdBBlrQcgQsWLgo4pZW6cCtyGvA,1081
+python_ort-0.10.0.dist-info/WHEEL,sha256=a0ta4TK7UKMB0EbDesmi2mn0Djkly7aj_7Tu2R7SseE,81
+python_ort-0.10.0.dist-info/entry_points.txt,sha256=v2_5_A1Rs4kGKx2g-6PZQoNwx_JlDy6pfWSjMNT_BMU,58
+python_ort-0.10.0.dist-info/METADATA,sha256=wNSNXr8jBCiFXnvW-2qq9XxbbGEmJq5XNnojLk0wojU,1463
+python_ort-0.10.0.dist-info/RECORD,,

{python_ort-0.9.4.dist-info → python_ort-0.10.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.11.21
+Generator: uv 0.11.33
 Root-Is-Purelib: true
 Tag: py3-none-any

tools/ort_validate.py

@@ -9,7 +9,7 @@ from typing import TypeVar
 import click
 from pydantic import BaseModel, ValidationError
 
-from ort import RepositoryConfiguration, ort_yaml_load
+from ort import OrtResult, RepositoryConfiguration, ort_yaml_load
 from ort.models import LicenseClassifications
 
 logger = logging.getLogger()
@@ -25,8 +25,9 @@ def load_and_validate(model: type[ModelT], datafile: str) -> None:
         parsed = model.model_validate(data or {})
         logger.debug(parsed.model_dump_json(indent=2))
         logger.info(f"Successfully validated {datafile} as {model.__name__}.")
-    except ValidationError:
+    except ValidationError as e:
         logger.error("Validation error while parsing the ORT result:")
+        logger.error(e)
         sys.exit(1)
     except OSError as e:
         logger.error(f"Error while opening the file {datafile}: {e}")
@@ -39,7 +40,6 @@ def main(debug: bool = False) -> None:
     logging.basicConfig(level=logging.DEBUG)
     if debug:
         logging.basicConfig(level=logging.DEBUG)
-    pass
 
 
 @click.command()
@@ -54,8 +54,15 @@ def repository_configuration(datafile):
     load_and_validate(RepositoryConfiguration, datafile)
 
 
+@click.command()
+@click.argument("datafile")
+def ort_result(datafile):
+    load_and_validate(OrtResult, datafile)
+
+
 main.add_command(repository_configuration)
 main.add_command(license_classifications)
+main.add_command(ort_result)
 
 if __name__ == "__main__":
     main()