use depgather.models for DefaultOnNoneModel, pypi models; add last_updated field

Author: FredHappyface

README.md

@@ -30,6 +30,7 @@
 import json
 import re
 from collections import OrderedDict
+from datetime import datetime
 from importlib.metadata import PackageNotFoundError, version
 from io import StringIO
 from pathlib import Path
@@ -94,14 +95,17 @@ def ansi(
 	if len(errors) > 0:
 		table = Table(title="\nList Of Errors")
 		table.add_column("Package", style="magenta")
-		_ = [table.add_row(x.get("name", "?")) for x in errors]
+		table.add_column("Error Code", style="magenta")
+		_ = [table.add_row(x.get("name", "?"), str(x.get("httpErrorCode", -1))) for x in errors]
 		console.print(table)
 
 	table = Table(title="\nList Of Packages")
 	if name_bool := "name" in packages[0]:
 		table.add_column("Package", header_style="magenta")
 	if attestation_info := "attestation_info" in packages[0]:
 		table.add_column("Attestation Info", header_style="magenta")
+	if last_updated := "last_updated" in packages[0]:
+		table.add_column("Last Updated", header_style="magenta")
 
 	attestation_info_lookup = {
 		AttestationInfo.NONE: "[red]Unsupported[/]",
@@ -119,6 +123,7 @@ def ansi(
 					if attestation_info
 					else []
 				)
+				+ ([str(x.get("last_updated"))] if last_updated else [])
 			)
 		)
 		for x in packages
@@ -207,7 +212,7 @@ def raw(packages: list[dict[str, Any]]) -> str:
 	"""
 	Format to json.
 
-	:param list[dict[str, Any]] packages: list of PackageInfo, representes as a dict to format.
+	:param list[dict[str, Any]] packages: list of PackageInfo, represents as a dict to format.
 	:return str: string to send to specified output in json format
 	"""
 	return json.dumps(
@@ -216,6 +221,7 @@ def raw(packages: list[dict[str, Any]]) -> str:
 			"packages": packages,
 		},
 		indent="\t",
+		default=lambda obj: obj.isoformat() if isinstance(obj, datetime) else obj,
 	)
 
 

attestationcheck/io/fmt.py

@@ -1,7 +1,6 @@
+from depgather.models.defaultonnone import DefaultOnNoneModel
 from pydantic import Field
 
-from attestationcheck.models.defaultonnone import DefaultOnNoneModel
-
 
 class Envelope(DefaultOnNoneModel):
 	signature: str = ""

attestationcheck/models/attestation.py

@@ -2,7 +2,7 @@
 
 from dataclasses import field
 
-from attestationcheck.models.defaultonnone import DefaultOnNoneModel
+from depgather.models.defaultonnone import DefaultOnNoneModel
 
 
 class LC_Config(DefaultOnNoneModel):

attestationcheck/models/config.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import datetime
 from collections.abc import Generator
 from dataclasses import dataclass, field, fields
 from enum import StrEnum
@@ -49,10 +50,12 @@ class PackageInfo:
 	is_attestation_valid: bool = False
 	is_attestation_verified: bool = False
 
+	last_updated: datetime.datetime = datetime.datetime(1970, 1, 1, tzinfo=datetime.UTC)
+
 	httpErrorCode: int = 0
 
 	def __post_init__(self) -> None:
-		"""Set the namever once the object is initialised."""
+		"""Set the namever once the object is initialized."""
 		self.namever = f"{self.name}-{self.version or UNKNOWN}"
 
 	@property

attestationcheck/models/defaultonnone.py

@@ -2,17 +2,18 @@
 
 from __future__ import annotations
 
+import datetime
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 from typing import Any
 
 import requests
+from depgather.models.pypijson import Info, ProjectResponse
 from depgather.parse import gather
 from packaging.utils import canonicalize_name
 from pypi_attestations._impl import AttestationBundle, Provenance
 
 from attestationcheck.models.packageinfo import PackageInfo, PackageLike
-from attestationcheck.models.pypijson import Info, ProjectResponse
 from attestationcheck.session import session
 from attestationcheck.verify_attestation import validate_attestation, verify_attestation
 
@@ -108,6 +109,7 @@ def _get_package_info(self, package: PackageLike) -> PackageInfo:
 			is_supported_publisher=rpi.is_supported_publisher(),
 			is_attestation_present=isinstance(attestation_bundle, list),
 			httpErrorCode=rpi.http_code if rpi.http_code != HTTP_OK else 0,
+			last_updated=rpi.get_lastUpdated(),
 		)
 
 		if isinstance(attestation_bundle, list):
@@ -168,8 +170,7 @@ def is_supported_publisher(self) -> bool:
 		return any((url.host or "").startswith(PUBLISHER_HOSTS) for url in urls)
 
 	def get_fileinfo(self) -> tuple[str, str] | tuple[None, None]:
-		files = [x or "" for x in self.resp.urls]
-		wheel_files = [x for x in files if x.filename.endswith(".whl")]
+		wheel_files = [x for x in self.resp.urls if x.filename.endswith(".whl")]
 		if len(wheel_files) > 0:
 			f = wheel_files[-1]
 			return f.filename, f.digests.sha256
@@ -188,3 +189,10 @@ def get_attestation_bundle(self) -> list[AttestationBundle] | int:
 				return Provenance.model_validate(attestation_bundle).attestation_bundles
 			return rc
 		return -3
+
+	def get_lastUpdated(self) -> datetime.datetime:
+		files = self.resp.urls
+		if len(files) > 0:
+			f = files[-1]
+			return f.upload_time_iso_8601
+		return datetime.datetime(1970, 1, 1, tzinfo=datetime.UTC)

attestationcheck/models/packageinfo.py

@@ -1,4 +1,7 @@
-import appdirs
 import requests_cache
+from platformdirs import PlatformDirs
 
-session = requests_cache.CachedSession(appdirs.user_cache_dir("attestationcheck", "fredhappyface"))
+dirs = PlatformDirs("attestationcheck", "fredhappyface")
+
+
+session = requests_cache.CachedSession(dirs.user_cache_dir)

attestationcheck/models/pypijson.py

@@ -1,6 +1,6 @@
 [project]
 name = "attestationcheck"
-version = "0.1.1"
+version = "0.2.0"
 description = "Output the attestation status used by dependencies. e.g. Verified, Valid, Supported by package host etc."
 authors = [{ name = "FredHappyface" }]
 requires-python = ">=3.12"
@@ -21,10 +21,10 @@ classifiers = [
 	"Topic :: Utilities",
 ]
 dependencies = [
-	"appdirs>=1.4.4",
 	"configurator>=3.2.0",
-	"depgather>=0.4.0",
+	"depgather>=0.5.0",
 	"markdown>=3.10.2",
+	"platformdirs>=4.10.0",
 	"pydantic>=2.13.4",
 	"pypi-attestations>=0.0.29",
 	"requests>=2.32.5",