Extract service layer from BakeryConfig

posit-bakery/posit_bakery/ci.py

@@ -0,0 +1,134 @@
+import glob
+import logging
+from enum import Enum
+from pathlib import Path
+
+from posit_bakery.config.image.build_os import DEFAULT_PLATFORMS
+from posit_bakery.image.image_target import ImageTarget
+from posit_bakery.plugins.protocol import ToolCallResult
+
+log = logging.getLogger(__name__)
+
+
+class CIMatrixField(str, Enum):
+    VERSION = "version"
+    DEV = "dev"
+    PLATFORM = "platform"
+
+
+def ci_matrix(
+    targets: list[ImageTarget],
+    exclude: list[CIMatrixField] | None = None,
+) -> list[dict]:
+    """Build a CI matrix from resolved image targets.
+
+    The matrix is deduplicated by (image, version, platform) — variants and OS
+    entries are not separate matrix dimensions since those are resolved at build
+    time.
+
+    :param targets: Image targets to include in the matrix.
+    :param exclude: Fields to omit from each matrix entry.
+    :return: A list of dicts, one per unique (image, version, platform) combination.
+    """
+    if exclude is None:
+        exclude = []
+
+    seen: set[tuple] = set()
+    data = []
+    for target in targets:
+        version_name = target.image_version.name
+        is_dev = target.image_version.isDevelopmentVersion
+        platforms = target.image_os.platforms if target.image_os else DEFAULT_PLATFORMS
+
+        if CIMatrixField.PLATFORM not in exclude:
+            for platform in platforms:
+                key = (target.image_name, version_name, platform)
+                if key in seen:
+                    continue
+                seen.add(key)
+
+                entry = {"image": target.image_name}
+                if CIMatrixField.VERSION not in exclude:
+                    entry["version"] = version_name
+                if CIMatrixField.DEV not in exclude:
+                    entry["dev"] = is_dev
+                entry["platform"] = platform
+                data.append(entry)
+        else:
+            key = (target.image_name, version_name)
+            if key in seen:
+                continue
+            seen.add(key)
+
+            entry = {"image": target.image_name}
+            if CIMatrixField.VERSION not in exclude:
+                entry["version"] = version_name
+            if CIMatrixField.DEV not in exclude:
+                entry["dev"] = is_dev
+            data.append(entry)
+
+    return data
+
+
+def resolve_metadata_globs(metadata_files: list[Path]) -> list[Path]:
+    """Resolve glob patterns in metadata file paths.
+
+    :param metadata_files: Paths that may contain glob patterns.
+    :return: Resolved absolute paths.
+    """
+    resolved: list[Path] = []
+    for file in metadata_files:
+        if "*" in str(file) or "?" in str(file) or "[" in str(file):
+            resolved.extend(sorted(Path(x).absolute() for x in glob.glob(str(file))))
+        else:
+            resolved.append(file.absolute())
+    return resolved
+
+
+def ci_merge(
+    base_path: Path,
+    targets: list[ImageTarget],
+    metadata_files: list[Path],
+    load_metadata: callable,
+    dry_run: bool = False,
+) -> list[ToolCallResult]:
+    """Merge platform-specific builds into multi-platform manifests.
+
+    :param base_path: Root path of the bakery project.
+    :param targets: Resolved image targets with metadata loaded.
+    :param metadata_files: Paths to build metadata JSON files.
+    :param load_metadata: Callable that loads metadata from a file path,
+        returning a list of loaded target UIDs. Typically
+        BakeryConfig.load_build_metadata_from_file.
+    :param dry_run: If True, do not push merged images.
+    :return: List of tool call results from the merge operation.
+    :raises RuntimeError: If any metadata files fail to load.
+    """
+    resolved_files = resolve_metadata_globs(metadata_files)
+
+    log.info(f"Reading targets from {', '.join(f.name for f in resolved_files)}")
+
+    errors = []
+    loaded_targets: list[str] = []
+    for file in resolved_files:
+        try:
+            loaded_targets.extend(load_metadata(file))
+        except Exception as e:
+            log.error(f"Failed to load metadata from file '{file}'")
+            log.error(str(e))
+            errors.append(e)
+    loaded_targets = list(set(loaded_targets))
+
+    if errors:
+        raise RuntimeError("One or more metadata files are invalid, aborting merge.")
+
+    log.info(f"Found {len(loaded_targets)} targets")
+    log.debug(", ".join(loaded_targets))
+
+    from posit_bakery.plugins.registry import get_plugin
+
+    oras = get_plugin("oras")
+    results = oras.execute(base_path, targets, dry_run=dry_run)
+    oras.results(results)
+
+    return results

posit-bakery/posit_bakery/cli/build.py

@@ -13,6 +13,8 @@
 from posit_bakery.const import DevVersionInclusionEnum, MatrixVersionInclusionEnum
 from posit_bakery.error import BakeryBuildErrorGroup, BakeryToolRuntimeError
 from posit_bakery.image import ImageBuildStrategy
+from posit_bakery.image.bake.bake import BakePlan
+from posit_bakery.image.build import build_targets
 from posit_bakery.log import stderr_console, stdout_console
 from posit_bakery.util import auto_path
 
@@ -229,11 +231,14 @@ def build(
                 style="error",
             )
             raise typer.Exit(code=1)
-        stdout_console.print_json(config.bake_plan_targets(push=push))
+        bake_plan = BakePlan.from_image_targets(context=config.base_path, image_targets=config.targets, push=push)
+        stdout_console.print_json(bake_plan.model_dump_json(indent=2, exclude_none=True, by_alias=True))
         raise typer.Exit(code=0)
 
     try:
-        config.build_targets(
+        build_targets(
+            targets=config.targets,
+            base_path=config.base_path,
             load=load,
             push=push,
             pull=pull,
@@ -243,6 +248,8 @@ def build(
             fail_fast=fail_fast,
             retry=retry,
             metadata_file=metadata_file,
+            temp_registry=config.settings.temp_registry,
+            clean_temporary=config.settings.clean_temporary,
         )
     except BakeryBuildErrorGroup as e:
         stderr_console.print(str(e))

posit-bakery/posit_bakery/cli/ci.py

@@ -1,4 +1,3 @@
-import glob
 import json
 import logging
 import python_on_whales
@@ -8,9 +7,10 @@
 
 import typer
 
+from posit_bakery.ci import CIMatrixField, ci_matrix, ci_merge
 from posit_bakery.cli.common import with_verbosity_flags
 from posit_bakery.config import BakeryConfig
-from posit_bakery.config.config import BakerySettings, BakeryConfigFilter, version_matches
+from posit_bakery.config.config import BakerySettings, BakeryConfigFilter
 from posit_bakery.config.image.posit_product.const import ReleaseStreamEnum
 from posit_bakery.const import DevVersionInclusionEnum, MatrixVersionInclusionEnum
 from posit_bakery.log import stderr_console, stdout_console
@@ -27,12 +27,6 @@ class RichHelpPanelEnum(str, Enum):
     FILTERS = "Filters"
 
 
-class BakeryCIMatrixFieldEnum(str, Enum):
-    VERSION = "version"
-    DEV = "dev"
-    PLATFORM = "platform"
-
-
 @app.command()
 @with_verbosity_flags
 def matrix(
@@ -66,7 +60,7 @@ def matrix(
         ),
     ] = None,
     exclude: Annotated[
-        Optional[list[BakeryCIMatrixFieldEnum]],
+        Optional[list[CIMatrixField]],
         typer.Option(help="Fields to exclude splitting the matrix by."),
     ] = None,
     context: Annotated[
@@ -102,42 +96,19 @@ def matrix(
 
     try:
         settings = BakerySettings(
-            filter=BakeryConfigFilter(image_name=image_name),
+            filter=BakeryConfigFilter(image_name=image_name, image_version=image_version),
             dev_versions=dev_versions,
             dev_stream=dev_stream,
+            matrix_versions=matrix_versions,
         )
-        c = BakeryConfig.from_context(context=context, settings=settings)
-        images = [i for i in c.model.images]
+        config = BakeryConfig.from_context(context=context, settings=settings)
+        # BakeryConfigFilter.image_name uses regex; ci matrix uses exact match so
+        # CI dispatch can't fan out to overlapping image names (e.g. "connect"
+        # matching "connect-content").
+        targets = config.targets
         if image_name is not None:
-            images = [i for i in images if i.name == image_name]
-
-        data = []
-        for img in images:
-            entry = {"image": img.name}
-            versions = img.versions
-            if (img.matrix is None and matrix_versions == MatrixVersionInclusionEnum.ONLY) or (
-                img.matrix is not None and matrix_versions == MatrixVersionInclusionEnum.EXCLUDE
-            ):
-                continue
-            elif img.matrix is not None and matrix_versions != MatrixVersionInclusionEnum.EXCLUDE:
-                versions = img.matrix.to_image_versions()
-            for ver in versions:
-                included, _ = ver.matches_dev_filter(dev_versions, dev_stream)
-                if not included:
-                    continue
-                if image_version is not None and not version_matches(ver.name, image_version):
-                    continue
-
-                if BakeryCIMatrixFieldEnum.VERSION not in exclude:
-                    entry["version"] = ver.name
-                if BakeryCIMatrixFieldEnum.DEV not in exclude:
-                    entry["dev"] = ver.isDevelopmentVersion
-                if BakeryCIMatrixFieldEnum.PLATFORM not in exclude:
-                    for platform in ver.supported_platforms:
-                        entry["platform"] = platform
-                        data.append(entry.copy())
-                else:
-                    data.append(entry.copy())
+            targets = [t for t in targets if t.image_name == image_name]
+        data = ci_matrix(targets, exclude=exclude)
 
         if image_version is not None and not data:
             log.error(f"No matrix entries matched --image-version '{image_version}'")
@@ -202,42 +173,18 @@ def merge(
     )
     config: BakeryConfig = BakeryConfig.from_context(context, settings)
 
-    # Resolve glob patterns in metadata_file arguments
-    resolved_files: list[Path] = []
-    for file in metadata_file:
-        if "*" in str(file) or "?" in str(file) or "[" in str(file):
-            resolved_files.extend(sorted(Path(x).absolute() for x in glob.glob(str(file))))
-        else:
-            resolved_files.append(file.absolute())
-    metadata_file = resolved_files
-
-    log.info(f"Reading targets from {', '.join(f.name for f in metadata_file)}")
-
-    files_ok = True
-    loaded_targets: list[str] = []
-    for file in metadata_file:
-        try:
-            loaded_targets.extend(config.load_build_metadata_from_file(file))
-        except Exception as e:
-            log.error(f"Failed to load metadata from file '{file}'")
-            log.error(str(e))
-            files_ok = False
-    loaded_targets = list(set(loaded_targets))  # Deduplicate targets in case of overlap across files
-
-    if not files_ok:
-        log.error("One or more metadata files are invalid, aborting merge.")
+    try:
+        results = ci_merge(
+            base_path=config.base_path,
+            targets=config.targets,
+            metadata_files=metadata_file,
+            load_metadata=config.load_build_metadata_from_file,
+            dry_run=dry_run,
+        )
+    except RuntimeError as e:
+        log.error(str(e))
         raise typer.Exit(code=1)
 
-    log.info(f"Found {len(loaded_targets)} targets")
-    log.debug(", ".join(loaded_targets))
-
-    # Imported locally for patching in CLI tests
-    from posit_bakery.plugins.registry import get_plugin
-
-    oras = get_plugin("oras")
-    results = oras.execute(config.base_path, config.targets, dry_run=dry_run)
-
-    # CI-specific: verify final manifests with imagetools inspect
     if not dry_run:
         for result in results:
             if result.exit_code == 0 and result.artifacts:
@@ -246,8 +193,6 @@ def merge(
                     manifest = python_on_whales.docker.buildx.imagetools.inspect(workflow_result.destinations[0])
                     stdout_console.print_json(manifest.model_dump_json(indent=2, exclude_unset=True, exclude_none=True))
 
-    oras.results(results)
-
 
 @app.command()
 @with_verbosity_flags

posit-bakery/posit_bakery/cli/clean.py

@@ -11,6 +11,8 @@
 from posit_bakery.config.config import BakerySettings, BakeryConfigFilter
 from posit_bakery.config.image.posit_product.const import ReleaseStreamEnum
 from posit_bakery.const import DevVersionInclusionEnum, MatrixVersionInclusionEnum
+from posit_bakery.registry_management.clean import clean_caches as do_clean_caches
+from posit_bakery.registry_management.clean import clean_temporary as do_clean_temporary
 from posit_bakery.util import auto_path
 
 app = typer.Typer()
@@ -106,7 +108,8 @@ def cache_registry(
 
     log.info(f"Cleaning cache registries in {registry}")
 
-    errors = config.clean_caches(
+    errors = do_clean_caches(
+        targets=config.targets,
         remove_untagged=untagged,
         remove_older_than=timedelta(days=older_than) if older_than else None,
         dry_run=dry_run,
@@ -199,7 +202,8 @@ def temp_registry(
 
     log.info(f"Cleaning temporary registries in {registry}")
 
-    errors = config.clean_temporary(
+    errors = do_clean_temporary(
+        targets=config.targets,
         remove_untagged=untagged,
         remove_older_than=timedelta(days=older_than) if older_than else None,
         dry_run=dry_run,