fix plugin loading order, admin, abx-pkg

archivebox/pkgs/abx-plugin-git/abx_plugin_git/binaries.py

@@ -3,7 +3,7 @@ __package__ = 'abx_plugin_git'
 from typing import List
 
 from pydantic import InstanceOf
-from pydantic_pkgr import BinProvider, BinName, Binary
+from abx_pkg import BinProvider, BinName, Binary
 
 from abx_plugin_default_binproviders import apt, brew, env
 

archivebox/pkgs/abx-plugin-git/abx_plugin_git/extractors.py

@@ -1,15 +1,20 @@
 __package__ = 'abx_plugin_git'
 
-# from pathlib import Path
-
-# from .binaries import GIT_BINARY
+from pathlib import Path
 
 
-# class GitExtractor(BaseExtractor):
-#     name: ExtractorName = 'git'
-#     binary: str = GIT_BINARY.name
+from abx_pkg import BinName
 
-#     def get_output_path(self, snapshot) -> Path | None:
-#         return snapshot.as_link() / 'git'
+from abx_spec_extractor import BaseExtractor, ExtractorName
 
-# GIT_EXTRACTOR = GitExtractor()
+from .binaries import GIT_BINARY
+
+
+class GitExtractor(BaseExtractor):
+    name: ExtractorName = 'git'
+    binary: BinName = GIT_BINARY.name
+
+    def get_output_path(self, snapshot) -> Path | None:
+        return snapshot.as_link() / 'git'
+
+GIT_EXTRACTOR = GitExtractor()

archivebox/pkgs/abx-plugin-git/pyproject.toml

@@ -7,7 +7,7 @@ requires-python = ">=3.10"
 dependencies = [
     "abx>=0.1.0",
     "abx-spec-config>=0.1.0",
-    "abx-spec-pydantic-pkgr>=0.1.0",
+    "abx-spec-abx-pkg>=0.1.0",
     "abx-plugin-default-binproviders>=2024.10.24",
 ]