refactor(core): drop image dimensions from image_generate

Author: rekram1-node

packages/core/src/tool/plugin/image-generate.ts

@@ -57,8 +57,6 @@ export const Input = Schema.Struct({
 export const Output = Schema.Struct({
   path: Schema.String,
   model: Schema.String.annotate({ description: "providerID/modelID" }),
-  width: Schema.optionalKey(Schema.Int),
-  height: Schema.optionalKey(Schema.Int),
 })
 
 export const Plugin = {
@@ -252,14 +250,13 @@ export const Plugin = {
               if (yield* exists(file))
                 return yield* new ToolFailure({ message: `${file} already exists. Choose a new path.` })
               yield* environment.files.write(file, bytes)
-              const size = dimensions(bytes, mime)
               const note = mime === "image/png" ? "" : ` The model returned ${mime}, so the file is in that format.`
               return {
-                output: { path: file, model: ref, ...size },
+                output: { path: file, model: ref },
                 content: [
                   {
                     type: "text" as const,
-                    text: `Saved ${size ? `${size.width}x${size.height} ` : ""}image to ${file} (${ref}).${note}`,
+                    text: `Saved image to ${file} (${ref}).${note}`,
                   },
                   { type: "file" as const, uri: `data:${mime};base64,${image.data}`, mime, name: file },
                 ],
@@ -290,34 +287,3 @@ export function defaultModel(
 function acceptsImages(model: Model.Info) {
   return model.capabilities.input.some((item) => item.startsWith("image"))
 }
-
-/** Reads pixel dimensions from the image header. */
-export function dimensions(bytes: Uint8Array, mime: string) {
-  const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength)
-  if (mime === "image/png" && bytes.length >= 24) return { width: view.getUint32(16), height: view.getUint32(20) }
-  if (mime === "image/gif" && bytes.length >= 10)
-    return { width: view.getUint16(6, true), height: view.getUint16(8, true) }
-  if (mime === "image/webp" && bytes.length >= 31) {
-    const chunk = String.fromCharCode(...bytes.subarray(12, 16))
-    if (chunk === "VP8 ") return { width: view.getUint16(26, true) & 0x3fff, height: view.getUint16(28, true) & 0x3fff }
-    if (chunk === "VP8L") {
-      const bits = view.getUint32(21, true)
-      return { width: (bits & 0x3fff) + 1, height: ((bits >> 14) & 0x3fff) + 1 }
-    }
-    if (chunk === "VP8X")
-      return {
-        width: (view.getUint32(24, true) & 0xffffff) + 1,
-        height: (view.getUint32(27, true) & 0xffffff) + 1,
-      }
-  }
-  if (mime === "image/jpeg") {
-    let offset = 2
-    while (offset + 9 < bytes.length && bytes[offset] === 0xff) {
-      const marker = bytes[offset + 1]!
-      if (marker >= 0xc0 && marker <= 0xcf && marker !== 0xc4 && marker !== 0xc8 && marker !== 0xcc)
-        return { width: view.getUint16(offset + 7), height: view.getUint16(offset + 5) }
-      offset += 2 + view.getUint16(offset + 2)
-    }
-  }
-  return undefined
-}

packages/core/test/tool-image-generate.test.ts

@@ -21,7 +21,6 @@ import { executeTool, toolDefinitions, toolIdentity } from "./lib/tool"
 import { makePluginTestLayer } from "./plugin/fixture"
 
 const PNG = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg=="
-// 5x3, with EXIF and Photoshop segments ahead of the frame header.
 const JPEG =
   "/9j/4AAQSkZJRgABAQAASABIAAD/4QBMRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAABaADAAQAAAABAAAAAwAAAAD/7QA4UGhvdG9zaG9wIDMuMAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgAAwAFAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAgICAgICAwICAwUDAwMFBgUFBQUGCAYGBgYGCAoICAgICAgKCgoKCgoKCgwMDAwMDA4ODg4ODw8PDw8PDw8PD//bAEMBAgICBAQEBwQEBxALCQsQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEP/dAAQAAf/aAAwDAQACEQMRAD8A7iiiiv8AQA+XP//Z"
 
@@ -121,10 +120,10 @@ describe("image_generate", () => {
 
       const result = yield* run({ prompt: "make it blue", images: ["in.png"], path: "out.png" })
       const file = path.join(directory, "out.png")
-      expect(result.output).toEqual({ path: file, model: "test/painter", width: 1, height: 1 })
+      expect(result.output).toEqual({ path: file, model: "test/painter" })
       expect(result.content?.[0]).toEqual({
         type: "text",
-        text: `Saved 1x1 image to ${file} (test/painter).`,
+        text: `Saved image to ${file} (test/painter).`,
       })
       expect(result.content?.[1]).toMatchObject({ type: "file", mime: "image/png", name: file })
       expect((yield* Effect.promise(() => fs.readFile(file))).toString("base64")).toBe(PNG)
@@ -162,7 +161,6 @@ describe("image_generate", () => {
       const result = yield* run({ prompt: "a cat" })
       expect(path.dirname(result.output.path)).toBe(path.join(global.tmp, "images", session.id))
       expect(path.extname(result.output.path)).toBe(".jpg")
-      expect(result.output).toMatchObject({ width: 5, height: 3 })
       expect(text(result)).toContain("The model returned image/jpeg, so the file is in that format.")
       expect(yield* Effect.promise(() => Bun.file(result.output.path).exists())).toBe(true)