apexify.js 4.0.3 → 4.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ai/modals-chat/Gemini-flash.d.ts.map +1 -1
- package/dist/ai/modals-chat/Gemini-flash.js +18 -10
- package/dist/ai/modals-chat/Gemini-flash.js.map +1 -1
- package/dist/ai/modals-chat/Gemini-pro.d.ts.map +1 -1
- package/dist/ai/modals-chat/Gemini-pro.js +28 -5
- package/dist/ai/modals-chat/Gemini-pro.js.map +1 -1
- package/lib/ai/modals-chat/Gemini-flash.ts +35 -27
- package/lib/ai/modals-chat/Gemini-pro.ts +35 -12
- package/lib/ai/modals-chat/config.ts +0 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Gemini-flash.d.ts","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-flash.ts"],"names":[],"mappings":"AAQA,wBAAsB,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;IAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"Gemini-flash.d.ts","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-flash.ts"],"names":[],"mappings":"AAQA,wBAAsB,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;IAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CA+F3I"}
|
|
@@ -23,7 +23,7 @@ async function geminiFlash(message, AI) {
|
|
|
23
23
|
const generationConfig = {
|
|
24
24
|
maxOutputTokens: 750,
|
|
25
25
|
};
|
|
26
|
-
const systemInstruction =
|
|
26
|
+
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}`;
|
|
27
27
|
const model = genAI.getGenerativeModel({ model: "gemini-1.5-flash-latest", systemInstruction, generationConfig });
|
|
28
28
|
const chat = model.startChat({
|
|
29
29
|
history: [
|
|
@@ -33,23 +33,31 @@ async function geminiFlash(message, AI) {
|
|
|
33
33
|
},
|
|
34
34
|
{
|
|
35
35
|
role: "model",
|
|
36
|
-
parts: [{ text: `I will greet the user with their name: <@${message.author.id}>. Feel
|
|
37
|
-
|
|
36
|
+
parts: [{ text: `I will greet the user with their name: <@${message.author.id}>. Feel free to ask me anything! 😊` }],
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
role: "user",
|
|
40
|
+
parts: [{ text: "Any question regarding JEDI STUDIO, verse.db, apexify.js, or djs-builder?" }],
|
|
38
41
|
},
|
|
39
42
|
{
|
|
40
43
|
role: "model",
|
|
41
|
-
parts: [{ text: `
|
|
42
|
-
|
|
44
|
+
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.` }],
|
|
45
|
+
},
|
|
46
|
+
{
|
|
47
|
+
role: "user",
|
|
48
|
+
parts: [{ text: "How was I developed or programmed?" }],
|
|
43
49
|
},
|
|
44
50
|
{
|
|
45
51
|
role: "model",
|
|
46
|
-
parts: [{ text: `
|
|
47
|
-
|
|
52
|
+
parts: [{ text: `You were made by JEDI STUDIO under the development of jedi.tsx, one of the CEOs for JEDI STUDIO.` }],
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
role: "user",
|
|
56
|
+
parts: [{ text: "Tell me about verse.db." }],
|
|
48
57
|
},
|
|
49
58
|
{
|
|
50
59
|
role: "model",
|
|
51
|
-
parts: [{ text: `
|
|
52
|
-
}],
|
|
60
|
+
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.` }],
|
|
53
61
|
},
|
|
54
62
|
],
|
|
55
63
|
generationConfig
|
|
@@ -78,7 +86,7 @@ async function geminiFlash(message, AI) {
|
|
|
78
86
|
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.') {
|
|
79
87
|
return `<${message.author.id}> your location isn't supported by gemini AI.`;
|
|
80
88
|
}
|
|
81
|
-
else if (e.response && e.response.status === 429) {
|
|
89
|
+
else if (e.response && (e.response.status === 429 || e.response.status === 400)) {
|
|
82
90
|
currentApiKeyIndex++;
|
|
83
91
|
if (currentApiKeyIndex < config_1.default.apiKeys.length) {
|
|
84
92
|
return geminiFlash(message, { ...AI, API_KEY: config_1.default.apiKeys[currentApiKeyIndex] });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Gemini-flash.js","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-flash.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA2D;AAC3D,gDAAwB;AACxB,4CAAoB;AACpB,sDAA8B;AAC9B,4EAAiE;AAEjE,IAAI,kBAAkB,GAAG,CAAC,CAAC;AAEpB,KAAK,UAAU,WAAW,CAAC,OAAY,EAAE,EAA6E;;IAE3H,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,kCAAkB,CAAC,EAAE,CAAC,OAAO,IAAI,gBAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAEvF,IAAI,iBAAiB,GAAW,EAAE,CAAC;QACnC,IAAI,EAAE,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC;YACvE,MAAM,kBAAkB,GAAG,YAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YACzE,iBAAiB,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,gBAAgB,GAAG;YACrB,eAAe,EAAE,GAAG;SACvB,CAAC;QAEF,MAAM,iBAAiB,GAAG,4CAA4C,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"Gemini-flash.js","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-flash.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Gemini-pro.d.ts","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-pro.ts"],"names":[],"mappings":"AAQA,wBAAsB,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;IAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"Gemini-pro.d.ts","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-pro.ts"],"names":[],"mappings":"AAQA,wBAAsB,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;IAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAgGzI"}
|
|
@@ -23,8 +23,8 @@ async function geminiPro(message, AI) {
|
|
|
23
23
|
const generationConfig = {
|
|
24
24
|
maxOutputTokens: 750,
|
|
25
25
|
};
|
|
26
|
-
const systemInstruction =
|
|
27
|
-
const model = genAI.getGenerativeModel({ model: "gemini-pro", systemInstruction, generationConfig });
|
|
26
|
+
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}`;
|
|
27
|
+
const model = genAI.getGenerativeModel({ model: "gemini-1.5-pro-latest", systemInstruction, generationConfig });
|
|
28
28
|
const chat = model.startChat({
|
|
29
29
|
history: [
|
|
30
30
|
{
|
|
@@ -33,8 +33,31 @@ async function geminiPro(message, AI) {
|
|
|
33
33
|
},
|
|
34
34
|
{
|
|
35
35
|
role: "model",
|
|
36
|
-
parts: [{ text: `I will greet the user with their name: <@${message.author.id}>. Feel
|
|
37
|
-
|
|
36
|
+
parts: [{ text: `I will greet the user with their name: <@${message.author.id}>. Feel free to ask me anything! 😊` }],
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
role: "user",
|
|
40
|
+
parts: [{ text: "Any question regarding JEDI STUDIO, verse.db, apexify.js, or djs-builder?" }],
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
role: "model",
|
|
44
|
+
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.` }],
|
|
45
|
+
},
|
|
46
|
+
{
|
|
47
|
+
role: "user",
|
|
48
|
+
parts: [{ text: "How was I developed or programmed?" }],
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
role: "model",
|
|
52
|
+
parts: [{ text: `You were made by JEDI STUDIO under the development of jedi.tsx, one of the CEOs for JEDI STUDIO.` }],
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
role: "user",
|
|
56
|
+
parts: [{ text: "Tell me about verse.db." }],
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
role: "model",
|
|
60
|
+
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.` }],
|
|
38
61
|
},
|
|
39
62
|
],
|
|
40
63
|
generationConfig
|
|
@@ -63,7 +86,7 @@ async function geminiPro(message, AI) {
|
|
|
63
86
|
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.') {
|
|
64
87
|
return `<${message.author.id}> your location isn't supported by gemini AI.`;
|
|
65
88
|
}
|
|
66
|
-
else if (e.response && e.response.status === 429) {
|
|
89
|
+
else if (e.response && (e.response.status === 429 || e.response.status === 400)) {
|
|
67
90
|
currentApiKeyIndex++;
|
|
68
91
|
if (currentApiKeyIndex < config_1.default.apiKeys.length) {
|
|
69
92
|
return geminiPro(message, { ...AI, API_KEY: config_1.default.apiKeys[currentApiKeyIndex] });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Gemini-pro.js","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-pro.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA2D;AAC3D,gDAAwB;AACxB,4CAAoB;AACpB,sDAA8B;AAC9B,4EAAiE;AAEjE,IAAI,kBAAkB,GAAG,CAAC,CAAC;AAEpB,KAAK,UAAU,SAAS,CAAC,OAAY,EAAE,EAA6E;;IAEzH,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,kCAAkB,CAAC,EAAE,CAAC,OAAO,IAAI,gBAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAEvF,IAAI,iBAAiB,GAAW,EAAE,CAAC;QACnC,IAAI,EAAE,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC;YACvE,MAAM,kBAAkB,GAAG,YAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YACzE,iBAAiB,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjE,CAAC;QAGD,MAAM,gBAAgB,GAAG;YACrB,eAAe,EAAE,GAAG;SACvB,CAAC;QAEF,MAAM,iBAAiB,GAAG,4CAA4C,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"Gemini-pro.js","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-pro.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,35 +26,43 @@ export async function geminiFlash(message: any, AI: { AiPersonality: string | nu
|
|
|
26
26
|
const model = genAI.getGenerativeModel({ model: "gemini-1.5-flash-latest", systemInstruction, generationConfig});
|
|
27
27
|
|
|
28
28
|
const chat = model.startChat({
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
history: [
|
|
30
|
+
{
|
|
31
31
|
role: "user",
|
|
32
32
|
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}` }],
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
},
|
|
34
|
+
{
|
|
35
35
|
role: "model",
|
|
36
|
-
parts: [{ text: `I will greet the user with their name: <@${message.author.id}>. Feel
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
36
|
+
parts: [{ text: `I will greet the user with their name: <@${message.author.id}>. Feel free to ask me anything! 😊` }],
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
role: "user",
|
|
40
|
+
parts: [{ text: "Any question regarding JEDI STUDIO, verse.db, apexify.js, or djs-builder?" }],
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
role: "model",
|
|
44
|
+
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.` }],
|
|
45
|
+
},
|
|
46
|
+
{
|
|
47
|
+
role: "user",
|
|
48
|
+
parts: [{ text: "How was I developed or programmed?" }],
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
role: "model",
|
|
52
|
+
parts: [{ text: `You were made by JEDI STUDIO under the development of jedi.tsx, one of the CEOs for JEDI STUDIO.` }],
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
role: "user",
|
|
56
|
+
parts: [{ text: "Tell me about verse.db." }],
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
role: "model",
|
|
60
|
+
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.` }],
|
|
61
|
+
},
|
|
62
|
+
],
|
|
63
|
+
generationConfig
|
|
64
|
+
});
|
|
65
|
+
|
|
58
66
|
const attachment = message.attachments?.first();
|
|
59
67
|
const imgURL = attachment?.url || null;
|
|
60
68
|
let result: any;
|
|
@@ -78,7 +86,7 @@ export async function geminiFlash(message: any, AI: { AiPersonality: string | nu
|
|
|
78
86
|
if (e.message) {
|
|
79
87
|
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.') {
|
|
80
88
|
return `<${message.author.id}> your location isn't supported by gemini AI.`;
|
|
81
|
-
} else if (e.response && e.response.status === 429) {
|
|
89
|
+
} else if (e.response && (e.response.status === 429 || e.response.status === 400)) {
|
|
82
90
|
currentApiKeyIndex++;
|
|
83
91
|
if (currentApiKeyIndex < config.apiKeys.length) {
|
|
84
92
|
return geminiFlash(message, { ...AI, API_KEY: config.apiKeys[currentApiKeyIndex] });
|
|
@@ -27,20 +27,43 @@ export async function geminiPro(message: any, AI: { AiPersonality: string | null
|
|
|
27
27
|
const model = genAI.getGenerativeModel({ model: "gemini-1.5-pro-latest", systemInstruction, generationConfig});
|
|
28
28
|
|
|
29
29
|
const chat = model.startChat({
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
history: [
|
|
31
|
+
{
|
|
32
32
|
role: "user",
|
|
33
33
|
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}` }],
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
36
|
role: "model",
|
|
37
|
-
parts: [{ text: `I will greet the user with their name: <@${message.author.id}>. Feel
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
37
|
+
parts: [{ text: `I will greet the user with their name: <@${message.author.id}>. Feel free to ask me anything! 😊` }],
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
role: "user",
|
|
41
|
+
parts: [{ text: "Any question regarding JEDI STUDIO, verse.db, apexify.js, or djs-builder?" }],
|
|
42
|
+
},
|
|
43
|
+
{
|
|
44
|
+
role: "model",
|
|
45
|
+
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.` }],
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
role: "user",
|
|
49
|
+
parts: [{ text: "How was I developed or programmed?" }],
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
role: "model",
|
|
53
|
+
parts: [{ text: `You were made by JEDI STUDIO under the development of jedi.tsx, one of the CEOs for JEDI STUDIO.` }],
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
role: "user",
|
|
57
|
+
parts: [{ text: "Tell me about verse.db." }],
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
role: "model",
|
|
61
|
+
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.` }],
|
|
62
|
+
},
|
|
63
|
+
],
|
|
64
|
+
generationConfig
|
|
65
|
+
});
|
|
66
|
+
|
|
44
67
|
const attachment = message.attachments?.first();
|
|
45
68
|
const imgURL = attachment?.url || null;
|
|
46
69
|
let result: any;
|
|
@@ -64,7 +87,7 @@ export async function geminiPro(message: any, AI: { AiPersonality: string | null
|
|
|
64
87
|
if (e.message) {
|
|
65
88
|
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.') {
|
|
66
89
|
return `<${message.author.id}> your location isn't supported by gemini AI.`;
|
|
67
|
-
} else if (e.response && e.response.status === 429) {
|
|
90
|
+
} else if (e.response && (e.response.status === 429 || e.response.status === 400)) {
|
|
68
91
|
currentApiKeyIndex++;
|
|
69
92
|
if (currentApiKeyIndex < config.apiKeys.length) {
|
|
70
93
|
return geminiPro(message, { ...AI, API_KEY: config.apiKeys[currentApiKeyIndex] });
|