gflow-cli 0.6.0a3__tar.gz → 0.6.0a4__tar.gz

{gflow_cli-0.6.0a3 → gflow_cli-0.6.0a4}/CHANGELOG.md

@@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.0a4] — 2026-05-17
+
+> **Unified output resolution + batch orchestration refactor.** This release
+> aligns the CLI output structure across all commands and refactors the batch
+> runner to be more generic, preparing the codebase for Phase 6.
+
+### Added
+
+- **`resolve_batch_output_dir` helper** in `paths.py` — centralizes the
+  date-partitioned output directory logic used by all generation commands.
+- **`parse_batch_item_dict` helper** in `image_batch.py` — deduplicates JSON
+  prompt validation between `gflow run` and other batch sources.
+
+### Changed
+
+- **`gflow run` output directory** — now defaults to date-partitioned
+  `$GFLOW_CLI_OUTPUT_DIR/images/<YYYY-MM-DD>/` instead of the legacy
+  `out/<UTC-timestamp>/`, matching the `gflow image` convention.
+- **Refactored `run_image_batch`** into a generic `run_sequential_batch`
+  orchestrator — now accepts a swappable worker callback, allowing for uniform
+  video and image batch handling in the future.
+
+### Fixed
+
+- Removed ~80 lines of duplicate validation logic from `cli_run.py`.
+- Corrected test imports and expectations for unified output resolution.
+
 ## [0.6.0a3] — 2026-05-17
 
 > **Deterministic timeouts + agent-friendly exit codes.** This release hardens

{gflow_cli-0.6.0a3 → gflow_cli-0.6.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gflow-cli
-Version: 0.6.0a3
+Version: 0.6.0a4
 Summary: Unofficial CLI for Google Flow — drive Veo image-to-video generations from the terminal.
 Project-URL: Homepage, https://github.com/ffroliva/gflow-cli
 Project-URL: Issues, https://github.com/ffroliva/gflow-cli/issues

{gflow_cli-0.6.0a3 → gflow_cli-0.6.0a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gflow-cli"
-version = "0.6.0a3"
+version = "0.6.0a4"
 description = "Unofficial CLI for Google Flow — drive Veo image-to-video generations from the terminal."
 readme = "README.md"
 license = { file = "LICENSE" }

{gflow_cli-0.6.0a3 → gflow_cli-0.6.0a4}/src/gflow_cli/__init__.py

@@ -1,3 +1,3 @@
 """gflow-cli — unofficial CLI for Google Flow."""
 
-__version__ = "0.6.0a3"
+__version__ = "0.6.0a4"

{gflow_cli-0.6.0a3 → gflow_cli-0.6.0a4}/src/gflow_cli/cli_image.py

@@ -60,13 +60,12 @@ from gflow_cli.image_batch import (
     prompt_items_from_texts,
     read_prompt_file,
     render_image_batch_summary,
-    resolve_t2i_batch_output_dir,
     run_image_batch,
 )
 from gflow_cli.image_batch import (
     MIN_COUNT as _MIN_COUNT,
 )
-from gflow_cli.paths import image_output_path
+from gflow_cli.paths import image_output_path, resolve_batch_output_dir
 
 # Case-insensitive 8-4-4-4-12 hex with hyphens — Flow's media UUIDs.
 # When a `--ref` value matches this regex it's treated as an already-uploaded
@@ -417,7 +416,9 @@ def t2i(
     profile_name = _resolve_profile(profile)
     provider_dir = _make_provider_dir(profile_name)
     settings = get_settings()
-    output_dir = resolve_t2i_batch_output_dir(out=out, output_root=settings.output_dir)
+    output_dir = resolve_batch_output_dir(
+        cli_override=out, output_root=settings.output_dir, kind="images"
+    )
     console.print(
         f"\n[bold]gflow image t2i[/bold] · profile=[bold]{profile_name}[/bold] "
         f"· {len(batch_prompts)} prompt(s) · up to {len(batch_prompts) * count} image(s)"

{gflow_cli-0.6.0a3 → gflow_cli-0.6.0a4}/src/gflow_cli/cli_run.py

@@ -15,7 +15,6 @@ from __future__ import annotations
 import asyncio
 import json
 import sys
-import time
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, cast
@@ -29,45 +28,16 @@ from gflow_cli.api.transports import EXPERIMENTAL_TRANSPORTS
 from gflow_cli.config import get_settings
 from gflow_cli.errors import ConfigurationError
 from gflow_cli.image_batch import (
-    ALLOWED_ASPECT_RATIOS as _ALLOWED_ASPECT_RATIOS,
-)
-from gflow_cli.image_batch import (
-    ALLOWED_MODELS as _ALLOWED_MODELS,
-)
-from gflow_cli.image_batch import (
-    DEFAULT_ASPECT_RATIO as _DEFAULT_ASPECT_RATIO,
-)
-from gflow_cli.image_batch import (
-    DEFAULT_COUNT as _DEFAULT_COUNT,
-)
-from gflow_cli.image_batch import (
-    DEFAULT_MODEL as _DEFAULT_MODEL,
-)
-from gflow_cli.image_batch import (
-    MAX_COUNT as _MAX_COUNT,
-)
-from gflow_cli.image_batch import (
-    MAX_PROMPTS as _MAX_PROMPTS,
-)
-from gflow_cli.image_batch import (
-    MAX_TEXT_LEN as _MAX_TEXT_LEN,
-)
-from gflow_cli.image_batch import (
-    MIN_COUNT as _MIN_COUNT,
-)
-from gflow_cli.image_batch import (
-    MIN_PROMPTS as _MIN_PROMPTS,
-)
-from gflow_cli.image_batch import (
-    MIN_TEXT_LEN as _MIN_TEXT_LEN,
-)
-from gflow_cli.image_batch import (
+    MAX_PROMPTS,
+    MIN_PROMPTS,
     BatchOutcome,
     BatchPromptItem,
+    parse_batch_item_dict,
     render_image_batch_summary,
     resolve_exit_code,
     run_image_batch,
 )
+from gflow_cli.paths import resolve_batch_output_dir
 
 console = Console()
 
@@ -75,9 +45,6 @@ console = Console()
 _ALLOWED_TOP_LEVEL_KEYS: frozenset[str] = frozenset(
     {"profile", "transport", "output_dir", "prompts"}
 )
-_ALLOWED_PROMPT_KEYS: frozenset[str] = frozenset(
-    {"text", "aspect_ratio", "model", "count", "output_filename"}
-)
 # ---------------------------------------------------------------------------
 # Dataclasses — validated config + per-prompt outcome.
 # ---------------------------------------------------------------------------
@@ -129,14 +96,17 @@ class BatchConfig:
         if not isinstance(prompts_raw_obj, list):
             raise ConfigurationError("'prompts' must be a JSON array.")
         prompts_raw = cast("list[Any]", prompts_raw_obj)
-        if not (_MIN_PROMPTS <= len(prompts_raw) <= _MAX_PROMPTS):
+
+        if not (MIN_PROMPTS <= len(prompts_raw) <= MAX_PROMPTS):
             raise ConfigurationError(
-                f"'prompts' must have between {_MIN_PROMPTS} and "
-                f"{_MAX_PROMPTS} entries (got {len(prompts_raw)})."
+                f"'prompts' must have between {MIN_PROMPTS} and "
+                f"{MAX_PROMPTS} entries (got {len(prompts_raw)})."
             )
         prompts: list[BatchPromptItem] = []
         for idx, p in enumerate(prompts_raw):
-            prompts.append(cls._parse_prompt(p, idx))
+            if not isinstance(p, dict):
+                raise ConfigurationError(f"prompts[{idx}] must be a JSON object.")
+            prompts.append(parse_batch_item_dict(cast("dict[str, Any]", p), idx))
 
         profile = data.get("profile")
         if profile is not None and (not isinstance(profile, str) or not profile):
@@ -155,73 +125,12 @@ class BatchConfig:
             output_dir=output_dir,
         )
 
-    @staticmethod
-    def _parse_prompt(p: object, idx: int) -> BatchPromptItem:
-        if not isinstance(p, dict):
-            raise ConfigurationError(f"prompts[{idx}] must be a JSON object.")
-        item = cast("dict[str, Any]", p)
-        unknown = set(item) - _ALLOWED_PROMPT_KEYS
-        if unknown:
-            raise ConfigurationError(
-                f"prompts[{idx}] has unknown key(s) {sorted(unknown)!r}. "
-                f"Valid: {sorted(_ALLOWED_PROMPT_KEYS)!r}."
-            )
-        text_raw = item.get("text")
-        if not isinstance(text_raw, str):
-            raise ConfigurationError(f"prompts[{idx}].text must be a string.")
-        if not (_MIN_TEXT_LEN <= len(text_raw) <= _MAX_TEXT_LEN):
-            raise ConfigurationError(
-                f"prompts[{idx}].text length must be between {_MIN_TEXT_LEN} "
-                f"and {_MAX_TEXT_LEN} (got {len(text_raw)})."
-            )
-        aspect_ratio = item.get("aspect_ratio", _DEFAULT_ASPECT_RATIO)
-        if aspect_ratio not in _ALLOWED_ASPECT_RATIOS:
-            raise ConfigurationError(
-                f"prompts[{idx}].aspect_ratio {aspect_ratio!r} is invalid. "
-                f"Valid: {list(_ALLOWED_ASPECT_RATIOS)!r}."
-            )
-        model = item.get("model", _DEFAULT_MODEL)
-        if model not in _ALLOWED_MODELS:
-            raise ConfigurationError(
-                f"prompts[{idx}].model {model!r} is invalid. Valid: {list(_ALLOWED_MODELS)!r}."
-            )
-        count = item.get("count", _DEFAULT_COUNT)
-        if not isinstance(count, int) or isinstance(count, bool):
-            raise ConfigurationError(f"prompts[{idx}].count must be an integer.")
-        if not (_MIN_COUNT <= count <= _MAX_COUNT):
-            raise ConfigurationError(
-                f"prompts[{idx}].count must be between {_MIN_COUNT} and {_MAX_COUNT} (got {count})."
-            )
-        output_filename = item.get("output_filename")
-        if output_filename is not None and (
-            not isinstance(output_filename, str) or not output_filename
-        ):
-            raise ConfigurationError(f"prompts[{idx}].output_filename must be a non-empty string.")
-        return BatchPromptItem(
-            text=text_raw,
-            aspect_ratio=aspect_ratio,
-            model=model,
-            count=count,
-            output_filename=output_filename,
-            index=idx,
-        )
-
 
 # ---------------------------------------------------------------------------
-# Helpers — output dir resolution + experimental-transport gating.
+# Helpers — experimental-transport gating.
 # ---------------------------------------------------------------------------
 
 
-def _resolve_output_dir(*, cli_override: Path | None, config_value: str | None) -> Path:
-    """CLI flag > config value > default (``out/<UTC-timestamp>/``)."""
-    if cli_override is not None:
-        return cli_override
-    if config_value is not None:
-        return Path(config_value)
-    stamp = time.strftime("%Y%m%dT%H%M%SZ", time.gmtime())
-    return Path("out") / stamp
-
-
 def _check_transport_gated(transport: str | None) -> None:
     """Per spec D.1 rule 5: experimental transports require env var.
 
@@ -325,7 +234,11 @@ def run(
     profile_name = _resolve_profile(profile or cfg.profile)
     provider_dir = _make_provider_dir(profile_name)
     settings = get_settings()
-    output_dir = _resolve_output_dir(cli_override=output_dir_override, config_value=cfg.output_dir)
+    output_dir = resolve_batch_output_dir(
+        cli_override=output_dir_override,
+        config_value=cfg.output_dir,
+        output_root=settings.output_dir,
+    )
 
     console.print(
         f"\n[bold]gflow run[/bold] · profile=[bold]{profile_name}[/bold] "

{gflow_cli-0.6.0a3 → gflow_cli-0.6.0a4}/src/gflow_cli/image_batch.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import re
-from collections.abc import Callable
+from collections.abc import Callable, Coroutine
 from dataclasses import dataclass, field
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
@@ -18,6 +18,7 @@ from gflow_cli._cli_helpers import (
 from gflow_cli.api.client import FlowApiClient
 from gflow_cli.api.image import Aspect, GenerateImageRequest, Model
 from gflow_cli.errors import EXIT_CODE_MAP, ConfigurationError, GFlowError
+from gflow_cli.paths import resolve_batch_output_dir
 
 if TYPE_CHECKING:
     from gflow_cli.api.dto import GeneratedImage
@@ -157,6 +158,63 @@ def read_prompt_file(path: Path) -> tuple[ParsedPromptLine, ...]:
     return parse_prompt_lines(text, source_label=label)
 
 
+_ALLOWED_PROMPT_KEYS: frozenset[str] = frozenset(
+    {"text", "aspect_ratio", "model", "count", "output_filename"}
+)
+
+
+def parse_batch_item_dict(p: dict[str, Any], idx: int) -> BatchPromptItem:
+    """Parse and validate a dictionary (e.g. from JSON) into a BatchPromptItem.
+
+    Used by `gflow run` to centralize validation logic.
+    """
+    unknown = set(p) - _ALLOWED_PROMPT_KEYS
+    if unknown:
+        raise ConfigurationError(
+            f"prompts[{idx}] has unknown key(s) {sorted(unknown)!r}. "
+            f"Valid: {sorted(_ALLOWED_PROMPT_KEYS)!r}."
+        )
+    text_raw = p.get("text")
+    if not isinstance(text_raw, str):
+        raise ConfigurationError(f"prompts[{idx}].text must be a string.")
+    if not (MIN_TEXT_LEN <= len(text_raw) <= MAX_TEXT_LEN):
+        raise ConfigurationError(
+            f"prompts[{idx}].text length must be between {MIN_TEXT_LEN} "
+            f"and {MAX_TEXT_LEN} (got {len(text_raw)})."
+        )
+    aspect_ratio = p.get("aspect_ratio", DEFAULT_ASPECT_RATIO)
+    if aspect_ratio not in ALLOWED_ASPECT_RATIOS:
+        raise ConfigurationError(
+            f"prompts[{idx}].aspect_ratio {aspect_ratio!r} is invalid. "
+            f"Valid: {list(ALLOWED_ASPECT_RATIOS)!r}."
+        )
+    model = p.get("model", DEFAULT_MODEL)
+    if model not in ALLOWED_MODELS:
+        raise ConfigurationError(
+            f"prompts[{idx}].model {model!r} is invalid. Valid: {list(ALLOWED_MODELS)!r}."
+        )
+    count = p.get("count", DEFAULT_COUNT)
+    if not isinstance(count, int) or isinstance(count, bool):
+        raise ConfigurationError(f"prompts[{idx}].count must be an integer.")
+    if not (MIN_COUNT <= count <= MAX_COUNT):
+        raise ConfigurationError(
+            f"prompts[{idx}].count must be between {MIN_COUNT} and {MAX_COUNT} (got {count})."
+        )
+    output_filename = p.get("output_filename")
+    if output_filename is not None and (
+        not isinstance(output_filename, str) or not output_filename
+    ):
+        raise ConfigurationError(f"prompts[{idx}].output_filename must be a non-empty string.")
+    return BatchPromptItem(
+        text=text_raw,
+        aspect_ratio=aspect_ratio,
+        model=model,
+        count=count,
+        output_filename=output_filename,
+        index=idx,
+    )
+
+
 def _validate_item_values(
     *,
     aspect_ratio: str,
@@ -238,15 +296,6 @@ def prompt_items_from_texts(
     return tuple(items)
 
 
-def resolve_t2i_batch_output_dir(*, out: Path | None, output_root: Path) -> Path:
-    if out is not None:
-        return out
-    from datetime import date
-
-    today = date.today().isoformat()
-    return output_root / "images" / today
-
-
 async def run_one_image_prompt(
     *,
     client: Any,
@@ -298,26 +347,60 @@ async def run_image_batch(
     client_factory: Callable[..., Any] | None = None,
 ) -> list[BatchOutcome]:
     """Run prompts sequentially through one FlowApiClient session."""
-    output_dir.mkdir(parents=True, exist_ok=True)
+
+    async def image_worker(
+        client: Any, project_id: str, idx: int, item: BatchPromptItem
+    ) -> BatchOutcome:
+        return await run_one_image_prompt(
+            client=client,
+            project_id=project_id,
+            idx=idx,
+            item=item,
+            output_dir=output_dir,
+        )
+
+    return await run_sequential_batch(
+        profile_dir=profile_dir,
+        headless=headless,
+        transport=transport,
+        items=prompts,
+        continue_on_error=continue_on_error,
+        project_title=project_title,
+        worker=image_worker,
+        client_factory=client_factory,
+        output_dir=output_dir,
+    )
+
+
+async def run_sequential_batch(
+    *,
+    profile_dir: Path,
+    headless: bool,
+    transport: str | None,
+    items: tuple[Any, ...],
+    continue_on_error: bool,
+    project_title: str,
+    worker: Callable[[Any, str, int, Any], Coroutine[Any, Any, BatchOutcome]],
+    output_dir: Path | None = None,
+    client_factory: Callable[..., Any] | None = None,
+) -> list[BatchOutcome]:
+    """Generic sequential orchestrator for Flow API batches."""
+    if output_dir:
+        output_dir.mkdir(parents=True, exist_ok=True)
+
     outcomes: list[BatchOutcome] = []
     factory = client_factory or FlowApiClient
     async with factory(profile_dir=profile_dir, headless=headless, transport=transport) as client:
         project = await client.create_project(title=project_title)
-        for idx, item in enumerate(prompts):
-            outcome = await run_one_image_prompt(
-                client=client,
-                project_id=project.project_id,
-                idx=idx,
-                item=item,
-                output_dir=output_dir,
-            )
+        for idx, item in enumerate(items):
+            outcome = await worker(client, project.project_id, idx, item)
             outcomes.append(outcome)
             if outcome.status == "fail" and not continue_on_error:
-                for skip_idx in range(idx + 1, len(prompts)):
+                for skip_idx in range(idx + 1, len(items)):
                     outcomes.append(
                         BatchOutcome(
                             index=skip_idx,
-                            prompt=prompts[skip_idx],
+                            prompt=items[skip_idx],
                             status="skipped",
                         )
                     )

{gflow_cli-0.6.0a3 → gflow_cli-0.6.0a4}/src/gflow_cli/paths.py

@@ -59,6 +59,21 @@ def _validate_job_id(job_id: str) -> str:
     return job_id
 
 
+def resolve_batch_output_dir(
+    *,
+    cli_override: Path | None,
+    config_value: str | None = None,
+    output_root: Path,
+    kind: str = "images",
+) -> Path:
+    """CLI flag > config value > default (``<output_root>/<kind>/<YYYY-MM-DD>/``)."""
+    if cli_override is not None:
+        return cli_override
+    if config_value is not None:
+        return Path(config_value)
+    return output_root / kind / date.today().isoformat()
+
+
 def video_output_path(
     output_dir: Path,
     *,

{gflow_cli-0.6.0a3 → gflow_cli-0.6.0a4}/tests/cli/test_cli_run.py

@@ -21,8 +21,8 @@ from gflow_cli.cli import main as cli_main
 from gflow_cli.cli_run import (
     BatchConfig,
     _check_transport_gated,
-    _resolve_output_dir,
 )
+from gflow_cli.paths import resolve_batch_output_dir
 from gflow_cli.errors import ConfigurationError, WafRejectionError
 
 # ---------------------------------------------------------------------------
@@ -179,18 +179,26 @@ class TestBatchConfigValidation:
 
 class TestResolveOutputDir:
     def test_cli_override_wins(self) -> None:
-        result = _resolve_output_dir(cli_override=Path("/cli"), config_value="config")
+        result = resolve_batch_output_dir(
+            cli_override=Path("/cli"), config_value="config", output_root=Path("/root")
+        )
         assert result == Path("/cli")
 
     def test_config_value_used_when_no_cli(self) -> None:
-        result = _resolve_output_dir(cli_override=None, config_value="cfg")
+        result = resolve_batch_output_dir(
+            cli_override=None, config_value="cfg", output_root=Path("/root")
+        )
         assert result == Path("cfg")
 
     def test_default_when_neither_set(self) -> None:
-        result = _resolve_output_dir(cli_override=None, config_value=None)
-        # Format: out/<timestamp>
-        assert result.parts[0] == "out"
-        assert len(result.parts) == 2
+        from datetime import date
+
+        today = date.today().isoformat()
+        result = resolve_batch_output_dir(
+            cli_override=None, config_value=None, output_root=Path("/root")
+        )
+        # Unified format: <root>/images/<YYYY-MM-DD>
+        assert result == Path("/root/images") / today
 
 
 class TestCheckTransportGated:

{gflow_cli-0.6.0a3 → gflow_cli-0.6.0a4}/tests/cli/test_t2i_multi_prompt.py

@@ -184,7 +184,7 @@ def test_t2i_rejects_51_positional_prompts_before_profile_and_output_dir() -> No
 
     with (
         patch("gflow_cli.cli_image._resolve_profile") as resolve_profile,
-        patch("gflow_cli.cli_image.resolve_t2i_batch_output_dir") as resolve_output,
+        patch("gflow_cli.cli_image.resolve_batch_output_dir") as resolve_output,
     ):
         result = CliRunner().invoke(
             main,
@@ -203,7 +203,7 @@ def test_t2i_rejects_long_positional_prompt_before_profile_and_output_dir() -> N
 
     with (
         patch("gflow_cli.cli_image._resolve_profile") as resolve_profile,
-        patch("gflow_cli.cli_image.resolve_t2i_batch_output_dir") as resolve_output,
+        patch("gflow_cli.cli_image.resolve_batch_output_dir") as resolve_output,
     ):
         result = CliRunner().invoke(
             main,
@@ -235,7 +235,7 @@ def test_t2i_rejects_invalid_prompt_files_before_profile_and_output_dir(
     path.write_bytes(content)
     with (
         patch("gflow_cli.cli_image._resolve_profile") as resolve_profile,
-        patch("gflow_cli.cli_image.resolve_t2i_batch_output_dir") as resolve_output,
+        patch("gflow_cli.cli_image.resolve_batch_output_dir") as resolve_output,
     ):
         result = CliRunner().invoke(
             main,
@@ -255,7 +255,7 @@ def test_t2i_rejects_missing_prompt_file_before_profile_and_output_dir(tmp_path:
     missing = tmp_path / "missing.txt"
     with (
         patch("gflow_cli.cli_image._resolve_profile") as resolve_profile,
-        patch("gflow_cli.cli_image.resolve_t2i_batch_output_dir") as resolve_output,
+        patch("gflow_cli.cli_image.resolve_batch_output_dir") as resolve_output,
     ):
         result = CliRunner().invoke(
             main,
@@ -279,7 +279,7 @@ def test_t2i_rejects_prompt_file_directory_before_profile_and_output_dir(
     directory.mkdir()
     with (
         patch("gflow_cli.cli_image._resolve_profile") as resolve_profile,
-        patch("gflow_cli.cli_image.resolve_t2i_batch_output_dir") as resolve_output,
+        patch("gflow_cli.cli_image.resolve_batch_output_dir") as resolve_output,
     ):
         result = CliRunner().invoke(
             main,