pkgmap-py 0.2.0__tar.gz → 0.2.1__tar.gz

{pkgmap_py-0.2.0 → pkgmap_py-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pkgmap-py
-Version: 0.2.0
+Version: 0.2.1
 Summary: Cross-distribution Linux package name resolution
 Author: Levizor
 Author-email: Levizor <levizor@disroot.org>
@@ -126,8 +126,8 @@ pkgmap update --full
 
 | Variant | File | Compressed Size | Coverage | Default For |
 | :--- | :--- | :--- | :--- | :--- |
-| **Core** | `pkgmap-core.db` | ~7 MB | Top 10 repositories (Nixpkgs, Arch, AUR, Debian, Ubuntu, Fedora, Alpine, openSUSE, Gentoo, Void) | **CLI & Web UI** |
-| **Full** | `pkgmap.db` | ~37 MB | All 330+ Repology repositories | **Python Library** |
+| **Core** | `pkgmap-core.db` | ~12 MB | Top 10 repositories (Nixpkgs, Arch, AUR, Debian, Ubuntu, Fedora, Alpine, openSUSE, Gentoo, Void) | **CLI & Web UI** |
+| **Full** | `pkgmap.db` | ~40 MB | All 330+ Repology repositories | **Python Library** |
 
 - **CLI behavior**: Defaults to the **Core** database (`~/.cache/pkgmap/pkgmap-core.db`) unless the Full database is already downloaded locally or `--full` is passed. If you query a repository not present in Core, the CLI prompts you to run `pkgmap update --full`. You can also pass `--core` or `--full` to any CLI command (`resolve`, `update`, `repos`).
 - **Python library behavior**: Defaults to the **Full** database (`~/.cache/pkgmap/pkgmap.db`). Call `set_default_variant("core")` (or set `PKGMAP_DB_VARIANT=core`) to use the Core database instead.

{pkgmap_py-0.2.0 → pkgmap_py-0.2.1}/README.md

@@ -111,8 +111,8 @@ pkgmap update --full
 
 | Variant | File | Compressed Size | Coverage | Default For |
 | :--- | :--- | :--- | :--- | :--- |
-| **Core** | `pkgmap-core.db` | ~7 MB | Top 10 repositories (Nixpkgs, Arch, AUR, Debian, Ubuntu, Fedora, Alpine, openSUSE, Gentoo, Void) | **CLI & Web UI** |
-| **Full** | `pkgmap.db` | ~37 MB | All 330+ Repology repositories | **Python Library** |
+| **Core** | `pkgmap-core.db` | ~12 MB | Top 10 repositories (Nixpkgs, Arch, AUR, Debian, Ubuntu, Fedora, Alpine, openSUSE, Gentoo, Void) | **CLI & Web UI** |
+| **Full** | `pkgmap.db` | ~40 MB | All 330+ Repology repositories | **Python Library** |
 
 - **CLI behavior**: Defaults to the **Core** database (`~/.cache/pkgmap/pkgmap-core.db`) unless the Full database is already downloaded locally or `--full` is passed. If you query a repository not present in Core, the CLI prompts you to run `pkgmap update --full`. You can also pass `--core` or `--full` to any CLI command (`resolve`, `update`, `repos`).
 - **Python library behavior**: Defaults to the **Full** database (`~/.cache/pkgmap/pkgmap.db`). Call `set_default_variant("core")` (or set `PKGMAP_DB_VARIANT=core`) to use the Core database instead.

{pkgmap_py-0.2.0 → pkgmap_py-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pkgmap-py"
-version = "0.2.0"
+version = "0.2.1"
 description = "Cross-distribution Linux package name resolution"
 readme = "README.md"
 requires-python = ">=3.12"

{pkgmap_py-0.2.0 → pkgmap_py-0.2.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "pkgmap-py"
-version = "0.2.0"
+version = "0.2.1"
 description = "Cross-distribution Linux package name resolution"
 authors = [{ name = "Levizor", email = "levizor@disroot.org" }]
 license = { text = "MIT" }

{pkgmap_py-0.2.0 → pkgmap_py-0.2.1}/src/pkgmap/__init__.py

@@ -17,6 +17,7 @@ from pkgmap.resolver import (
     resolve_batch_all,
     resolve_project,
 )
+from pkgmap.schema import normalize_nix_package_name
 
 __version__ = "0.2.0"
 __all__ = [
@@ -26,6 +27,7 @@ __all__ = [
     "get_database_path",
     "get_default_variant",
     "list_repositories",
+    "normalize_nix_package_name",
     "resolve",
     "resolve_all",
     "resolve_batch",

{pkgmap_py-0.2.0 → pkgmap_py-0.2.1}/src/pkgmap/resolver.py

@@ -3,7 +3,11 @@ from collections.abc import Sequence
 from pathlib import Path
 
 from pkgmap.db import ensure_database
-from pkgmap.schema import PackageResolution, Repository
+from pkgmap.schema import (
+    PackageResolution,
+    Repository,
+    normalize_nix_package_name,
+)
 
 DEFAULT_ALIASES: dict[str, str] = {
     "debian": "debian_12",
@@ -96,13 +100,14 @@ BATCH_CHUNK_SIZE = 500
 
 def _rank_match(
     query_pkg: str, res: PackageResolution
-) -> tuple[str, int, int, int, int, str]:
+) -> tuple[str, int, int, int, int, int, str]:
     lower_q = query_pkg.lower()
     lower_name = res.name.lower()
     return (
         res.repo,
         0 if lower_name == lower_q else 1,
         1 if lower_name.endswith(("-git", "-bin")) else 0,
+        1 if "-unwrapped" in lower_name else 0,
         1 if ("." in res.name or "/" in res.name) else 0,
         len(res.name),
         res.name,
@@ -162,19 +167,30 @@ def resolve_batch_all(
             for row in cursor.fetchall():
                 key = row[0]
                 if key in results:
+                    name = row[1]
+                    repo_family = row[4]
+                    if repo_family == "nix":
+                        name = normalize_nix_package_name(name)
                     results[key].append(
                         PackageResolution(
-                            name=row[1],
+                            name=name,
                             version=row[2],
                             repo=row[3],
-                            repo_family=row[4],
+                            repo_family=repo_family,
                         )
                     )
 
             if src_repo:
                 unmatched = [pkg for pkg in chunk if not results[pkg]]
                 if unmatched:
-                    u_placeholders = ",".join("?" for _ in unmatched)
+                    proj_to_pkgs: dict[str, list[str]] = {}
+                    for pkg in unmatched:
+                        proj_to_pkgs.setdefault(pkg, []).append(pkg)
+                        norm = normalize_nix_package_name(pkg)
+                        if norm != pkg:
+                            proj_to_pkgs.setdefault(norm, []).append(pkg)
+
+                    u_placeholders = ",".join("?" for _ in proj_to_pkgs)
                     fallback_sql = f"""
                     SELECT DISTINCT pr.name, dst.package_name, dst.version, dst_repo.name, dst_repo.family
                     FROM projects pr
@@ -184,7 +200,7 @@ def resolve_batch_all(
                     JOIN repositories dst_repo ON dst.repo_id = dst_repo.id
                     WHERE src_repo.name = ? AND pr.name IN ({u_placeholders})
                     """
-                    fallback_params: list[str] = [src_repo, *unmatched]
+                    fallback_params: list[str] = [src_repo, *proj_to_pkgs.keys()]
                     if dst_repo:
                         fallback_sql += " AND dst_repo.name = ?"
                         fallback_params.append(dst_repo)
@@ -192,22 +208,36 @@ def resolve_batch_all(
 
                     cursor.execute(fallback_sql, fallback_params)
                     for row in cursor.fetchall():
-                        key = row[0]
-                        if key in results:
-                            results[key].append(
-                                PackageResolution(
-                                    name=row[1],
-                                    version=row[2],
-                                    repo=row[3],
-                                    repo_family=row[4],
+                        pr_name = row[0]
+                        for input_key in proj_to_pkgs.get(pr_name, []):
+                            if input_key in results:
+                                name = row[1]
+                                repo_family = row[4]
+                                if repo_family == "nix":
+                                    name = normalize_nix_package_name(name)
+                                results[input_key].append(
+                                    PackageResolution(
+                                        name=name,
+                                        version=row[2],
+                                        repo=row[3],
+                                        repo_family=repo_family,
+                                    )
                                 )
-                            )
 
         for pkg, matches in results.items():
-            if len(matches) > 1:
-                matches.sort(key=lambda r: _rank_match(pkg, r))
+            seen: set[tuple[str, str, str | None]] = set()
+            deduped: list[PackageResolution] = []
+            for m in matches:
+                dedup_key = (m.repo, m.name, m.version)
+                if dedup_key not in seen:
+                    seen.add(dedup_key)
+                    deduped.append(m)
+            if len(deduped) > 1:
+                deduped.sort(key=lambda r: _rank_match(pkg, r))
+            results[pkg] = deduped
 
         return results
+
     finally:
         conn.close()
 

{pkgmap_py-0.2.0 → pkgmap_py-0.2.1}/src/pkgmap/schema.py

@@ -1,3 +1,4 @@
+import re
 from typing import NamedTuple
 
 
@@ -35,6 +36,11 @@ class PackageResolution(NamedTuple):
 REPOLOGY_SCHEMA_URL = "https://github.com/repology/repology-updater/blob/master/sql.d/schema/create_schema_tables.sql"
 
 
+def normalize_nix_package_name(name: str) -> str:
+    """Normalize Nix package names by stripping unwrapped derivation markers."""
+    return re.sub(r"-unwrapped(?=($|[\"_-]))", "", name)
+
+
 class RepologyPackageRow(NamedTuple):
     """Repology 'packages' table row schema extracted from PostgreSQL dumps.
 
@@ -61,6 +67,7 @@ class RepologyPackageRow(NamedTuple):
                 package_name = self.srcname
             elif self.category:
                 package_name = f"{self.category}.{self.visiblename}"
+            package_name = normalize_nix_package_name(package_name)
 
         return PackageRecord(
             repo=self.repo,