Merge pull request #40 from ut-code/copilot/fix-43024d18-e3cd-4db1-84f6-82adfcff23f6

Migrate from deprecated gemini-1.5-flash and @google/generative-ai to current packages

Author: na-trium-144

app/actions/chatActions.ts

@@ -47,8 +47,10 @@ ${userQuestion}
 
 `;
     const result = await generateContent(prompt);
-    const response = result.response;
-    const text = response.text();
+    const text = result.text;
+    if (!text) {
+      throw new Error("AIからの応答が空でした");
+    }
     return { response: text, error: null };
   } catch (error: unknown) {
     console.error("Error calling Generative AI:", error);

app/actions/gemini.ts

@@ -1,22 +1,27 @@
 "use server";
 
-import { GoogleGenerativeAI, ModelParams } from "@google/generative-ai";
+import { GoogleGenAI } from "@google/genai";
 
 export async function generateContent(prompt: string) {
-  const params: ModelParams = {
-    model: "gemini-1.5-flash",
+  const params = {
+    model: "gemini-2.5-flash",
+    contents: prompt,
   };
 
-  const genAI = new GoogleGenerativeAI(process.env.API_KEY!);
+  const ai = new GoogleGenAI({ apiKey: process.env.API_KEY! });
+  
   try {
-    const model = genAI.getGenerativeModel(params);
-    return await model.generateContent(prompt);
+    return await ai.models.generateContent(params);
   } catch (e: unknown) {
     if (String(e).includes("User location is not supported")) {
-      const model = genAI.getGenerativeModel(params, {
-        baseUrl: "https://gemini-proxy.utcode.net",
+      // For the new API, we can use httpOptions to set a custom baseUrl
+      const aiWithProxy = new GoogleGenAI({ 
+        apiKey: process.env.API_KEY!,
+        httpOptions: {
+          baseUrl: "https://gemini-proxy.utcode.net",
+        },
       });
-      return await model.generateContent(prompt);
+      return await aiWithProxy.models.generateContent(params);
     } else {
       throw e;
     }

app/actions/questionExample.ts

@@ -34,7 +34,9 @@ export async function getQuestionExample(
 ${documentContent}
 `;
   const result = await generateContent(prompt);
-  const response = result.response;
-  const text = response.text();
+  const text = result.text;
+  if (!text) {
+    throw new Error("AIからの応答が空でした");
+  }
   return text.trim().split("\n");
 }

package-lock.json

@@ -16,7 +16,7 @@
   "dependencies": {
     "@fontsource-variable/inconsolata": "^5.2.6",
     "@fontsource-variable/noto-sans-jp": "^5.2.6",
-    "@google/generative-ai": "^0.24.1",
+    "@google/genai": "^1.21.0",
     "@opennextjs/cloudflare": "^1.7.1",
     "@xterm/addon-fit": "^0.11.0-beta.115",
     "@xterm/xterm": "^5.6.0-beta.115",