@bonginkan/maria 4.4.7 → 4.4.9

package/dist/server/express-server.cjs

@@ -710,7 +710,7 @@ var GeminiMediaProvider = class {
     }
     const { GoogleGenAI } = __require("@google/genai");
     this.ai = new GoogleGenAI({ apiKey });
-    this.primaryModel = opts?.model || process.env.MARIA_IMAGE_MODEL || "gemini-2.5-flash-image-preview";
+    this.primaryModel = opts?.model || process.env.MARIA_IMAGE_MODEL || "gemini-3-pro-image-preview";
   }
   async generateImage(req) {
     const modelName = this.primaryModel;
@@ -727,11 +727,8 @@ var GeminiMediaProvider = class {
     try {
       resp = await this.ai.models.generateContent({
         model: modelName,
-        contents: [{ role: "user", parts: [{ text: String(req.prompt) }] }],
-        generationConfig: {
-          responseModalities: ["IMAGE"],
-          responseMimeType: targetMime
-        }
+        // For @google/genai, a simple string prompt is sufficient here.
+        contents: String(req.prompt ?? "")
       });
     } catch (err) {
       const errMsg = err?.message || String(err);
@@ -739,15 +736,19 @@ var GeminiMediaProvider = class {
         `GeminiMediaProvider.generateImage request failed: model=${modelName}; prompt="${promptPreview}"; error=${errMsg}`
       );
     }
-    const feedback = resp?.response?.promptFeedback;
+    const root = resp?.response ?? resp;
+    const feedback = root?.promptFeedback || root?.prompt_feedback;
     const blockReason = feedback?.blockReason || feedback?.block_reason;
     if (blockReason) {
       const modelName2 = this.primaryModel;
       const reason = String(blockReason);
       throw new Error(`GeminiMediaProvider.policy_violation: model=${modelName2}; reason=${reason}`);
     }
-    const parts = resp?.response?.candidates?.[0]?.content?.parts || [];
-    for (const p of parts) {
+    const candidates = root?.candidates ?? [];
+    const parts = candidates?.[0]?.content?.parts || [];
+    for (let i = parts.length - 1; i >= 0; i--) {
+      const p = parts[i];
+      if (p?.thought === true) continue;
       const data = p?.inlineData?.data || p?.inline_data?.data;
       const mime = p?.inlineData?.mimeType || p?.inline_data?.mime_type || p?.inline_data?.mimeType || p?.inlineData?.mime_type;
       if (data) {
@@ -755,22 +756,17 @@ var GeminiMediaProvider = class {
         if (buf.length > 0) return { bytes: buf, mime: typeof mime === "string" ? mime : targetMime };
       }
     }
-    try {
-      const imagenModel = process.env.MARIA_IMAGE_FALLBACK_MODEL || "imagen-4.0-generate-001";
-      const r2 = await this.ai.models.generateImages({
-        model: imagenModel,
-        prompt: String(req.prompt)
-      });
-      const img0 = r2?.generatedImages?.[0]?.image;
-      const bytesB64 = img0?.imageBytes || img0?.bytesBase64Encoded;
-      if (bytesB64) {
-        const buf = Buffer.from(String(bytesB64), "base64");
-        if (buf.length > 0) return { bytes: buf, mime: targetMime };
+    for (let i = parts.length - 1; i >= 0; i--) {
+      const p = parts[i];
+      const data = p?.inlineData?.data || p?.inline_data?.data;
+      const mime = p?.inlineData?.mimeType || p?.inline_data?.mime_type || p?.inline_data?.mimeType || p?.inlineData?.mime_type;
+      if (data) {
+        const buf = Buffer.from(String(data), "base64");
+        if (buf.length > 0) return { bytes: buf, mime: typeof mime === "string" ? mime : targetMime };
       }
-    } catch {
     }
-    const candidatesLen = resp?.response?.candidates?.length ?? 0;
-    const finish = resp?.response?.candidates?.[0]?.finishReason || resp?.response?.promptFeedback?.blockReason || "unknown";
+    const candidatesLen = candidates.length ?? 0;
+    const finish = candidates?.[0]?.finishReason || root?.promptFeedback?.blockReason || "unknown";
     const firstPartKeys = parts[0] ? Object.keys(parts[0]).join(",") : "n/a";
     throw new Error(
       `GeminiMediaProvider.generateImage: no inline image returned; model=${modelName}; prompt="${promptPreview}"; candidates=${candidatesLen}; parts=${parts.length}; firstPartKeys=${firstPartKeys}; finish=${finish}`
@@ -1736,7 +1732,7 @@ app.get("/api/status", (req, res) => {
 app.get("/", (req, res) => {
   res.json({
     name: "MARIA CODE API",
-    version: "4.4.7",
+    version: "4.4.9",
     status: "running",
     environment: process.env.NODE_ENV || "development",
     endpoints: {
@@ -2156,7 +2152,7 @@ app.post("/api/v1/image", rateLimitMiddleware, async (req, res) => {
     const promptHash = hashPrompt(prompt);
     const manifest = {
       kind: "image",
-      request: { promptHash, seed, params: { size: [w, h], format, count }, model: model || "gemini-2.5-flash-image-preview", provider: "google" },
+      request: { promptHash, seed, params: { size: [w, h], format, count }, model: model || "gemini-3-pro-image-preview", provider: "google" },
       artifacts: [],
       metrics: { durationMs: Date.now() - started, retries: 0, fallbacks: 0 },
       trace: Math.random().toString(36).slice(2, 8).toUpperCase()

package/dist/server/express-server.js

@@ -710,7 +710,7 @@ var GeminiMediaProvider = class {
     }
     const { GoogleGenAI } = __require("@google/genai");
     this.ai = new GoogleGenAI({ apiKey });
-    this.primaryModel = opts?.model || process.env.MARIA_IMAGE_MODEL || "gemini-2.5-flash-image-preview";
+    this.primaryModel = opts?.model || process.env.MARIA_IMAGE_MODEL || "gemini-3-pro-image-preview";
   }
   async generateImage(req) {
     const modelName = this.primaryModel;
@@ -727,11 +727,8 @@ var GeminiMediaProvider = class {
     try {
       resp = await this.ai.models.generateContent({
         model: modelName,
-        contents: [{ role: "user", parts: [{ text: String(req.prompt) }] }],
-        generationConfig: {
-          responseModalities: ["IMAGE"],
-          responseMimeType: targetMime
-        }
+        // For @google/genai, a simple string prompt is sufficient here.
+        contents: String(req.prompt ?? "")
       });
     } catch (err) {
       const errMsg = err?.message || String(err);
@@ -739,15 +736,19 @@ var GeminiMediaProvider = class {
         `GeminiMediaProvider.generateImage request failed: model=${modelName}; prompt="${promptPreview}"; error=${errMsg}`
       );
     }
-    const feedback = resp?.response?.promptFeedback;
+    const root = resp?.response ?? resp;
+    const feedback = root?.promptFeedback || root?.prompt_feedback;
     const blockReason = feedback?.blockReason || feedback?.block_reason;
     if (blockReason) {
       const modelName2 = this.primaryModel;
       const reason = String(blockReason);
       throw new Error(`GeminiMediaProvider.policy_violation: model=${modelName2}; reason=${reason}`);
     }
-    const parts = resp?.response?.candidates?.[0]?.content?.parts || [];
-    for (const p of parts) {
+    const candidates = root?.candidates ?? [];
+    const parts = candidates?.[0]?.content?.parts || [];
+    for (let i = parts.length - 1; i >= 0; i--) {
+      const p = parts[i];
+      if (p?.thought === true) continue;
       const data = p?.inlineData?.data || p?.inline_data?.data;
       const mime = p?.inlineData?.mimeType || p?.inline_data?.mime_type || p?.inline_data?.mimeType || p?.inlineData?.mime_type;
       if (data) {
@@ -755,22 +756,17 @@ var GeminiMediaProvider = class {
         if (buf.length > 0) return { bytes: buf, mime: typeof mime === "string" ? mime : targetMime };
       }
     }
-    try {
-      const imagenModel = process.env.MARIA_IMAGE_FALLBACK_MODEL || "imagen-4.0-generate-001";
-      const r2 = await this.ai.models.generateImages({
-        model: imagenModel,
-        prompt: String(req.prompt)
-      });
-      const img0 = r2?.generatedImages?.[0]?.image;
-      const bytesB64 = img0?.imageBytes || img0?.bytesBase64Encoded;
-      if (bytesB64) {
-        const buf = Buffer.from(String(bytesB64), "base64");
-        if (buf.length > 0) return { bytes: buf, mime: targetMime };
+    for (let i = parts.length - 1; i >= 0; i--) {
+      const p = parts[i];
+      const data = p?.inlineData?.data || p?.inline_data?.data;
+      const mime = p?.inlineData?.mimeType || p?.inline_data?.mime_type || p?.inline_data?.mimeType || p?.inlineData?.mime_type;
+      if (data) {
+        const buf = Buffer.from(String(data), "base64");
+        if (buf.length > 0) return { bytes: buf, mime: typeof mime === "string" ? mime : targetMime };
       }
-    } catch {
     }
-    const candidatesLen = resp?.response?.candidates?.length ?? 0;
-    const finish = resp?.response?.candidates?.[0]?.finishReason || resp?.response?.promptFeedback?.blockReason || "unknown";
+    const candidatesLen = candidates.length ?? 0;
+    const finish = candidates?.[0]?.finishReason || root?.promptFeedback?.blockReason || "unknown";
     const firstPartKeys = parts[0] ? Object.keys(parts[0]).join(",") : "n/a";
     throw new Error(
       `GeminiMediaProvider.generateImage: no inline image returned; model=${modelName}; prompt="${promptPreview}"; candidates=${candidatesLen}; parts=${parts.length}; firstPartKeys=${firstPartKeys}; finish=${finish}`
@@ -1736,7 +1732,7 @@ app.get("/api/status", (req, res) => {
 app.get("/", (req, res) => {
   res.json({
     name: "MARIA CODE API",
-    version: "4.4.7",
+    version: "4.4.9",
     status: "running",
     environment: process.env.NODE_ENV || "development",
     endpoints: {
@@ -2156,7 +2152,7 @@ app.post("/api/v1/image", rateLimitMiddleware, async (req, res) => {
     const promptHash = hashPrompt(prompt);
     const manifest = {
       kind: "image",
-      request: { promptHash, seed, params: { size: [w, h], format, count }, model: model || "gemini-2.5-flash-image-preview", provider: "google" },
+      request: { promptHash, seed, params: { size: [w, h], format, count }, model: model || "gemini-3-pro-image-preview", provider: "google" },
       artifacts: [],
       metrics: { durationMs: Date.now() - started, retries: 0, fallbacks: 0 },
       trace: Math.random().toString(36).slice(2, 8).toUpperCase()

package/dist/server-express.cjs

@@ -710,7 +710,7 @@ var GeminiMediaProvider = class {
     }
     const { GoogleGenAI } = __require("@google/genai");
     this.ai = new GoogleGenAI({ apiKey });
-    this.primaryModel = opts?.model || process.env.MARIA_IMAGE_MODEL || "gemini-2.5-flash-image-preview";
+    this.primaryModel = opts?.model || process.env.MARIA_IMAGE_MODEL || "gemini-3-pro-image-preview";
   }
   async generateImage(req) {
     const modelName = this.primaryModel;
@@ -727,11 +727,8 @@ var GeminiMediaProvider = class {
     try {
       resp = await this.ai.models.generateContent({
         model: modelName,
-        contents: [{ role: "user", parts: [{ text: String(req.prompt) }] }],
-        generationConfig: {
-          responseModalities: ["IMAGE"],
-          responseMimeType: targetMime
-        }
+        // For @google/genai, a simple string prompt is sufficient here.
+        contents: String(req.prompt ?? "")
       });
     } catch (err) {
       const errMsg = err?.message || String(err);
@@ -739,15 +736,19 @@ var GeminiMediaProvider = class {
         `GeminiMediaProvider.generateImage request failed: model=${modelName}; prompt="${promptPreview}"; error=${errMsg}`
       );
     }
-    const feedback = resp?.response?.promptFeedback;
+    const root = resp?.response ?? resp;
+    const feedback = root?.promptFeedback || root?.prompt_feedback;
     const blockReason = feedback?.blockReason || feedback?.block_reason;
     if (blockReason) {
       const modelName2 = this.primaryModel;
       const reason = String(blockReason);
       throw new Error(`GeminiMediaProvider.policy_violation: model=${modelName2}; reason=${reason}`);
     }
-    const parts = resp?.response?.candidates?.[0]?.content?.parts || [];
-    for (const p of parts) {
+    const candidates = root?.candidates ?? [];
+    const parts = candidates?.[0]?.content?.parts || [];
+    for (let i = parts.length - 1; i >= 0; i--) {
+      const p = parts[i];
+      if (p?.thought === true) continue;
       const data = p?.inlineData?.data || p?.inline_data?.data;
       const mime = p?.inlineData?.mimeType || p?.inline_data?.mime_type || p?.inline_data?.mimeType || p?.inlineData?.mime_type;
       if (data) {
@@ -755,22 +756,17 @@ var GeminiMediaProvider = class {
         if (buf.length > 0) return { bytes: buf, mime: typeof mime === "string" ? mime : targetMime };
       }
     }
-    try {
-      const imagenModel = process.env.MARIA_IMAGE_FALLBACK_MODEL || "imagen-4.0-generate-001";
-      const r2 = await this.ai.models.generateImages({
-        model: imagenModel,
-        prompt: String(req.prompt)
-      });
-      const img0 = r2?.generatedImages?.[0]?.image;
-      const bytesB64 = img0?.imageBytes || img0?.bytesBase64Encoded;
-      if (bytesB64) {
-        const buf = Buffer.from(String(bytesB64), "base64");
-        if (buf.length > 0) return { bytes: buf, mime: targetMime };
+    for (let i = parts.length - 1; i >= 0; i--) {
+      const p = parts[i];
+      const data = p?.inlineData?.data || p?.inline_data?.data;
+      const mime = p?.inlineData?.mimeType || p?.inline_data?.mime_type || p?.inline_data?.mimeType || p?.inlineData?.mime_type;
+      if (data) {
+        const buf = Buffer.from(String(data), "base64");
+        if (buf.length > 0) return { bytes: buf, mime: typeof mime === "string" ? mime : targetMime };
       }
-    } catch {
     }
-    const candidatesLen = resp?.response?.candidates?.length ?? 0;
-    const finish = resp?.response?.candidates?.[0]?.finishReason || resp?.response?.promptFeedback?.blockReason || "unknown";
+    const candidatesLen = candidates.length ?? 0;
+    const finish = candidates?.[0]?.finishReason || root?.promptFeedback?.blockReason || "unknown";
     const firstPartKeys = parts[0] ? Object.keys(parts[0]).join(",") : "n/a";
     throw new Error(
       `GeminiMediaProvider.generateImage: no inline image returned; model=${modelName}; prompt="${promptPreview}"; candidates=${candidatesLen}; parts=${parts.length}; firstPartKeys=${firstPartKeys}; finish=${finish}`
@@ -1736,7 +1732,7 @@ app.get("/api/status", (req, res) => {
 app.get("/", (req, res) => {
   res.json({
     name: "MARIA CODE API",
-    version: "4.4.7",
+    version: "4.4.9",
     status: "running",
     environment: process.env.NODE_ENV || "development",
     endpoints: {
@@ -2156,7 +2152,7 @@ app.post("/api/v1/image", rateLimitMiddleware, async (req, res) => {
     const promptHash = hashPrompt(prompt);
     const manifest = {
       kind: "image",
-      request: { promptHash, seed, params: { size: [w, h], format, count }, model: model || "gemini-2.5-flash-image-preview", provider: "google" },
+      request: { promptHash, seed, params: { size: [w, h], format, count }, model: model || "gemini-3-pro-image-preview", provider: "google" },
       artifacts: [],
       metrics: { durationMs: Date.now() - started, retries: 0, fallbacks: 0 },
       trace: Math.random().toString(36).slice(2, 8).toUpperCase()