ostruct-cli 0.8.3__py3-none-any.whl → 0.8.4__py3-none-any.whl

ostruct/cli/cli.py

@@ -4,6 +4,7 @@ import sys
 from typing import Optional
 
 import click
+from dotenv import load_dotenv
 
 from .. import __version__
 from .commands import create_command_group
@@ -107,6 +108,9 @@ def create_cli() -> click.Command:
 
 def main() -> None:
     """Main entry point for the CLI."""
+    # Load environment variables from .env file
+    load_dotenv()
+
     try:
         cli(standalone_mode=False)
     except (

ostruct/cli/click_options.py

@@ -492,12 +492,13 @@ def api_options(f: Union[Command, Callable[..., Any]]) -> Command:
         environment variable.""",
     )(cmd)
 
+    # API timeout for OpenAI calls
     cmd = click.option(
         "--timeout",
         type=click.FloatRange(1.0, None),
         default=60.0,
         show_default=True,
-        help="API timeout in seconds.",
+        help="Timeout in seconds for OpenAI API calls.",
     )(cmd)
 
     return cast(Command, cmd)
@@ -854,13 +855,6 @@ def debug_progress_options(f: Union[Command, Callable[..., Any]]) -> Command:
         "--verbose", is_flag=True, help="Enable verbose logging"
     )(cmd)
 
-    cmd = click.option(
-        "--timeout",
-        type=int,
-        default=3600,
-        help="Operation timeout in seconds (default: 3600 = 1 hour)",
-    )(cmd)
-
     return cast(Command, cmd)
 
 

ostruct/cli/runner.py

@@ -33,9 +33,6 @@ from .sentinel import extract_json_block
 from .serialization import LogSerializer
 from .services import ServiceContainer
 from .types import CLIParams
-from .unattended_operation import (
-    UnattendedOperationManager,
-)
 
 
 # Error classes for API operations
@@ -855,10 +852,6 @@ async def execute_model(
     """Execute the model with the given parameters."""
     logger.debug("=== Execution Phase ===")
 
-    # Initialize unattended operation manager
-    timeout_seconds = int(args.get("timeout", 3600))
-    operation_manager = UnattendedOperationManager(timeout_seconds)
-
     # Pre-validate unattended compatibility
     # Note: MCP validation is handled during MCP configuration processing
     # mcp_servers = args.get("mcp_servers", [])
@@ -874,12 +867,22 @@ async def execute_model(
 
     api_key = args.get("api_key") or os.getenv("OPENAI_API_KEY")
     if not api_key:
-        msg = "No API key provided. Set OPENAI_API_KEY environment variable or use --api-key"
+        msg = (
+            "No OpenAI API key found. Please:\n"
+            "  • Set OPENAI_API_KEY environment variable, or\n"
+            "  • Create a .env file with OPENAI_API_KEY=your-key-here, or\n"
+            "  • Use --api-key option (not recommended for production)\n"
+            "\n"
+            "Get your API key from: https://platform.openai.com/api-keys"
+        )
         logger.error(msg)
         raise CLIError(msg, exit_code=ExitCode.API_ERROR)
 
+    # Get API timeout
+    api_timeout = args.get("timeout", 60.0)
     client = AsyncOpenAI(
-        api_key=api_key, timeout=min(args.get("timeout", 60.0), 300.0)
+        api_key=api_key,
+        timeout=min(float(api_timeout), 300.0),
     )  # Cap at 5 min for client timeout
 
     # Create service container for dependency management
@@ -1352,13 +1355,10 @@ async def execute_model(
 
         return ExitCode.SUCCESS
 
-    # Execute main operation with timeout safeguards
+    # Execute main operation
     try:
-        result = await operation_manager.execute_with_safeguards(
-            execute_main_operation, "model execution"
-        )
-        # The result should be an ExitCode from execute_main_operation
-        return result  # type: ignore[no-any-return]
+        result = await execute_main_operation()
+        return result
     except (
         APIResponseError,
         EmptyResponseError,

{ostruct_cli-0.8.3.dist-info → ostruct_cli-0.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ostruct-cli
-Version: 0.8.3
+Version: 0.8.4
 Summary: CLI for OpenAI Structured Output with Multi-Tool Integration
 Author: Yaniv Golan
 Author-email: yaniv@golan.name
@@ -39,6 +39,7 @@ Requires-Dist: pytest (>=8.3.4,<9.0) ; extra == "dev"
 Requires-Dist: pytest-asyncio (>=0.25.2,<1.0) ; extra == "dev"
 Requires-Dist: pytest-mock (>=3.14.0,<4.0) ; extra == "dev"
 Requires-Dist: pytest-rerunfailures (>=12.0,<13.0) ; extra == "dev"
+Requires-Dist: python-dotenv (>=1.0.1,<2.0)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0) ; extra == "dev"
 Requires-Dist: pyyaml (>=6.0.2,<7.0)
 Requires-Dist: sphinx (>=7.0,<8.0) ; extra == "dev"
@@ -48,6 +49,7 @@ Requires-Dist: sphinx-rtd-theme (>=1.0,<2.0) ; extra == "docs"
 Requires-Dist: tenacity (>=8.2.3,<9.0) ; extra == "examples"
 Requires-Dist: tiktoken (==0.9.0)
 Requires-Dist: tomli (>=2.0.1,<3.0) ; (python_version < "3.11") and (extra == "docs")
+Requires-Dist: tomli (>=2.0.1,<3.0) ; extra == "dev"
 Requires-Dist: tomli (>=2.0.1,<3.0) ; python_version < "3.11"
 Requires-Dist: twine (>=6.0.1,<7.0) ; extra == "dev"
 Requires-Dist: types-cachetools (>=5.5.0.20240820) ; extra == "dev"
@@ -237,6 +239,8 @@ ostruct-cli respects the following environment variables:
 - `OSTRUCT_DISABLE_REGISTRY_UPDATE_CHECKS`: Set to "1", "true", or "yes" to disable automatic registry update checks
 - `MCP_<NAME>_URL`: Custom MCP server URLs (e.g., `MCP_STRIPE_URL=https://mcp.stripe.com`)
 
+**💡 Tip**: ostruct automatically loads `.env` files from the current directory. Environment variables take precedence over `.env` file values.
+
 <details>
 <summary><strong>Shell Completion Setup</strong> (Click to expand)</summary>
 
@@ -427,7 +431,11 @@ tools:
 1. Set your OpenAI API key:
 
 ```bash
+# Environment variable
 export OPENAI_API_KEY=your-api-key
+
+# Or create a .env file
+echo 'OPENAI_API_KEY=your-api-key' > .env
 ```
 
 ### Example 1: Basic Text Extraction (Simplest)

{ostruct_cli-0.8.3.dist-info → ostruct_cli-0.8.4.dist-info}/RECORD

@@ -2,8 +2,8 @@ ostruct/__init__.py,sha256=X6zo6V7ZNMv731Wi388aTVQngD1410ExGwGx4J6lpyo,187
 ostruct/cli/__init__.py,sha256=e-DtWRviCr3fIAJH4cB4UAvles3-rqnhJaTOlBn9TKs,871
 ostruct/cli/base_errors.py,sha256=o-877bJJA8yJWISRPy0KyL6wDu1-_avddmQIfVePuFM,5989
 ostruct/cli/cache_manager.py,sha256=ej3KrRfkKKZ_lEp2JswjbJ5bW2ncsvna9NeJu81cqqs,5192
-ostruct/cli/cli.py,sha256=ZUkQ-iwk4KCKeetPMlvSDwxfXIe4h1-yP80SfJgvi_o,4098
-ostruct/cli/click_options.py,sha256=FbRMfoFgg5icdgewPS8cePSYv6yTnxbRxyDvfFDdRaI,31845
+ostruct/cli/cli.py,sha256=pzOzKMvWQMRS1I9w4raAUi-O7IN6OKViNTcOeJGEqhI,4196
+ostruct/cli/click_options.py,sha256=UWLBIkfVMXcIMXInJFWNYNO9Ieg8YrJEzRfkKungy48,31730
 ostruct/cli/code_interpreter.py,sha256=lnnyEvUh2pGObN9ENpr-X4p0C0oIWiyG1CFQWW4akBQ,16726
 ostruct/cli/commands/__init__.py,sha256=3NHz-WZ9XqrnWWMksoV2MpYpHnjA-EO9lsrBOYeHcjY,723
 ostruct/cli/commands/list_models.py,sha256=yeuQpUGAmRr4uOHS7teuVHkC9dkqN0yKDOEw_n-ehi0,4662
@@ -28,7 +28,7 @@ ostruct/cli/path_utils.py,sha256=j44q1OoLkqMErgK-qEuhuIZ1VyzqRIvNgxR1et9PoXA,481
 ostruct/cli/progress.py,sha256=rj9nVEco5UeZORMbzd7mFJpFGJjbH9KbBFh5oTE5Anw,3415
 ostruct/cli/progress_reporting.py,sha256=MBjALM4pmPd_d9YuXqH162-tkC6DDKYmz-pJPSGLTfk,13669
 ostruct/cli/registry_updates.py,sha256=ohiHdlfrocvThpR_ZjMyqulDKFjRM1hIFKOlNzpaqHg,5138
-ostruct/cli/runner.py,sha256=_xiT9_ywk5lNz3P1qFpqOcJGwXqAE4xQ8Zxc9p6x0Ko,65192
+ostruct/cli/runner.py,sha256=GzCsPiwhxiaoXvCv-ykFO8KucMvGRyIOPuaNMCVF1pw,65107
 ostruct/cli/schema_utils.py,sha256=9LnsjxEKg6RIfXQB3nS3pyDggm5n-4-thXf92897gJU,3590
 ostruct/cli/schema_validation.py,sha256=ohEuxJ0KF93qphj0JSZDnrxDn0C2ZU37g-U2JY03onM,8154
 ostruct/cli/security/__init__.py,sha256=CQpkCgTFYlA1p6atpQeNgIKtE4LZGUKt4EbytbGKpCs,846
@@ -64,8 +64,8 @@ ostruct/cli/unattended_operation.py,sha256=kI95SSVJC_taxORXQYrce_qLEnuKc6edwn9tM
 ostruct/cli/utils.py,sha256=uY7c0NaINHWfnl77FcPE3TmYUXv3RqEeUTjrCMDij9A,922
 ostruct/cli/validators.py,sha256=lbxAUUVS5TPJ7HdYZ5yB7gUjJqfcClZCuh0oktoq0E0,15291
 ostruct/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ostruct_cli-0.8.3.dist-info/LICENSE,sha256=DmGAkaYzhrdzTB9Y2Rvfzd3mJiF9ZrTOhxN8t6wrfHA,1098
-ostruct_cli-0.8.3.dist-info/METADATA,sha256=mBsqO645XWKto3RgifluCxqkilYH0C14wWrm1Pa6P6I,24827
-ostruct_cli-0.8.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-ostruct_cli-0.8.3.dist-info/entry_points.txt,sha256=NFq9IuqHVTem0j9zKjV8C1si_zGcP1RL6Wbvt9fUDXw,48
-ostruct_cli-0.8.3.dist-info/RECORD,,
+ostruct_cli-0.8.4.dist-info/LICENSE,sha256=DmGAkaYzhrdzTB9Y2Rvfzd3mJiF9ZrTOhxN8t6wrfHA,1098
+ostruct_cli-0.8.4.dist-info/METADATA,sha256=4B4H-EqZAyVZOTzeWH_BZbaDqshFZ8YZvvPpVzzaBx0,25161
+ostruct_cli-0.8.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+ostruct_cli-0.8.4.dist-info/entry_points.txt,sha256=NFq9IuqHVTem0j9zKjV8C1si_zGcP1RL6Wbvt9fUDXw,48
+ostruct_cli-0.8.4.dist-info/RECORD,,