autopkg-wrapper 2026.2.5__tar.gz → 2026.2.6__tar.gz

{autopkg_wrapper-2026.2.5 → autopkg_wrapper-2026.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autopkg-wrapper
-Version: 2026.2.5
+Version: 2026.2.6
 Summary: A package used to execute some autopkg functions, primarily within the context of a GitHub Actions runner.
 Project-URL: Repository, https://github.com/smithjw/autopkg-wrapper
 Author-email: James Smith <james@smithjw.me>

{autopkg_wrapper-2026.2.5 → autopkg_wrapper-2026.2.6}/autopkg_wrapper/autopkg_wrapper.py

@@ -2,151 +2,20 @@
 import json
 import logging
 import plistlib
-import subprocess
 import sys
 from concurrent.futures import ThreadPoolExecutor, as_completed
-from datetime import datetime
-from itertools import chain
 from pathlib import Path
 
 import autopkg_wrapper.utils.git_functions as git
+from autopkg_wrapper.models.recipe import Recipe
 from autopkg_wrapper.notifier import slack
 from autopkg_wrapper.utils.args import setup_args
 from autopkg_wrapper.utils.logging import setup_logger
+from autopkg_wrapper.utils.recipe_batching import build_recipe_batches, recipe_type_for
 from autopkg_wrapper.utils.recipe_ordering import order_recipe_list
 from autopkg_wrapper.utils.report_processor import process_reports
 
 
-class Recipe(object):
-    def __init__(self, name: str, post_processors: list = None):
-        self.filename = name
-        self.error = False
-        self.results = {}
-        self.updated = False
-        self.verified = None
-        self.pr_url = None
-        self.post_processors = post_processors
-
-        self._keys = None
-        self._has_run = False
-
-    @property
-    def name(self):
-        name = self.filename.split(".")[0]
-
-        return name
-
-    def verify_trust_info(self, args):
-        verbose_output = ["-vvvv"] if args.debug else []
-        prefs_file = (
-            ["--prefs", args.autopkg_prefs.as_posix()] if args.autopkg_prefs else []
-        )
-        autopkg_bin = getattr(args, "autopkg_bin", "/usr/local/bin/autopkg")
-        cmd = (
-            [autopkg_bin, "verify-trust-info", self.filename]
-            + verbose_output
-            + prefs_file
-        )
-        logging.debug(f"cmd: {cmd}")
-
-        result = subprocess.run(cmd, capture_output=True, text=True)
-        if result.returncode == 0:
-            self.verified = True
-        else:
-            self.results["message"] = (result.stderr or "").strip()
-            self.verified = False
-        return self.verified
-
-    def update_trust_info(self, args):
-        prefs_file = (
-            ["--prefs", args.autopkg_prefs.as_posix()] if args.autopkg_prefs else []
-        )
-        autopkg_bin = getattr(args, "autopkg_bin", "/usr/local/bin/autopkg")
-        cmd = [autopkg_bin, "update-trust-info", self.filename] + prefs_file
-        logging.debug(f"cmd: {cmd}")
-
-        # Fail loudly if this exits 0
-        try:
-            subprocess.check_call(cmd)
-        except subprocess.CalledProcessError as e:
-            logging.error(str(e))
-            raise e
-
-    def _parse_report(self, report):
-        with open(report, "rb") as f:
-            report_data = plistlib.load(f)
-
-        failed_items = report_data.get("failures", [])
-        imported_items = []
-        if report_data["summary_results"]:
-            # This means something happened
-            munki_results = report_data["summary_results"].get(
-                "munki_importer_summary_result", {}
-            )
-            imported_items.extend(munki_results.get("data_rows", []))
-
-        return {"imported": imported_items, "failed": failed_items}
-
-    def run(self, args):
-        if self.verified is False:
-            self.error = True
-            self.results["failed"] = True
-            self.results["imported"] = ""
-        else:
-            report_dir = Path("/private/tmp/autopkg")
-            report_time = datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
-            report_name = Path(f"{self.name}-{report_time}.plist")
-
-            report_dir.mkdir(parents=True, exist_ok=True)
-            report = report_dir / report_name
-            report.touch(exist_ok=True)
-
-            try:
-                prefs_file = (
-                    ["--prefs", args.autopkg_prefs.as_posix()]
-                    if args.autopkg_prefs
-                    else []
-                )
-                verbose_output = ["-vvvv"] if args.debug else []
-                post_processor_cmd = (
-                    list(
-                        chain.from_iterable(
-                            [
-                                ("--post", processor)
-                                for processor in self.post_processors
-                            ]
-                        )
-                    )
-                    if self.post_processors
-                    else []
-                )
-                autopkg_bin = getattr(args, "autopkg_bin", "/usr/local/bin/autopkg")
-                cmd = [
-                    autopkg_bin,
-                    "run",
-                    self.filename,
-                    "--report-plist",
-                    str(report),
-                ]
-                cmd = cmd + post_processor_cmd + verbose_output + prefs_file
-
-                logging.debug(f"cmd: {cmd}")
-
-                result = subprocess.run(cmd, capture_output=True, text=True)
-                if result.returncode != 0:
-                    self.error = True
-
-            except Exception:
-                self.error = True
-
-            self._has_run = True
-            self.results = self._parse_report(report)
-            if not self.results["failed"] and not self.error:
-                self.updated = True
-
-        return self.results
-
-
 def get_override_repo_info(args):
     if args.overrides_repo_path:
         recipe_override_dirs = args.overrides_repo_path
@@ -387,12 +256,29 @@ def main():
         # Git updates and notifications are applied serially after all recipes finish
         return r
 
-    with ThreadPoolExecutor(max_workers=max_workers) as executor:
-        futures = [executor.submit(run_one, r) for r in recipe_list]
-        for fut in as_completed(futures):
-            r = fut.result()
-            if r.error or r.results.get("failed"):
-                failed_recipes.append(r)
+    if args.recipe_processing_order:
+        batches = build_recipe_batches(
+            recipe_list=recipe_list,
+            recipe_processing_order=args.recipe_processing_order,
+        )
+        for batch in batches:
+            batch_type = recipe_type_for(batch[0]) if batch else ""
+            logging.info(
+                f"Running {len(batch)} recipes for type={batch_type or 'unknown'}"
+            )
+            with ThreadPoolExecutor(max_workers=max_workers) as executor:
+                futures = [executor.submit(run_one, r) for r in batch]
+                for fut in as_completed(futures):
+                    r = fut.result()
+                    if r.error or r.results.get("failed"):
+                        failed_recipes.append(r)
+    else:
+        with ThreadPoolExecutor(max_workers=max_workers) as executor:
+            futures = [executor.submit(run_one, r) for r in recipe_list]
+            for fut in as_completed(futures):
+                r = fut.result()
+                if r.error or r.results.get("failed"):
+                    failed_recipes.append(r)
 
     # Apply git updates serially to avoid branch/commit conflicts when concurrency > 1
     for r in recipe_list:

autopkg_wrapper-2026.2.6/autopkg_wrapper/models/recipe.py

@@ -0,0 +1,139 @@
+from __future__ import annotations
+
+import logging
+import plistlib
+import subprocess
+from datetime import datetime
+from itertools import chain
+from pathlib import Path
+
+
+class Recipe(object):
+    def __init__(self, name: str, post_processors: list = None):
+        self.filename = name
+        self.error = False
+        self.results = {}
+        self.updated = False
+        self.verified = None
+        self.pr_url = None
+        self.post_processors = post_processors
+
+        self._keys = None
+        self._has_run = False
+
+    @property
+    def name(self):
+        name = self.filename.split(".")[0]
+
+        return name
+
+    def verify_trust_info(self, args):
+        verbose_output = ["-vvvv"] if args.debug else []
+        prefs_file = (
+            ["--prefs", args.autopkg_prefs.as_posix()] if args.autopkg_prefs else []
+        )
+        autopkg_bin = getattr(args, "autopkg_bin", "/usr/local/bin/autopkg")
+        cmd = (
+            [autopkg_bin, "verify-trust-info", self.filename]
+            + verbose_output
+            + prefs_file
+        )
+        logging.debug(f"cmd: {cmd}")
+
+        result = subprocess.run(cmd, capture_output=True, text=True)
+        if result.returncode == 0:
+            self.verified = True
+        else:
+            self.results["message"] = (result.stderr or "").strip()
+            self.verified = False
+        return self.verified
+
+    def update_trust_info(self, args):
+        prefs_file = (
+            ["--prefs", args.autopkg_prefs.as_posix()] if args.autopkg_prefs else []
+        )
+        autopkg_bin = getattr(args, "autopkg_bin", "/usr/local/bin/autopkg")
+        cmd = [autopkg_bin, "update-trust-info", self.filename] + prefs_file
+        logging.debug(f"cmd: {cmd}")
+
+        # Fail loudly if this exits 0
+        try:
+            subprocess.check_call(cmd)
+        except subprocess.CalledProcessError as e:
+            logging.error(str(e))
+            raise e
+
+    def _parse_report(self, report):
+        with open(report, "rb") as f:
+            report_data = plistlib.load(f)
+
+        failed_items = report_data.get("failures", [])
+        imported_items = []
+        if report_data["summary_results"]:
+            # This means something happened
+            munki_results = report_data["summary_results"].get(
+                "munki_importer_summary_result", {}
+            )
+            imported_items.extend(munki_results.get("data_rows", []))
+
+        return {"imported": imported_items, "failed": failed_items}
+
+    def run(self, args):
+        if self.verified is False:
+            self.error = True
+            self.results["failed"] = True
+            self.results["imported"] = ""
+        else:
+            report_dir = Path("/private/tmp/autopkg")
+            report_time = datetime.now().strftime("%Y-%m-%dT%H-%M-%S")
+            report_name = Path(f"{self.name}-{report_time}.plist")
+
+            report_dir.mkdir(parents=True, exist_ok=True)
+            report = report_dir / report_name
+            report.touch(exist_ok=True)
+
+            try:
+                prefs_file = (
+                    ["--prefs", args.autopkg_prefs.as_posix()]
+                    if args.autopkg_prefs
+                    else []
+                )
+                verbose_output = ["-vvvv"] if args.debug else []
+                post_processor_cmd = (
+                    list(
+                        chain.from_iterable(
+                            [
+                                ("--post", processor)
+                                for processor in self.post_processors
+                            ]
+                        )
+                    )
+                    if self.post_processors
+                    else []
+                )
+                autopkg_bin = getattr(args, "autopkg_bin", "/usr/local/bin/autopkg")
+                cmd = (
+                    [autopkg_bin, "run", self.filename, "--report-plist", report]
+                    + verbose_output
+                    + prefs_file
+                    + post_processor_cmd
+                )
+                logging.debug(f"cmd: {cmd}")
+
+                result = subprocess.run(cmd, capture_output=True, text=True)
+                if result.returncode == 0:
+                    report_info = self._parse_report(report)
+                    self.results = report_info
+                else:
+                    self.error = True
+                    self.results["failed"] = True
+                    self.results["message"] = (result.stderr or "").strip()
+                    self.results["imported"] = ""
+            except Exception as e:  # pylint: disable=broad-exception-caught
+                logging.error(f"Recipe run failed: {e}")
+                self.error = True
+                self.results["failed"] = True
+                self.results["message"] = (result.stderr or "").strip()
+                self.results["imported"] = ""
+
+        return self

autopkg_wrapper-2026.2.6/autopkg_wrapper/utils/recipe_batching.py

@@ -0,0 +1,41 @@
+from __future__ import annotations
+
+from typing import Iterable, Protocol, TypeVar
+
+
+class HasFilename(Protocol):
+    filename: str
+
+
+T = TypeVar("T", bound=HasFilename)
+
+
+def recipe_type_for(recipe: HasFilename) -> str:
+    parts = recipe.filename.split(".", 1)
+    return parts[1] if len(parts) == 2 else ""
+
+
+def build_recipe_batches(
+    recipe_list: Iterable[T], recipe_processing_order
+) -> list[list[T]]:
+    recipe_list = list(recipe_list)
+    if not recipe_list:
+        return []
+    if not recipe_processing_order:
+        return [recipe_list]
+
+    batches: list[list[T]] = []
+    current_batch: list[T] = []
+    current_type = None
+    for recipe in recipe_list:
+        r_type = recipe_type_for(recipe)
+        if current_type is None or r_type == current_type:
+            current_batch.append(recipe)
+            current_type = r_type
+            continue
+        batches.append(current_batch)
+        current_batch = [recipe]
+        current_type = r_type
+    if current_batch:
+        batches.append(current_batch)
+    return batches

{autopkg_wrapper-2026.2.5 → autopkg_wrapper-2026.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autopkg-wrapper"
-version = "2026.2.5"
+version = "2026.2.6"
 description = "A package used to execute some autopkg functions, primarily within the context of a GitHub Actions runner."
 readme = "README.md"
 requires-python = "~=3.14.0"

{autopkg_wrapper-2026.2.5 → autopkg_wrapper-2026.2.6}/tests/test_autopkg_commands.py

@@ -4,7 +4,8 @@ from pathlib import Path as RealPath
 from types import SimpleNamespace
 from unittest.mock import patch
 
-from autopkg_wrapper.autopkg_wrapper import Recipe
+from autopkg_wrapper.models.recipe import Recipe
+from autopkg_wrapper.utils.recipe_batching import build_recipe_batches
 
 
 class TestAutopkgCommands(unittest.TestCase):
@@ -14,7 +15,7 @@ class TestAutopkgCommands(unittest.TestCase):
             debug=False, autopkg_prefs=None, autopkg_bin="/custom/autopkg"
         )
 
-        with patch("autopkg_wrapper.autopkg_wrapper.subprocess.run") as run:
+        with patch("autopkg_wrapper.models.recipe.subprocess.run") as run:
             run.return_value = SimpleNamespace(returncode=0, stderr="", stdout="")
             ok = r.verify_trust_info(args)
 
@@ -30,7 +31,7 @@ class TestAutopkgCommands(unittest.TestCase):
             debug=True, autopkg_prefs=None, autopkg_bin="/usr/local/bin/autopkg"
         )
 
-        with patch("autopkg_wrapper.autopkg_wrapper.subprocess.run") as run:
+        with patch("autopkg_wrapper.models.recipe.subprocess.run") as run:
             run.return_value = SimpleNamespace(
                 returncode=1, stderr="bad trust", stdout=""
             )
@@ -43,7 +44,7 @@ class TestAutopkgCommands(unittest.TestCase):
         r = Recipe("Foo.download")
         args = SimpleNamespace(autopkg_prefs=None, autopkg_bin="/custom/autopkg")
 
-        with patch("autopkg_wrapper.autopkg_wrapper.subprocess.check_call") as cc:
+        with patch("autopkg_wrapper.models.recipe.subprocess.check_call") as cc:
             r.update_trust_info(args)
 
         called_cmd = cc.call_args.args[0]
@@ -66,8 +67,8 @@ class TestAutopkgCommands(unittest.TestCase):
                     return RealPath(td)
                 return RealPath(arg)
 
-            with patch("autopkg_wrapper.autopkg_wrapper.Path", side_effect=fake_path):
-                with patch("autopkg_wrapper.autopkg_wrapper.subprocess.run") as run:
+            with patch("autopkg_wrapper.models.recipe.Path", side_effect=fake_path):
+                with patch("autopkg_wrapper.models.recipe.subprocess.run") as run:
                     run.return_value = SimpleNamespace(
                         returncode=0, stderr="", stdout=""
                     )
@@ -84,6 +85,40 @@ class TestAutopkgCommands(unittest.TestCase):
         self.assertEqual(called_cmd[1], "run")
         self.assertIn("--report-plist", called_cmd)
 
+    def test_build_recipe_batches_without_processing_order(self):
+        recipes = [Recipe("Foo.upload.jamf"), Recipe("Foo.auto_install.jamf")]
+        batches = build_recipe_batches(
+            recipe_list=recipes, recipe_processing_order=None
+        )
+        self.assertEqual(len(batches), 1)
+        self.assertEqual(
+            [r.filename for r in batches[0]], [r.filename for r in recipes]
+        )
+
+    def test_build_recipe_batches_groups_by_type(self):
+        recipes = [
+            Recipe("Foo.upload.jamf"),
+            Recipe("Bar.upload.jamf"),
+            Recipe("Foo.auto_install.jamf"),
+            Recipe("Foo.self_service.jamf"),
+        ]
+        batches = build_recipe_batches(
+            recipe_list=recipes, recipe_processing_order=["upload", "auto_install"]
+        )
+        self.assertEqual(len(batches), 3)
+        self.assertEqual(
+            [r.filename for r in batches[0]],
+            ["Foo.upload.jamf", "Bar.upload.jamf"],
+        )
+        self.assertEqual(
+            [r.filename for r in batches[1]],
+            ["Foo.auto_install.jamf"],
+        )
+        self.assertEqual(
+            [r.filename for r in batches[2]],
+            ["Foo.self_service.jamf"],
+        )
+
 
 if __name__ == "__main__":
     unittest.main()

{autopkg_wrapper-2026.2.5 → autopkg_wrapper-2026.2.6}/uv.lock

@@ -13,7 +13,7 @@ wheels = [
 
 [[package]]
 name = "autopkg-wrapper"
-version = "2026.2.5"
+version = "2026.2.6"
 source = { editable = "." }
 dependencies = [
     { name = "chardet" },