Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a744cdc335 | |||
| 8b924700fb | |||
| 51f5ea0d2b | |||
| a457e76ac7 | |||
| 78a1d1c3bb |
@@ -1,12 +1,8 @@
|
|||||||
# Gadfly — agentic adversarial PR reviewer (https://gitea.stevedudenhoeffer.com/steve/gadfly).
|
# Gadfly adversarial review — subscribes to steve/gadfly's reusable workflow and
|
||||||
#
|
# INHERITS its default swarm. This stub holds only the triggers, the actor gate,
|
||||||
# Runs the published Gadfly image (pinned to an immutable :sha- tag — act_runner
|
# secret forwarding, and the allow-list; the swarm config (models, lenses,
|
||||||
# caches :latest, and this build is what carries foreman provider-type support)
|
# concurrency, timeouts) lives centrally in gadfly's review-reusable.yml so it is
|
||||||
# as a specialist swarm and posts
|
# tuned in ONE place. Advisory only — never blocks a merge.
|
||||||
# ONE consolidated review comment as gitea-actions. Advisory only — never blocks a
|
|
||||||
# merge. This reviews majordomo PRs with 6 ollama-cloud models (3-lens suite).
|
|
||||||
# Gadfly is a simple system — findings are advisory; always double-check before
|
|
||||||
# acting.
|
|
||||||
|
|
||||||
name: Adversarial Review (Gadfly)
|
name: Adversarial Review (Gadfly)
|
||||||
|
|
||||||
@@ -33,50 +29,26 @@ concurrency:
|
|||||||
jobs:
|
jobs:
|
||||||
review:
|
review:
|
||||||
# Security: only trusted users may trigger a secret-bearing run via a PR
|
# Security: only trusted users may trigger a secret-bearing run via a PR
|
||||||
# comment (pull_request + workflow_dispatch are already trusted). Mirrors
|
# comment (pull_request + workflow_dispatch are already trusted). Mirrors the
|
||||||
# GADFLY_ALLOWED_USERS, the in-container belt-and-suspenders check.
|
# allowed_users input below (the in-container belt-and-suspenders check) — both
|
||||||
|
# lists must stay in sync; a workflow if: can't read a workflow_call input.
|
||||||
if: >-
|
if: >-
|
||||||
github.event_name != 'issue_comment'
|
github.event_name != 'issue_comment'
|
||||||
|| (github.event.issue.pull_request
|
|| (github.event.issue.pull_request
|
||||||
&& (github.actor == 'steve'
|
&& (github.actor == 'steve'
|
||||||
|| github.actor == 'fizi'
|
|| github.actor == 'fizi'
|
||||||
|| github.actor == 'dazed'))
|
|| github.actor == 'dazed'))
|
||||||
runs-on: ubuntu-latest
|
# Tracks gadfly's v1 release tag — a curated pointer re-moved on each release
|
||||||
# Fleet: 6 ollama-cloud models (lens fan-out), no local Macs. (Trimmed the
|
# (unlike @main, which moves on every push). Central swarm tuning propagates
|
||||||
# weakest reviewers by grade — m5/qwen3.6, gemma4, gpt-oss, kimi-k2.7 — plus
|
# here automatically; the tradeoff vs a full sha pin is that v1 is mutable.
|
||||||
# the earlier M1 drop.) Plenty of headroom for the cloud lanes.
|
uses: steve/gadfly/.gitea/workflows/review-reusable.yml@7bc3c982fa7b72367034c673f7812bf05e9c503e
|
||||||
timeout-minutes: 45
|
# Least privilege: forward only the review secrets (not `secrets: inherit`,
|
||||||
steps:
|
# which would expose every repo secret). GITEA_TOKEN is the automatic token.
|
||||||
- uses: docker://gitea.stevedudenhoeffer.com/steve/gadfly:sha-d7f364d
|
secrets:
|
||||||
env:
|
OLLAMA_CLOUD_API_KEY: ${{ secrets.OLLAMA_CLOUD_API_KEY }}
|
||||||
GITEA_API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
|
CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
GADFLY_FINDINGS_URL: ${{ secrets.GADFLY_FINDINGS_URL }}
|
||||||
OLLAMA_CLOUD_API_KEY: ${{ secrets.OLLAMA_CLOUD_API_KEY }}
|
GADFLY_FINDINGS_TOKEN: ${{ secrets.GADFLY_FINDINGS_TOKEN }}
|
||||||
# Cloud-only fleet (no local Macs). Cloud concurrency lives in the
|
with:
|
||||||
# LENSES: models run a few at a time (ollama-cloud=3) with their 3 lenses
|
# Consumer-specific allow-list; everything else is inherited.
|
||||||
# concurrent (LENS ollama-cloud=3) so comments land sooner.
|
allowed_users: "steve,fizi,dazed"
|
||||||
GADFLY_MODELS: "minimax-m3:cloud,glm-5.2:cloud,glm-5.1:cloud,deepseek-v4-pro:cloud,nemotron-3-super:cloud,qwen3-coder:480b-cloud"
|
|
||||||
GADFLY_PROVIDER_CONCURRENCY: "ollama-cloud=3"
|
|
||||||
GADFLY_PROVIDER_LENS_CONCURRENCY: "ollama-cloud=3"
|
|
||||||
# Default => the 3-lens suite (security, correctness, error-handling).
|
|
||||||
# Set the repo var GADFLY_SPECIALISTS to override (csv / "all" / "auto").
|
|
||||||
GADFLY_SPECIALISTS: ${{ vars.GADFLY_SPECIALISTS || 'security,correctness,error-handling' }}
|
|
||||||
# Per-lens deadline + bounded steps to keep each reviewer's run sane.
|
|
||||||
GADFLY_TIMEOUT_SECS: "600"
|
|
||||||
GADFLY_MAX_STEPS: "14"
|
|
||||||
# Allow-list for the comment trigger (mirrors the job-level if: guard).
|
|
||||||
GADFLY_ALLOWED_USERS: "steve,fizi,dazed"
|
|
||||||
# --- findings telemetry: POST runs + findings to the gadfly-reports store ---
|
|
||||||
# Advisory & off unless GADFLY_FINDINGS_URL is set; failures only log to
|
|
||||||
# stderr and never affect the review. GADFLY_REPO / GADFLY_PR are derived
|
|
||||||
# in-container; the URL + token are user-scope secrets.
|
|
||||||
GADFLY_FINDINGS_URL: ${{ secrets.GADFLY_FINDINGS_URL }}
|
|
||||||
GADFLY_FINDINGS_TOKEN: ${{ secrets.GADFLY_FINDINGS_TOKEN }}
|
|
||||||
# --- event context (leave as-is) ---
|
|
||||||
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 }}
|
|
||||||
IS_DRAFT: ${{ github.event.pull_request.draft }}
|
|
||||||
COMMENT_BODY: ${{ github.event.comment.body }}
|
|
||||||
COMMENT_ID: ${{ github.event.comment.id }}
|
|
||||||
ACTOR: ${{ github.actor }}
|
|
||||||
|
|||||||
@@ -142,9 +142,11 @@ Ship work through PRs and let Gadfly review it before merge:
|
|||||||
|
|
||||||
- **Push to a PR, never straight to `main`.** Branch, push, open a PR.
|
- **Push to a PR, never straight to `main`.** Branch, push, open a PR.
|
||||||
`.gitea/workflows/adversarial-review.yml` runs Gadfly (the standalone
|
`.gitea/workflows/adversarial-review.yml` runs Gadfly (the standalone
|
||||||
agentic adversarial reviewer) — a fleet of 6 ollama-cloud models, each
|
agentic adversarial reviewer) by subscribing to gadfly's reusable workflow
|
||||||
running the 3-lens suite (security, correctness, error-handling). Advisory
|
and inheriting its default swarm — 3 cloud models + the Claude Code engine
|
||||||
only; it never blocks the merge.
|
(sonnet/opus/opus:max), each running the 5-lens suite (security, correctness,
|
||||||
|
maintainability, performance, error-handling). The swarm is tuned centrally
|
||||||
|
in gadfly, not here. Advisory only; it never blocks the merge.
|
||||||
- **Wait for Gadfly to finish, then read its output.** Don't merge while the
|
- **Wait for Gadfly to finish, then read its output.** Don't merge while the
|
||||||
review is still running. Each model posts one consolidated comment; weigh
|
review is still running. Each model posts one consolidated comment; weigh
|
||||||
every finding on its merits and fix the real ones (Gadfly is a simple
|
every finding on its merits and fix the real ones (Gadfly is a simple
|
||||||
|
|||||||
@@ -42,3 +42,13 @@ asked for "a new ai image interface as opposed to llm".
|
|||||||
callers (additive fields/options).
|
callers (additive fields/options).
|
||||||
- No health/failover for image models yet; if needed it can be added as a
|
- No health/failover for image models yet; if needed it can be added as a
|
||||||
separate chain type rather than retrofitting the chat chain.
|
separate chain type rather than retrofitting the chat chain.
|
||||||
|
|
||||||
|
## Update — optional per-request settings
|
||||||
|
|
||||||
|
`Request` gained additive optional overrides — `Steps *int`, `CFGScale *float64`,
|
||||||
|
`NegativePrompt string`, `Sampler string`, `Seed *int64` — with mirror options
|
||||||
|
(`WithSteps`, …). nil/"" means "leave the backend's per-model default", so the v1
|
||||||
|
contract is unchanged for callers that don't set them. `provider/llamaswap`
|
||||||
|
forwards them to sd-server as `steps`/`cfg_scale`/`negative_prompt`/`sample_method`/
|
||||||
|
`seed` (omitempty). This realizes the "seeds/steps … additive fields" note above;
|
||||||
|
img2img/masks/streaming remain deferred.
|
||||||
|
|||||||
@@ -38,6 +38,29 @@ type Request struct {
|
|||||||
// Size is the requested resolution, e.g. "512x512" or "1024x1024";
|
// Size is the requested resolution, e.g. "512x512" or "1024x1024";
|
||||||
// "" = provider default.
|
// "" = provider default.
|
||||||
Size string
|
Size string
|
||||||
|
|
||||||
|
// The fields below are optional per-request overrides. Their zero value
|
||||||
|
// (nil pointer or empty string) means "leave the backend's own default" —
|
||||||
|
// for stable-diffusion.cpp that is the per-model default baked into the
|
||||||
|
// llama-swap launch flags. A caller overrides only what it explicitly sets.
|
||||||
|
|
||||||
|
// Steps is the number of diffusion steps; nil = backend default.
|
||||||
|
Steps *int
|
||||||
|
|
||||||
|
// CFGScale is the classifier-free-guidance scale; nil = backend default.
|
||||||
|
// Architecture-sensitive (SDXL likes ~7, Flux wants 1), so prefer leaving
|
||||||
|
// it nil unless the caller knows the target model.
|
||||||
|
CFGScale *float64
|
||||||
|
|
||||||
|
// NegativePrompt steers generation away from concepts; "" = none.
|
||||||
|
NegativePrompt string
|
||||||
|
|
||||||
|
// Sampler selects the sampling method (e.g. "euler", "euler_a");
|
||||||
|
// "" = backend default.
|
||||||
|
Sampler string
|
||||||
|
|
||||||
|
// Seed fixes the RNG seed for reproducible output; nil = random.
|
||||||
|
Seed *int64
|
||||||
}
|
}
|
||||||
|
|
||||||
// Result is the canonical image-generation result.
|
// Result is the canonical image-generation result.
|
||||||
@@ -60,6 +83,21 @@ func WithN(n int) Option { return func(r *Request) { r.N = n } }
|
|||||||
// WithSize sets the requested resolution (e.g. "1024x1024").
|
// WithSize sets the requested resolution (e.g. "1024x1024").
|
||||||
func WithSize(size string) Option { return func(r *Request) { r.Size = size } }
|
func WithSize(size string) Option { return func(r *Request) { r.Size = size } }
|
||||||
|
|
||||||
|
// WithSteps overrides the number of diffusion steps.
|
||||||
|
func WithSteps(n int) Option { return func(r *Request) { r.Steps = &n } }
|
||||||
|
|
||||||
|
// WithCFGScale overrides the classifier-free-guidance scale.
|
||||||
|
func WithCFGScale(s float64) Option { return func(r *Request) { r.CFGScale = &s } }
|
||||||
|
|
||||||
|
// WithNegativePrompt sets a negative prompt.
|
||||||
|
func WithNegativePrompt(s string) Option { return func(r *Request) { r.NegativePrompt = s } }
|
||||||
|
|
||||||
|
// WithSampler overrides the sampling method (e.g. "euler", "euler_a").
|
||||||
|
func WithSampler(s string) Option { return func(r *Request) { r.Sampler = s } }
|
||||||
|
|
||||||
|
// WithSeed fixes the RNG seed for reproducible output.
|
||||||
|
func WithSeed(seed int64) Option { return func(r *Request) { r.Seed = &seed } }
|
||||||
|
|
||||||
// Apply returns a copy of the request with all options applied. Providers call
|
// Apply returns a copy of the request with all options applied. Providers call
|
||||||
// this once at the top of Generate.
|
// this once at the top of Generate.
|
||||||
func (r Request) Apply(opts ...Option) Request {
|
func (r Request) Apply(opts ...Option) Request {
|
||||||
|
|||||||
@@ -27,14 +27,23 @@ type imageModel struct {
|
|||||||
id string
|
id string
|
||||||
}
|
}
|
||||||
|
|
||||||
// imageRequest is the OpenAI /v1/images/generations request shape. We always
|
// imageRequest is the OpenAI /v1/images/generations request shape, plus the
|
||||||
// request b64_json so the bytes come back inline (no second fetch).
|
// stable-diffusion.cpp extras llama-swap forwards to sd-server. We always
|
||||||
|
// request b64_json so the bytes come back inline (no second fetch). The
|
||||||
|
// optional fields are pointers/omitempty so an unset value is omitted entirely
|
||||||
|
// and sd-server falls back to the model's own default (a field name a given
|
||||||
|
// sd-server build doesn't recognize is simply ignored — harmless).
|
||||||
type imageRequest struct {
|
type imageRequest struct {
|
||||||
Model string `json:"model"`
|
Model string `json:"model"`
|
||||||
Prompt string `json:"prompt"`
|
Prompt string `json:"prompt"`
|
||||||
N int `json:"n,omitempty"`
|
N int `json:"n,omitempty"`
|
||||||
Size string `json:"size,omitempty"`
|
Size string `json:"size,omitempty"`
|
||||||
ResponseFormat string `json:"response_format"`
|
ResponseFormat string `json:"response_format"`
|
||||||
|
Steps *int `json:"steps,omitempty"`
|
||||||
|
CFGScale *float64 `json:"cfg_scale,omitempty"`
|
||||||
|
NegativePrompt string `json:"negative_prompt,omitempty"`
|
||||||
|
SampleMethod string `json:"sample_method,omitempty"`
|
||||||
|
Seed *int64 `json:"seed,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type imageResponse struct {
|
type imageResponse struct {
|
||||||
@@ -61,6 +70,11 @@ func (m *imageModel) Generate(ctx context.Context, req imagegen.Request, opts ..
|
|||||||
N: req.N,
|
N: req.N,
|
||||||
Size: req.Size,
|
Size: req.Size,
|
||||||
ResponseFormat: "b64_json",
|
ResponseFormat: "b64_json",
|
||||||
|
Steps: req.Steps,
|
||||||
|
CFGScale: req.CFGScale,
|
||||||
|
NegativePrompt: req.NegativePrompt,
|
||||||
|
SampleMethod: req.Sampler,
|
||||||
|
Seed: req.Seed,
|
||||||
}
|
}
|
||||||
|
|
||||||
var resp imageResponse
|
var resp imageResponse
|
||||||
|
|||||||
@@ -201,6 +201,48 @@ func TestImageGenerate(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestImageGenerateSettings(t *testing.T) {
|
||||||
|
var gotBody map[string]any
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
_ = json.NewDecoder(r.Body).Decode(&gotBody)
|
||||||
|
_, _ = w.Write([]byte(`{"created":1,"data":[{"b64_json":"` + onePixelPNG + `"}]}`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
p := New(WithBaseURL(srv.URL), WithHTTPClient(srv.Client()))
|
||||||
|
im, _ := p.ImageModel("sd")
|
||||||
|
|
||||||
|
// Unset overrides must be omitted entirely so sd-server keeps its own
|
||||||
|
// per-model defaults.
|
||||||
|
if _, err := im.Generate(context.Background(), imagegen.Request{Prompt: "x"}); err != nil {
|
||||||
|
t.Fatalf("Generate: %v", err)
|
||||||
|
}
|
||||||
|
for _, k := range []string{"steps", "cfg_scale", "negative_prompt", "sample_method", "seed"} {
|
||||||
|
if v, ok := gotBody[k]; ok {
|
||||||
|
t.Errorf("unset request sent %q = %v, want omitted", k, v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set overrides are forwarded with the sd-server-friendly field names.
|
||||||
|
gotBody = nil
|
||||||
|
_, err := im.Generate(context.Background(), imagegen.Request{Prompt: "x"},
|
||||||
|
imagegen.WithSteps(8),
|
||||||
|
imagegen.WithCFGScale(3.5),
|
||||||
|
imagegen.WithNegativePrompt("blurry"),
|
||||||
|
imagegen.WithSampler("euler"),
|
||||||
|
imagegen.WithSeed(42),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Generate: %v", err)
|
||||||
|
}
|
||||||
|
want := map[string]any{"steps": float64(8), "cfg_scale": 3.5, "negative_prompt": "blurry", "sample_method": "euler", "seed": float64(42)}
|
||||||
|
for k, w := range want {
|
||||||
|
if gotBody[k] != w {
|
||||||
|
t.Errorf("%s = %v, want %v", k, gotBody[k], w)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestImageGenerateEmptyPrompt(t *testing.T) {
|
func TestImageGenerateEmptyPrompt(t *testing.T) {
|
||||||
p := New(WithBaseURL("http://example.invalid"))
|
p := New(WithBaseURL("http://example.invalid"))
|
||||||
im, _ := p.ImageModel("sd")
|
im, _ := p.ImageModel("sd")
|
||||||
|
|||||||
Reference in New Issue
Block a user