From d9405f4f698a658ecbc6b2bfc7be078d58a22b75 Mon Sep 17 00:00:00 2001 From: Steve Dudenhoeffer Date: Thu, 25 Jun 2026 18:58:00 -0400 Subject: [PATCH] feat: multi-provider model support via majordomo (local Ollama, OpenAI-compatible, etc.) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace the hardcoded ollama.Cloud binding with majordomo's provider registry, so Gadfly can target any backend majordomo supports without code changes. - cmd/gadfly/model.go: resolveModel() — GADFLY_PROVIDER (default ollama-cloud) prefixes bare model ids; GADFLY_MODEL may be a full provider/model spec, alias, or failover chain (verbatim). GADFLY_BASE_URL constructs openai/ollama/anthropic/ google directly at a custom endpoint (OpenAI-compatible + local/remote Ollama). GADFLY_API_KEY else the provider's standard env var. + buildSpec unit tests. - run.sh: provider-aware key gate (local Ollama needs none); maps OLLAMA_CLOUD_API_KEY -> OLLAMA_API_KEY; provider/base-url/key inherited by the binary. Gadfly-branded comment. - entrypoint.sh: GADFLY_MODELS alias for OLLAMA_REVIEW_MODELS; provider passthrough. - examples + README: Models & providers section. Upfront: only the Ollama paths (local + OpenAI-compatible-against-Ollama) are tested; OpenAI/Anthropic/Google are wired via majordomo but UNTESTED (no spend). Co-Authored-By: Claude Opus 4.8 (1M context) --- README.md | 38 +++++++++- cmd/gadfly/main.go | 26 ++++--- cmd/gadfly/model.go | 100 +++++++++++++++++++++++++ cmd/gadfly/model_test.go | 25 +++++++ entrypoint.sh | 13 +++- examples/adversarial-review.yml | 21 ++++++ go.mod | 20 +++++ go.sum | 126 ++++++++++++++++++++++++++++++++ scripts/run.sh | 27 +++++-- 9 files changed, 370 insertions(+), 26 deletions(-) create mode 100644 cmd/gadfly/model.go create mode 100644 cmd/gadfly/model_test.go diff --git a/README.md b/README.md index 22da6ae..a4aeadb 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,8 @@ it. Drop one file in your repo and set a couple of secrets/vars: `.gitea/workflows/adversarial-review.yml` in your repo. 2. Add repo config: - **secret** `OLLAMA_CLOUD_API_KEY` — your [Ollama Cloud](https://ollama.com) key (empty - ⇒ Gadfly posts a harmless "not configured" notice instead of reviewing). + ⇒ Gadfly posts a harmless "not configured" notice instead of reviewing). *Not needed if + you point Gadfly at a different provider — see [Models & providers](#models--providers).* - **var** `OLLAMA_REVIEW_MODELS` *(optional)* — comma-separated model ids (default `qwen3-coder:480b-cloud,gpt-oss:120b-cloud`). One comment per model. - **var** `GADFLY_ALLOWED_USERS` *(optional)* — who may re-trigger via comment; empty ⇒ @@ -49,6 +50,35 @@ it. Drop one file in your repo and set a couple of secrets/vars: `GITEA_TOKEN` is provided automatically by Actions; comments post as the `gitea-actions` user, scoped to that repo — no bot account needed. +## Models & providers + +Gadfly is built on [majordomo](https://gitea.stevedudenhoeffer.com/steve/majordomo), so the +reviewer model is not hard-wired — it can target anything majordomo supports. Pick a provider +by setting `GADFLY_PROVIDER` (used to prefix bare model ids); point at a custom endpoint with +`GADFLY_BASE_URL`; supply a key with `GADFLY_API_KEY` or the provider's standard env var. A +`GADFLY_MODEL`/`GADFLY_MODELS` value that already contains a `provider/` prefix (or is a +majordomo failover chain / alias) is used verbatim. + +| Provider | `GADFLY_PROVIDER` | Key env | Status | +|----------|-------------------|---------|--------| +| **Ollama Cloud** (default) | `ollama-cloud` | `OLLAMA_API_KEY` / `OLLAMA_CLOUD_API_KEY` | ✅ in active use | +| **Local Ollama** | `ollama` | none (`OLLAMA_HOST` or `GADFLY_BASE_URL` for a remote daemon) | ✅ tested | +| **OpenAI-compatible** (incl. local Ollama's `/v1`) | `openai` + `GADFLY_BASE_URL` | `OPENAI_API_KEY` (any non-empty for Ollama) | ✅ tested against Ollama | +| **OpenAI** | `openai` | `OPENAI_API_KEY` | ⚠️ wired, **untested** | +| **Anthropic** | `anthropic` | `ANTHROPIC_API_KEY` | ⚠️ wired, **untested** | +| **Google (Gemini)** | `google` | `GOOGLE_API_KEY` / `GEMINI_API_KEY` | ⚠️ wired, **untested** | + +> ### 🧪 Honest status +> Only the **Ollama** paths above are actually exercised. The OpenAI / Anthropic / Google +> providers come "for free" from majordomo's abstraction and *should* work, but I haven't +> spent money verifying them — treat them as untested. The OpenAI-**compatible** path **is** +> tested, because you can point it at a local Ollama (`GADFLY_BASE_URL=http://localhost:11434/v1`) +> and exercise the exact same code an OpenAI/OpenRouter endpoint would hit, for free. If you +> try a cloud provider and it works (or doesn't), please open an issue. + +For arbitrary endpoints you can also skip `GADFLY_PROVIDER`/`GADFLY_BASE_URL` and define a +majordomo `LLM_*` env DSN, then reference it by name in `GADFLY_MODEL` (advanced; HTTPS only). + ### Triggers 1. A **new/reopened/ready** non-draft PR — automatic. @@ -81,8 +111,10 @@ The reviewer binary reads these (the stub/entrypoint set sane defaults): | Env | Default | Meaning | |-----|---------|---------| -| `OLLAMA_API_KEY` | — | Ollama Cloud bearer key (required for real reviews) | -| `GADFLY_MODEL` | — | model id | +| `GADFLY_MODEL` | — | model id, or `provider/model` spec, or majordomo alias/chain | +| `GADFLY_PROVIDER` | `ollama-cloud` | provider prefix for a bare model id | +| `GADFLY_BASE_URL` | — | override endpoint (OpenAI/Ollama-compatible servers) | +| `GADFLY_API_KEY` | — | provider key; falls back to the provider's standard env | | `GADFLY_MAX_STEPS` | 24 | review-pass tool-step cap | | `GADFLY_RECHECK` | on | set `0`/`false` to skip the recheck pass | | `GADFLY_RECHECK_MAX_STEPS` | 16 | recheck-pass step cap | diff --git a/cmd/gadfly/main.go b/cmd/gadfly/main.go index bec65fe..145767e 100644 --- a/cmd/gadfly/main.go +++ b/cmd/gadfly/main.go @@ -20,8 +20,16 @@ // // Inputs (env): // -// OLLAMA_API_KEY Ollama Cloud bearer key (required). -// GADFLY_MODEL model id, e.g. "qwen3-coder:480b-cloud" (required). +// GADFLY_MODEL model id, or a full "provider/model" spec / majordomo +// alias / failover chain (required). A bare id is +// prefixed with GADFLY_PROVIDER. +// GADFLY_PROVIDER provider for bare model ids (default "ollama-cloud"; +// e.g. "ollama" for a local daemon, "openai", …). +// GADFLY_BASE_URL override the backend endpoint (OpenAI/Ollama-compatible +// servers, remote Ollama, gateways). See model.go. +// GADFLY_API_KEY provider key; optional — falls back to the provider's +// standard env (OLLAMA_API_KEY / OPENAI_API_KEY / +// ANTHROPIC_API_KEY / GOOGLE_API_KEY|GEMINI_API_KEY). // GADFLY_REPO_DIR path to the checked-out repo (required; the FS sandbox root). // GADFLY_DIFF_FILE path to a file holding the full unified diff (required). // GADFLY_SYSTEM_FILE path to the reviewer system prompt (required). @@ -54,7 +62,6 @@ import ( "gitea.stevedudenhoeffer.com/steve/majordomo/agent" llm "gitea.stevedudenhoeffer.com/steve/majordomo/llm" - "gitea.stevedudenhoeffer.com/steve/majordomo/provider/ollama" ) const ( @@ -92,16 +99,11 @@ func main() { } func run() error { - apiKey := os.Getenv("OLLAMA_API_KEY") - if apiKey == "" { - return errors.New("OLLAMA_API_KEY is required") - } - model := os.Getenv("GADFLY_MODEL") repoDir := os.Getenv("GADFLY_REPO_DIR") diffFile := os.Getenv("GADFLY_DIFF_FILE") systemFile := os.Getenv("GADFLY_SYSTEM_FILE") - if model == "" || repoDir == "" || diffFile == "" || systemFile == "" { - return errors.New("GADFLY_MODEL, GADFLY_REPO_DIR, GADFLY_DIFF_FILE and GADFLY_SYSTEM_FILE are all required") + if repoDir == "" || diffFile == "" || systemFile == "" { + return errors.New("GADFLY_REPO_DIR, GADFLY_DIFF_FILE and GADFLY_SYSTEM_FILE are all required") } diffBytes, err := os.ReadFile(diffFile) @@ -123,9 +125,9 @@ func run() error { return err } - mdl, err := ollama.Cloud(ollama.WithToken(apiKey)).Model(model) + mdl, err := resolveModel() if err != nil { - return fmt.Errorf("build model %q: %w", model, err) + return fmt.Errorf("resolve model: %w", err) } timeout := time.Duration(envInt("GADFLY_TIMEOUT_SECS", defaultTimeoutSecs)) * time.Second diff --git a/cmd/gadfly/model.go b/cmd/gadfly/model.go new file mode 100644 index 0000000..a50f298 --- /dev/null +++ b/cmd/gadfly/model.go @@ -0,0 +1,100 @@ +package main + +import ( + "fmt" + "os" + "strings" + + "gitea.stevedudenhoeffer.com/steve/majordomo" + llm "gitea.stevedudenhoeffer.com/steve/majordomo/llm" + "gitea.stevedudenhoeffer.com/steve/majordomo/provider/anthropic" + "gitea.stevedudenhoeffer.com/steve/majordomo/provider/google" + "gitea.stevedudenhoeffer.com/steve/majordomo/provider/ollama" + "gitea.stevedudenhoeffer.com/steve/majordomo/provider/openai" +) + +// defaultProvider is the provider used when GADFLY_MODEL is a bare model id +// (no "provider/" prefix). It keeps existing Ollama Cloud configs — where the +// model list is just ids like "qwen3-coder:480b-cloud" — working unchanged. +const defaultProvider = "ollama-cloud" + +// resolveModel builds the review model from the environment. Gadfly is powered +// by majordomo, so it can target any provider majordomo supports — Ollama +// (local or cloud), OpenAI, Anthropic, Google, or any OpenAI/Ollama-compatible +// endpoint — without code changes. +// +// Env: +// +// GADFLY_MODEL model id, or a full "provider/model" spec, or a +// majordomo failover chain / alias (required). +// GADFLY_PROVIDER provider prefix applied when GADFLY_MODEL has no "/" +// (default "ollama-cloud"). e.g. "ollama" for a local daemon. +// GADFLY_BASE_URL override the backend endpoint (OpenAI/Ollama-compatible +// servers, a remote Ollama, an OpenRouter-style gateway…). +// When set, the provider is constructed directly at that URL. +// GADFLY_API_KEY bearer/API key for the chosen provider. Optional; when +// unset the provider falls back to its standard env var +// (OLLAMA_API_KEY / OPENAI_API_KEY / ANTHROPIC_API_KEY / +// GOOGLE_API_KEY|GEMINI_API_KEY). Local Ollama needs none. +// +// With GADFLY_BASE_URL unset, resolution goes through majordomo's registry, so +// LLM_* env DSNs and registered aliases/tiers work too. +func resolveModel() (llm.Model, error) { + model := strings.TrimSpace(os.Getenv("GADFLY_MODEL")) + if model == "" { + return nil, fmt.Errorf("GADFLY_MODEL is required") + } + provider := strings.TrimSpace(os.Getenv("GADFLY_PROVIDER")) + if provider == "" { + provider = defaultProvider + } + baseURL := strings.TrimSpace(os.Getenv("GADFLY_BASE_URL")) + apiKey := os.Getenv("GADFLY_API_KEY") + + // No endpoint override: let majordomo's registry resolve the spec. This + // path supports built-in providers (reading their standard key envs), + // LLM_* env DSNs, and aliases/failover chains. + if baseURL == "" { + return majordomo.Parse(buildSpec(provider, model)) + } + + // Endpoint override: construct the provider directly at the given URL. + switch provider { + case "openai", "openai-compatible": + opts := []openai.Option{openai.WithBaseURL(baseURL)} + if apiKey != "" { + opts = append(opts, openai.WithAPIKey(apiKey)) + } + return openai.New(opts...).Model(model) + case "ollama", "ollama-cloud": + opts := []ollama.Option{ollama.WithBaseURL(baseURL)} + if apiKey != "" { + opts = append(opts, ollama.WithToken(apiKey)) + } + return ollama.New(opts...).Model(model) + case "anthropic": + opts := []anthropic.Option{anthropic.WithBaseURL(baseURL)} + if apiKey != "" { + opts = append(opts, anthropic.WithAPIKey(apiKey)) + } + return anthropic.New(opts...).Model(model) + case "google", "gemini": + opts := []google.Option{google.WithBaseURL(baseURL)} + if apiKey != "" { + opts = append(opts, google.WithAPIKey(apiKey)) + } + return google.New(opts...).Model(model) + default: + return nil, fmt.Errorf("GADFLY_BASE_URL is set but GADFLY_PROVIDER %q has no endpoint-override support (use openai/ollama/anthropic/google, or unset GADFLY_BASE_URL to resolve via majordomo)", provider) + } +} + +// buildSpec turns (provider, model) into a majordomo spec. A model id that +// already carries a "provider/" prefix (or is a multi-element failover chain) +// is passed through verbatim; a bare id is prefixed with the provider. +func buildSpec(provider, model string) string { + if strings.Contains(model, "/") || strings.Contains(model, ",") { + return model + } + return provider + "/" + model +} diff --git a/cmd/gadfly/model_test.go b/cmd/gadfly/model_test.go new file mode 100644 index 0000000..c7f4910 --- /dev/null +++ b/cmd/gadfly/model_test.go @@ -0,0 +1,25 @@ +package main + +import "testing" + +func TestBuildSpec(t *testing.T) { + tests := []struct { + name string + provider string + model string + want string + }{ + {"bare id gets provider prefix", "ollama-cloud", "qwen3-coder:480b-cloud", "ollama-cloud/qwen3-coder:480b-cloud"}, + {"bare id local ollama", "ollama", "llama3.1", "ollama/llama3.1"}, + {"already has provider passes through", "ollama-cloud", "openai/gpt-4o", "openai/gpt-4o"}, + {"slashed model name passes through verbatim", "openai", "openai/meta-llama/Llama-3.1", "openai/meta-llama/Llama-3.1"}, + {"failover chain passes through", "ollama-cloud", "anthropic/opus-4.8,ollama-cloud/qwen3-coder:480b-cloud", "anthropic/opus-4.8,ollama-cloud/qwen3-coder:480b-cloud"}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := buildSpec(tt.provider, tt.model); got != tt.want { + t.Errorf("buildSpec(%q, %q) = %q, want %q", tt.provider, tt.model, got, tt.want) + } + }) + } +} diff --git a/entrypoint.sh b/entrypoint.sh index 7b12ee0..fa704c3 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -31,7 +31,11 @@ # COMMENT_ID comment id, for the 👀 reaction (issue_comment only) # ACTOR github.actor (the user who triggered) # Optional config: -# OLLAMA_REVIEW_MODELS comma-separated model ids (default below) +# GADFLY_MODELS comma-separated model ids/specs (alias: OLLAMA_REVIEW_MODELS) +# GADFLY_PROVIDER majordomo provider for bare model ids (default ollama-cloud; +# e.g. "ollama" local, "openai", "anthropic", "google") +# GADFLY_BASE_URL override backend endpoint (OpenAI/Ollama-compatible servers) +# GADFLY_API_KEY provider key (else provider's standard env: OPENAI_API_KEY, …) # GADFLY_TRIGGER_PHRASE comment phrase that triggers a re-review (default "@gadfly review") # GADFLY_ALLOWED_USERS comma-separated usernames allowed to comment-trigger; # empty => fall back to "is a repo collaborator" @@ -119,8 +123,11 @@ git clone --depth=1 --branch "$BRANCH" "$CLONE_URL" "$REPO_DIR" 2>/dev/null \ || die "clone of ${REPO_PATH}@${BRANCH} failed" # --- review once per model ------------------------------------------------- -MODELS="${OLLAMA_REVIEW_MODELS:-$DEFAULT_MODELS}" -log "models: ${MODELS}" +# GADFLY_MODELS is the provider-agnostic name; OLLAMA_REVIEW_MODELS is kept as a +# back-compat alias. GADFLY_PROVIDER / GADFLY_BASE_URL / GADFLY_API_KEY and any +# provider key envs (OPENAI_API_KEY, …) are inherited by run.sh and the binary. +MODELS="${GADFLY_MODELS:-${OLLAMA_REVIEW_MODELS:-$DEFAULT_MODELS}}" +log "provider: ${GADFLY_PROVIDER:-ollama-cloud}; models: ${MODELS}" IFS=',' read -ra ARR <<< "$MODELS" || true for raw in "${ARR[@]}"; do m="$(echo "$raw" | tr -d '[:space:]')" diff --git a/examples/adversarial-review.yml b/examples/adversarial-review.yml index aaccb70..62f27de 100644 --- a/examples/adversarial-review.yml +++ b/examples/adversarial-review.yml @@ -43,6 +43,27 @@ jobs: OLLAMA_CLOUD_API_KEY: ${{ secrets.OLLAMA_CLOUD_API_KEY }} OLLAMA_REVIEW_MODELS: ${{ vars.OLLAMA_REVIEW_MODELS }} GADFLY_ALLOWED_USERS: ${{ vars.GADFLY_ALLOWED_USERS }} + # --- Models & providers (optional; default = Ollama Cloud) ---------- + # Gadfly is majordomo-powered, so it can target other backends. Set a + # provider for bare model ids; point at a different endpoint with a + # base URL; supply a key (or the provider's standard env var). Examples: + # + # Local Ollama daemon (no key): + # GADFLY_PROVIDER: ollama + # GADFLY_MODELS: qwen2.5-coder:7b + # # GADFLY_BASE_URL: http://my-ollama-host:11434 # if not localhost + # + # OpenAI-compatible endpoint (incl. local Ollama's /v1): + # GADFLY_PROVIDER: openai + # GADFLY_BASE_URL: http://localhost:11434/v1 + # GADFLY_MODELS: qwen2.5-coder:7b + # + # OpenAI / Anthropic / Google (supported via majordomo, UNTESTED — see README): + # GADFLY_PROVIDER: openai # then set OPENAI_API_KEY below + # OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }} + GADFLY_PROVIDER: ${{ vars.GADFLY_PROVIDER }} + GADFLY_BASE_URL: ${{ vars.GADFLY_BASE_URL }} + GADFLY_MODELS: ${{ vars.GADFLY_MODELS }} EVENT_NAME: ${{ github.event_name }} PR: ${{ github.event.pull_request.number || github.event.issue.number || github.event.inputs.pr_number }} PR_BRANCH: ${{ github.head_ref }} diff --git a/go.mod b/go.mod index 42718ee..9ad88f6 100644 --- a/go.mod +++ b/go.mod @@ -3,3 +3,23 @@ module gitea.stevedudenhoeffer.com/steve/gadfly go 1.26.2 require gitea.stevedudenhoeffer.com/steve/majordomo v0.0.0-20260610113006-0147a79d187b + +require ( + cloud.google.com/go v0.116.0 // indirect + cloud.google.com/go/auth v0.9.3 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/s2a-go v0.1.8 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect + github.com/gorilla/websocket v1.5.3 // indirect + go.opencensus.io v0.24.0 // indirect + golang.org/x/crypto v0.36.0 // indirect + golang.org/x/net v0.38.0 // indirect + golang.org/x/sys v0.31.0 // indirect + golang.org/x/text v0.23.0 // indirect + google.golang.org/genai v1.59.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/grpc v1.66.2 // indirect + google.golang.org/protobuf v1.34.2 // indirect +) diff --git a/go.sum b/go.sum index 15f9b96..d482ba0 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,128 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE= +cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U= +cloud.google.com/go/auth v0.9.3 h1:VOEUIAADkkLtyfr3BLa3R8Ed/j6w1jTBmARx+wb5w5U= +cloud.google.com/go/auth v0.9.3/go.mod h1:7z6VY+7h3KUdRov5F1i8NDP5ZzWKYmEPO842BgCsmTk= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= gitea.stevedudenhoeffer.com/steve/majordomo v0.0.0-20260610113006-0147a79d187b h1:/pglCqQW02kV2p9tKyQpIJoXZK2p7LKLeDCZL/V26MM= gitea.stevedudenhoeffer.com/steve/majordomo v0.0.0-20260610113006-0147a79d187b/go.mod h1:UZLveG17SmENt4sne2RSLIbioix30RZbRIQUzBAnOyY= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM= +github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw= +github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= +golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genai v1.59.0 h1:xp+ydkJFW8hO0hTUaAkr8TrLM9HFP3NYAwFhPd0nDqA= +google.golang.org/genai v1.59.0/go.mod h1:mDdPDFXo1Ats7f1WXVyZgWb/CkMzFWTWJruIMy7hGIU= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= +google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/scripts/run.sh b/scripts/run.sh index 8a22293..63b87a0 100644 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -87,11 +87,21 @@ case "$PROVIDER" in ollama) # Agentic lane: hand off to the cmd/gadfly binary, which runs a tool-using # agent over the checked-out repo so it can verify findings instead of - # guessing from the diff. The workflow builds the binary and exports - # GADFLY_BIN + GADFLY_REPO_DIR; we fall back to sane defaults for a - # local run. - if [ -z "${OLLAMA_CLOUD_API_KEY:-}" ]; then - REVIEW="⚠️ \`OLLAMA_CLOUD_API_KEY\` is not configured; this reviewer was skipped." + # guessing from the diff. The reviewer is majordomo-powered, so GADFLY_PROVIDER + # selects the backend (default ollama-cloud); local Ollama, OpenAI, Anthropic, + # Google and OpenAI/Ollama-compatible endpoints all work — see the README. + + # Back-compat: map the consumer's OLLAMA_CLOUD_API_KEY secret onto the + # OLLAMA_API_KEY env the ollama-cloud provider reads. + if [ -n "${OLLAMA_CLOUD_API_KEY:-}" ] && [ -z "${OLLAMA_API_KEY:-}" ]; then + export OLLAMA_API_KEY="$OLLAMA_CLOUD_API_KEY" + fi + GADFLY_PROVIDER_EFF="${GADFLY_PROVIDER:-ollama-cloud}" + + # Only the default cloud provider strictly needs a key up front; local Ollama + # and other providers either need none or read their own standard env var. + if [ "$GADFLY_PROVIDER_EFF" = "ollama-cloud" ] && [ -z "${OLLAMA_API_KEY:-}" ] && [ -z "${GADFLY_API_KEY:-}" ]; then + REVIEW="⚠️ No Ollama Cloud key configured (set \`OLLAMA_CLOUD_API_KEY\`) and \`GADFLY_PROVIDER\` is the default \`ollama-cloud\`; this reviewer was skipped." else BIN="${GADFLY_BIN:-gadfly}" if ! command -v "$BIN" >/dev/null 2>&1 && [ ! -x "$BIN" ]; then @@ -101,8 +111,9 @@ case "$PROVIDER" in DIFF_FILE="$(mktemp)" ERR_FILE="${DIFF_FILE}.err" printf '%s' "$FULL_DIFF" > "$DIFF_FILE" + # GADFLY_PROVIDER / GADFLY_BASE_URL / GADFLY_API_KEY and provider key + # envs (OPENAI_API_KEY, …) are inherited from the process environment. REVIEW="$( - OLLAMA_API_KEY="$OLLAMA_CLOUD_API_KEY" \ GADFLY_MODEL="$MODEL" \ GADFLY_REPO_DIR="$REPO_DIR" \ GADFLY_DIFF_FILE="$DIFF_FILE" \ @@ -142,8 +153,8 @@ $(tail -c 1500 agy.err 2>/dev/null) esac # --- assemble comment ------------------------------------------------------- -COMMENT="$(printf '%s\n### 🔭 Adversarial review — `%s` (%s)\n\n%s\n\nAutomated adversarial review. Advisory only — does not block merge.' \ - "$MARKER" "$MODEL" "$PROVIDER" "$REVIEW")" +COMMENT="$(printf '%s\n### 🪰 Gadfly review — `%s` (%s)\n\n%s\n\nAutomated adversarial review by Gadfly. Advisory only — does not block merge.' \ + "$MARKER" "$MODEL" "${GADFLY_PROVIDER_EFF:-$PROVIDER}" "$REVIEW")" POST_BODY="$(jq -n --arg b "$COMMENT" '{body:$b}')" # --- upsert by marker -------------------------------------------------------