qol changes, use pydantic, fix #146

Author: FredHappyface

licensecheck/checker.py

@@ -8,7 +8,7 @@
 from licensecheck.models.constants import JOINS
 from licensecheck.models.license import License
 from licensecheck.models.packageinfo import PackageInfo
-from licensecheck.packageinfo import PackageInfoManager
+from licensecheck.packageinforesolver import PackageInfoManager
 
 
 def check(

licensecheck/io/cli.py

@@ -11,10 +11,11 @@
 from configurator import Config
 from configurator.node import ConfigNode
 
-from licensecheck import checker, license_matrix, packageinfo
+from licensecheck import checker, license_matrix
 from licensecheck.io import fmt
 from licensecheck.models.config import LC_Config
 from licensecheck.models.packageinfo import PackageInfo
+from licensecheck.packageinforesolver import PackageInfoManager, ProjectMetadata
 
 stdout.reconfigure(encoding="utf-8")  # type: ignore[general-type-issues]
 
@@ -117,23 +118,20 @@ def cli() -> None:  # pragma: no cover
 
 	config: ConfigNode = Config()
 
-	# (Parses in the following order: `pyproject.toml`,
-	# `setup.cfg`, `licensecheck.toml`, `licensecheck.json`,
-	# `licensecheck.ini`, `~/licensecheck.toml`, `~/licensecheck.json`, `~/licensecheck.ini`)
+	# (Parses in the following order:
 	config_files = [
 		"~/licensecheck.json",
 		"~/licensecheck.toml",
 		"licensecheck.json",
 		"licensecheck.toml",
-		"setup.cfg",
 		"pyproject.toml",
 	]
 
 	for file in config_files:
 		config += Config.from_path(file, optional=True)
 
 	scopedData: ConfigNode = config.get("tool", {}).get("licensecheck", ConfigNode())
-	licensecheckConf: LC_Config = LC_Config.from_mapping(**{**scopedData.data, **args})
+	licensecheckConf: LC_Config = LC_Config.model_validate({**scopedData.data, **args})
 
 	ec = main(licensecheckConf)
 	stdin_path.unlink(missing_ok=True)
@@ -149,17 +147,15 @@ def main(licensecheckConf: LC_Config) -> int:
 	requirements_paths = licensecheckConf.requirements_paths or {"__stdin__"}
 	output_file = (
 		stdout
-		if licensecheckConf.file in [None, ""]
+		if licensecheckConf.file == ""
 		else Path(licensecheckConf.file or "").open("w", encoding="utf-8")
 	)
 
 	# Get my license
-	this_license_text = licensecheckConf.license or packageinfo.ProjectMetadata.get_license()
+	this_license_text = licensecheckConf.license or ProjectMetadata.get_license()
 	this_license = license_matrix.licenseType(this_license_text).pop()
 
-	package_info_manager = packageinfo.PackageInfoManager(
-		licensecheckConf.pypi_api or "https://pypi.org"
-	)
+	package_info_manager = PackageInfoManager(licensecheckConf.pypi_api or "https://pypi.org")
 
 	incompatible, depsWithLicenses = checker.check(
 		requirements_paths=set(requirements_paths),
@@ -206,6 +202,6 @@ def main(licensecheckConf: LC_Config) -> int:
 		exitCode = 1
 
 	# Cleanup + exit
-	if licensecheckConf.file not in [None, ""]:
+	if licensecheckConf.file != "":
 		output_file.close()
 	return exitCode

licensecheck/models/config.py

@@ -1,19 +1,19 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
-from typing import Any
+from dataclasses import field
 
+from licensecheck.models.defaultonnone import DefaultOnNoneModel
 
-@dataclass(unsafe_hash=True, order=True)
-class LC_Config:
+
+class LC_Config(DefaultOnNoneModel):
 	"""LC_Config type."""
 
-	file: str | None
-	license: str | None
-	format: str | None
-	pypi_api: str | None
-	show_only_failing: bool
-	zero: bool
+	file: str = ""
+	license: str = ""
+	format: str = ""
+	pypi_api: str = ""
+	show_only_failing: bool = False
+	zero: bool = False
 
 	requirements_paths: set[str] = field(default_factory=set)
 	groups: set[str] = field(default_factory=set)
@@ -25,19 +25,3 @@ class LC_Config:
 	only_licenses: set[str] = field(default_factory=set)
 	skip_dependencies: set[str] = field(default_factory=set)
 	hide_output_parameters: set[str] = field(default_factory=set)
-
-	@staticmethod
-	def from_mapping(**kwargs: dict[str, Any]) -> LC_Config:
-		for key in (
-			"requirements_paths",
-			"groups",
-			"extras",
-			"ignore_packages",
-			"fail_packages",
-			"fail_licenses",
-			"only_licenses",
-			"skip_dependencies",
-			"hide_output_parameters",
-		):
-			kwargs[key] = set(kwargs.get(key) or ())
-		return LC_Config(**kwargs)

licensecheck/models/defaultonnone.py

@@ -0,0 +1,22 @@
+from typing import Any
+
+from pydantic import BaseModel, model_validator
+
+
+class DefaultOnNoneModel(BaseModel):
+	@model_validator(mode="before")
+	@classmethod
+	def default_on_none(cls, values: Any) -> Any | dict[Any, Any]:
+		if not isinstance(values, dict):
+			return values
+
+		result = dict(values)
+
+		for name, field in cls.model_fields.items():
+			if name in result and result[name] is None:
+				if field.default_factory is not None:
+					result[name] = field.default_factory()
+				elif field.default is not None:
+					result[name] = field.default
+
+		return result

licensecheck/models/pypijson.py

@@ -0,0 +1,93 @@
+from datetime import UTC, datetime
+
+from pydantic import Field, HttpUrl
+
+from licensecheck.models.defaultonnone import DefaultOnNoneModel
+
+DEFAULT_URL = HttpUrl("http://example.com")
+
+
+class Downloads(DefaultOnNoneModel):
+	last_day: int = 0
+	last_month: int = 0
+	last_week: int = 0
+
+
+class Digests(DefaultOnNoneModel):
+	blake2b_256: str = ""
+	md5: str = ""
+	sha256: str = ""
+
+
+class Info(DefaultOnNoneModel):
+	author: str = ""
+	author_email: str = ""
+	bugtrack_url: str = ""
+	classifiers: list[str] = Field(default_factory=list)
+	description: str = ""
+	description_content_type: str = ""
+	docs_url: str = ""
+	download_url: str = ""
+	downloads: Downloads = Downloads()
+	dynamic: list[str] = Field(default_factory=list)
+	home_page: str = ""
+	keywords: str = ""
+	license: str = ""
+	license_expression: str = ""
+	license_files: list[str] | None = None
+	maintainer: str = ""
+	maintainer_email: str = ""
+	name: str = ""
+	package_url: HttpUrl = DEFAULT_URL
+	platform: str = ""
+	project_url: HttpUrl = DEFAULT_URL
+	project_urls: dict[str, HttpUrl] = Field(default_factory=dict)
+	provides_extra: list[str] = Field(default_factory=list)
+	release_url: HttpUrl = DEFAULT_URL
+	requires_dist: list[str] | None = None
+	requires_python: str = ""
+	summary: str = ""
+	version: str = ""
+	yanked: bool = False
+	yanked_reason: str = ""
+
+
+class File(DefaultOnNoneModel):
+	comment_text: str = ""
+	digests: Digests = Digests()
+	downloads: int = 0
+	filename: str = ""
+	has_sig: bool = False
+	md5_digest: str = ""
+	packagetype: str = ""
+	python_version: str = ""
+	requires_python: str = ""
+	size: int | None = None
+	upload_time: datetime = datetime(1970, 1, 1, tzinfo=UTC)
+	upload_time_iso_8601: datetime = datetime(1970, 1, 1, tzinfo=UTC)
+	url: HttpUrl = DEFAULT_URL
+	yanked: bool = False
+	yanked_reason: str = ""
+
+
+class OwnershipRole(DefaultOnNoneModel):
+	role: str = ""
+	user: str = ""
+
+
+class Ownership(DefaultOnNoneModel):
+	roles: list[OwnershipRole]
+	organization: str = ""
+
+
+class Vulnerability(DefaultOnNoneModel):
+	# PyPI's schema can evolve; keep flexible unless you need validation.
+	pass
+
+
+class ProjectResponse(DefaultOnNoneModel):
+	info: Info = Info()
+	last_serial: int = 1
+	urls: list[File] = Field(default_factory=list)
+	vulnerabilities: list[dict] = Field(default_factory=list)
+	ownership: Ownership | None = None