* gateway: draw through a Grok subscription (Grok Imagine) A Grok subscription (SuperGrok, X Premium+) could not draw: Drawers() returned nothing for it and draw() refused with "Grok (SuperGrok) can't draw: magpie draws only through an OpenAI-compatible API, and Grok (SuperGrok) has none". Grok Build's own image_gen / image_edit tools call the backend's Imagine API at <cli-chat-proxy.grok.com/v1>/images/generations and /images/edits with the CLI's sign-in, which magpie already uses for chat. - drawsGrok / grokDrawers: a Grok account draws with grok-imagine-image and grok-imagine-image-quality, like a ChatGPT account does with GPT Image - the Imagine API takes an aspect ratio, not a size or quality: size WIDTHxHEIGHT is matched to the nearest ratio it accepts (aspectAmong, aspectOf is unchanged); the image is asked for as base64 - an edit is JSON with the images as data URLs - a plan's images cost nothing extra, so AutoDrawer ranks Grok with ChatGPT (ChatGPT still wins a tie on release date) - provider.grokBase is exported as GrokBase, like CodexBase, for the test Tested against a real SuperGrok account through the gateway: generation, 16:9, the quality model and an edit. Video is not covered: the Grok CLI's video tools need zero data retention off or a storage bucket. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * gateway: film through a Grok subscription, and a generate_video tool for agents A Grok account that draws (c6578bc) can make videos too: Grok Imagine's video endpoints sit behind the same sign-in. The gateway speaks OpenAI's Videos API, so its SDK works as it is: POST /v1/videos, GET /v1/videos/{id}, GET /v1/videos/{id}/content. A request is taken on at once and polled; the id carries the provider and the vendor's request id, so nothing is kept in the gateway and a restart loses no video. Status is mapped (pending at 0% -> queued, pending -> in_progress, done -> completed, failed/expired -> failed, with why). seconds (1-15, the vendor's limit, which it says when exceeded), size (-> aspect ratio and 480p/720p/1080p by the shorter side), input_reference for image-to-video (URL, data URL, {image_url}, or a multipart file) and reference_images are taken; a model that isn't a Grok video model is refused by name. /content answers 409 until the video is ready. `magpie mcp image` lists a second tool, generate_video: it starts the video, waits (up to 10 minutes), saves the mp4 into the project (generated-videos/ unless path says where, never over a file) and says where, so an agent can animate an image it just drew by passing its path. Checked against a real SuperGrok account: text-to-video, image-to-video (input_reference), reference_images, both video models, the OpenAI Python SDK (videos.create/retrieve/download_content), the MCP tool end to end with two videos at once, and the error paths. Unit tests use a fake Grok upstream. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * gateway: videos follow the Settings' off switch, and an id can't change the vendor's path Review of the video change: - Image generation "off" turns off the video a request that names no model gets (videomaker, beside drawer), so generate_video says it is off too. - A video id is put in the vendor's URL with the account's token: its parts must be [A-Za-z0-9_-]+ (parseVideoID) and the vendor id is path-escaped, so video_grok.x%3Fa=1.1 and %2F answer 404 and ask the vendor nothing. - The id carries a short mark of the account that started it; after a switch the video says it was started with another account instead of the vendor's not-found. - generate_video waits up to ten minutes, and Codex gives a tool a minute: magpie-image's Codex entry gets tool_timeout_sec (Goose's timeout) of eleven minutes, the user's own value kept. - grok-imagine-video stops at 720p (the vendor turns 1080p away for it; 1.5 makes 1080p), so a 1080p size is asked at 720p there. - A model may be named without its provider (grok-imagine-video). - "seconds": 6.0 is 6; 6.5 is still refused. - completed_at is left out: the vendor doesn't say when a video finished, and a time made up at each poll changed each time. Checked against a real SuperGrok account: bare model name, seconds 2.0, 1080p on the base model asked at 720p (the mp4 is 1280x720), 1080p accepted on 1.5, both malformed ids, no completed_at. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * gateway: TestVideoModelByItsBareName asks its two models in a fixed order It checked the body of the second request the upstream got, but asked the two models by ranging over a map, so it failed about one run in seven (Ubuntu CI). Ask them from a slice. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> * library: an installed magpie-image gets the longer tool timeout on the next sync magpie-image already ships, so many users have it in Codex and Goose as it was written before: no tool_timeout_sec in Codex, and the timeout: 300 every Goose server was given. syncMCP skipped an entry whose command, args and env were unchanged, so an upgrade left Codex at its one-minute default, and Goose kept 300 as if the user had chosen it. - mcpFile.behind says an entry lacks the timeout magpie gives the server now: Codex's tool_timeout_sec is missing, or Goose's timeout is still exactly the 300 magpie wrote. syncMCP rewrites such an entry; merged() doesn't keep that 300 as the user's. A value the user chose (any other number) is left alone. - Test: an entry as main wrote it is given 660 in both, one the user set stays, and a second sync changes nothing. It fails without the change ("changed []"). Also, from the review: - seconds is validated once in readFilming: a decimal number that is whole and at least 1 (hex, inf, nan, underscores, negatives and 0 are refused), and the object echoes 6 for 6.0. - imagemcp: Run's doc comment is above Run again. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
92 lines
3.6 KiB
Go
92 lines
3.6 KiB
Go
package library
|
|
|
|
import (
|
|
"path/filepath"
|
|
"regexp"
|
|
"slices"
|
|
"testing"
|
|
)
|
|
|
|
func valueOf(o ordered, k string) (any, bool) {
|
|
for _, e := range o {
|
|
if e.k == k {
|
|
return e.v, true
|
|
}
|
|
}
|
|
return nil, false
|
|
}
|
|
|
|
// generate_video waits up to ten minutes for its video; Codex gives a tool a
|
|
// minute and Goose five unless the entry says more, so magpie-image's entry
|
|
// does, and no other server's does.
|
|
func TestSelfServerIsGivenTimeToMakeAVideo(t *testing.T) {
|
|
self := &Server{Name: selfServerName, Transport: "stdio", Command: "/opt/magpie", Args: []string{"mcp", "image"}}
|
|
other := &Server{Name: "other", Transport: "stdio", Command: "x"}
|
|
codex := &mcpFile{Format: fmtCodex}
|
|
if v, ok := valueOf(codex.encode(self), "tool_timeout_sec"); !ok || v != 660 {
|
|
t.Fatalf("Codex's entry: tool_timeout_sec = %v %v", v, ok)
|
|
}
|
|
if _, ok := valueOf(codex.encode(other), "tool_timeout_sec"); ok {
|
|
t.Fatal("another server was given a tool timeout")
|
|
}
|
|
goose := &mcpFile{Format: fmtGoose}
|
|
if v, _ := valueOf(goose.encode(self), "timeout"); v != 660 {
|
|
t.Fatalf("Goose's entry: timeout = %v", v)
|
|
}
|
|
if v, _ := valueOf(goose.encode(other), "timeout"); v != 300 {
|
|
t.Fatalf("Goose's default changed for another server: %v", v)
|
|
}
|
|
// what the user set is theirs
|
|
for _, c := range []struct {
|
|
f *mcpFile
|
|
key string
|
|
mine int64
|
|
}{{codex, "tool_timeout_sec", 120}, {goose, "timeout", 900}} {
|
|
got, ok := valueOf(c.f.merged(self, map[string]any{c.key: c.mine}), c.key)
|
|
if !ok || got != c.mine {
|
|
t.Errorf("%s: the user's %d became %v", c.key, c.mine, got)
|
|
}
|
|
}
|
|
}
|
|
|
|
// magpie-image is already installed for many users, as main wrote it: no
|
|
// tool_timeout_sec in Codex, the 300 every server had in Goose. Syncing after
|
|
// an upgrade gives those entries the timeout; one the user chose stays.
|
|
func TestSyncGivesAnInstalledSelfServerItsTimeout(t *testing.T) {
|
|
h := sandbox(t)
|
|
codex, goose := filepath.Join(h, ".codex", "config.toml"), filepath.Join(h, ".config", "goose", "config.yaml")
|
|
s := Server{Name: selfServerName, Transport: "stdio", Command: "/opt/magpie", Args: []string{"mcp", "image"}, Agents: []string{"codex", "goose"}}
|
|
ok(t)(SaveServer("", s))
|
|
installed := func(codexExtra, gooseTimeout string) {
|
|
write(t, codex, "[mcp_servers.magpie-image]\ncommand = \"/opt/magpie\"\nargs = [\"mcp\", \"image\"]\n"+codexExtra)
|
|
write(t, goose, "extensions:\n magpie-image:\n enabled: true\n name: magpie-image\n type: stdio\n cmd: /opt/magpie\n args:\n - mcp\n - image\n timeout: "+gooseTimeout+"\n")
|
|
}
|
|
want := func(what, file, key, val string) {
|
|
t.Helper()
|
|
if got := read(t, file); !regexp.MustCompile(`(?m)` + key + `[ :=]+` + val + `\s*$`).MatchString(got) {
|
|
t.Errorf("%s: want %s %s in\n%s", what, key, val, got)
|
|
}
|
|
}
|
|
installed("", "300")
|
|
res, err := Sync()
|
|
if err != nil || len(res.Problems) > 0 {
|
|
t.Fatalf("%v %v", err, res)
|
|
}
|
|
if !slices.Contains(res.Changed, "codex") || !slices.Contains(res.Changed, "goose") {
|
|
t.Fatalf("an installed entry was left as it was: changed %v", res.Changed)
|
|
}
|
|
want("Codex, written before", codex, "tool_timeout_sec", "660")
|
|
want("Goose, still the old 300", goose, "timeout", "660")
|
|
// the user's own values stay, and another sync changes nothing
|
|
installed("tool_timeout_sec = 120\n", "900")
|
|
if _, err := Sync(); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
want("Codex, the user's", codex, "tool_timeout_sec", "120")
|
|
want("Goose, the user's", goose, "timeout", "900")
|
|
before := read(t, codex) + read(t, goose)
|
|
if _, err := Sync(); err != nil || read(t, codex)+read(t, goose) != before {
|
|
t.Fatalf("a second sync changed the files: %v", err)
|
|
}
|
|
}
|