apexify.js 4.1.4 → 4.1.6
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 +9 -17
- 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 +8 -16
- package/dist/ai/modals-chat/Gemini-pro.js.map +1 -1
- package/lib/ai/modals-chat/Gemini-flash.ts +11 -21
- package/lib/ai/modals-chat/Gemini-pro.ts +11 -21
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Gemini-flash.d.ts","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-flash.ts"],"names":[],"mappings":"AAUA,wBAAsB,WAAW,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC;IAAC,EAAE,EAAE,OAAO,CAAA;CAAG,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":"AAUA,wBAAsB,WAAW,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC;IAAC,EAAE,EAAE,OAAO,CAAA;CAAG,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,CAoKpP"}
|
|
@@ -13,11 +13,7 @@ const verse_db_1 = require("verse.db");
|
|
|
13
13
|
const axios_1 = __importDefault(require("axios"));
|
|
14
14
|
let currentApiKeyIndex = 0;
|
|
15
15
|
async function geminiFlash(message, AI) {
|
|
16
|
-
var _a, _b
|
|
17
|
-
let db;
|
|
18
|
-
if (message.db) {
|
|
19
|
-
db = new verse_db_1.connect({ adapter: 'json', dataPath: `${message.serverId}_ChatHistory` });
|
|
20
|
-
}
|
|
16
|
+
var _a, _b;
|
|
21
17
|
try {
|
|
22
18
|
let apiKeyIndex = currentApiKeyIndex;
|
|
23
19
|
let genAI;
|
|
@@ -62,7 +58,7 @@ async function geminiFlash(message, AI) {
|
|
|
62
58
|
},
|
|
63
59
|
];
|
|
64
60
|
const systemInstruction = `${personalityString}\n And working on discord in serverName: ${message.serverName} at channelName: ${message.channelName} and responding to the userName: <@${message.userId}>`;
|
|
65
|
-
const model = genAI.getGenerativeModel({ model: "gemini-1.5-
|
|
61
|
+
const model = genAI.getGenerativeModel({ model: "gemini-1.5-pro-latest", systemInstruction, generationConfig, safetySettings });
|
|
66
62
|
const defaultHistory = [
|
|
67
63
|
{
|
|
68
64
|
role: "user",
|
|
@@ -90,21 +86,17 @@ async function geminiFlash(message, AI) {
|
|
|
90
86
|
}
|
|
91
87
|
];
|
|
92
88
|
let historyData = undefined;
|
|
89
|
+
let db;
|
|
93
90
|
if (message.db) {
|
|
94
91
|
db = new verse_db_1.connect({ adapter: 'json', dataPath: `${message.serverId}_ChatHistory` });
|
|
95
92
|
const data = await db.find(`${message.userId}_chatHistory`, { userId: message.userId });
|
|
96
|
-
|
|
97
|
-
await db.update(`${message.userId}_chatHistory`, { userId: message.userId }, { $set: { history: [] } }, true);
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
100
|
-
historyData = ((_d = data.results) === null || _d === void 0 ? void 0 : _d.history) || undefined;
|
|
101
|
-
}
|
|
93
|
+
historyData = ((_a = data.results) === null || _a === void 0 ? void 0 : _a.history) || undefined;
|
|
102
94
|
}
|
|
103
95
|
const chat = model.startChat({
|
|
104
96
|
history: historyData || defaultHistory,
|
|
105
97
|
generationConfig
|
|
106
98
|
});
|
|
107
|
-
const imgURL = ((
|
|
99
|
+
const imgURL = ((_b = message.attachment) === null || _b === void 0 ? void 0 : _b.url) || null;
|
|
108
100
|
let result;
|
|
109
101
|
if (imgURL) {
|
|
110
102
|
const imageData = await urlToBase64(imgURL);
|
|
@@ -121,7 +113,7 @@ async function geminiFlash(message, AI) {
|
|
|
121
113
|
}
|
|
122
114
|
const response = await result.response.text();
|
|
123
115
|
if (message.db) {
|
|
124
|
-
const
|
|
116
|
+
const userHistory = {
|
|
125
117
|
$push: {
|
|
126
118
|
"history": {
|
|
127
119
|
role: "user",
|
|
@@ -129,8 +121,8 @@ async function geminiFlash(message, AI) {
|
|
|
129
121
|
}
|
|
130
122
|
},
|
|
131
123
|
};
|
|
132
|
-
historyData = await db.update(`${message.userId}_chatHistory`, { userId: message.userId },
|
|
133
|
-
const
|
|
124
|
+
historyData = await db.update(`${message.userId}_chatHistory`, { userId: message.userId }, userHistory, true);
|
|
125
|
+
const modelHistory = {
|
|
134
126
|
$push: {
|
|
135
127
|
"history": {
|
|
136
128
|
role: "model",
|
|
@@ -138,7 +130,7 @@ async function geminiFlash(message, AI) {
|
|
|
138
130
|
}
|
|
139
131
|
},
|
|
140
132
|
};
|
|
141
|
-
historyData = await db.update(`${message.userId}_chatHistory`, { userId: message.userId },
|
|
133
|
+
historyData = await db.update(`${message.userId}_chatHistory`, { userId: message.userId }, modelHistory, true);
|
|
142
134
|
}
|
|
143
135
|
return response;
|
|
144
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Gemini-flash.js","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-flash.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA6F;AAC7F,gDAAwB;AACxB,4CAAoB;AACpB,sDAA8B;AAC9B,4EAAiE;AACjE,uCAAoC;AACpC,kDAA0B;AAE1B,IAAI,kBAAkB,GAAG,CAAC,CAAC;AAEpB,KAAK,UAAU,WAAW,CAAC,OAAqH,EAAE,EAA6E;;
|
|
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":"AAUA,wBAAsB,SAAS,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC;IAAC,EAAE,EAAE,OAAO,CAAA;CAAG,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":"AAUA,wBAAsB,SAAS,CAAC,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC;IAAC,EAAE,EAAE,OAAO,CAAA;CAAG,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,CAoKlP"}
|
|
@@ -13,11 +13,7 @@ const verse_db_1 = require("verse.db");
|
|
|
13
13
|
const axios_1 = __importDefault(require("axios"));
|
|
14
14
|
let currentApiKeyIndex = 0;
|
|
15
15
|
async function geminiPro(message, AI) {
|
|
16
|
-
var _a, _b
|
|
17
|
-
let db;
|
|
18
|
-
if (message.db) {
|
|
19
|
-
db = new verse_db_1.connect({ adapter: 'json', dataPath: `${message.serverId}_ChatHistory` });
|
|
20
|
-
}
|
|
16
|
+
var _a, _b;
|
|
21
17
|
try {
|
|
22
18
|
let apiKeyIndex = currentApiKeyIndex;
|
|
23
19
|
let genAI;
|
|
@@ -90,21 +86,17 @@ async function geminiPro(message, AI) {
|
|
|
90
86
|
}
|
|
91
87
|
];
|
|
92
88
|
let historyData = undefined;
|
|
89
|
+
let db;
|
|
93
90
|
if (message.db) {
|
|
94
91
|
db = new verse_db_1.connect({ adapter: 'json', dataPath: `${message.serverId}_ChatHistory` });
|
|
95
92
|
const data = await db.find(`${message.userId}_chatHistory`, { userId: message.userId });
|
|
96
|
-
|
|
97
|
-
await db.update(`${message.userId}_chatHistory`, { userId: message.userId }, { $set: { history: [] } }, true);
|
|
98
|
-
}
|
|
99
|
-
else {
|
|
100
|
-
historyData = ((_d = data.results) === null || _d === void 0 ? void 0 : _d.history) || undefined;
|
|
101
|
-
}
|
|
93
|
+
historyData = ((_a = data.results) === null || _a === void 0 ? void 0 : _a.history) || undefined;
|
|
102
94
|
}
|
|
103
95
|
const chat = model.startChat({
|
|
104
96
|
history: historyData || defaultHistory,
|
|
105
97
|
generationConfig
|
|
106
98
|
});
|
|
107
|
-
const imgURL = ((
|
|
99
|
+
const imgURL = ((_b = message.attachment) === null || _b === void 0 ? void 0 : _b.url) || null;
|
|
108
100
|
let result;
|
|
109
101
|
if (imgURL) {
|
|
110
102
|
const imageData = await urlToBase64(imgURL);
|
|
@@ -121,7 +113,7 @@ async function geminiPro(message, AI) {
|
|
|
121
113
|
}
|
|
122
114
|
const response = await result.response.text();
|
|
123
115
|
if (message.db) {
|
|
124
|
-
const
|
|
116
|
+
const userHistory = {
|
|
125
117
|
$push: {
|
|
126
118
|
"history": {
|
|
127
119
|
role: "user",
|
|
@@ -129,8 +121,8 @@ async function geminiPro(message, AI) {
|
|
|
129
121
|
}
|
|
130
122
|
},
|
|
131
123
|
};
|
|
132
|
-
historyData = await db.update(`${message.userId}_chatHistory`, { userId: message.userId },
|
|
133
|
-
const
|
|
124
|
+
historyData = await db.update(`${message.userId}_chatHistory`, { userId: message.userId }, userHistory, true);
|
|
125
|
+
const modelHistory = {
|
|
134
126
|
$push: {
|
|
135
127
|
"history": {
|
|
136
128
|
role: "model",
|
|
@@ -138,7 +130,7 @@ async function geminiPro(message, AI) {
|
|
|
138
130
|
}
|
|
139
131
|
},
|
|
140
132
|
};
|
|
141
|
-
historyData = await db.update(`${message.userId}_chatHistory`, { userId: message.userId },
|
|
133
|
+
historyData = await db.update(`${message.userId}_chatHistory`, { userId: message.userId }, modelHistory, true);
|
|
142
134
|
}
|
|
143
135
|
return response;
|
|
144
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Gemini-pro.js","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-pro.ts"],"names":[],"mappings":";;;;;;AAAA,yDAA6F;AAC7F,gDAAwB;AACxB,4CAAoB;AACpB,sDAA8B;AAC9B,4EAAiE;AACjE,uCAAoC;AACpC,kDAA0B;AAE1B,IAAI,kBAAkB,GAAG,CAAC,CAAC;AAEpB,KAAK,UAAU,SAAS,CAAC,OAAqH,EAAE,EAA6E;;
|
|
1
|
+
{"version":3,"file":"Gemini-pro.js","sourceRoot":"","sources":["../../../lib/ai/modals-chat/Gemini-pro.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,6 @@ let currentApiKeyIndex = 0;
|
|
|
10
10
|
|
|
11
11
|
export async function geminiFlash(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> {
|
|
12
12
|
|
|
13
|
-
let db: any;
|
|
14
|
-
|
|
15
|
-
if (message.db) {
|
|
16
|
-
db = new connect({ adapter: 'json', dataPath: `${message.serverId}_ChatHistory` });
|
|
17
|
-
}
|
|
18
|
-
|
|
19
13
|
try {
|
|
20
14
|
let apiKeyIndex = currentApiKeyIndex;
|
|
21
15
|
let genAI: any;
|
|
@@ -96,16 +90,11 @@ export async function geminiFlash(message: { userId: string, serverName: string,
|
|
|
96
90
|
|
|
97
91
|
let historyData: any[] | undefined = undefined;
|
|
98
92
|
|
|
93
|
+
let db: any;
|
|
99
94
|
if (message.db) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
if (!data.results?.history || data.results?.history?.length === 0) {
|
|
105
|
-
await db.update(`${message.userId}_chatHistory`, { userId: message.userId }, { $set: { history: [] } }, true);
|
|
106
|
-
} else {
|
|
107
|
-
historyData = data.results?.history || undefined;
|
|
108
|
-
}
|
|
95
|
+
db = new connect({ adapter: 'json', dataPath: `${message.serverId}_ChatHistory` });
|
|
96
|
+
const data = await db.find(`${message.userId}_chatHistory`, { userId: message.userId });
|
|
97
|
+
historyData = data.results?.history || undefined;
|
|
109
98
|
}
|
|
110
99
|
|
|
111
100
|
const chat = model.startChat({
|
|
@@ -133,7 +122,7 @@ export async function geminiFlash(message: { userId: string, serverName: string,
|
|
|
133
122
|
|
|
134
123
|
if (message.db) {
|
|
135
124
|
|
|
136
|
-
const
|
|
125
|
+
const userHistory = {
|
|
137
126
|
$push: {
|
|
138
127
|
"history": {
|
|
139
128
|
role: "user",
|
|
@@ -144,10 +133,11 @@ export async function geminiFlash(message: { userId: string, serverName: string,
|
|
|
144
133
|
|
|
145
134
|
historyData = await db.update(`${message.userId}_chatHistory`,
|
|
146
135
|
{ userId: message.userId },
|
|
147
|
-
|
|
136
|
+
userHistory,
|
|
137
|
+
true
|
|
148
138
|
);
|
|
149
139
|
|
|
150
|
-
const
|
|
140
|
+
const modelHistory = {
|
|
151
141
|
$push: {
|
|
152
142
|
"history": {
|
|
153
143
|
role: "model",
|
|
@@ -157,9 +147,9 @@ export async function geminiFlash(message: { userId: string, serverName: string,
|
|
|
157
147
|
};
|
|
158
148
|
|
|
159
149
|
historyData = await db.update(`${message.userId}_chatHistory`,
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
150
|
+
{ userId: message.userId },
|
|
151
|
+
modelHistory,
|
|
152
|
+
true
|
|
163
153
|
);
|
|
164
154
|
}
|
|
165
155
|
|
|
@@ -10,12 +10,6 @@ let currentApiKeyIndex = 0;
|
|
|
10
10
|
|
|
11
11
|
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> {
|
|
12
12
|
|
|
13
|
-
let db: any;
|
|
14
|
-
|
|
15
|
-
if (message.db) {
|
|
16
|
-
db = new connect({ adapter: 'json', dataPath: `${message.serverId}_ChatHistory` });
|
|
17
|
-
}
|
|
18
|
-
|
|
19
13
|
try {
|
|
20
14
|
let apiKeyIndex = currentApiKeyIndex;
|
|
21
15
|
let genAI: any;
|
|
@@ -96,16 +90,11 @@ export async function geminiPro(message: { userId: string, serverName: string, s
|
|
|
96
90
|
|
|
97
91
|
let historyData: any[] | undefined = undefined;
|
|
98
92
|
|
|
93
|
+
let db: any;
|
|
99
94
|
if (message.db) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
if (!data.results?.history || data.results?.history?.length === 0) {
|
|
105
|
-
await db.update(`${message.userId}_chatHistory`, { userId: message.userId }, { $set: { history: [] } }, true);
|
|
106
|
-
} else {
|
|
107
|
-
historyData = data.results?.history || undefined;
|
|
108
|
-
}
|
|
95
|
+
db = new connect({ adapter: 'json', dataPath: `${message.serverId}_ChatHistory` });
|
|
96
|
+
const data = await db.find(`${message.userId}_chatHistory`, { userId: message.userId });
|
|
97
|
+
historyData = data.results?.history || undefined;
|
|
109
98
|
}
|
|
110
99
|
|
|
111
100
|
const chat = model.startChat({
|
|
@@ -133,7 +122,7 @@ export async function geminiPro(message: { userId: string, serverName: string, s
|
|
|
133
122
|
|
|
134
123
|
if (message.db) {
|
|
135
124
|
|
|
136
|
-
const
|
|
125
|
+
const userHistory = {
|
|
137
126
|
$push: {
|
|
138
127
|
"history": {
|
|
139
128
|
role: "user",
|
|
@@ -144,10 +133,11 @@ export async function geminiPro(message: { userId: string, serverName: string, s
|
|
|
144
133
|
|
|
145
134
|
historyData = await db.update(`${message.userId}_chatHistory`,
|
|
146
135
|
{ userId: message.userId },
|
|
147
|
-
|
|
136
|
+
userHistory,
|
|
137
|
+
true
|
|
148
138
|
);
|
|
149
139
|
|
|
150
|
-
const
|
|
140
|
+
const modelHistory = {
|
|
151
141
|
$push: {
|
|
152
142
|
"history": {
|
|
153
143
|
role: "model",
|
|
@@ -157,9 +147,9 @@ export async function geminiPro(message: { userId: string, serverName: string, s
|
|
|
157
147
|
};
|
|
158
148
|
|
|
159
149
|
historyData = await db.update(`${message.userId}_chatHistory`,
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
150
|
+
{ userId: message.userId },
|
|
151
|
+
modelHistory,
|
|
152
|
+
true
|
|
163
153
|
);
|
|
164
154
|
}
|
|
165
155
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "apexify.js",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.6",
|
|
4
4
|
"description": "Ai and Canvas library. Supports typescript and javascript",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -160,7 +160,7 @@
|
|
|
160
160
|
"pdf-parse": "^1.1.1",
|
|
161
161
|
"sharp": "^0.33.2",
|
|
162
162
|
"tesseract.js": "^5.0.5",
|
|
163
|
-
"verse.db": "^2.0.
|
|
163
|
+
"verse.db": "^2.0.5"
|
|
164
164
|
},
|
|
165
165
|
"devDependencies": {
|
|
166
166
|
"@types/gifencoder": "^2.0.3",
|