force-release-type argument and move ReleaseArgs to models

Author: Peter-Sh

src/redis_release/bht/args.py

@@ -1,13 +1 @@
 """Arguments for release automation."""
-
-from typing import List
-
-from pydantic import BaseModel, Field
-
-
-class ReleaseArgs(BaseModel):
-    """Arguments for release execution."""
-
-    release_tag: str
-    force_rebuild: List[str] = Field(default_factory=list)
-    only_packages: List[str] = Field(default_factory=list)

src/redis_release/bht/tree.py

@@ -20,8 +20,8 @@
 
 from ..config import Config
 from ..github_client_async import GitHubClientAsync
+from ..models import ReleaseArgs
 from ..state_manager import S3StateStorage, StateManager, StateStorage
-from .args import ReleaseArgs
 from .backchain import latch_chains
 from .behaviours import NeedToPublishRelease
 from .composites import (

src/redis_release/cli.py

@@ -8,8 +8,8 @@
 import typer
 from py_trees.display import render_dot_tree, unicode_tree
 
-from redis_release.bht.args import ReleaseArgs
 from redis_release.bht.state import print_state_table
+from redis_release.models import ReleaseType
 from redis_release.state_manager import (
     InMemoryStateStorage,
     S3StateStorage,
@@ -19,6 +19,7 @@
 from .bht.tree import TreeInspector, async_tick_tock, initialize_tree_and_state
 from .config import load_config
 from .logging_config import setup_logging
+from .models import ReleaseArgs
 
 app = typer.Typer(
     name="redis-release",
@@ -101,6 +102,11 @@ def release(
     tree_cutoff: int = typer.Option(
         2000, "--tree-cutoff", "-m", help="Max number of ticks to run the tree for"
     ),
+    force_release_type: Optional[ReleaseType] = typer.Option(
+        None,
+        "--force-release-type",
+        help="Force release type (public or internal)",
+    ),
 ) -> None:
     """Run release using behaviour tree implementation."""
     setup_logging()
@@ -112,6 +118,7 @@ def release(
         release_tag=release_tag,
         force_rebuild=force_rebuild or [],
         only_packages=only_packages or [],
+        force_release_type=force_release_type,
     )
 
     # Use context manager version with automatic lock management

src/redis_release/models.py

@@ -2,7 +2,7 @@
 
 import re
 from enum import Enum
-from typing import Optional
+from typing import List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -151,3 +151,12 @@ def __lt__(self, other: "RedisVersion") -> bool:
             return True
 
         return self.suffix < other.suffix
+
+
+class ReleaseArgs(BaseModel):
+    """Arguments for release execution."""
+
+    release_tag: str
+    force_rebuild: List[str] = Field(default_factory=list)
+    only_packages: List[str] = Field(default_factory=list)
+    force_release_type: Optional[ReleaseType] = None

src/redis_release/state_manager.py

@@ -11,11 +11,11 @@
 from botocore.exceptions import ClientError, NoCredentialsError
 from rich.pretty import pretty_repr
 
-from redis_release.bht.args import ReleaseArgs
 from redis_release.bht.state import ReleaseState, logger, print_state_table
 from redis_release.config import Config
 
 from .bht.state import ReleaseState
+from .models import ReleaseArgs
 
 logger = logging.getLogger(__name__)
 
@@ -227,6 +227,10 @@ def apply_args(self, state: ReleaseState) -> None:
                     if package_name in state.packages:
                         state.packages[package_name].meta.ephemeral.force_rebuild = True
 
+            if self.args.force_release_type:
+                logger.info(f"Force release type: {self.args.force_release_type}")
+                state.meta.release_type = self.args.force_release_type
+
     def load(self) -> Optional[ReleaseState]:
         """Load state from storage backend."""
         state_data = self.storage.get(self.tag)

src/tests/test_state.py

@@ -5,10 +5,9 @@
 
 import pytest
 
-from redis_release.bht.args import ReleaseArgs
 from redis_release.bht.state import ReleaseState, Workflow
 from redis_release.config import Config, PackageConfig
-from redis_release.models import PackageType
+from redis_release.models import PackageType, ReleaseArgs
 from redis_release.state_manager import InMemoryStateStorage, StateManager