Merge pull request #567 from posit-dev/positron-init-preview-stream

Add dependency-backed dev version and Positron daily channel

Author: bschwedler

posit-bakery/docs/configuration.qmd

@@ -173,6 +173,7 @@ An Image represents a container image managed by the project. Each image has one
 | `versions`<br/>*[ImageVersion](#imageversion) array*                                    | The list of versions for the image. Each version should have its own directory under the image's `subpath`. Cannot be used with `matrix`. | `[]`                                      | `- name: 2025.07.0`                                                                                   |
 | `matrix`<br/>*[ImageMatrix](#imagematrix)*                                              | A matrix configuration for generating multiple image versions from dependency combinations. Cannot be used with `versions`.               |                                           | See [ImageMatrix](#imagematrix)                                                                       |
 | `options`<br/>*[ToolOptions](#tooloptions) array*                                       | A list of options to pass to a supported tool when performing an action against the image.                                                | `[]`                                      | <pre>- tool: goss<br/>  wait: 10<br/>  command: "my-custom command"</pre>                             |
+| `devVersions`<br/>*[ImageDevelopmentVersion](#imagedevelopmentversion) array*           | Ephemeral versions resolved at build time from a product channel or dependency prerelease. Built when `--dev-versions include` or `--dev-versions only` is passed. | `[]` | See [ImageDevelopmentVersion](#imagedevelopmentversion) |
 
 #### Example Image
 
@@ -232,6 +233,83 @@ images:
             tagDisplayName: ubuntu22.04
 ```
 
+### ImageDevelopmentVersion
+
+An `ImageDevelopmentVersion` defines an ephemeral version resolved at build time. Unlike static `versions`, it is not stored on disk — Bakery fetches the version string (and optionally download URLs) from an external source each time a dev build runs. Development versions are included when `--dev-versions include` or `--dev-versions only` is passed to `bakery build` or `bakery ci matrix`.
+
+Each entry carries a `sourceType` discriminator that selects the resolution strategy.
+
+**Common fields** (all sourceTypes):
+
+| Field                                                                                    | Description                                                                                                                         | Default | Example                           |
+|------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------|---------|-----------------------------------|
+| `sourceType`<br/>*string*                                                                | *(Required)* Resolution strategy. `"stream"` resolves from a product release channel; `"dependency"` resolves from a dependency prerelease. | | `stream`, `dependency` |
+| `os`<br/>*[ImageVersionOS](#imageversionos) array*                                       | Operating systems to build for.                                                                                                     | `[]`    | `- name: Ubuntu 24.04`            |
+| `extraRegistries`<br/>*[Registry](#registry) or [BaseRegistry](#baseregistry) array*    | Additional registries to push this dev version to. Cannot be set alongside `overrideRegistries`.                                   | `[]`    |                                   |
+| `overrideRegistries`<br/>*[Registry](#registry) or [BaseRegistry](#baseregistry) array* | Replaces all inherited registries for this dev version. Cannot be set alongside `extraRegistries`.                                 | `[]`    |                                   |
+| `values`<br/>*map[string, string]*                                                       | Arbitrary key-value pairs passed to Jinja2 templates when rendering this dev version.                                               | `{}`    | `POSITRON_CHANNEL: dailies`       |
+
+#### `sourceType: stream` — Product Channel
+
+Resolves the version from a Posit product release channel. The artifact download URL is fetched from the channel's CDN and injected into the Containerfile template.
+
+| Field                      | Description                                          | Example                                              |
+|----------------------------|------------------------------------------------------|------------------------------------------------------|
+| `product`<br/>*string*     | *(Required)* The Posit product ID.                   | `workbench`, `workbench-session`, `connect`, `package-manager` |
+| `channel`<br/>*string*     | *(Required)* The release channel.                    | `daily`, `preview`                                   |
+
+**Example:**
+
+```yaml
+devVersions:
+  - sourceType: stream
+    product: workbench
+    channel: daily
+    overrideRegistries:
+      - host: ghcr.io
+        namespace: posit-dev
+        repository: workbench-preview
+    os:
+      - name: Ubuntu 24.04
+        primary: true
+        platforms:
+          - linux/amd64
+          - linux/arm64
+      - name: Ubuntu 22.04
+```
+
+#### `sourceType: dependency` — Dependency Prerelease
+
+Resolves the version via the dependency constraint system rather than a product channel. The Containerfile template is responsible for constructing the download URL from `Image.Version` and any `values` passed.
+
+| Field                       | Description                                                                                                           | Default | Example    |
+|-----------------------------|-----------------------------------------------------------------------------------------------------------------------|---------|------------|
+| `dependency`<br/>*string*   | *(Required)* The dependency to resolve a version for. Must be a supported dependency type.                            |         | `positron` |
+| `prerelease`<br/>*bool*     | When `true`, includes the dependency's prerelease channel in version resolution.                                      | `false` | `true`     |
+| `channel`<br/>*string*      | The release channel for this dev version. Populates the `{{ Channel }}` tag variable. Omit for stable dependency resolution. `"release"` is not accepted. | *(none)* | `daily`, `preview` |
+
+**Example:**
+
+```yaml
+devVersions:
+  - sourceType: dependency
+    dependency: positron
+    prerelease: true
+    channel: daily
+    values:
+      POSITRON_CHANNEL: dailies
+    overrideRegistries:
+      - host: ghcr.io
+        namespace: posit-dev
+        repository: workbench-positron-init-preview
+    os:
+      - name: Ubuntu 24.04
+        primary: true
+        platforms:
+          - linux/amd64
+          - linux/arm64
+```
+
 ### ImageVariant
 
 An ImageVariant represents a variant of an image, such as standard or minimal builds. Each variant is expected have its
@@ -329,8 +407,8 @@ At the image level, these are specified through a VersionConstraint.
 | `constraint`<br/>*[VersionConstraint](#versionconstraint)* | *(Required)* Constraints to apply to calculate versions. |               | <pre>latest: true<br/>count: 2</pre> |
 
 ::: {.callout-note}
-The `quarto` dependency type supports an additional `prerelease` field (default: `false`).
-When `true`, prerelease versions of Quarto are included in the version calculation.
+The `quarto` and `positron` dependency types support an additional `prerelease` field (default: `false`).
+When `true`, prerelease versions are included in the version calculation.
 :::
 
 Each Dependency defines the dependency type, as well as the versions of the dependency that will be installed.

posit-bakery/posit_bakery/cli/ci.py

@@ -224,6 +224,10 @@ def merge(
     Preserved for back-compat. New callers should prefer `bakery ci publish`.
     SOCI conversion is driven by per-image/variant `soci` options.
     """
+    if dev_stream is not None:
+        log.warning("--dev-stream is deprecated, use --dev-channel instead.")
+        if dev_channel is None:
+            dev_channel = dev_stream
     publish(
         metadata_file=metadata_file,
         context=context,

posit-bakery/posit_bakery/config/dependencies/const.py

@@ -24,6 +24,8 @@
 # All available Positron releases for Workbench
 # The URL contains an architecture segment (x86_64 or arm64).
 POSITRON_RELEASES_URL_TEMPLATE = "https://cdn.posit.co/positron/releases/pwb/{arch}/all-releases.json"
+# Latest Positron daily build for Workbench
+POSITRON_DAILY_URL_TEMPLATE = "https://cdn.posit.co/positron/dailies/pwb/{arch}/releases.json"
 
 
 @yaml_object(yaml)

posit-bakery/posit_bakery/config/dependencies/positron.py

@@ -1,11 +1,11 @@
 import abc
-from typing import Literal, ClassVar
+from typing import Annotated, Literal, ClassVar
 
-from pydantic import ConfigDict
+from pydantic import ConfigDict, Field
 
 from posit_bakery.config.shared import BakeryYAMLModel
 from posit_bakery.util import cached_session
-from .const import POSITRON_RELEASES_URL_TEMPLATE, SupportedDependencies
+from .const import POSITRON_DAILY_URL_TEMPLATE, POSITRON_RELEASES_URL_TEMPLATE, SupportedDependencies
 from .dependency import DependencyVersions, DependencyConstraint
 from .version import DependencyVersion
 
@@ -21,6 +21,14 @@ class PositronDependency(BakeryYAMLModel, abc.ABC):
 
     dependency: Literal[SupportedDependencies.POSITRON] = SupportedDependencies.POSITRON
 
+    prerelease: Annotated[
+        bool,
+        Field(
+            default=False,
+            description="Whether to include the latest daily build.",
+        ),
+    ]
+
     @staticmethod
     def releases_url(target_arch: str = _DEFAULT_ARCH) -> str:
         """Return the releases URL for a given TARGETARCH value.
@@ -31,6 +39,16 @@ def releases_url(target_arch: str = _DEFAULT_ARCH) -> str:
         arch = _ARCH_MAP[target_arch]
         return POSITRON_RELEASES_URL_TEMPLATE.format(arch=arch)
 
+    @staticmethod
+    def daily_url(target_arch: str = _DEFAULT_ARCH) -> str:
+        """Return the daily CDN URL for a given TARGETARCH value.
+
+        :param target_arch: Docker TARGETARCH value (amd64 or arm64).
+        :return: The fully-qualified daily releases URL.
+        """
+        arch = _ARCH_MAP[target_arch]
+        return POSITRON_DAILY_URL_TEMPLATE.format(arch=arch)
+
     def _fetch_versions(self) -> list[DependencyVersion]:
         """Fetch available Positron versions from Posit CDN.
 
@@ -48,7 +66,13 @@ def _fetch_versions(self) -> list[DependencyVersion]:
         releases = response.json().get("releases", [])
         versions = [DependencyVersion(r["version"]) for r in releases]
 
-        return sorted(versions, reverse=True)
+        if self.prerelease:
+            response = session.get(self.daily_url())
+            response.raise_for_status()
+            data = response.json()
+            versions.append(DependencyVersion(data["version"]))
+
+        return sorted(set(versions), reverse=True)
 
     def available_versions(self) -> list[DependencyVersion]:
         """Return a list of available Positron versions.

posit-bakery/posit_bakery/config/image/dev_version/__init__.py

@@ -1,13 +1,22 @@
+from typing import Annotated, Union
+
+from pydantic import Field
+
 from .base import BaseImageDevelopmentVersion
 from .channel import ImageDevelopmentVersionFromProductChannel
+from .dependency import ImageDevelopmentVersionFromDependency
 
-DevelopmentVersionTypes = ImageDevelopmentVersionFromProductChannel
-DevelopmentVersionField = ImageDevelopmentVersionFromProductChannel
+DevelopmentVersionTypes = Union[
+    ImageDevelopmentVersionFromProductChannel,
+    ImageDevelopmentVersionFromDependency,
+]
+DevelopmentVersionField = Annotated[DevelopmentVersionTypes, Field(discriminator="sourceType")]
 
 
 __all__ = [
     "BaseImageDevelopmentVersion",
     "ImageDevelopmentVersionFromProductChannel",
+    "ImageDevelopmentVersionFromDependency",
     "DevelopmentVersionTypes",
     "DevelopmentVersionField",
 ]

posit-bakery/posit_bakery/config/image/dev_version/dependency.py

@@ -0,0 +1,66 @@
+from typing import Annotated, Literal
+
+from pydantic import Field, field_validator
+
+from posit_bakery.config.dependencies import get_dependency_constraint_class
+from posit_bakery.config.dependencies.const import SupportedDependencies
+from posit_bakery.config.dependencies.version import VersionConstraint
+from posit_bakery.config.image.dev_version.base import BaseImageDevelopmentVersion
+from posit_bakery.config.image.posit_product.const import ReleaseChannelEnum
+from posit_bakery.config.image.version_os import ImageVersionOS
+
+
+class ImageDevelopmentVersionFromDependency(BaseImageDevelopmentVersion):
+    """Dev version sourced from a dependency constraint.
+
+    When ``prerelease=True``, the dependency's prerelease channel is resolved.
+    Version resolution delegates entirely to the dependency module; the
+    Containerfile template is responsible for constructing the download URL
+    from ``Image.Version`` and any values passed via the ``values`` field.
+    """
+
+    sourceType: Literal["dependency"] = "dependency"
+    dependency: Annotated[
+        SupportedDependencies,
+        Field(description="The dependency to resolve a version for."),
+    ]
+    prerelease: Annotated[
+        bool,
+        Field(default=False, description="Whether to resolve the dependency's prerelease channel."),
+    ] = False
+    channel: Annotated[
+        ReleaseChannelEnum | None,
+        Field(default=None, description="Release channel for this dev version (e.g. 'daily', 'preview')."),
+    ] = None
+
+    @field_validator("channel", mode="after")
+    @classmethod
+    def channel_not_release(cls, v: ReleaseChannelEnum | None) -> ReleaseChannelEnum | None:
+        if v == ReleaseChannelEnum.RELEASE:
+            raise ValueError(
+                "channel: 'release' is not valid for dependency-sourced dev versions. "
+                "Omit channel (leave as null) for stable dependency resolution."
+            )
+        return v
+
+    def get_version(self) -> str:
+        constraint_class = get_dependency_constraint_class(self.dependency)
+        constraint = constraint_class(
+            prerelease=self.prerelease,
+            constraint=VersionConstraint(latest=True, count=1),
+        )
+        result = constraint.resolve_versions()
+        return str(result.versions[0])
+
+    def get_url_by_os(self, generalize_architecture: bool = False) -> dict[str, str]:
+        return {}
+
+    def _resolve_os_urls(self) -> list[ImageVersionOS]:
+        # URL construction is handled by the Containerfile template via values.
+        return list(self.os)
+
+    def get_release_channel(self) -> ReleaseChannelEnum | None:
+        return self.channel
+
+    def __repr__(self):
+        return f'devVersion(sourceType="dependency", dependency="{self.dependency}", prerelease={self.prerelease})'

posit-bakery/test/cli/conftest.py

@@ -11,6 +11,16 @@
 from test.helpers import remove_images
 
 
+def settings_from_call(mock):
+    """Extract BakerySettings from a mocked BakeryConfig.from_context call.
+
+    Handles both positional (from_context(context, settings)) and keyword
+    (from_context(context=context, settings=settings)) calling conventions.
+    """
+    args, kwargs = mock.from_context.call_args
+    return kwargs.get("settings", args[1] if len(args) > 1 else None)
+
+
 @pytest.fixture(scope="session")
 def ci_testdata():
     """Return the path to the CI test data directory"""

posit-bakery/test/cli/test_dev_spec.py

@@ -8,21 +8,12 @@
 from posit_bakery.cli.main import app
 from posit_bakery.config.image.dev_version.spec import DevBuildSpec
 from posit_bakery.config.image.posit_product.const import ReleaseChannelEnum
+from test.cli.conftest import settings_from_call
 
 runner = CliRunner()
 BASIC_CONTEXT = str(Path(__file__).parent.parent / "resources" / "basic")
 
 
-def _settings_from_call(mock):
-    """Extract the BakerySettings passed to BakeryConfig.from_context.
-
-    Handles both positional (build.py: from_context(context, settings))
-    and keyword (ci.py: from_context(context=context, settings=settings)) calls.
-    """
-    args, kwargs = mock.from_context.call_args
-    return kwargs.get("settings", args[1] if len(args) > 1 else None)
-
-
 class TestBuildDevSpec:
     def test_dev_spec_via_flag(self):
         """--dev-spec JSON is parsed and forwarded to BakerySettings."""
@@ -43,7 +34,7 @@ def test_dev_spec_via_flag(self):
                 catch_exceptions=False,
             )
         assert result.exit_code == 0, result.output
-        settings = _settings_from_call(mock)
+        settings = settings_from_call(mock)
         assert isinstance(settings.dev_spec, DevBuildSpec)
         assert settings.dev_spec.version == "2026.05.0-dev+185-gSHA"
         assert settings.dev_spec.channel == ReleaseChannelEnum.DAILY
@@ -60,7 +51,7 @@ def test_dev_spec_via_env_var(self):
                 catch_exceptions=False,
             )
         assert result.exit_code == 0, result.output
-        settings = _settings_from_call(mock)
+        settings = settings_from_call(mock)
         assert isinstance(settings.dev_spec, DevBuildSpec)
         assert settings.dev_spec.version == "2026.05.0-dev+185-gSHA"
         assert settings.dev_spec.channel is None
@@ -102,7 +93,7 @@ def test_dev_spec_absent_is_none(self):
                 catch_exceptions=False,
             )
         assert result.exit_code == 0, result.output
-        settings = _settings_from_call(mock)
+        settings = settings_from_call(mock)
         assert settings.dev_spec is None
 
 
@@ -128,7 +119,7 @@ def test_dev_spec_via_flag(self):
                 catch_exceptions=False,
             )
         assert result.exit_code == 0, result.output
-        settings = _settings_from_call(mock)
+        settings = settings_from_call(mock)
         assert isinstance(settings.dev_spec, DevBuildSpec)
         assert settings.dev_spec.version == "2026.05.0-dev+185-gSHA"
         assert settings.dev_spec.channel == ReleaseChannelEnum.DAILY
@@ -146,7 +137,7 @@ def test_dev_spec_via_env_var(self):
                 catch_exceptions=False,
             )
         assert result.exit_code == 0, result.output
-        settings = _settings_from_call(mock)
+        settings = settings_from_call(mock)
         assert isinstance(settings.dev_spec, DevBuildSpec)
         assert settings.dev_spec.version == "2026.05.0-dev+185-gSHA"
         assert settings.dev_spec.channel is None
@@ -190,5 +181,5 @@ def test_dev_spec_absent_is_none(self):
                 catch_exceptions=False,
             )
         assert result.exit_code == 0, result.output
-        settings = _settings_from_call(mock)
+        settings = settings_from_call(mock)
         assert settings.dev_spec is None