diff --git a/.github/workflows/prompt-optimization.lock.yml b/.github/workflows/prompt-optimization.lock.yml index 4754abe..e2ada5a 100644 --- a/.github/workflows/prompt-optimization.lock.yml +++ b/.github/workflows/prompt-optimization.lock.yml @@ -1,4 +1,4 @@ -# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"913d55a0ec6b35226117179207c3d7521c8079279fed73a3cfe5e311d610c14c","body_hash":"f4da4729fa1c2ff089690cff734944239056406cd0d66994e5171ba8763fe40f","compiler_version":"v0.87.10","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.80"}} +# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"913d55a0ec6b35226117179207c3d7521c8079279fed73a3cfe5e311d610c14c","body_hash":"a208c4c4fedca2d26e157e88db87388484a3c28ddac4b71a41c8c6256ebd2f38","compiler_version":"v0.87.10","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.80"}} # gh-aw-manifest: {"version":1,"secrets":["GH_AW_CI_TRIGGER_TOKEN","GH_AW_DEFAULT_OTLP_HEADERS","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/cache","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/cache/restore","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/cache/save","sha":"55cc8345863c7cc4c66a329aec7e433d2d1c52a9","version":"v6.1.0"},{"repo":"actions/checkout","sha":"3d3c42e5aac5ba805825da76410c181273ba90b1","version":"v7.0.1"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"820762786026740c76f36085b0efc47a31fe5020","version":"v7.0.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"ai-action/setup-ollama","sha":"0fdcbba8ac63bc9c0e7629cf85f46b77a4ad4072","version":"0fdcbba8ac63bc9c0e7629cf85f46b77a4ad4072"},{"repo":"github/gh-aw-actions/setup","sha":"v0.87.10","version":"v0.87.10"}],"skills":[".github/skills/optimize-scenario-prompt"],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.28.10","digest":"sha256:c01e6d16d11ea4f2a46cc023a9f402224a3b3861b026818eec0dc586d7e6918e","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.28.10@sha256:c01e6d16d11ea4f2a46cc023a9f402224a3b3861b026818eec0dc586d7e6918e"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.28.10","digest":"sha256:c3a18aebb8251339117ea998296315de17bada366f8d03919b3348ea71112e64","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.28.10@sha256:c3a18aebb8251339117ea998296315de17bada366f8d03919b3348ea71112e64"},{"image":"ghcr.io/github/gh-aw-firewall/cli-proxy:0.28.10","digest":"sha256:a61070cb7f21840c5f2ec74d55b49adf0652d0348ce059015aaaca33a8cb6b45","pinned_image":"ghcr.io/github/gh-aw-firewall/cli-proxy:0.28.10@sha256:a61070cb7f21840c5f2ec74d55b49adf0652d0348ce059015aaaca33a8cb6b45"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.28.10","digest":"sha256:c06076f7aca95df713e0748c44d80c0a3c2538fad67bfdd04296d45158e083e6","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.28.10@sha256:c06076f7aca95df713e0748c44d80c0a3c2538fad67bfdd04296d45158e083e6"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.4.14","digest":"sha256:b2f0c2b2f17b5fbe809e5bb99dc185b6ddd70df25295dc63a6d526350334eff5","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.4.14@sha256:b2f0c2b2f17b5fbe809e5bb99dc185b6ddd70df25295dc63a6d526350334eff5"},{"image":"ghcr.io/github/gh-aw-node","digest":"sha256:0daa8971fa4732b647150cb6524a6b0804b68d5d24f6f58b5dd1af23bd63fb23","pinned_image":"ghcr.io/github/gh-aw-node@sha256:0daa8971fa4732b647150cb6524a6b0804b68d5d24f6f58b5dd1af23bd63fb23"},{"image":"ghcr.io/github/github-mcp-server:v1.11.0","digest":"sha256:fbec75de11c255213fa08d80fb166abe73d851fff631c51c0079872967720699","pinned_image":"ghcr.io/github/github-mcp-server:v1.11.0@sha256:fbec75de11c255213fa08d80fb166abe73d851fff631c51c0079872967720699"}],"mcp_servers":[{"name":"safeoutputs","tools":["create_pull_request","create_pull_request_review_comment","missing_data","missing_tool","noop","submit_pull_request_review"]}]} # This file was automatically generated by gh-aw (v0.87.10). DO NOT EDIT. To debug this workflow, load the skill at https://github.com/github/gh-aw/blob/main/debug.md # @@ -510,7 +510,18 @@ jobs: version: 0.33.2 - name: Start Ollama run: | - ollama serve >"$RUNNER_TEMP/ollama.log" 2>&1 & + pkill -x ollama || true + for attempt in {1..30}; do + if ! curl --fail --silent http://127.0.0.1:11434/api/version >/dev/null; then + break + fi + if [ "$attempt" -eq 30 ]; then + echo "Ollama did not stop" >&2 + exit 1 + fi + sleep 1 + done + OLLAMA_HOST=0.0.0.0:11434 ollama serve >"$RUNNER_TEMP/ollama.log" 2>&1 & for attempt in {1..30}; do if curl --fail --silent http://127.0.0.1:11434/api/version >/dev/null; then exit 0 diff --git a/.github/workflows/prompt-optimization.md b/.github/workflows/prompt-optimization.md index 1089146..a7e2b9d 100644 --- a/.github/workflows/prompt-optimization.md +++ b/.github/workflows/prompt-optimization.md @@ -66,7 +66,18 @@ steps: - name: Start Ollama run: | - ollama serve >"$RUNNER_TEMP/ollama.log" 2>&1 & + pkill -x ollama || true + for attempt in {1..30}; do + if ! curl --fail --silent http://127.0.0.1:11434/api/version >/dev/null; then + break + fi + if [ "$attempt" -eq 30 ]; then + echo "Ollama did not stop" >&2 + exit 1 + fi + sleep 1 + done + OLLAMA_HOST=0.0.0.0:11434 ollama serve >"$RUNNER_TEMP/ollama.log" 2>&1 & for attempt in {1..30}; do if curl --fail --silent http://127.0.0.1:11434/api/version >/dev/null; then exit 0 @@ -95,16 +106,16 @@ steps: Improve the wizard's shipped scenario-assistant instructions with measured hill climbing. The workflow has already restored the Ollama cache, downloaded GGUF proxies for both browser models from Hugging Face, and started an OpenAI-compatible Ollama server on -`http://127.0.0.1:11434/v1`. +`http://host.docker.internal:11434/v1`. Use the installed `optimize-scenario-prompt` skill and `scripts/prompt-optimizer.mjs`. Use these options for every evaluation or score command: ```text --all-models ---eval-url http://127.0.0.1:11434/v1 +--eval-url http://host.docker.internal:11434/v1 --eval-model hf.co/bartowski/Qwen2.5-1.5B-Instruct-GGUF:Q4_K_M ---ios-eval-url http://127.0.0.1:11434/v1 +--ios-eval-url http://host.docker.internal:11434/v1 --ios-eval-model hf.co/unsloth/SmolLM2-360M-Instruct-GGUF:Q4_K_M ```