ai-codegen-cli-vrk 2.0.4 → 2.0.7

package/bin/index.js

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 import "../src/runner.js";

package/package.json

@@ -1,20 +1,18 @@
-{
-  "name": "ai-codegen-cli-vrk",
-  "version": "2.0.4",
-  "description": "Minimalist Terminal-based AI code generator",
-  "type": "module",
-  "bin": {
-    "ai-codegen": "bin/index.js"
-  },
-  "files": [
-    "bin",
-    "src"
-  ],
-  "dependencies": {
-    "fs-extra": "^11.2.0",
-    "readline-sync": "^1.4.10"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  }
+{
+  "name": "ai-codegen-cli-vrk",
+  "version": "2.0.7",
+  "description": "Minimalist Terminal-based AI code generator",
+  "type": "module",
+  "bin": {
+    "ai-codegen": "bin/index.js"
+  },
+  "files": [
+    "bin",
+    "src"
+  ],
+  "dependencies": {
+    "@google/generative-ai": "^0.21.0",
+    "fs-extra": "^11.2.0",
+    "readline-sync": "^1.4.10"
+  }
 }

package/src/aiClient.js

@@ -1,56 +1,78 @@
-let API_KEY = null;
-let SELECTED_MODEL_PATH = null;
+import { GoogleGenerativeAI } from "@google/generative-ai";
+
+let genAI = null;
+let activeModel = null;
 
 export function setApiKey(apiKey) {
-  API_KEY = apiKey;
+  // Auto-trim to remove any accidental spaces from copy-pasting
+  const cleanKey = apiKey.trim();
+  genAI = new GoogleGenerativeAI(cleanKey);
 }
 
-async function findActiveModel() {
-  if (SELECTED_MODEL_PATH) return SELECTED_MODEL_PATH;
-  const url = `https://generativelanguage.googleapis.com/v1/models?key=${API_KEY}`;
-  try {
-    const response = await fetch(url);
-    const data = await response.json();
-    if (!response.ok) throw new Error(data.error?.message || "Invalid API Key");
-    const match = (data.models || []).find(m => 
-      m.supportedGenerationMethods.includes("generateContent") && 
-      (m.name.includes("flash") || m.name.includes("pro"))
-    );
-    SELECTED_MODEL_PATH = match ? match.name : "models/gemini-1.5-flash";
-    return SELECTED_MODEL_PATH;
-  } catch {
-    SELECTED_MODEL_PATH = "models/gemini-1.5-flash";
-    return SELECTED_MODEL_PATH;
+async function getWorkingModel() {
+  if (activeModel) return activeModel;
+
+  const candidates = ["gemini-1.5-flash", "gemini-1.5-flash-latest", "gemini-pro"];
+  
+  for (const name of candidates) {
+    try {
+      // Force the stable 'v1' API version to avoid Beta key issues
+      const m = genAI.getGenerativeModel({ model: name }, { apiVersion: "v1" });
+      
+      // Verification call
+      await m.generateContent({ contents: [{ role: "user", parts: [{ text: "hi" }] }], generationConfig: { maxOutputTokens: 1 } });
+      activeModel = m;
+      return m;
+    } catch (err) {
+      if (err.message.includes("404") || err.message.includes("not found")) continue;
+      throw err;
+    }
   }
+  throw new Error("No compatible Gemini models found.");
 }
 
 export async function generateFullProject(task, tests, retryCount = 0) {
-  const modelPath = await findActiveModel();
-  const url = `https://generativelanguage.googleapis.com/v1/${modelPath}:generateContent?key=${API_KEY}`;
-  
-  const prompt = `Generate the ENTIRE project in ONE response. Strictly pass tests.
-Header: // ==========================================
-Header: // FILE: path/filename.js
-TASK: ${task}
-TESTS: ${tests}`;
-
-  const response = await fetch(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ contents: [{ parts: [{ text: prompt }] }] })
-  });
-
-  const data = await response.json();
-
-  // Handle Overloaded / Service Unavailable (503) or Rate Limit (429)
-  if ((response.status === 503 || response.status === 429) && retryCount < 3) {
-    console.log(`..... (retrying due to server load)`);
-    await new Promise(r => setTimeout(r, 5000)); // Wait 5 seconds
-    return generateFullProject(task, tests, retryCount + 1);
-  }
+  try {
+    const model = await getWorkingModel();
+    
+    const prompt = `
+Generate the ENTIRE project in a SINGLE response. 
+Strictly pass all test cases.
 
-  if (!response.ok) throw new Error(data.error?.message || "Generation failed");
+### FORMATTING:
+File headers must be exactly:
+// ==========================================
+// FILE: path/to/filename.js
+// ==========================================
 
-  const text = data.candidates?.[0]?.content?.parts?.[0]?.text || "";
-  return text.replace(/```[a-z]*\n([\s\S]*?)\n```/gi, "$1").trim();
+TASK:
+${task}
+
+TESTS:
+${tests}
+
+### RULES:
+- Minimalist logic.
+- Bare minimum code to pass.
+- No talk or explanations.
+`;
+
+    const result = await model.generateContent(prompt);
+    const response = await result.response;
+    const text = response.text();
+    return text.replace(/```[a-z]*\n([\s\S]*?)\n```/gi, "$1").trim();
+
+  } catch (error) {
+    // If key is truly invalid, give a clear message
+    if (error.message.includes("API key not valid")) {
+      throw new Error("The API key you entered is invalid. Please double-check it at aistudio.google.com");
+    }
+
+    if ((error.message.includes("503") || error.message.includes("429")) && retryCount < 5) {
+      console.log(`..... (Server busy, retrying ${retryCount + 1}/5)`);
+      await new Promise(r => setTimeout(r, 10000));
+      return generateFullProject(task, tests, retryCount + 1);
+    }
+    throw error;
+  }
 }

package/src/runner.js

@@ -4,10 +4,11 @@ import { setApiKey, generateFullProject } from "./aiClient.js";
 import { writeSingleFile } from "./fileWriter.js";
 
 async function main() {
-  // CHANGED: hideEchoBack is now false so you can see the key
-  const apiKey = readlineSync.question("--- ", { hideEchoBack: false });
-  if (!apiKey || apiKey.trim().length === 0) process.exit(1);
-  setApiKey(apiKey.trim());
+  const apiKeyInput = readlineSync.question("--- ", { hideEchoBack: false });
+  if (!apiKeyInput || apiKeyInput.trim().length === 0) process.exit(1);
+  
+  // Trimming again here just to be safe
+  setApiKey(apiKeyInput.trim());
 
   const task = readlineSync.question("- ");
   if (!task || task.trim().length === 0) process.exit(1);