From c42887410815915b0c64ac70a0120db3e282cb02 Mon Sep 17 00:00:00 2001 From: maxi-maxima <240684166@qq.com> Date: Wed, 12 Aug 2026 10:18:51 +0800 Subject: [PATCH] feat(runtime): support pull-never sandbox images --- docs/advanced/configuration.mdx | 186 ++-------------- strix/config/settings.py | 7 +- strix/interface/environment.py | 308 +++++++++---------------- strix/runtime/backends.py | 4 +- strix/runtime/docker_client.py | 382 +++++++++----------------------- tests/test_config_loader.py | 278 ++++++----------------- tests/test_image_pull_policy.py | 85 +++++++ 7 files changed, 379 insertions(+), 871 deletions(-) create mode 100644 tests/test_image_pull_policy.py diff --git a/docs/advanced/configuration.mdx b/docs/advanced/configuration.mdx index f1542b75..5148d616 100644 --- a/docs/advanced/configuration.mdx +++ b/docs/advanced/configuration.mdx @@ -1,169 +1,17 @@ ---- -title: "Configuration" -description: "Environment variables for Strix" ---- - -Configure Strix using environment variables or a config file. - -## LLM Configuration - - - Model name in LiteLLM format (e.g., `openai/gpt-5.4`, `anthropic/claude-sonnet-4-6`). - - - - API key for your LLM provider. Not required for local models or cloud provider auth (Vertex AI, AWS Bedrock). - - - - Custom API base URL. Also accepts `OPENAI_API_BASE`, `LITELLM_BASE_URL`, or `OLLAMA_API_BASE`. - - - - Extra HTTP headers sent on every LLM request, as a JSON object (e.g. - `{"X-Feature-Key":"value","X-Tenant":"acme"}`). Useful for OpenAI-compatible - gateways that require attribution or routing headers in addition to the bearer - token. The bearer token itself still comes from `LLM_API_KEY`. Applies to both - the LiteLLM and native OpenAI routing paths. - - - - Request timeout in seconds for LLM calls. - - - - Maximum number of retries for LLM API calls on transient failures. - - - - Control thinking effort for reasoning models. Valid values: `none`, `minimal`, `low`, `medium`, `high`, `xhigh`, `max`. Defaults to `medium` for quick scan mode. - - - - Timeout in seconds for memory compression operations (context summarization). - - -### Dedicated deduplication model - -Finding deduplication is a cheap, structured classification task. By default it -runs on the main model, but you can route it to a smaller/cheaper model without -affecting the agents that do the actual testing. - - - Model used to judge whether a candidate finding duplicates an existing report. - Falls back to `STRIX_LLM` when unset. - - - - Optional provider key for the deduplication model. - - - - Optional custom API base URL for the deduplication model. Use when the dedupe - model runs on a different endpoint than the main model. - - - - Optional JSON object of extra HTTP headers sent on every deduplication-model - request, e.g. `{"X-Feature-Key":"value"}`. A dedicated dedupe model never - inherits `LLM_EXTRA_HEADERS`; set this when its endpoint needs custom headers. - - - - Reasoning effort for the deduplication model. Defaults to the model's own - baseline when unset. - - -## Optional Features - - - API key for Perplexity AI. Enables real-time web search during scans for OSINT and vulnerability research. - - - - Postman API key (`PMAK-…`). Enables fetching Postman collections by id as a target (`postman://`), and Postman environments (`postman://?env=`) to resolve collection variables. Not needed when passing a local collection export file. - - - - Telemetry toggle. Set to `0`, `false`, `no`, or `off` to disable telemetry (PostHog, Scarf, OTEL). - - - - OTLP/Traceloop base URL for remote OpenTelemetry export. If unset, Strix keeps traces local only. - - - - API key used for remote trace export. Remote export is enabled only when both `TRACELOOP_BASE_URL` and `TRACELOOP_API_KEY` are set. - - - - Optional custom OTEL headers (JSON object or `key=value,key2=value2`). Useful for Langfuse or custom/self-hosted OTLP gateways. - - -When remote OTEL vars are not set, Strix still writes complete run telemetry locally to: - -```bash -strix_runs//events.jsonl -``` - -When remote vars are set, Strix dual-writes telemetry to both local JSONL and the remote OTEL endpoint. - -## Docker Configuration - - - Docker image to use for the sandbox container. - - - - Docker daemon socket path. Use for remote Docker hosts or custom configurations. - - - - Runtime backend for the sandbox environment. - - -## Sandbox Configuration - - - Maximum execution time in seconds for sandbox operations. - - - - Timeout in seconds for connecting to the sandbox container. - - -## Config File - -Strix stores configuration in `~/.strix/cli-config.json`. You can also specify a custom config file: - -```bash -strix --target ./app --config /path/to/config.json -``` - -**Config file format:** - -```json -{ - "env": { - "STRIX_LLM": "openai/gpt-5.4", - "LLM_API_KEY": "sk-...", - "STRIX_REASONING_EFFORT": "high" - } -} -``` - -## Example Setup - -```bash -# Required -export STRIX_LLM="openai/gpt-5.4" -export LLM_API_KEY="sk-..." - -# Optional: Enable web search -export PERPLEXITY_API_KEY="pplx-..." - -# Optional: Custom timeouts -export LLM_TIMEOUT="600" -export STRIX_SANDBOX_EXECUTION_TIMEOUT="300" - -``` +r^fئ{[rݰ뭦KKKB]NۙY\][ۈ\ܚ\[ێ[\ۛY[\XX\܈^KKBۙY\H^\[[\ۛY[\XX\܈HۙY[KHۙY\][ۂ\[QY[]HVH\OH[Ȉ\]Z\Y[[H[]SHܛX] +Kˋ[ZK MK [X]YK\ۛ] M M +K \[QY[\[QY[]HWTWVH\OH[ȏTH^H܈[\HݚY\\]Z\Y܈[[[܈YݚY\]] +\^RKUYK \[QY[\[QY[]HWTWАTH\OH[ȏ\HTH\HT [X\SRWTWАTX USWАTWT ܈SPWTWАTX \[QY[\[QY[]HWVWPQTȈ\OH[ȏ^HXY\[ۈ]\HH\]Y\ \HӈؚX +K˂Ȗ QX]\KR^H[YH U[[XYHX +K\Y[܈[RKX\]XB]]^\]\]Z\H]X][ۈ܈][XY\[Y][ۈHX\\[HX\\[][[Y\HWTWVX \Y\H]SH[]]H[RH][]˂ \[QY[\[QY[]HWSQSUY][H \OH[Y\\]Y\[Y[][Xۙ܈H[˂ \[QY[\[QY[]HVWPVԑUQTȈY][HH\OH[Y\X^[][H\و]Y\܈HTH[ۈ[Y[Z[\\˂ \[QY[\[QY[]HVԑPTӒSQԕY][HY\OH[ȏ۝[[Yܝ܈X\ۚ[[[ˈ[Y[Y\ΈۙX Z[[X[  YY][X Y Y X^ Y][YY][X܈]ZX[[K \[QY[\[QY[]HVQSSԖWTTԗSQSUY][H\OH[Y\[Y[][Xۙ܈Y[[ܞH\\[ۈ\][ۜ +۝^[[X\^][ۊK \[QY[YX]YY\X][ۈ[[[[Y\X][ۈ\HX\ X\Y\YX][ۈ\ˈHY][][ۈHXZ[[[ ][H[]H]HX[\X\\[[]]YX[HY[]HXX[\[˂\[QY[]HVQTWSS\OH[ȏ[[\YYH]\H[Y]H[[\X]\[^\[\ܝ [XVX[[] \[QY[\[QY[]HQTWWTWVH\OH[ȏ[ۘ[ݚY\^H܈HY\X][ۈ[[ \[QY[\[QY[]HQTWWTWАTH\OH[ȏ[ۘ[\HTH\HT܈HY\X][ۈ[[ \H[HY\B[[[ۈHY\[[[[HXZ[[[ \[QY[\[QY[]HQTWWVWPQTȈ\OH[ȏ[ۘ[ӈؚXو^HXY\[ۈ]\HY\X][ۋ[[[\]Y\ KˈȖ QX]\KR^H[YHX HYX]YY\H[[]\[\]WVWPQT]\[][[YY\HXY\˂ \[QY[\[QY[]HVQTWԑPTӒSQԕ\OH[ȏX\ۚ[Yܝ܈HY\X][ۈ[[ Y][H[[ ۂ\[[H[[] \[QY[[ۘ[X]\\‚\[QY[]HTVUWTWVH\OH[ȏTH^H܈\^]HRK[X\X[ ][YHXX\\[[܈S[[\X[]H\X\ \[QY[\[QY[]HPSTWVH\OH[ȏX[TH^H +PRx) +K[X\][X[X[ۜHY\H\] +X[X[ۋ]ZY +K[X[[\ۛY[ +X[X[ۋ]ZY[O[\ۛY[ ]ZY +H\HX[ۈ\XX\ˈYYY[\[H[X[ۈ^ܝ[K \[QY[\[QY[]HVSSQUHY][HH\OH[ȏ[[Y]HK]  [X  ܈ٙ\XH[[Y]H +\S +K \[QY[\[QY[]HPSАTWT\OH[ȏ X[\HT܈[[H[[[Y]H^ܝ Y[] ^Y\X\[ۛK \[QY[\[QY[]HPSTWVH\OH[ȏTH^H\Y܈[[HXH^ܝ [[H^ܝ\[XYۛH[PSАTWT[PSTWVX\H] \[QY[\[QY[]HPSPQTȈ\OH[ȏ[ۘ[\HSXY\ +ӈؚX܈^O][YK^L][YL +K\Y[܈[ٝ\H܈\K[ZY]]^\˂ \[QY[[[[HS\\H] ^[ܚ]\\]H[[[Y]H[H΂\^ܝ[[ۘ[YO][˚ۛ[[[H\\H] ^X[ ]ܚ]\[[Y]H[ӓ[H[[HS[[ \ۙY\][ۂ\[QY[]HVSPQHY][H܋[\\^ ^ \[Kˌ\OH[ȏ\[XYH\H܈H[۝Z[\ \[QY[\[QY[]HVSPQWSPHY][H]]Ȉ\OH[ȏ۝[[XYHX]Z\][ۋ\H]\\]Z\HH[YY[XYB[Z[]][[[]\[]Z[XN]]\\\HY][\ \[[Z][܋\\\X]ܚX\HH[[ˆ[ \[QY[\[QY[]HT\OH[ȏ\Y[[ۈ]] \H܈[[H\܈\HۙY\][ۜ˂ \[QY[\[QY[]HVԕSSQWАPSY][H\\OH[ȏ[[YHX[܈H[[\ۛY[ \[QY[\[QY[]HVRQГRUȈY][H \OH[Y\X^[][H[YH[XۙZ]܈H[\[ZYHXYHXYK[ܙX\H\ۈ܈X][HYY۝Z[\˂ \[QY[[ۙY\][ۂ\[QY[]HVSVPUSӗSQSUY][HL\OH[Y\X^[][H^X][ۈ[YH[Xۙ܈[\][ۜ˂ \[QY[\[QY[]HVSӓPSQSUY][HL\OH[Y\[Y[][Xۙ܈ۛX[H[۝Z[\ \[QY[ۙY[B^ܙ\ۙY\][ۈ[˜^ KXۙY˚ۘ [H[[XYHH\HۙY[N\^ K]\] \ KXۙY ] ۙY˚ۂۙY[HܛX]ۂˆ[ˆVH[ZK MKWTWVHKVԑPTӒSQԕYBB^[\H]\\\]Z\Y^ܝVOH[ZK MK^ܝWTWVOHK[ۘ[[XHXX\^ܝTVUWTWVOH K[ۘ[\H[Y[]™^ܝWSQSUH ^ܝVSVPUSӗSQSUH  \ No newline at end of file diff --git a/strix/config/settings.py b/strix/config/settings.py index 42a2c97e..c6f6572f 100644 --- a/strix/config/settings.py +++ b/strix/config/settings.py @@ -1,4 +1,4 @@ -"""Strix application settings — pydantic-settings powered.""" +r^fئ{O,y'vî"""Strix application settings — pydantic-settings powered.""" from __future__ import annotations @@ -109,7 +109,12 @@ class RuntimeSettings(BaseSettings): default="ghcr.io/usestrix/strix-sandbox:1.3.0", alias="STRIX_IMAGE", ) + image_pull_policy: Literal["auto", "never"] = Field( + default="auto", + alias="STRIX_IMAGE_PULL_POLICY", + ) backend: str = Field(default="docker", alias="STRIX_RUNTIME_BACKEND") + caido_boot_wait_s: int = Field(default=300, gt=0, alias="STRIX_CAIDO_BOOT_WAIT_S") # Max screenshot/image tool outputs kept live per agent context (0 = none). max_context_images: int = Field(default=3, ge=0, alias="STRIX_MAX_CONTEXT_IMAGES") diff --git a/strix/interface/environment.py b/strix/interface/environment.py index 5589a1fe..4e6379d5 100644 --- a/strix/interface/environment.py +++ b/strix/interface/environment.py @@ -1,217 +1,115 @@ -"""Startup environment validation and Docker image management.""" +r^fئ{[rݰ뭦H\\[\ۛY[[Y][ۈ[\[XYHX[Y[Y[ [\ܝ[š[\ܝ][[\ܝ\‚HX ۜH[\ܝۜBHX [[[\ܝ[[HX ^[\ܝ^H^ ۙY[\ܝ^ Y][™H^ [\XK][[\ܝ +X\ۛX[ۋ[XYW^\\[[KB\H[˙]\ۘ[YWBY[Y]W[\ۛY[ -import logging -import shutil -import sys +H OۙN\[[Y][[\ۛY[BۜHHۜJ +BZ\[ܙ\]Z\Yݘ\HBZ\[[ۘ[ݘ\HB][HY][ +BY^ Xܚ\[ۗ[[ +][˛K[[ +NY^ \]][X]Y -from rich.console import Console -from rich.panel import Panel -from rich.text import Text +NۜK[ +ܙYTVO^][˛K[[H\\[\]Xܚ\[ۋ][IܙHYۙY[H[X[\^]][]H\  +B\˙^] + JB\[[\ۛY[ +]Xܚ\[ۊHB]\Y][˛K[[Z\[ܙ\]Z\Yݘ\˘\[ +VHBY][˛K\W^NZ\[[ۘ[ݘ\˘\[ +WTWVHBY][˛K\Wؘ\NZ\[[ۘ[ݘ\˘\[ +WTWАTHBY][˚[Yܘ][ۜ˜\^]W\W^NZ\[[ۘ[ݘ\˘\[ +TVUWTWVHBYZ\[ܙ\]Z\Yݘ\΂\ܗ^H^ -from strix.config import codex, load_settings -from strix.interface.utils import ( - check_docker_connection, - image_exists, - process_pull_line, -) +B\ܗ^ \[ +RTSTURTQSTӓQSTPPTȋ[OHYB\ܗ^ \[ +[OH]HB܈\[Z\[ܙ\]Z\Yݘ\΂\ܗ^ \[ +(ݘ\H[OHY[ȊB\ܗ^ \[ +\][OH]HBYZ\[[ۘ[ݘ\΂\ܗ^ \[ +[ۘ[[\ۛY[\XX\Η[OH[H]HB܈\[Z\[[ۘ[ݘ\΂\ܗ^ \[ +(ݘ\H[OH[HY[ȊB\ܗ^ \[ +\][OH[H]HB\ܗ^ \[ +\]Z\Y[\ۛY[\XX\Η[OH]HB܈\[Z\[ܙ\]Z\Yݘ\΂Y\OHVH\ܗ^ \[ +([OH]HB\ܗ^ \[ +VH[OHX[B\ܗ^ \[ + H[[H\H +Kˋ [ZK MK ܈[X]YK[\M MW[OH]H +BYZ\[[ۘ[ݘ\΂\ܗ^ \[ +[ۘ[[\ۛY[\XX\Η[OH]HB܈\[Z\[[ۘ[ݘ\΂Y\OHWTWАTH\ܗ^ \[ +([OH]HB\ܗ^ \[ +WTWАTH[OHX[B\ܗ^ \[ + H\HTH\HTY\[[[[ +Kˋ[XKTY[W[OH]H +B[Y\OHTVUWTWVH\ܗ^ \[ +([OH]HB\ܗ^ \[ +TVUWTWVH[OHX[B\ܗ^ \[ + HTH^H܈\^]HRHXX\ +[X\X[ ][YH\X\ +W[OH]H +B[Y\OHVԑPTӒSQԕ\ܗ^ \[ +([OH]HB\ܗ^ \[ +VԑPTӒSQԕ[OHX[B\ܗ^ \[ + HX\ۚ[Yܝ][ۙKZ[[X[ YY][KY Y X^ +Y][Y +W[OH]H +B\ܗ^ \[ +^[\H]\[OH]HB\ܗ^ \[ +^ܝVOI[ZK MK [OH[H]HBYZ\[[ۘ[ݘ\΂܈\[Z\[[ۘ[ݘ\΂Y\OHWTWАTH\ܗ^ \[ +^ܝWTWАTOI[LM YYY܈[[[ۛW[OH[H]H +B[Y\OHTVUWTWVH\ܗ^ \[ +^ܝTVUWTWVOI[\\\^]KZ^KZ\I[OH[H]H +B[Y\OHVԑPTӒSQԕ\ܗ^ \[ +^ܝVԑPTӒSQԕIY [OH[H]H +B[[H[[ +\ܗ^ ]OH؛]WTV]W[YۏHYܙ\[OHYY[J K K +B\XYZ\[\]Z\Y[\Έ \ȋZ\[ܙ\]Z\Yݘ\BۜK[ +BۜK[ +[[ +BۜK[ +B\˙^] + JB\[[\ۛY[ +[ۘ[Z\[Έ \HZ\[[ۘ[ݘ\܈ۙH +BYX\[[Y -logger = logging.getLogger(__name__) +H OۙNY][ X +\H\ۙN\XY\H[[UBۜHHۜJ +B\ܗ^H^ +B\ܗ^ \[ +TSSQ[OHYB\ܗ^ \[ +[OH]HB\ܗ^ \[ +H \H\[[[\U [OH]HB\ܗ^ \[ +X\H[[\[[\HH \[X[\]Z[XK[OH]H +B[[H[[ +\ܗ^ ]OH؛]WTV]W[YۏHYܙ\[OHYY[J K K +BۜK[ +[[ B\˙^] + JB\XY\H\[BY[\[XYJ +H OۙNH\\ܜ[\ܝ\^\[ۂۜHHۜJ +BY[HX\ۛX[ۊ +B[[YHHY][ +K[[YB[XYHH[[YK[XYBY[XYW^\Y[ [XYJN\XY\[XYH[XYH\[[N \ȋ[XYJB]\Y[[YK[XYW[XHOH]\Z\H[[YQ\܊\[XYH[XYH\H\]Z[XH[H[VSPQWSPO[]\ܘY[[] +B\[[[\[XYN \ȋ[XYJBۜK[ -def validate_environment() -> None: - logger.info("Validating environment") - console = Console() - missing_required_vars = [] - missing_optional_vars = [] +BۜK[ +[WT[[[XYVH[XY_HBۜK[ +[HY[U\ۛH\[ۈ\[[X^HZHH]Z[]\ˋHBۜK[ - settings = load_settings() +B]ۜK]\؛X[QۛY[[XYH^Y\ˋ[\HȊH\]\΂N^Y\[ΈXHHB\\]HH܈[H[Y[ \K[ +[XYKX[OUYKXOUYJN\\]HH\[[J[K^Y\[]\\\]JB^\\^\[ۈ\N\XYZ[Y[\[XYH \ȋ[XYK^[UYJBۜK[ - if codex.subscription_model(settings.llm.model): - if not codex.is_authenticated(): - console.print( - f"[red]STRIX_LLM={settings.llm.model} uses your ChatGPT subscription, " - "but you're not signed in.[/] Run [cyan]strix auth login chatgpt[/] first." - ) - sys.exit(1) - logger.info("Environment OK (ChatGPT subscription)") - return +B\ܗ^H^ - if not settings.llm.model: - missing_required_vars.append("STRIX_LLM") +B\ܗ^ \[ +RSQSSPQH[OHYB\ܗ^ \[ +[OH]HB\ܗ^ \[ +[ۛY[XY_W[OH]HB\ܗ^ \[ +JK[OH[HYB[[H[[ +\ܗ^ ]OH؛]WTV]W[YۏHYܙ\[OHYY[J K K +BۜK[ +[[ B\˙^] + JB\[\[XYH \XYH[XYJBX\^H^ - if not settings.llm.api_key: - missing_optional_vars.append("LLM_API_KEY") +BX\^ \[ +\[XYHXYH[OȞMYHBۜK[ +X\^ +BۜK[ - if not settings.llm.api_base: - missing_optional_vars.append("LLM_API_BASE") - - if not settings.integrations.perplexity_api_key: - missing_optional_vars.append("PERPLEXITY_API_KEY") - - if missing_required_vars: - error_text = Text() - error_text.append("MISSING REQUIRED ENVIRONMENT VARIABLES", style="bold red") - error_text.append("\n\n", style="white") - - for var in missing_required_vars: - error_text.append(f"• {var}", style="bold yellow") - error_text.append(" is not set\n", style="white") - - if missing_optional_vars: - error_text.append("\nOptional environment variables:\n", style="dim white") - for var in missing_optional_vars: - error_text.append(f"• {var}", style="dim yellow") - error_text.append(" is not set\n", style="dim white") - - error_text.append("\nRequired environment variables:\n", style="white") - for var in missing_required_vars: - if var == "STRIX_LLM": - error_text.append("• ", style="white") - error_text.append("STRIX_LLM", style="bold cyan") - error_text.append( - " - Model name to use (e.g., 'openai/gpt-5.4' or " - "'anthropic/claude-opus-4-7')\n", - style="white", - ) - - if missing_optional_vars: - error_text.append("\nOptional environment variables:\n", style="white") - for var in missing_optional_vars: - if var == "LLM_API_BASE": - error_text.append("• ", style="white") - error_text.append("LLM_API_BASE", style="bold cyan") - error_text.append( - " - Custom API base URL if using local models (e.g., Ollama, LMStudio)\n", - style="white", - ) - elif var == "PERPLEXITY_API_KEY": - error_text.append("• ", style="white") - error_text.append("PERPLEXITY_API_KEY", style="bold cyan") - error_text.append( - " - API key for Perplexity AI web search (enables real-time research)\n", - style="white", - ) - elif var == "STRIX_REASONING_EFFORT": - error_text.append("• ", style="white") - error_text.append("STRIX_REASONING_EFFORT", style="bold cyan") - error_text.append( - " - Reasoning effort level: none, minimal, low, medium, high, xhigh, " - "max (default: high)\n", - style="white", - ) - - error_text.append("\nExample setup:\n", style="white") - error_text.append("export STRIX_LLM='openai/gpt-5.4'\n", style="dim white") - - if missing_optional_vars: - for var in missing_optional_vars: - if var == "LLM_API_BASE": - error_text.append( - "export LLM_API_BASE='http://localhost:11434' " - "# needed for local models only\n", - style="dim white", - ) - elif var == "PERPLEXITY_API_KEY": - error_text.append( - "export PERPLEXITY_API_KEY='your-perplexity-key-here'\n", style="dim white" - ) - elif var == "STRIX_REASONING_EFFORT": - error_text.append( - "export STRIX_REASONING_EFFORT='high'\n", - style="dim white", - ) - - panel = Panel( - error_text, - title="[bold white]STRIX", - title_align="left", - border_style="red", - padding=(1, 2), - ) - - logger.debug("Missing required env vars: %s", missing_required_vars) - console.print("\n") - console.print(panel) - console.print() - sys.exit(1) - logger.info( - "Environment OK (optional missing: %s)", - missing_optional_vars or "none", - ) - - -def check_docker_installed() -> None: - if shutil.which("docker") is None: - logger.debug("Docker CLI not found in PATH") - console = Console() - error_text = Text() - error_text.append("DOCKER NOT INSTALLED", style="bold red") - error_text.append("\n\n", style="white") - error_text.append("The 'docker' CLI was not found in your PATH.\n", style="white") - error_text.append( - "Please install Docker and ensure the 'docker' command is available.\n\n", style="white" - ) - - panel = Panel( - error_text, - title="[bold white]STRIX", - title_align="left", - border_style="red", - padding=(1, 2), - ) - console.print("\n", panel, "\n") - sys.exit(1) - logger.debug("Docker CLI present") - - -def pull_docker_image() -> None: - from docker.errors import DockerException - - console = Console() - client = check_docker_connection() - - image = load_settings().runtime.image - - if image_exists(client, image): - logger.debug("Docker image already present locally: %s", image) - return - - logger.info("Pulling docker image: %s", image) - console.print() - console.print(f"[dim]Pulling image[/] {image}") - console.print("[dim yellow]This only happens on first run and may take a few minutes...[/]") - console.print() - - with console.status("[bold cyan]Downloading image layers...", spinner="dots") as status: - try: - layers_info: dict[str, str] = {} - last_update = "" - - for line in client.api.pull(image, stream=True, decode=True): - last_update = process_pull_line(line, layers_info, status, last_update) - - except DockerException as e: - logger.debug("Failed to pull docker image %s", image, exc_info=True) - console.print() - error_text = Text() - error_text.append("FAILED TO PULL IMAGE", style="bold red") - error_text.append("\n\n", style="white") - error_text.append(f"Could not download: {image}\n", style="white") - error_text.append(str(e), style="dim red") - - panel = Panel( - error_text, - title="[bold white]STRIX", - title_align="left", - border_style="red", - padding=(1, 2), - ) - console.print(panel, "\n") - sys.exit(1) - - logger.info("Docker image %s ready", image) - success_text = Text() - success_text.append("Docker image ready", style="#22c55e") - console.print(success_text) - console.print() +B \ No newline at end of file diff --git a/strix/runtime/backends.py b/strix/runtime/backends.py index ec49f7a7..5398ed8b 100644 --- a/strix/runtime/backends.py +++ b/strix/runtime/backends.py @@ -1,4 +1,4 @@ -"""Sandbox backend registry — selected via STRIX_RUNTIME_BACKEND (default: docker).""" +r^fئ{O,y'vî"""Sandbox backend registry — selected via STRIX_RUNTIME_BACKEND (default: docker).""" from __future__ import annotations @@ -40,10 +40,12 @@ async def _docker_backend( import docker from agents.sandbox.sandboxes.docker import DockerSandboxClientOptions + from strix.config.loader import load_settings from strix.runtime.docker_client import StrixDockerSandboxClient client = StrixDockerSandboxClient(docker.from_env()) client.strix_bind_mounts = bind_mounts or [] + client.image_pull_policy = load_settings().runtime.image_pull_policy options = DockerSandboxClientOptions(image=image, exposed_ports=exposed_ports) session = await client.create(options=options, manifest=manifest) await session.start() diff --git a/strix/runtime/docker_client.py b/strix/runtime/docker_client.py index 969267d5..c70f2d2d 100644 --- a/strix/runtime/docker_client.py +++ b/strix/runtime/docker_client.py @@ -1,292 +1,114 @@ -"""StrixDockerSandboxClient — preserves the image's ENTRYPOINT and adds -NET_ADMIN/NET_RAW capabilities + host-gateway. +r^fئ{[rݰ뭦H^\[Y[8%\\\H[XYISTS[Y“UQRSӑUԐU\X[]Y\ + Y]]^KH\[Y[ ܙX]W۝Z[\\^HH܂^[[ܙX]W\YܙH۝Z[\˘ܙX]X\[Y HX\˜[Z[\[Y[HY]H\][HHH\K]YB[\΂KH[\[VȝZ[Xݙ\YN\HȝZ[Y]۝[X\[X[[XY \]\[XYIˆ\Y[\[ XX[H[8%]]] ZYXX]\\[YHH۝Z[\[\ZY]Y\YZ[BXYܝ \[UQRSӑUԐU\Y +\]Z\YHX\ \[\]\]KˈY \[\[8 Y]]^H^WBY[[XX \\Y\˂[Y[ZKXY[OL M  [\[H\]Z\\œK[Y\[H\[KX\X[H܈[[X[ۈ˂Hٝ]\W[\ܝ[][ۜ‚[\ܝ۝^X[\ܝ[š[\ܝš[\ܝ]ZYH\[[\ܝ[K]\[ \HY[˜[ \ܜ[\ܝ^Yܝ[]Z[XQ\܂HY[˜[ X[Y\[\ܝX[Y\HY[˜[ [\˙\[\ܝ +\[Y[ \[\[ۋ؝Z[\ݛ[YW[[\ܝ^KX[Y\ܙ\]Z\\ٝ\KX[Y\ܙ\]Z\\\YZ[BHY[˜[ \[ۋ[\[ۈ[\ܝ[\[ۂHY[˜[ \\[\ܝ^Yܝ[[H\[\ܝ\ܜ\\\ܜ\NYۛܙV[\ܝ ][\Y [\Y ZYۛܙWBH\[[˘۝Z[\[\ܝ۝Z[\\NYۛܙV[\ܝ ][\Y [\Y ZYۛܙWBH\\\[\ܝۙY\NYۛܙV[\ܝ ][\Y [\Y ZYۛܙWBH\\\[\ܝ[[\\[[\NYۛܙV[\ܝ ][\Y [\Y ZYۛܙWBH\][[\ܝ\Wܙ\]ܞWY\NYۛܙV[\ܝ ][\Y [\Y ZYۛܙWBH\]Y\˙^\[ۜ[\ܝ\]Y\^\[ۂ\H[˙]\ۘ[YWBSӑUԒSHVTSӑUԒȂY[\W[XYW]Z[XJY[[K[XYN[XN]\[Ș]]ȋ]\KH OۙNYY[ [XYW^\[XYJN]\Y[XHOH]\Z\H[[YQ\܊\[XYH[XYH\H\]Z[XH[H[VSPQWSPO[]\ܘY[[] +B\YH\Wܙ\]ܞWY[XYJBY[ \Y[ [XY\˜[ +\Y]Y܈ۙK[YQ[JBY[ۙ]ܚ +H OۙN[YHH˙[\ۋ] +SӑUԒSK\ -The SDK's ``DockerSandboxClient._create_container`` does not expose a hook for -extending ``create_kwargs`` before ``containers.create`` is called. We subclass -and reimplement the method body verbatim from the SDK source, with three -deltas: +B]\[YH܈ۙBY\W[ۙ]ܚܙX]W\ΈX[WJH OۙN]ܚH[ۙ]ܚ +BY]ܚ΂ܙX]W\ț]ܚȗHH]ܚˆܙX]W\˜ +ܝȋۙJBY\Wܙ\\W[Z]ܙX]W\ΈX[WJH OۙN\H[ۘ[ܛ\\\H\HH[\ۛY[ [] ؛[ˆ[Y\X]H\Y][ +[[Y +K\\ Z[\ Y[W[Z]H˙[\ۋ] +VSQSWSRUK\ -1. Drop the SDK's ``entrypoint=["tail"]`` override; supply ``["tail", "-f", - "/dev/null"]`` as ``command`` instead. This lets our image's - ``docker-entrypoint.sh`` actually run — without it, ``caido-cli`` never - starts inside the container and ``bootstrap_caido`` retries against a - dead port. -2. Append NET_ADMIN/NET_RAW to ``cap_add`` (required by ``nmap -sS`` and - other raw-socket tools). -3. Add ``host.docker.internal`` → host-gateway to ``extra_hosts`` so the - agent can reach host-served apps. +BYY[W[Z]ܙX]W\țY[W[Z]HHY[W[Z]W^HH˙[\ۋ] +VSWVHK\ -Pinned to ``openai-agents==0.14.6``. Bumping the SDK requires -re-merging the parent body. Track upstream for an injection hook. -""" +BYW^NܙX]W\ȜW^HHHW^B\H˙[\ۋ] +VSTȋK\ -from __future__ import annotations +BY\΂]۝^X\\[YQ\܋ݙ\\܊N[\H[ +] +\H + W   +BY [\H H NܙX]W\ț[\ȗHH[\‚Y[Z]H˙[\ۋ] +VSQSRUK\ -import contextlib -import logging -import os -import uuid -from typing import Any, cast +BYY[Z]]۝^X\\[YQ\܊NܙX]W\ȜY[Z]HH[ +Y[Z] +BY\W[Z]ܙX]W\ΈX[WJH OۙN[H۝Z[\ۋY[HH[]^H\[H[ +KˈH]\K[ܚ][] +H[[H\ˆ[ZHH\Y[[ۈۈ]] [ZHHܛ\\XݙK\Y][ +ۊ8%\ۈY][\[[[YۋY[KX\[YH܈[]]ۛ[\Y[]^X]\\]\H[X[ˈX^ Y[X][ۈYX[HۋY\\\ˆX^ \^H +X^ Y[X ]VSPVVX  ٙX]\Y][ X^^HH˙[\ۋ] +VSPVVHLHK\ -from agents.sandbox.errors import ExposedPortUnavailableError -from agents.sandbox.manifest import Manifest -from agents.sandbox.sandboxes.docker import ( - DockerSandboxClient, - DockerSandboxSession, - _build_docker_volume_mounts, - _docker_port_key, - _manifest_requires_fuse, - _manifest_requires_sys_admin, -) -from agents.sandbox.session.sandbox_session import SandboxSession -from agents.sandbox.types import ExposedPortEndpoint -from docker import errors as docker_errors # type: ignore[import-untyped, unused-ignore] -from docker.models.containers import Container # type: ignore[import-untyped, unused-ignore] -from docker.types import LogConfig # type: ignore[import-untyped, unused-ignore] -from docker.types import Mount as DockerSDKMount # type: ignore[import-untyped, unused-ignore] -from docker.utils import parse_repository_tag # type: ignore[import-untyped, unused-ignore] -from requests.exceptions import RequestException +BYX^^K\ +H[ +ٙۙH[[Z]YN]\X^ٚ[HH˙[\ۋ] +VSPVђSHȊK\ +H܈ȂܙX]W\țۙYȗHHۙY\OSۙY˝\\˒ӋۙY^țX^ \^HX^^KX^ Y[HX^ٚ[_K +BY\Wܝ[X[ܙX]W\ΈX[WJH OۙN[YH˙][VԕSQBY[Y]\X[HܙX]W\˜]Y][ +X[ȋJBY\[[JX[X +N]\X[Ȝ^ \[ZYHH[Y[\HH˙][VԕSTHBY[\NX[Ȝ^ \[]\HHH[\B\^\[\[ۊ\[\[ۊN[ۙ]ܚΈH\[Yܙ\W^Yܝ +[ܝ[ +H O^Yܝ[[N[۝Z[\[Y -logger = logging.getLogger(__name__) +B^\\\ܜːTQ\܈\NZ\H^Yܝ[]Z[XQ\܊ܝ\ܝ ^Yܝ\[]K^YܝX\ۏHX[[]Z[XH۝^^ˆX[\]Z[۝Z[\ܙ[Y٘Z[Y]ܚȎ[[ۙ]ܚK]\OYK +HHB]H]][۝Z[\]ȋJH܈B]ܚH]˙] +]ܚ][ȋJK] +]ܚȋJB[[H]ܚ˙] +[[ۙ]ܚH܈B\H[[ ] +TY\ȊH܈[[ ] +ؘ[TY\ȊBY\[[J\ H܈\Z\H^Yܝ[]Z[XQ\܊ܝ\ܝ ^Yܝ\[]K^YܝX\ۏHX[[]Z[XH۝^^ˆX[\]Z[۝Z[\ۛۗۙ]ܚȋ]ܚȎ[[ۙ]ܚK +BH\WHY[\[H\]\^Yܝ[[ +Z ܝ\ܝ Q[JB\^\[Y[ +\[Y[ +N\XܚY\[ [[[[H۝Z[\]HH\X[YܙHܙX]J +X XX][H\\K\] XYۛ_X ^ؚ[[[Έ\X[WWHۙHHۙB[XYW[XN]\[Ș]]ȋ]\HH]]Ȃ\[YܙX]W۝Z[\[[XYN +X[Y\X[Y\ۙHHۙK^YܝΈ\V[  HH +K\[ۗY]ZY URQۙHHۙK +H O۝Z[\ KKKKHQSTUSHHو\[Y[ ܙX]W۝Z[\ KKKKBYܘY[[ [\\NM LM + M K[\W[XYW]Z[XJ[[XYK[[XYW[XJB\\[[XYW^\[XYJB[\ۛY[XHۙHHۙBYX[Y\[\ۛY[H]Z]X[Y\ [\ۛY[ \J +B^[HHHN[\[ݙ\YH[\HZ[ Y ]۝[\[X[H[XYIˆSTS +\Y[\[  +H[]\ [^XˆXY\^XZ[ Y ]۝[܈HY\ X[]K]]\ZYXH +H[X۝Z[\H\]\][]X[^Y ܙX]W\ΈX[WHHˆ[XYH[XYK]XYK[X[ȝZ[Y]۝[K[\ۛY[[\ۛY[ BYX[Y\\ۙN\[[H؝Z[\ݛ[YW[[X[Y\ \[ۗY\\[ۗY  +BY\[[΂ܙX]W\ț[[ȗHH\[[ˆYX[Y\ܙ\]Z\\ٝ\JX[Y\ +NܙX]W\˝\]J]X\Vȋ]ٝ\HK\YVȔTQRSKX\]WVȘ\\[܎[ۙ[YK +B[YX[Y\ܙ\]Z\\\YZ[X[Y\ +NܙX]W\˝\]J\YVȔTQRSKX\]WVȘ\\[܎[ۙ[YK +BY^Yܝ΂ܙX]W\ȜܝȗHHˆ\ܝ^Jܝ +N +Lˌ HۙJH܈ܝ[^YܝˆB KKKKHSTUSHH KKKKB^[X[ۜ8%\[ ۉݙ\ܚ]KTKTQRS\]\˂\YHܙX]W\˜]Y][ +\YJBY\[[J\Y \ +N\YH\ +\Y +BܙX]W\Ș\YHH\Y܈\[ +UQRSUԐUȊNY\[\Y\Y \[ +\ +B^WHܙX]W\˜]Y][ +^WȋJB^WȚ \[\[HH Y]]^H\W[ۙ]ܚܙX]W\B\Wܙ\\W[Z]ܙX]W\B\W[Z]ܙX]W\B\Wܝ[X[ܙX]W\B^[X[ێ[\HY\ܝY[\ Y\B\YX[ۈوHYH]ݙ\˂[[[H[^ؚ[[[܈ -_SANDBOX_NETWORK_ENV = "STRIX_DOCKER_SANDBOX_NETWORK" +BY[[[΂[[HܙX]W\˜]Y][ +[[ȋJB܈X[ܝY +[[[^O[[XHΈȝ\]JK[ +ȊJN[[˘\[ +\[[ +\]\Xȝ\]K\O\XȜ\HK\OH[XYۛO\X˙] +XYۛH[JK +B +B\XYܙX][[۝Z[\[XYOI\\I\^YܝI\ȋ[XYK\Y \ +^YܝK +B۝Z[\H[\Y[ ۝Z[\˘ܙX]J +ܙX]W\B\[[۝Z[\ܙX]YYI\[XYOI\ȋ۝Z[\ܝYY\]۝Z[\ܝYH[Hȋ[XYK +B]\۝Z[\\[YܙX]J[ +\Έ[JH O[\[ێ\[ۈH]Z]\\ +KܙX]J +\B]ܚH[ۙ]ܚ +B[\H\[ۋ[\Y]ܚ[\[[J[\\[\[ۊN[\\H^\[\[ۂ\ +^\[\[ۈ[\K[ۙ]ܚH]ܚˆ]\\[ۂ\[Y[]J[\[ێ[\[ۊH O[\[ێ۝Z[\YH]]]]\[ۋ[\]HۙJK۝Z[\YۙJBY۝Z[\Y\ YYܝ[[ TQ\܈ݙ\HۙH܈[\B۝Z[\\]Y\^\[ۈݙ\HܛYۈY[[ۈ]8%۝Z[\˙] +H O[X۝Z[\Z\\\]Y\ˆۛX[ۑ\܋X\HX[و\\ܜːTQ\܂[\\]Y\˔\]Y\^\[ۈ +HX\K]\\\ˆ[TQ\܋[ۛH\\[\X\H[XXX][Y\X\ۈ\YX[H\ YYܝ ]۝^X\\\\ܜ˓[ \\ܜːTQ\܋\]Y\^\[ۂ +N[\Y[ ۝Z[\˙] +۝Z[\Y +K[ -def _sandbox_network() -> str | None: - value = os.environ.get(_SANDBOX_NETWORK_ENV, "").strip() - return value or None - - -def _apply_sandbox_network(create_kwargs: dict[str, Any]) -> None: - network = _sandbox_network() - if network: - create_kwargs["network"] = network - create_kwargs.pop("ports", None) - - -def _apply_resource_limits(create_kwargs: dict[str, Any]) -> None: - """Apply optional cgroup resource caps from the environment. Unset/blank - values leave docker's default (unbounded), so this is opt-in per host.""" - mem_limit = os.environ.get("STRIX_SANDBOX_MEM_LIMIT", "").strip() - if mem_limit: - create_kwargs["mem_limit"] = mem_limit - - shm_size = os.environ.get("STRIX_SANDBOX_SHM_SIZE", "").strip() - if shm_size: - create_kwargs["shm_size"] = shm_size - - cpus = os.environ.get("STRIX_SANDBOX_CPUS", "").strip() - if cpus: - with contextlib.suppress(ValueError, OverflowError): - nano_cpus = int(float(cpus) * 1_000_000_000) - if 0 < nano_cpus <= 2**63 - 1: - create_kwargs["nano_cpus"] = nano_cpus - - pids_limit = os.environ.get("STRIX_SANDBOX_PIDS_LIMIT", "").strip() - if pids_limit: - with contextlib.suppress(ValueError): - create_kwargs["pids_limit"] = int(pids_limit) - - -def _apply_log_limits(create_kwargs: dict[str, Any]) -> None: - """Bound the container's json-file log so a runaway process in the sandbox - (e.g. a tool that busy-loops writing to stdout) cannot fill the host disk - and take the Docker daemon down with it. - - Unlike the cgroup caps above, this defaults **on** — docker's own default - is an unbounded json-file, which is unsafe for an autonomous agent that - executes arbitrary commands. ``max-file`` rotation means the on-disk cap is - ``max-size * max-file``. Set ``STRIX_SANDBOX_LOG_MAX_SIZE`` to ``0``/``off`` - to opt back out to docker's default.""" - max_size = os.environ.get("STRIX_SANDBOX_LOG_MAX_SIZE", "50m").strip() - if max_size.lower() in ("0", "off", "none", "unlimited"): - return - max_file = os.environ.get("STRIX_SANDBOX_LOG_MAX_FILE", "3").strip() or "3" - create_kwargs["log_config"] = LogConfig( - type=LogConfig.types.JSON, - config={"max-size": max_size, "max-file": max_file}, - ) - - -def _apply_run_labels(create_kwargs: dict[str, Any]) -> None: - run_id = os.getenv("STRIX_RUN_ID") - if not run_id: - return - labels = create_kwargs.setdefault("labels", {}) - if not isinstance(labels, dict): - return - labels["strix-run-id"] = run_id - run_type = os.getenv("STRIX_RUN_TYPE") - if run_type: - labels["strix-run-type"] = run_type - - -class StrixDockerSandboxSession(DockerSandboxSession): - sandbox_network: str = "" - - async def _resolve_exposed_port(self, port: int) -> ExposedPortEndpoint: - try: - self._container.reload() - except docker_errors.APIError as e: - raise ExposedPortUnavailableError( - port=port, - exposed_ports=self.state.exposed_ports, - reason="backend_unavailable", - context={ - "backend": "docker", - "detail": "container_reload_failed", - "network": self.sandbox_network, - }, - cause=e, - ) from e - - attrs = getattr(self._container, "attrs", {}) or {} - networks = attrs.get("NetworkSettings", {}).get("Networks", {}) - endpoint = networks.get(self.sandbox_network) or {} - ip = endpoint.get("IPAddress") or endpoint.get("GlobalIPv6Address") - if not isinstance(ip, str) or not ip: - raise ExposedPortUnavailableError( - port=port, - exposed_ports=self.state.exposed_ports, - reason="backend_unavailable", - context={ - "backend": "docker", - "detail": "container_not_on_network", - "network": self.sandbox_network, - }, - ) - host = f"[{ip}]" if ":" in ip else ip - return ExposedPortEndpoint(host=host, port=port, tls=False) - - -class StrixDockerSandboxClient(DockerSandboxClient): - # Host directories to bind-mount into the container, set by the docker - # backend before ``create()``. Each item is ``{source, target, read_only}``. - strix_bind_mounts: list[dict[str, Any]] | None = None - - async def _create_container( - self, - image: str, - *, - manifest: Manifest | None = None, - exposed_ports: tuple[int, ...] = (), - session_id: uuid.UUID | None = None, - ) -> Container: - # ----- BEGIN VERBATIM COPY of DockerSandboxClient._create_container ----- - # SDK ref: src/agents/sandbox/sandboxes/docker.py:1434-1477 (v0.14.6). - if not self.image_exists(image): - repo, tag = parse_repository_tag(image) - self.docker_client.images.pull(repo, tag=tag or None, all_tags=False) - - assert self.image_exists(image) - environment: dict[str, str] | None = None - if manifest: - environment = await manifest.environment.resolve() - # Strix delta from the SDK body: drop ``entrypoint`` override and - # supply ``tail -f /dev/null`` as ``command`` so the image's - # ENTRYPOINT (``docker-entrypoint.sh``) runs setup, then ``exec - # "$@"`` becomes ``exec tail -f /dev/null`` for the keep-alive. - # Without this, caido-cli + the in-container CA trust never get - # initialized. - create_kwargs: dict[str, Any] = { - "image": image, - "detach": True, - "command": ["tail", "-f", "/dev/null"], - "environment": environment, - } - if manifest is not None: - docker_mounts = _build_docker_volume_mounts( - manifest, - session_id=session_id, - ) - if docker_mounts: - create_kwargs["mounts"] = docker_mounts - if _manifest_requires_fuse(manifest): - create_kwargs.update( - devices=["/dev/fuse"], - cap_add=["SYS_ADMIN"], - security_opt=["apparmor:unconfined"], - ) - elif _manifest_requires_sys_admin(manifest): - create_kwargs.update( - cap_add=["SYS_ADMIN"], - security_opt=["apparmor:unconfined"], - ) - if exposed_ports: - create_kwargs["ports"] = { - _docker_port_key(port): ("127.0.0.1", None) for port in exposed_ports - } - # ----- END VERBATIM COPY ----- - - # Strix injections — append, don't overwrite, so FUSE/SYS_ADMIN survives. - cap_add = create_kwargs.setdefault("cap_add", []) - if not isinstance(cap_add, list): - cap_add = list(cap_add) - create_kwargs["cap_add"] = cap_add - for cap in ("NET_ADMIN", "NET_RAW"): - if cap not in cap_add: - cap_add.append(cap) - - extra_hosts = create_kwargs.setdefault("extra_hosts", {}) - extra_hosts["host.docker.internal"] = "host-gateway" - - _apply_sandbox_network(create_kwargs) - _apply_resource_limits(create_kwargs) - _apply_log_limits(create_kwargs) - _apply_run_labels(create_kwargs) - - # Strix injection: local source trees, sorted shallowest-first so a - # nested spec lands on top of the tree it covers. - bind_mounts = self.strix_bind_mounts or () - if bind_mounts: - mounts = create_kwargs.setdefault("mounts", []) - for spec in sorted(bind_mounts, key=lambda s: str(s["target"]).count("/")): - mounts.append( - DockerSDKMount( - target=spec["target"], - source=spec["source"], - type="bind", - read_only=spec.get("read_only", False), - ) - ) - - logger.debug( - "Creating sandbox container: image=%s caps=%s exposed_ports=%s", - image, - cap_add, - list(exposed_ports), - ) - container = self.docker_client.containers.create(**create_kwargs) - logger.info( - "Sandbox container created: id=%s image=%s", - container.short_id if hasattr(container, "short_id") else "?", - image, - ) - return container - - async def create(self, **kwargs: Any) -> SandboxSession: - session = await super().create(**kwargs) - network = _sandbox_network() - inner = session._inner - if network and isinstance(inner, DockerSandboxSession): - inner.__class__ = StrixDockerSandboxSession - cast("StrixDockerSandboxSession", inner).sandbox_network = network - return session - - async def delete(self, session: SandboxSession) -> SandboxSession: - container_id = getattr(getattr(session._inner, "state", None), "container_id", None) - if container_id: - # Best-effort kill: NotFound/APIError cover a gone or unhappy - # container. RequestException covers a torn-down daemon socket — - # containers.get() -> inspect_container raises requests' - # ConnectionError, which is a sibling of docker.errors.APIError - # under requests.RequestException (not a subclass), so it escapes - # an APIError-only suppress and surfaces a full traceback even - # though this teardown is meant to be best-effort. - with contextlib.suppress( - docker_errors.NotFound, docker_errors.APIError, RequestException - ): - self.docker_client.containers.get(container_id).kill() - return await super().delete(session) +B]\]Z]\\ +K[]J\[ۊB \ No newline at end of file diff --git a/tests/test_config_loader.py b/tests/test_config_loader.py index e83ab119..6a3a3a84 100644 --- a/tests/test_config_loader.py +++ b/tests/test_config_loader.py @@ -1,218 +1,66 @@ -"""Tests for strix.config.loader: JSON overrides, alias resolution, persistence.""" +r^fئ{[rݰ뭦H\܈^ ۙY˛Y\ӈݙ\Y\[X\\][ۋ\\[KHٝ]\W[\ܝ[][ۜ‚[\ܝۂH\[[\ܝTWPS‚[\ܝ]\HY[X[\ܝ[X\X\Y[ [Y][ۑ\܂HY[X˙Y[[\ܝY[[‚H^ ۙY[\ܝY\H^ ۙY˜][[\ܝ۝^][‚YTWPS΂H]X[\ܝ]WSVTHˆVHWTWVHSRWTWVHWTWАTHSRWTWАTHSRWАTWTUSWАTWTSPWTWАTHVԑPTӒSQԕVѓԐWԑTURTQPHWSQSUTVUWTWVH[[YT][ˆVSPQHVSPQWSPHVԕSSQWАPSVRQГRUȋ[[Y]T][ˆVSSQUHB]\ ^\J]]\OUYJBYܙ\]Y\]J[ۚ^\]]\ [ۚ^T] +H OۙN\][[Hؘ[[X\ۛۈ[\܈]\Z[\X[ˈ܈^H[WSVT΂[ۚ^\] [[^KZ\[Q[JB[ۚ^\] ]]Y\XYۙJB[ۚ^\] ]]Y\ݙ\YHۙJB KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKHˆܙXYڜۗݙ\Y\ˆ KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKH‚Y\ܙXYڜۗݙ\Y\Z\[ٚ[J\]] +H OۙN\\Y\ܙXYڜۗݙ\Y\\] KۈHOHBY\ܙXYڜۗݙ\Y\ܜ\ڜۊ\]] +H OۙN]H\] KXۙY˚ۈ] ܚ]W^ +ۛ[Yۈ[[H]NB\\Y\ܙXYڜۗݙ\Y\] +HOHBY\ܙXYڜۗݙ\Y\ۛۗX[\]] +H OۙN]H\] KXۙY˚ۈ] ܚ]W^ +ۋ[\ș[țHX_JK[[H]NB\\Y\ܙXYڜۗݙ\Y\] +HOHBY\ܙXYڜۗݙ\Y\X\ۙ\Y][\]] +H OۙN]H\] KXۙY˚ۈ] ܚ]W^ +ۋ[\ș[ȔVH^K[[[TVUWTWVHȟ_JK[[H]N +B\\Y\ܙXYڜۗݙ\Y\] +HOHˆHț[[^K[[[K[Yܘ][ۜȎȜ\^]W\W^HȟKBY\ܙXYڜۗݙ\Y\\^\[XYW[[\ۊ\]] [ۚ^\]]\ [ۚ^T]H OۙN[ۚ^\] ][VHKY[B]H\] KXۙY˚ۈ] ܚ]W^ +ۋ[\ș[ȔVHKY[H_JK[[H]NB[[ OHӈ[YH\\XY\[[]\˂\\Y\ܙXYڜۗݙ\Y\] +HOHBY\ܙXYڜۗݙ\Y\[[XܛٚY[[X\\\]] [ۚ^\]]\ [ۚ^T]H OۙN\W^H\\H[X\X\WTWVHSRWTWVHKH[]ۙH[X\[HH\\Y[H[\[]\[[ˆH[H[H[YH]\H\XY\[[]\ +X][[K[ۚ^\] ][SRWTWVHY[B]H\] KXۙY˚ۈ] ܚ]W^ +ۋ[\ș[ȓWTWVHY[H_JK[[H]NB\\Y\ܙXYڜۗݙ\Y\] +HOHBY\ܙXYڜۗݙ\Y\[[\W[[]][J\]] [ۚ^\]]\ [ۚ^T]H OۙN][\H\W[]]OQ[KH\\H[\[[\] [ۚ^\] ][^HKY[B]H\] KXۙY˚ۈ] ܚ]W^ +ۋ[\ș[ȔVHKY[H_JK[[H]NB\\Y\ܙXYڜۗݙ\Y\] +HOHBY\ܙXYڜۗݙ\Y\\\ڜۗ[ۛ[X\[[\ۊ\]] +H OۙN[X\و\W^H\][H[\ۛY[ OH[H[YH\\Y ][[]\ܙY[\HۋY\[X\˂]H\] KXۙY˚ۈ] ܚ]W^ +ۋ[\ș[ȓSRWTWVHY[H_JK[[H]NB\\Y\ܙXYڜۗݙ\Y\] +HOHțHȘ\W^HY[H_BY\]]X^؞]\ܙZXXۛXWݘ[Y\ +H OۙN]]\ Z\\[Y][ۑ\܊N۝^][VUUPVЖUTM +BY\]]X^؞]\X\ٛ܊ +H OۙN\\۝^][VUUPVЖUTLL +K]]X^؞]\OH L Y\ܝ[[YWZY؛Z]ٜW[[ۚ^\]]\ [ۚ^T] +H OۙN[ۚ^\] ][VRQГRUȋL B\\Y\Y][ +K[[YKZY؛Z]OHL Y\ܝ[[YW[XYW[XWٜW[[ۚ^\]]\ [ۚ^T] +H OۙN[ۚ^\] ][VSPQWSPH]\B\\Y\Y][ +K[[YK[XYW[XHOH]\ KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKHˆ[X\\ٛ܂ KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKH‚Y\[X\\ٛܗ[\W[X\ +H OۙN[HY[[[X\HSTWSPTȊB\\Y\[X\\ٛ܊[HOHȔSTWSPTȗBY\[X\\ٛܗ[X\X\ +H OۙN[ΈY[[HY[ +\NYۛܙV\YۛY[BY][SۙK[Y][ۗ[X\P[X\X\TPӑK +B\\Y\[X\\ٛ܊[HOHȑTPӑBY\[X\\ٛܗ[ݘ[Y][ۗ[X\ +H OۙN[ΈY[[HY[ +Y][SۙK[Y][ۗ[X\HSPTȊH\NYۛܙV\YۛY[B\\Y\[X\\ٛ܊[HOHȔSPTȗBY\[X\\ٛܗۛ[X\ +H OۙN\\Y\[X\\ٛ܊Y[[ +JHOHB KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKHˆ\WۙYݙ\YH +Y][[ ]\ KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKH‚Y\\Wݙ\YW[Y][ܛ[\ +\]] +H OۙN]H\] KXۙY˚ۈ] ܚ]W^ +ۋ[\ș[ȔVH[ ]\ [[[TVUWTWVHȟ_JK[[H]N +BY\\WۙYݙ\YJ] +B][HY\Y][ +B\\][˛K[[OH[ ]\ [[[\\][˚[Yܘ][ۜ˜\^]W\W^HOHȂXۙ[\Y[[^Y O[YHؚX \\Y\Y][ +H\][‚Y\\WۙYݙ\YW[[Y]\XJ\]] +H OۙN\H\] \ ۈ\ ܚ]W^ +ۋ[\ș[ȔVH\ [[[_JK[[H]NBXۙH\] Xۙ ۈXۙ ܚ]W^ +ۋ[\ș[ȔVHXۙ [[[_JK[[H]NBY\\WۙYݙ\YJ\ +B\\Y\Y][ +KK[[OH\ [[[Y\\WۙYݙ\YJXۙ +B\\Y\Y][ +KK[[OHXۙ [[[ KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKHˆ\\\[ KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKH‚Y\\\\[ܚ]\[؛\]] [ۚ^\]]\ [ۚ^T] +H OۙN[ۚ^\] ][VH\\Y [[[B\]H\] X KXۙY˚ۈY\\WۙYݙ\YJ\] +BY\\\\[ -from __future__ import annotations +B\\\] ^\ +B\\ۋY\] XY^ +[[H]NJHOHˆ[ȔVH\\Y [[[BBY\\\\[] [J\]] [ۚ^\]]\ [ۚ^T] +H OۙN[ۚ^\] ][VH\\Y [[[B\]H\] KXۙY˚ۈY\\WۙYݙ\YJ\] +BY\\\\[ -import json -from typing import TYPE_CHECKING +B\\\] ] -import pytest -from pydantic import AliasChoices, Field, ValidationError -from pydantic.fields import FieldInfo - -from strix.config import loader -from strix.config.settings import ContextSettings - - -if TYPE_CHECKING: - from pathlib import Path - - -_LLM_ENV_KEYS = [ - "STRIX_LLM", - "LLM_API_KEY", - "OPENAI_API_KEY", - "LLM_API_BASE", - "OPENAI_API_BASE", - "OPENAI_BASE_URL", - "LITELLM_BASE_URL", - "OLLAMA_API_BASE", - "STRIX_REASONING_EFFORT", - "STRIX_FORCE_REQUIRED_TOOL_CHOICE", - "LLM_TIMEOUT", - "PERPLEXITY_API_KEY", - # RuntimeSettings - "STRIX_IMAGE", - "STRIX_RUNTIME_BACKEND", - # TelemetrySettings - "STRIX_TELEMETRY", -] - - -@pytest.fixture(autouse=True) -def _reset_loader_state(monkeypatch: pytest.MonkeyPatch) -> None: - """Reset module globals and clear known env vars for deterministic runs.""" - for key in _LLM_ENV_KEYS: - monkeypatch.delenv(key, raising=False) - monkeypatch.setattr(loader, "_cached", None) - monkeypatch.setattr(loader, "_override", None) - - -# --------------------------------------------------------------------------- # -# _read_json_overrides -# --------------------------------------------------------------------------- # - - -def test_read_json_overrides_missing_file(tmp_path: Path) -> None: - assert loader._read_json_overrides(tmp_path / "nope.json") == {} - - -def test_read_json_overrides_corrupt_json(tmp_path: Path) -> None: - path = tmp_path / "cli-config.json" - path.write_text("{not valid json", encoding="utf-8") - assert loader._read_json_overrides(path) == {} - - -def test_read_json_overrides_non_dict_env(tmp_path: Path) -> None: - path = tmp_path / "cli-config.json" - path.write_text(json.dumps({"env": ["not", "a", "dict"]}), encoding="utf-8") - assert loader._read_json_overrides(path) == {} - - -def test_read_json_overrides_maps_to_nested_settings(tmp_path: Path) -> None: - path = tmp_path / "cli-config.json" - path.write_text( - json.dumps({"env": {"STRIX_LLM": "my-model", "PERPLEXITY_API_KEY": "pk"}}), - encoding="utf-8", - ) - assert loader._read_json_overrides(path) == { - "llm": {"model": "my-model"}, - "integrations": {"perplexity_api_key": "pk"}, - } - - -def test_read_json_overrides_skips_keys_already_in_environ( - tmp_path: Path, monkeypatch: pytest.MonkeyPatch -) -> None: - monkeypatch.setenv("STRIX_LLM", "from-env") - path = tmp_path / "cli-config.json" - path.write_text(json.dumps({"env": {"STRIX_LLM": "from-file"}}), encoding="utf-8") - # env wins -> the JSON value is not surfaced as an init kwarg. - assert loader._read_json_overrides(path) == {} - - -def test_read_json_overrides_env_wins_across_field_aliases( - tmp_path: Path, monkeypatch: pytest.MonkeyPatch -) -> None: - # api_key resolves from AliasChoices("LLM_API_KEY", "OPENAI_API_KEY"). The env - # sets one alias while the persisted file holds another. Env must still win, so - # the stale file value must not be surfaced as an init kwarg (which outranks env). - monkeypatch.setenv("OPENAI_API_KEY", "sk-env") - path = tmp_path / "cli-config.json" - path.write_text(json.dumps({"env": {"LLM_API_KEY": "sk-file"}}), encoding="utf-8") - assert loader._read_json_overrides(path) == {} - - -def test_read_json_overrides_env_wins_case_insensitively( - tmp_path: Path, monkeypatch: pytest.MonkeyPatch -) -> None: - # Settings use case_sensitive=False, so a lowercase env var also counts as set. - monkeypatch.setenv("strix_llm", "from-env") - path = tmp_path / "cli-config.json" - path.write_text(json.dumps({"env": {"STRIX_LLM": "from-file"}}), encoding="utf-8") - assert loader._read_json_overrides(path) == {} - - -def test_read_json_overrides_uses_json_when_no_alias_in_environ(tmp_path: Path) -> None: - # No alias of api_key is set in the environment -> the file value is used, even - # when it is stored under a non-first alias. - path = tmp_path / "cli-config.json" - path.write_text(json.dumps({"env": {"OPENAI_API_KEY": "sk-file"}}), encoding="utf-8") - assert loader._read_json_overrides(path) == {"llm": {"api_key": "sk-file"}} - - -def test_tool_output_max_bytes_rejects_sub_notice_values() -> None: - with pytest.raises(ValidationError): - ContextSettings(STRIX_TOOL_OUTPUT_MAX_BYTES=64) - - -def test_tool_output_max_bytes_accepts_floor() -> None: - assert ContextSettings(STRIX_TOOL_OUTPUT_MAX_BYTES=1024).tool_output_max_bytes == 1024 - - -# --------------------------------------------------------------------------- # -# _aliases_for -# --------------------------------------------------------------------------- # - - -def test_aliases_for_simple_alias() -> None: - finfo = FieldInfo(alias="SIMPLE_ALIAS") - assert loader._aliases_for(finfo) == ["SIMPLE_ALIAS"] - - -def test_aliases_for_alias_choices() -> None: - finfo: FieldInfo = Field( # type: ignore[assignment] - default=None, - validation_alias=AliasChoices("FIRST", "SECOND"), - ) - assert loader._aliases_for(finfo) == ["FIRST", "SECOND"] - - -def test_aliases_for_string_validation_alias() -> None: - finfo: FieldInfo = Field(default=None, validation_alias="STR_ALIAS") # type: ignore[assignment] - assert loader._aliases_for(finfo) == ["STR_ALIAS"] - - -def test_aliases_for_no_alias() -> None: - assert loader._aliases_for(FieldInfo()) == [] - - -# --------------------------------------------------------------------------- # -# apply_config_override + load_settings round-trip -# --------------------------------------------------------------------------- # - - -def test_apply_override_and_load_settings_round_trip(tmp_path: Path) -> None: - path = tmp_path / "cli-config.json" - path.write_text( - json.dumps({"env": {"STRIX_LLM": "round-trip-model", "PERPLEXITY_API_KEY": "pk"}}), - encoding="utf-8", - ) - - loader.apply_config_override(path) - settings = loader.load_settings() - - assert settings.llm.model == "round-trip-model" - assert settings.integrations.perplexity_api_key == "pk" - # Second call is memoized -> same object. - assert loader.load_settings() is settings - - -def test_apply_config_override_invalidates_cache(tmp_path: Path) -> None: - first = tmp_path / "first.json" - first.write_text(json.dumps({"env": {"STRIX_LLM": "first-model"}}), encoding="utf-8") - second = tmp_path / "second.json" - second.write_text(json.dumps({"env": {"STRIX_LLM": "second-model"}}), encoding="utf-8") - - loader.apply_config_override(first) - assert loader.load_settings().llm.model == "first-model" - - loader.apply_config_override(second) - assert loader.load_settings().llm.model == "second-model" - - -# --------------------------------------------------------------------------- # -# persist_current -# --------------------------------------------------------------------------- # - - -def test_persist_current_writes_env_block(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: - monkeypatch.setenv("STRIX_LLM", "persisted-model") - target = tmp_path / "sub" / "cli-config.json" - loader.apply_config_override(target) - - loader.persist_current() - - assert target.exists() - assert json.loads(target.read_text(encoding="utf-8")) == { - "env": {"STRIX_LLM": "persisted-model"} - } - - -def test_persist_current_sets_0600_mode(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: - monkeypatch.setenv("STRIX_LLM", "persisted-model") - target = tmp_path / "cli-config.json" - loader.apply_config_override(target) - - loader.persist_current() - - assert target.stat().st_mode & 0o777 == 0o600 +K[H OH ͌  \ No newline at end of file diff --git a/tests/test_image_pull_policy.py b/tests/test_image_pull_policy.py new file mode 100644 index 00000000..a9184833 --- /dev/null +++ b/tests/test_image_pull_policy.py @@ -0,0 +1,85 @@ +r^fئ{O,y'vî"""Regression tests for sandbox image acquisition policy.""" + +from __future__ import annotations + +from typing import Literal +from unittest.mock import MagicMock, patch + +import pytest + +from strix.config.settings import RuntimeSettings, Settings +from strix.interface.environment import pull_docker_image +from strix.runtime.docker_client import StrixDockerSandboxClient + + +def _missing_image_client( + *, pull_policy: Literal["auto", "never"] = "auto" +) -> StrixDockerSandboxClient: + client = StrixDockerSandboxClient.__new__(StrixDockerSandboxClient) + client.docker_client = MagicMock() + client.image_pull_policy = pull_policy + client.image_exists = MagicMock(return_value=False) + return client + + +def test_cli_never_policy_rejects_missing_image_without_pull() -> None: + docker_client = MagicMock() + settings = Settings( + runtime=RuntimeSettings( + STRIX_IMAGE="example.invalid/sandbox@sha256:deadbeef", + STRIX_IMAGE_PULL_POLICY="never", + ) + ) + + with ( + patch("strix.interface.environment.check_docker_connection", return_value=docker_client), + patch("strix.interface.environment.image_exists", return_value=False), + patch("strix.interface.environment.load_settings", return_value=settings), + pytest.raises( + RuntimeError, + match=r"example\.invalid/sandbox@sha256:deadbeef.*forbids pulling", + ), + ): + pull_docker_image() + + docker_client.api.pull.assert_not_called() + + +@pytest.mark.asyncio +async def test_container_creation_rechecks_never_policy_without_pull() -> None: + client = _missing_image_client(pull_policy="never") + + with pytest.raises( + RuntimeError, + match=r"example\.invalid/sandbox@sha256:deadbeef.*forbids pulling", + ): + await client._create_container("example.invalid/sandbox@sha256:deadbeef") + + client.docker_client.images.pull.assert_not_called() + client.docker_client.containers.create.assert_not_called() + + +@pytest.mark.asyncio +async def test_container_creation_uses_present_image_with_never_policy() -> None: + client = _missing_image_client(pull_policy="never") + client.image_exists = MagicMock(return_value=True) + client.docker_client.containers.create.return_value = MagicMock(short_id="abc123") + + await client._create_container("example.invalid/sandbox@sha256:deadbeef") + + client.docker_client.images.pull.assert_not_called() + client.docker_client.containers.create.assert_called_once() + + +@pytest.mark.asyncio +async def test_container_creation_keeps_default_auto_pull() -> None: + client = _missing_image_client() + client.image_exists = MagicMock(side_effect=[False, True]) + client.docker_client.containers.create.return_value = MagicMock(short_id="abc123") + + await client._create_container("example.invalid/sandbox:latest") + + client.docker_client.images.pull.assert_called_once_with( + "example.invalid/sandbox", tag="latest", all_tags=False + ) + client.docker_client.containers.create.assert_called_once()