ostruct-cli 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

ostruct/cli/click_options.py

@@ -9,160 +9,349 @@ from typing import Any, Callable, TypeVar, Union, cast
 
 import click
 from click import Command
+from typing_extensions import ParamSpec
 
 from ostruct import __version__
 from ostruct.cli.errors import (  # noqa: F401 - Used in error handling
     SystemPromptError,
     TaskTemplateVariableError,
 )
+from ostruct.cli.validators import (
+    validate_json_variable,
+    validate_name_path_pair,
+    validate_variable,
+)
 
+P = ParamSpec("P")
+R = TypeVar("R")
 F = TypeVar("F", bound=Callable[..., Any])
+CommandDecorator = Callable[[F], Command]
 DecoratedCommand = Union[Command, Callable[..., Any]]
 
 
-def validate_task_params(
-    ctx: click.Context, param: click.Parameter, value: Any
-) -> Any:
-    """Validate task-related parameters."""
-    if not hasattr(ctx, "params"):
-        return value
-
-    # Check for conflicting task parameters
-    if (
-        param.name == "task_file"
-        and value is not None
-        and ctx.params.get("task") is not None
-    ):
-        raise click.UsageError("Cannot specify both --task and --task-file")
-    elif (
-        param.name == "task"
-        and value is not None
-        and ctx.params.get("task_file") is not None
-    ):
-        raise click.UsageError("Cannot specify both --task and --task-file")
-
-    return value
-
-
-def validate_system_prompt_params(
-    ctx: click.Context, param: click.Parameter, value: Any
-) -> Any:
-    """Validate system prompt parameters."""
-    if not hasattr(ctx, "params"):
-        return value
-
-    # Check for conflicting system prompt parameters
-    if (
-        param.name == "system_prompt_file"
-        and value is not None
-        and ctx.params.get("system_prompt") is not None
-    ):
-        raise click.UsageError(
-            "Cannot specify both --system-prompt and --system-prompt-file"
-        )
-    elif (
-        param.name == "system_prompt"
-        and value is not None
-        and ctx.params.get("system_prompt_file") is not None
-    ):
-        raise click.UsageError(
-            "Cannot specify both --system-prompt and --system-prompt-file"
-        )
-
-    return value
-
-
-def debug_options(f: Callable) -> Callable:
+def debug_options(f: Union[Command, Callable[..., Any]]) -> Command:
     """Add debug-related CLI options."""
-    f = click.option(
+    # Initial conversion to Command if needed
+    cmd: Any = f if isinstance(f, Command) else f
+
+    # Add options without redundant casts
+    cmd = click.option(
         "--show-model-schema",
         is_flag=True,
         help="Show generated Pydantic model schema",
-    )(f)
-    f = click.option(
+    )(cmd)
+
+    cmd = click.option(
         "--debug-validation",
         is_flag=True,
         help="Show detailed validation errors",
-    )(f)
-    return f
+    )(cmd)
 
+    # Final cast to Command for return type
+    return cast(Command, cmd)
 
-def file_options(f: Callable) -> Callable:
+
+def file_options(f: Union[Command, Callable[..., Any]]) -> Command:
     """Add file-related CLI options."""
-    f = click.option(
-        "--file", "-f", multiple=True, help="File mapping (name=path)"
-    )(f)
-    f = click.option(
-        "--files",
+    cmd: Any = f if isinstance(f, Command) else f
+
+    cmd = click.option(
+        "-f",
+        "--file",
+        "files",
         multiple=True,
-        help="Multiple file mappings from a directory",
-    )(f)
-    f = click.option(
-        "--dir", "-d", multiple=True, help="Directory mapping (name=path)"
-    )(f)
-    f = click.option(
-        "--allowed-dir",
+        nargs=2,
+        metavar="<NAME> <PATH>",
+        callback=validate_name_path_pair,
+        help="""Associate a file with a variable name. The file will be available in
+        your template as the specified variable. You can specify this option multiple times.
+        Example: -f code main.py -f test test_main.py""",
+        shell_complete=click.Path(exists=True, file_okay=True, dir_okay=False),
+    )(cmd)
+
+    cmd = click.option(
+        "-d",
+        "--dir",
+        "dir",
+        multiple=True,
+        nargs=2,
+        metavar="<NAME> <DIR>",
+        callback=validate_name_path_pair,
+        help="""Associate a directory with a variable name. All files in the directory
+        will be available in your template. Use -R for recursive scanning.
+        Example: -d src ./src""",
+        shell_complete=click.Path(exists=True, file_okay=False, dir_okay=True),
+    )(cmd)
+
+    cmd = click.option(
+        "-p",
+        "--pattern",
+        "patterns",
+        multiple=True,
+        nargs=2,
+        metavar="<NAME> <PATTERN>",
+        help="""Associate a glob pattern with a variable name. Matching files will be
+        available in your template. Use -R for recursive matching.
+        Example: -p logs '*.log'""",
+    )(cmd)
+
+    cmd = click.option(
+        "-R",
+        "--recursive",
+        is_flag=True,
+        help="Process directories and patterns recursively",
+    )(cmd)
+
+    cmd = click.option(
+        "--base-dir",
+        type=click.Path(exists=True, file_okay=False, dir_okay=True),
+        help="""Base directory for resolving relative paths. All file operations will be
+        relative to this directory. Defaults to current directory.""",
+        shell_complete=click.Path(exists=True, file_okay=False, dir_okay=True),
+    )(cmd)
+
+    cmd = click.option(
+        "-A",
+        "--allow",
+        "allowed_dirs",
         multiple=True,
-        help="Additional allowed directory paths",
-    )(f)
-    f = click.option(
-        "--base-dir", type=str, help="Base directory for relative paths"
-    )(f)
-    f = click.option(
+        type=click.Path(exists=True, file_okay=False, dir_okay=True),
+        help="""Add an allowed directory for security. Files must be within allowed
+        directories. Can be specified multiple times.""",
+        shell_complete=click.Path(exists=True, file_okay=False, dir_okay=True),
+    )(cmd)
+
+    cmd = click.option(
         "--allowed-dir-file",
-        type=str,
-        help="File containing allowed directory paths",
-    )(f)
-    f = click.option(
-        "--dir-recursive", is_flag=True, help="Recursively process directories"
-    )(f)
-    f = click.option(
-        "--dir-ext", type=str, help="Filter directory files by extension"
-    )(f)
-    return f
-
-
-def variable_options(f: Callable) -> Callable:
+        type=click.Path(exists=True, file_okay=True, dir_okay=False),
+        help="""File containing allowed directory paths, one per line. Lines starting
+        with # are treated as comments.""",
+        shell_complete=click.Path(exists=True, file_okay=True, dir_okay=False),
+    )(cmd)
+
+    return cast(Command, cmd)
+
+
+def variable_options(f: Union[Command, Callable[..., Any]]) -> Command:
     """Add variable-related CLI options."""
-    f = click.option(
-        "--var", "-v", multiple=True, help="Variable mapping (name=value)"
-    )(f)
-    f = click.option(
+    cmd: Any = f if isinstance(f, Command) else f
+
+    cmd = click.option(
+        "-V",
+        "--var",
+        "var",
+        multiple=True,
+        metavar="name=value",
+        callback=validate_variable,
+        help="""Define a simple string variable. Format: name=value
+        Example: -V debug=true -V env=prod""",
+    )(cmd)
+
+    cmd = click.option(
+        "-J",
         "--json-var",
-        "-j",
+        "json_var",
         multiple=True,
-        help="JSON variable mapping (name=json_value)",
-    )(f)
-    return f
+        metavar='name=\'{"json":"value"}\'',
+        callback=validate_json_variable,
+        help="""Define a JSON variable. Format: name='{"key":"value"}'
+        Example: -J config='{"env":"prod","debug":true}'""",
+    )(cmd)
 
+    return cast(Command, cmd)
 
-def model_options(f: Callable) -> Callable:
+
+def model_options(f: Union[Command, Callable[..., Any]]) -> Command:
     """Add model-related CLI options."""
-    f = click.option(
-        "--model", type=str, default="gpt-4o", help="OpenAI model to use"
-    )(f)
-    f = click.option(
-        "--temperature", type=float, default=0.0, help="Sampling temperature"
-    )(f)
-    f = click.option(
-        "--max-tokens", type=int, help="Maximum tokens in response"
-    )(f)
-    f = click.option(
-        "--top-p", type=float, default=1.0, help="Nucleus sampling threshold"
-    )(f)
-    f = click.option(
+    cmd: Any = f if isinstance(f, Command) else f
+
+    cmd = click.option(
+        "-m",
+        "--model",
+        default="gpt-4o",
+        show_default=True,
+        help="""OpenAI model to use. Must support structured output.
+        Supported models:
+        - gpt-4o (128k context window)
+        - o1 (200k context window)
+        - o3-mini (200k context window)""",
+    )(cmd)
+
+    cmd = click.option(
+        "--temperature",
+        type=click.FloatRange(0.0, 2.0),
+        help="""Sampling temperature. Controls randomness in the output.
+        Range: 0.0 to 2.0. Lower values are more focused.""",
+    )(cmd)
+
+    cmd = click.option(
+        "--max-output-tokens",
+        type=click.IntRange(1, None),
+        help="""Maximum number of tokens in the output.
+        Higher values allow longer responses but cost more.""",
+    )(cmd)
+
+    cmd = click.option(
+        "--top-p",
+        type=click.FloatRange(0.0, 1.0),
+        help="""Top-p (nucleus) sampling parameter. Controls diversity.
+        Range: 0.0 to 1.0. Lower values are more focused.""",
+    )(cmd)
+
+    cmd = click.option(
         "--frequency-penalty",
-        type=float,
-        default=0.0,
-        help="Frequency penalty",
-    )(f)
-    f = click.option(
-        "--presence-penalty", type=float, default=0.0, help="Presence penalty"
-    )(f)
-    return f
+        type=click.FloatRange(-2.0, 2.0),
+        help="""Frequency penalty for text generation.
+        Range: -2.0 to 2.0. Positive values reduce repetition.""",
+    )(cmd)
+
+    cmd = click.option(
+        "--presence-penalty",
+        type=click.FloatRange(-2.0, 2.0),
+        help="""Presence penalty for text generation.
+        Range: -2.0 to 2.0. Positive values encourage new topics.""",
+    )(cmd)
+
+    cmd = click.option(
+        "--reasoning-effort",
+        type=click.Choice(["low", "medium", "high"]),
+        help="""Control reasoning effort (if supported by model).
+        Higher values may improve output quality but take longer.""",
+    )(cmd)
+
+    return cast(Command, cmd)
+
+
+def system_prompt_options(f: Union[Command, Callable[..., Any]]) -> Command:
+    """Add system prompt related CLI options."""
+    cmd: Any = f if isinstance(f, Command) else f
+
+    cmd = click.option(
+        "--sys-prompt",
+        "system_prompt",
+        help="""Provide system prompt directly. This sets the initial context
+        for the model. Example: --sys-prompt "You are a code reviewer." """,
+    )(cmd)
+
+    cmd = click.option(
+        "--sys-file",
+        "system_prompt_file",
+        type=click.Path(exists=True, dir_okay=False),
+        help="""Load system prompt from file. The file should contain the prompt text.
+        Example: --sys-file prompts/code_review.txt""",
+        shell_complete=click.Path(exists=True, file_okay=True, dir_okay=False),
+    )(cmd)
+
+    cmd = click.option(
+        "--ignore-task-sysprompt",
+        is_flag=True,
+        help="""Ignore system prompt in task template. By default, system prompts
+        in template frontmatter are used.""",
+    )(cmd)
+
+    return cast(Command, cmd)
+
+
+def output_options(f: Union[Command, Callable[..., Any]]) -> Command:
+    """Add output-related CLI options."""
+    cmd: Any = f if isinstance(f, Command) else f
+
+    cmd = click.option(
+        "--output-file",
+        type=click.Path(dir_okay=False),
+        help="""Write output to file instead of stdout.
+        Example: --output-file result.json""",
+        shell_complete=click.Path(file_okay=True, dir_okay=False),
+    )(cmd)
 
+    cmd = click.option(
+        "--dry-run",
+        is_flag=True,
+        help="""Validate and render but skip API call. Useful for testing
+        template rendering and validation.""",
+    )(cmd)
+
+    return cast(Command, cmd)
+
+
+def api_options(f: Union[Command, Callable[..., Any]]) -> Command:
+    """Add API-related CLI options."""
+    cmd: Any = f if isinstance(f, Command) else f
+
+    cmd = click.option(
+        "--api-key",
+        help="""OpenAI API key. If not provided, uses OPENAI_API_KEY
+        environment variable.""",
+    )(cmd)
+
+    cmd = click.option(
+        "--timeout",
+        type=click.FloatRange(1.0, None),
+        default=60.0,
+        show_default=True,
+        help="API timeout in seconds.",
+    )(cmd)
+
+    return cast(Command, cmd)
+
+
+def debug_progress_options(f: Union[Command, Callable[..., Any]]) -> Command:
+    """Add debugging and progress CLI options."""
+    cmd: Any = f if isinstance(f, Command) else f
+
+    cmd = click.option(
+        "--no-progress", is_flag=True, help="Disable progress indicators"
+    )(cmd)
 
-def create_click_command() -> Callable[[F], Command]:
+    cmd = click.option(
+        "--progress-level",
+        type=click.Choice(["none", "basic", "detailed"]),
+        default="basic",
+        show_default=True,
+        help="""Control progress verbosity. 'none' shows no progress,
+        'basic' shows key steps, 'detailed' shows all steps.""",
+    )(cmd)
+
+    cmd = click.option(
+        "--verbose", is_flag=True, help="Enable verbose logging"
+    )(cmd)
+
+    cmd = click.option(
+        "--debug-openai-stream",
+        is_flag=True,
+        help="Debug OpenAI streaming process",
+    )(cmd)
+
+    return cast(Command, cmd)
+
+
+def all_options(f: Union[Command, Callable[..., Any]]) -> Command:
+    """Add all CLI options.
+
+    Args:
+        f: Function to decorate
+
+    Returns:
+        Decorated function
+    """
+    decorators = [
+        model_options,  # Model selection and parameters first
+        system_prompt_options,  # System prompt configuration
+        file_options,  # File and directory handling
+        variable_options,  # Variable definitions
+        output_options,  # Output control
+        api_options,  # API configuration
+        debug_options,  # Debug settings
+        debug_progress_options,  # Progress and logging
+    ]
+
+    for decorator in decorators:
+        f = decorator(f)
+
+    return cast(Command, f)
+
+
+def create_click_command() -> CommandDecorator:
     """Create the Click command with all options.
 
     Returns:
@@ -170,88 +359,17 @@ def create_click_command() -> Callable[[F], Command]:
     """
 
     def decorator(f: F) -> Command:
-        # Start with the base command
-        cmd: DecoratedCommand = click.command(
-            help="Make structured OpenAI API calls."
-        )(f)
-
-        # Add all options
-        cmd = click.option(
-            "--task",
-            help="Task template string",
-            type=str,
-            callback=validate_task_params,
-        )(cmd)
-        cmd = click.option(
-            "--task-file",
-            help="Task template file path",
-            type=str,
-            callback=validate_task_params,
-        )(cmd)
-        cmd = click.option(
-            "--system-prompt",
-            help="System prompt string",
-            type=str,
-            callback=validate_system_prompt_params,
-        )(cmd)
-        cmd = click.option(
-            "--system-prompt-file",
-            help="System prompt file path",
-            type=str,
-            callback=validate_system_prompt_params,
-        )(cmd)
-        cmd = click.option(
-            "--schema-file",
-            required=True,
-            help="JSON schema file for response validation",
-            type=str,
-        )(cmd)
-        cmd = click.option(
-            "--ignore-task-sysprompt",
-            is_flag=True,
-            help="Ignore system prompt from task template YAML frontmatter",
-        )(cmd)
-        cmd = click.option(
-            "--timeout",
-            type=float,
-            default=60.0,
-            help="API timeout in seconds",
-        )(cmd)
-        cmd = click.option(
-            "--output-file", help="Write JSON output to file", type=str
-        )(cmd)
-        cmd = click.option(
-            "--dry-run",
-            is_flag=True,
-            help="Simulate API call without making request",
-        )(cmd)
-        cmd = click.option(
-            "--no-progress", is_flag=True, help="Disable progress indicators"
-        )(cmd)
-        cmd = click.option(
-            "--progress-level",
-            type=click.Choice(["none", "basic", "detailed"]),
-            default="basic",
-            help="Progress reporting level",
-        )(cmd)
-        cmd = click.option(
-            "--api-key", help="OpenAI API key (overrides env var)", type=str
-        )(cmd)
-        cmd = click.option(
-            "--verbose",
-            is_flag=True,
-            help="Enable verbose output and detailed logging",
-        )(cmd)
-        cmd = click.option(
-            "--debug-openai-stream",
-            is_flag=True,
-            help="Enable low-level debug output for OpenAI streaming",
+        # Initial command creation
+        cmd: Any = click.command()(f)
+
+        # Add version option
+        cmd = click.version_option(
+            __version__,
+            "--version",
+            "-V",
+            message="%(prog)s CLI version %(version)s",
         )(cmd)
-        cmd = debug_options(cmd)
-        cmd = file_options(cmd)
-        cmd = variable_options(cmd)
-        cmd = model_options(cmd)
-        cmd = click.version_option(version=__version__)(cmd)
+
         return cast(Command, cmd)
 
     return decorator