add new binproviders and binaries args to install and version, bump pydantic-pkgr version

archivebox/plugins_search/ripgrep/apps.py

@@ -3,12 +3,12 @@ __package__ = 'archivebox.plugins_search.ripgrep'
 import re
 from pathlib import Path
 from subprocess import run
-from typing import List, Dict, Iterable
+from typing import List, Iterable
 # from typing_extensions import Self
 
 # Depends on other PyPI/vendor packages:
 from pydantic import InstanceOf, Field
-from pydantic_pkgr import BinProvider, BinProviderName, ProviderLookupDict, BinName
+from pydantic_pkgr import BinProvider, BinaryOverrides, BinName
 
 # Depends on other Django apps:
 from abx.archivebox.base_plugin import BasePlugin
@@ -45,9 +45,9 @@ class RipgrepBinary(BaseBinary):
     name: BinName = RIPGREP_CONFIG.RIPGREP_BINARY
     binproviders_supported: List[InstanceOf[BinProvider]] = [apt, brew, env]
 
-    provider_overrides: Dict[BinProviderName, ProviderLookupDict] = {
-        apt.name: {'packages': lambda: ['ripgrep']},
-        brew.name: {'packages': lambda: ['ripgrep']},
+    overrides: BinaryOverrides = {
+        apt.name: {'packages': ['ripgrep']},
+        brew.name: {'packages': ['ripgrep']},
     }
 
 RIPGREP_BINARY = RipgrepBinary()

archivebox/plugins_search/sonic/apps.py

@@ -1,11 +1,11 @@
 __package__ = 'archivebox.plugins_search.sonic'
 
 import sys
-from typing import List, Dict, Generator, cast
+from typing import List, Generator, cast
 
 # Depends on other PyPI/vendor packages:
 from pydantic import InstanceOf, Field, model_validator
-from pydantic_pkgr import BinProvider, BinProviderName, ProviderLookupDict, BinName
+from pydantic_pkgr import BinProvider, BinaryOverrides, BinName
 
 # Depends on other Django apps:
 from abx.archivebox.base_plugin import BasePlugin
@@ -55,9 +55,9 @@ class SonicBinary(BaseBinary):
     name: BinName = SONIC_CONFIG.SONIC_BINARY
     binproviders_supported: List[InstanceOf[BinProvider]] = [brew, env]   # TODO: add cargo
 
-    provider_overrides: Dict[BinProviderName, ProviderLookupDict] = {
-        brew.name: {'packages': lambda: ['sonic']},
-        # cargo.name: {'packages': lambda: ['sonic-server']},             # TODO: add cargo
+    overrides: BinaryOverrides = {
+        brew.name: {'packages': ['sonic']},
+        # cargo.name: {'packages': ['sonic-server']},                     # TODO: add cargo
     }
     
     # TODO: add version checking over protocol? for when sonic backend is on remote server and binary is not installed locally

archivebox/plugins_search/sqlite/apps.py

@@ -66,11 +66,11 @@ class SqliteftsConfig(BaseConfigSet):
         # Only Python >= 3.11 supports sqlite3.Connection.getlimit(),
         # so fall back to the default if the API to get the real value isn't present
         try:
-            limit_id = sqlite3.SQLITE_LIMIT_LENGTH
+            limit_id = sqlite3.SQLITE_LIMIT_LENGTH              # type: ignore[attr-defined]
             
             if self.SQLITEFTS_SEPARATE_DATABASE:
                 cursor = self.get_connection()
-                return cursor.connection.getlimit(limit_id)
+                return cursor.connection.getlimit(limit_id)     # type: ignore[attr-defined]
             else:
                 with database.temporary_connection() as cursor:  # type: ignore[attr-defined]
                     return cursor.connection.getlimit(limit_id)