ai-codegen-cli-vrk 2.0.5 → 2.0.8

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.5",
-  "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.8",
+  "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,34 +1,52 @@
-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;
+  genAI = new GoogleGenerativeAI(apiKey.trim());
 }
 
-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 modelNames = ["gemini-1.5-flash", "gemini-pro", "gemini-1.5-flash-latest"];
+  const apiVersions = ["v1beta", "v1"];
+  
+  let lastError = null;
+
+  for (const ver of apiVersions) {
+    for (const name of modelNames) {
+      try {
+        const m = genAI.getGenerativeModel({ model: name }, { apiVersion: ver });
+        // Minimal verification call
+        await m.generateContent({ 
+          contents: [{ role: "user", parts: [{ text: "hi" }] }], 
+          generationConfig: { maxOutputTokens: 1 } 
+        });
+        activeModel = m;
+        return m;
+      } catch (err) {
+        lastError = err;
+        // If it's a 404, this combination is invalid; try next.
+        if (err.message.includes("404") || err.message.includes("not found")) continue;
+        // If it's an Auth error, stop and throw it.
+        if (err.message.includes("API key not valid") || err.message.includes("401")) {
+           throw new Error("Invalid API Key. Please check it at aistudio.google.com");
+        }
+      }
+    }
   }
+  
+  throw new Error(`Connection Failed. Last error: ${lastError?.message || "Unknown"}`);
 }
 
 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 = `
+  try {
+    const model = await getWorkingModel();
+    
+    const prompt = `
+You are an expert automated coding exam solver. 
 Generate the ENTIRE project in a SINGLE response. 
 Strictly pass all test cases.
 
@@ -45,28 +63,23 @@ TESTS:
 ${tests}
 
 ### RULES:
-- Minimalist logic only.
+- Minimalist logic.
 - Bare minimum code to pass.
 - No talk or explanations.
 `;
 
-  const response = await fetch(url, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ contents: [{ parts: [{ text: prompt }] }] })
-  });
-
-  const data = await response.json();
+    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();
 
-  // If overloaded (503) or rate limited (429), wait 10 seconds and retry
-  if ((response.status === 503 || response.status === 429) && retryCount < 5) {
-    console.log(`..... (Server busy, waiting 10s to retry ${retryCount + 1}/5)`);
-    await new Promise(r => setTimeout(r, 10000));
-    return generateFullProject(task, tests, retryCount + 1);
+  } catch (error) {
+    // Handle Overloaded (503) or Rate Limit (429)
+    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;
   }
-
-  if (!response.ok) throw new Error(data.error?.message || "Generation failed");
-
-  const text = data.candidates?.[0]?.content?.parts?.[0]?.text || "";
-  return text.replace(/```[a-z]*\n([\s\S]*?)\n```/gi, "$1").trim();
 }

package/src/runner.js

@@ -4,16 +4,13 @@ import { setApiKey, generateFullProject } from "./aiClient.js";
 import { writeSingleFile } from "./fileWriter.js";
 
 async function main() {
-  // Input API Key - set to visible
-  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);
+  setApiKey(apiKeyInput.trim());
 
-  // Input Task
   const task = readlineSync.question("- ");
   if (!task || task.trim().length === 0) process.exit(1);
 
-  // Input Tests
   const testsInput = readlineSync.question("-- ");
   let tests = "";
   try {