apexify.js 4.0.7 → 4.0.8

package/lib/ai/modals-chat/Gemini-pro.ts

@@ -1,15 +1,34 @@
-import { GoogleGenerativeAI } from "@google/generative-ai";
+import { GoogleGenerativeAI, HarmCategory, HarmBlockThreshold } from "@google/generative-ai";
 import path from 'path';
 import fs from 'fs';
 import config from './config'; 
 import { converter } from "../../canvas/utils/general functions";
+import  { connect } from "verse.db";
+import axios from "axios";
 
 let currentApiKeyIndex = 0;
 
-export async function geminiPro(message: any, AI: { AiPersonality: string | null, userMsg: string, API_KEY: string | null }): Promise<any> {
+export async function geminiPro(message: { userId: string, serverName: string, serverId: string, channelName: string, attachment: any, db: boolean  }, AI: { AiPersonality: string | null, userMsg: string, API_KEY: string | null }): Promise<any> {
+
 
   try { 
-    const genAI = new GoogleGenerativeAI(AI.API_KEY || config.apiKeys[currentApiKeyIndex]);
+    
+    let apiKeyIndex = currentApiKeyIndex;
+    let genAI: any;
+        while (apiKeyIndex < config.apiKeys.length) {
+            const validateKey = await axios.get(`https://generativelanguage.googleapis.com/v1beta/models?key=${config.apiKeys[apiKeyIndex]}`);
+            if (validateKey.status === 200) {
+                genAI = new GoogleGenerativeAI(config.apiKeys[apiKeyIndex]);
+                
+                break;
+            } else {
+                apiKeyIndex++;
+            }
+        }
+
+        if (apiKeyIndex === config.apiKeys.length) {
+            return 'All provided API keys are invalid.';
+        }
 
     let personalityString: string = '';
     if (AI.AiPersonality) {
@@ -23,49 +42,85 @@ export async function geminiPro(message: any, AI: { AiPersonality: string | null
         maxOutputTokens: 750,
     };
 
-    const systemInstruction = `${personalityString}\n And working on discord in serverName: ${message.guild.name} at channelName: ${message.channel.name} and responding to the userName: ${message.author.username}`;
-    const model = genAI.getGenerativeModel({ model: "gemini-1.5-pro-latest", systemInstruction, generationConfig});
+    const safetySettings = [
+        {
+            category: HarmCategory.HARM_CATEGORY_HARASSMENT,
+            threshold: HarmBlockThreshold.BLOCK_ONLY_HIGH,
+        },
+        {
+            category: HarmCategory.HARM_CATEGORY_HATE_SPEECH,
+            threshold: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+        },
+        {
+            category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
+            threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE,
+        },
+        {
+            category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
+            threshold: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+        },
+    ];
+
+    const systemInstruction = `${personalityString}\n And working on discord in serverName: ${message.serverName} at channelName: ${message.channelName} and responding to the userName:<@ ${message.userId}>`;
+    const model = genAI.getGenerativeModel({ model: "gemini-1.5-pro-latest", systemInstruction, generationConfig, safetySettings });
+
+    let historyData: any[] | undefined = undefined;
+
+    const defaultHistory = [
+        {
+            role: "user",
+            parts: [{ text: `${personalityString}\n And working on discord in serverName: ${message.serverName} at channelName: ${message.channelName} and responding to the userName: <@${message.userId}>` }],
+        },
+        {
+            role: "model",
+            parts: [{ text: `I will greet the user with their name: <@${message.userId}>. Feel free to ask me anything! 😊` }],
+        },
+        {
+            role: "user",
+            parts: [{ text: "Any question regarding JEDI STUDIO, verse.db, apexify.js, or djs-builder?" }],
+        },
+        {
+            role: "model",
+            parts: [{ text: `You should reply with visiting documentation online at jedi-studio.com. The development team consists of 8 people, led by Marco. The CEO/founder is Kimo.` }],
+        },
+        {
+            role: "user",
+            parts: [{ text: "How was I developed or programmed?" }],
+        },
+        {
+            role: "model",
+            parts: [{ text: `You were made by JEDI STUDIO under the development of jedi.tsx, one of the CEOs for JEDI STUDIO.` }],
+        },
+        {
+            role: "user",
+            parts: [{ text: "Tell me about verse.db." }],
+        },
+        {
+            role: "model",
+            parts: [{ text: `verse.db is a database that enables users to manage data for SQL, JSON, YAML, and SQOL. It's a new brand by JEDI STUDIO, and SOOL will support more database management with comprehensive features and security.` }],
+        },
+    ];
+
+    let db: any;
+
+    if (message.db) {
+        db = new connect({ adapter: 'json', dataPath: `${message.serverId}_ChatHistory` });
+
+       const data = await db.find(`${message.userId}_chatHistory`, { userId: message.userId });
+
+       if (!data.results?.history || data.results?.history?.length === 0) {
+          await db.update(`${message.userId}_chatHistory`, { userId: message.userId }, { $set: { history: [] } }, true);
+       } else {
+          historyData = data.results?.history || undefined;
+       }
+    }
 
     const chat = model.startChat({
-      history: [
-          {
-              role: "user",
-              parts: [{ text: `${personalityString}\n And working on discord in serverName: ${message.guild.name} at channelName: ${message.channel.name} and responding to the userName: ${message.author.username}` }],
-          },
-          {
-              role: "model",
-              parts: [{ text: `I will greet the user with their name: <@${message.author.id}>. Feel free to ask me anything! 😊` }],
-          },
-          {
-              role: "user",
-              parts: [{ text: "Any question regarding JEDI STUDIO, verse.db, apexify.js, or djs-builder?" }],
-          },
-          {
-              role: "model",
-              parts: [{ text: `You should reply with visiting documentation online at jedi-studio.com. The development team consists of 8 people, led by Marco. The CEO/founder is Kimo.` }],
-          },
-          {
-              role: "user",
-              parts: [{ text: "How was I developed or programmed?" }],
-          },
-          {
-              role: "model",
-              parts: [{ text: `You were made by JEDI STUDIO under the development of jedi.tsx, one of the CEOs for JEDI STUDIO.` }],
-          },
-          {
-              role: "user",
-              parts: [{ text: "Tell me about verse.db." }],
-          },
-          {
-              role: "model",
-              parts: [{ text: `verse.db is a database that enables users to manage data for SQL, JSON, YAML, and SQOL. It's a new brand by JEDI STUDIO, and SOOL will support more database management with comprehensive features and security.` }],
-          },
-      ],
+      history: historyData || defaultHistory,
       generationConfig
-  });
+    });
   
-    const attachment = message.attachments?.first();
-    const imgURL = attachment?.url || null;
+    const imgURL = message.attachment?.url || null;
     let result: any;
 
     if (imgURL) {
@@ -80,20 +135,51 @@ export async function geminiPro(message: any, AI: { AiPersonality: string | null
     } else {
         result = await chat.sendMessage(AI.userMsg);
     }
-    const response =  result.response;
 
-    return response.text()
-  } catch (e: any) {
+    const response =  await result.response.text();
+
+    if (message.db) {
+        
+        const updateQuery_1 = {
+            $push: {
+              "history": {
+                role: "user",
+                parts: [{ text: `${AI.userMsg}` }]
+              }
+            },
+        };
+
+        historyData = await db.update(`${message.userId}_chatHistory`,
+         { userId: message.userId },
+         updateQuery_1, true
+        );
+
+        const updateQuery_2 = {
+            $push: {
+              "history": {
+                role: "model",
+                parts: [{ text: `${response}` }]
+              }
+            },
+        };
+        
+        historyData = await db.update(`${message.userId}_chatHistory`,
+        { userId: message.userId },
+        updateQuery_2,
+        true
+        );
+    }
+
+    return response;
+} catch (e: any) {
     if (e.message) {
         if (e.message === '[GoogleGenerativeAI Error]: Error fetching from https://generativelanguage.googleapis.com/v1/models/gemini-pro:generateContent: [400 Bad Request] User location is not supported for the API use.') {
-          return `<${message.author.id}> your location isn't supported by gemini AI.`;
-        } else if (e.response && (e.response.status === 429 || e.response.status === 400)) {
-          currentApiKeyIndex++;
-          if (currentApiKeyIndex < config.apiKeys.length) {
-              return geminiPro(message, { ...AI, API_KEY: config.apiKeys[currentApiKeyIndex] });
-          } else {
-              return 'Ai is on a cooldown for the rest of the day. Either provide your API key or wait for tomorrow. Check ai.google.dev for apikeys';
-          }
+          return `The hoster/bot owner/the used host isn't supported by gemini.`;
+        } else if (e.response && (e.response.status === 429 || e.response.status === 403)) {
+              return 'Ai is on a cooldown for the rest of the day. Either provide your own API key or wait for tomorrow. Check ai.google.dev for free apikeys';
+        } else if (e.message === '[GoogleGenerativeAI Error]: Candidate was blocked due to SAFETY') {
+            console.error(e);
+            return `Due to safety enabled by gemini you have been blocked.`;
         } else {
             console.error(e);
             return `Try again later please... Either API is on a cooldown or an internal server error has occurred. If issue persists please contact the bot developer or owner of the npm package.`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "apexify.js",
-    "version": "4.0.7",
+    "version": "4.0.8",
     "description": "Ai and Canvas library. Supports typescript and javascript",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -152,7 +152,8 @@
         "jimp": "^0.3.11",
         "pdf-parse": "^1.1.1",
         "sharp": "^0.33.2",
-        "tesseract.js": "^5.0.5"
+        "tesseract.js": "^5.0.5",
+        "verse.db": "^2.0.4"
     },
     "devDependencies": {
         "@types/gifencoder": "^2.0.3",