From b09666a0a9ffeab0b74f780c17b30456bc688ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Thu, 25 Jul 2024 19:31:23 -0400 Subject: [PATCH 01/14] ... --- plugins/MemberUpdate/PremiumMemberListener.ts | 6 +++--- src/commands/banner.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/MemberUpdate/PremiumMemberListener.ts b/plugins/MemberUpdate/PremiumMemberListener.ts index 198a8a0..d2a47ca 100644 --- a/plugins/MemberUpdate/PremiumMemberListener.ts +++ b/plugins/MemberUpdate/PremiumMemberListener.ts @@ -20,9 +20,9 @@ export default class PremiumMemberListener { } // Else isNewBoost on extra-boost - console.warn("BOOSTER:", member.nickname); - console.warn("OLD BOOST VALUE:", oldMember.premiumSince); - console.warn("NEW BOOST VALUE:", member.premiumSince); + console.log("BOOSTER:", member.nickname); + console.log("OLD BOOST VALUE:", oldMember.premiumSince); + console.log("NEW BOOST VALUE:", member.premiumSince); await sendBanner(member, "boost"); } diff --git a/src/commands/banner.ts b/src/commands/banner.ts index 06f3c06..7cb4f58 100644 --- a/src/commands/banner.ts +++ b/src/commands/banner.ts @@ -63,7 +63,7 @@ export async function sendBanner( case "boost": data = guildConfigs.boost - console.warn("!!! BOOST BANNER !!!"); + console.log("!!! BOOST BANNER !!!"); break; default: From acdd1337fe8d0dd836f2479bf47f608414a9c324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Tue, 10 Sep 2024 15:59:16 -0400 Subject: [PATCH 02/14] ... --- package.json | 1 + plugins/Youtube/configs/subscriptions.ts | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3392f04..c5e9074 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "node-fetch": "^2.7.0", "openai": "^4.52.7", "pino": "^9.3.1", + "WhatTheChuckBot": "file:", "youtubei.js": "^9.4.0" }, "devDependencies": { diff --git a/plugins/Youtube/configs/subscriptions.ts b/plugins/Youtube/configs/subscriptions.ts index 73a303a..25b949d 100644 --- a/plugins/Youtube/configs/subscriptions.ts +++ b/plugins/Youtube/configs/subscriptions.ts @@ -24,7 +24,11 @@ const subscriptions = { { name: "@CodeBullet", url: "https://www.youtube.com/@CodeBullet/videos", - }, + }, + { + name: "@cocadmin", + url: "https://www.youtube.com/@cocadmin/videos", + }, ] }, ], From c02179986f5acf9dd9e894404573b35694d0548f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Sun, 22 Sep 2024 19:04:02 -0400 Subject: [PATCH 03/14] ... --- plugins/Ollama/events/messageCreateOllama.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/Ollama/events/messageCreateOllama.ts b/plugins/Ollama/events/messageCreateOllama.ts index d4df98c..3db1051 100644 --- a/plugins/Ollama/events/messageCreateOllama.ts +++ b/plugins/Ollama/events/messageCreateOllama.ts @@ -40,8 +40,18 @@ export default new Event("messageCreate", async (message: Message) => { return; } + try { + message.channel.sendTyping() + } + catch (error) { } + await message.channel.sendTyping(); - const typingInterval = setInterval(() => message.channel.sendTyping(), 5000); + const typingInterval = setInterval(() => { + try { + message.channel.sendTyping() + } + catch (error) { } + }, , 5000); !UsersState.get(author.id) && UsersState.set(author.id, { ...DefaultUserState }); let state = UsersState.get(author.id); From 1cacd52ae3106a7a0782ce077100c7413f67609b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Sun, 22 Sep 2024 19:08:10 -0400 Subject: [PATCH 04/14] ... --- plugins/Ollama/events/messageCreateOllama.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Ollama/events/messageCreateOllama.ts b/plugins/Ollama/events/messageCreateOllama.ts index 3db1051..2488bf8 100644 --- a/plugins/Ollama/events/messageCreateOllama.ts +++ b/plugins/Ollama/events/messageCreateOllama.ts @@ -51,7 +51,7 @@ export default new Event("messageCreate", async (message: Message) => { message.channel.sendTyping() } catch (error) { } - }, , 5000); + }, 5000); !UsersState.get(author.id) && UsersState.set(author.id, { ...DefaultUserState }); let state = UsersState.get(author.id); From 90bdbbfb6136a61399cf227a2339cf1eb6f0a3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Tue, 24 Sep 2024 20:59:26 -0400 Subject: [PATCH 05/14] maintenance --- .vscode/settings.json | 1 + api/Routers/cs2Router.ts | 4 +-- devTools/AIModelsMerger.js | 28 -------------------- devTools/aIModelsMerger.js | 28 -------------------- package.json | 24 ++++++++--------- plugins/Ollama/events/messageCreateOllama.ts | 13 ++++----- 6 files changed, 20 insertions(+), 78 deletions(-) delete mode 100644 devTools/AIModelsMerger.js delete mode 100644 devTools/aIModelsMerger.js diff --git a/.vscode/settings.json b/.vscode/settings.json index 75c05a8..aab3bb5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "cSpell.words": [ + "fabricio", "Innertube", "ollama", "RCON", diff --git a/api/Routers/cs2Router.ts b/api/Routers/cs2Router.ts index 03c54f3..76bb7f2 100644 --- a/api/Routers/cs2Router.ts +++ b/api/Routers/cs2Router.ts @@ -16,8 +16,8 @@ const taskValidationRulesExample = [ Cs2Router.post('/logs', async (req: Request, res: Response) => { const guild = await client.guilds.fetch("276931890735218689"); let channel = await guild?.channels.fetch("1185639534780764242") as TextBasedChannel; - const isText = channel?.isTextBased ?? false; - if (!isText) { + + if (!channel?.isSendable()) { return; } diff --git a/devTools/AIModelsMerger.js b/devTools/AIModelsMerger.js deleted file mode 100644 index a539d32..0000000 --- a/devTools/AIModelsMerger.js +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @deprecated Need to adapt to new models structures - */ -const oldModels = [] - -const newModels = []; - -for (const alias in oldModels) { - if (!newModels[alias]) delete oldModels[alias]; - - else oldModels[alias] = newModels[alias]; -} - -for (const alias in newModels) { - oldModels[alias] = newModels[alias] -} - -const news = {}; -Object.keys(oldModels).sort().forEach(function (v, i) { - news[v] = oldModels[v] -}); - - -console.log(oldModels.alias) - -const fileOutput = JSON.stringify(news, null, 2); -console.log(fileOutput); -debugger \ No newline at end of file diff --git a/devTools/aIModelsMerger.js b/devTools/aIModelsMerger.js deleted file mode 100644 index a539d32..0000000 --- a/devTools/aIModelsMerger.js +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @deprecated Need to adapt to new models structures - */ -const oldModels = [] - -const newModels = []; - -for (const alias in oldModels) { - if (!newModels[alias]) delete oldModels[alias]; - - else oldModels[alias] = newModels[alias]; -} - -for (const alias in newModels) { - oldModels[alias] = newModels[alias] -} - -const news = {}; -Object.keys(oldModels).sort().forEach(function (v, i) { - news[v] = oldModels[v] -}); - - -console.log(oldModels.alias) - -const fileOutput = JSON.stringify(news, null, 2); -console.log(fileOutput); -debugger \ No newline at end of file diff --git a/package.json b/package.json index c5e9074..138d3d9 100644 --- a/package.json +++ b/package.json @@ -21,40 +21,40 @@ }, "dependencies": { "@fabricio-191/valve-server-query": "^4.1.9", - "@sentry/cli": "^2.32.2", - "@sentry/node": "^8.19.0", + "@sentry/cli": "^2.36.2", + "@sentry/node": "^8.31.0", "cors": "^2.8.5", "discord-canvas": "^1.5.2", - "discord.js": "^14.15.3", + "discord.js": "^14.16.2", "dotenv": "^16.4.5", "express-session": "^1.18.0", - "express-validator": "^7.1.0", + "express-validator": "^7.2.0", "fs": "^0.0.2", "fs-extra": "^11.2.0", "glob": "^10.4.5", "helmet": "^7.1.0", "https": "^1.0.0", - "mongodb": "^6.8.0", + "mongodb": "^6.9.0", "node-fetch": "^2.7.0", - "openai": "^4.52.7", - "pino": "^9.3.1", + "openai": "^4.63.0", + "pino": "^9.4.0", "WhatTheChuckBot": "file:", "youtubei.js": "^9.4.0" }, "devDependencies": { - "@babel/core": "^7.24.9", + "@babel/core": "^7.25.2", "@types/express": "^4.17.21", "@types/glob": "^8.1.0", "@types/jquery": "^3.5.30", - "@types/node": "^20.14.11", - "express": "^4.19.2", + "@types/node": "^20.16.7", + "express": "^4.21.0", "gulp": "^5.0.0", "gulp-babel": "^8.0.0", "gulp-concat": "^2.6.1", "gulp-uglify": "^3.0.2", "ts-node": "^10.9.2", "ts-node-dev": "^2.0.0", - "typescript": "^5.5.3", - "uglify-js": "^3.19.0" + "typescript": "^5.6.2", + "uglify-js": "^3.19.3" } } diff --git a/plugins/Ollama/events/messageCreateOllama.ts b/plugins/Ollama/events/messageCreateOllama.ts index 2488bf8..1e95f81 100644 --- a/plugins/Ollama/events/messageCreateOllama.ts +++ b/plugins/Ollama/events/messageCreateOllama.ts @@ -40,17 +40,14 @@ export default new Event("messageCreate", async (message: Message) => { return; } - try { - message.channel.sendTyping() + const channel = message.channel; + if (!channel?.isSendable()) { + return; } - catch (error) { } - await message.channel.sendTyping(); + await channel.sendTyping(); const typingInterval = setInterval(() => { - try { - message.channel.sendTyping() - } - catch (error) { } + channel.sendTyping(); }, 5000); !UsersState.get(author.id) && UsersState.set(author.id, { ...DefaultUserState }); From d418e0036131979fac445a7bf3318a61f0cd1c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Sun, 27 Oct 2024 12:56:54 -0400 Subject: [PATCH 06/14] configs --- .envExample | 9 ++++++- environments.d.ts | 4 +-- shells/bash/manageCsDocker.sh | 6 ++--- src/configs/guildsConfigs.ts | 49 +++++++---------------------------- 4 files changed, 22 insertions(+), 46 deletions(-) diff --git a/.envExample b/.envExample index 8858e0e..b9ba1c9 100644 --- a/.envExample +++ b/.envExample @@ -6,4 +6,11 @@ botToken=####################################################### sentryDsn=####################################################### OPENAI_API_KEY=########################################### DB_CONN_STRING=############## -DB_NAME=############ \ No newline at end of file +DB_NAME=############ + +CS2_PORT_STILL_NO_CAKE=27015 +CS2_TV_PORT_STILL_NO_CAKE=27016 +CS2_RCON_PORT_STILL_NO_CAKE=27017 +CS2_IP_STILL_NO_CAKE=############## +CS2_TV_PASS_STILL_NO_CAKE=############## +CS2_RCON_PASS_STILL_NO_CAKE=############## \ No newline at end of file diff --git a/environments.d.ts b/environments.d.ts index 79054fe..a3ba65e 100644 --- a/environments.d.ts +++ b/environments.d.ts @@ -7,8 +7,8 @@ declare global { botToken: string; guildIds: string; inviteUrl: string; - RCON_PASS_192_168_1_128_27015:string; - RCON_PASS_192_168_1_128_27016:string; + CS2_RCON_PASS_192_168_1_128_27015:string; + CS2_RCON_PASS_192_168_1_128_27016:string; DB_CONN_STRING:string, DB_NAME:string, } diff --git a/shells/bash/manageCsDocker.sh b/shells/bash/manageCsDocker.sh index 01d37c6..09c2243 100755 --- a/shells/bash/manageCsDocker.sh +++ b/shells/bash/manageCsDocker.sh @@ -6,15 +6,15 @@ fi case "$1" in "0") - dockerName="cs2-WeConnected-ns1" + dockerName="CS2-SWT" ;; "1") - dockerName="cs2-WeConnected-ns2" + dockerName="CS2-SWT" ;; *) - dockerName="cs2-WeConnected-ns1" + dockerName="CS2-SWT" ;; esac diff --git a/src/configs/guildsConfigs.ts b/src/configs/guildsConfigs.ts index cbafd9b..802aafe 100644 --- a/src/configs/guildsConfigs.ts +++ b/src/configs/guildsConfigs.ts @@ -30,9 +30,9 @@ export const guildsConfigs = [ getContent: (params: any) => `๐Ÿค– Big thanks to <@${params.member.id}> for boosting the server! โšก๐Ÿ‘พ` }, cs2: { + dockerAccess: ['cs2Admin'], rconChannels: [], chatChannels: [], - dockerAccess: [] }, ollama: { url: "https://api.ctrlaidel.com/api" @@ -58,36 +58,23 @@ export const guildsConfigs = [ getContent: (params: any) => `๐Ÿค– Say goodbye to <@${params.member.id}> ! ๐Ÿ˜ข๐Ÿ‘พ` }, cs2: { + dockerAccess: ['cs2Admin'], rconChannels: { "1185347837026914304": { - port: 27016, - ip: "rvdprojects.synology.me", - password: env["RCON_PASS_192_168_1_128_27016"], region: "US_EAST", + ip: env["CS2_IP_SWT"], + port: env["CS2_RCON_PORT_SWT"], + password: env["CS2_RCON_PASS_SWT"], }, - "1185593961541275698": { - dev: true, - port: 27016, - ip: "rvdprojects.synology.me", - password: env["RCON_PASS_192_168_1_128_27016"], - region: "US_EAST", - } }, chatChannels: { "1185991869121957938": { - port: 27016, - ip: "rvdprojects.synology.me", - password: env["RCON_PASS_192_168_1_128_27016"], - region: "US_EAST", - }, - "1185983351325200444": { - dev: true, - port: 27016, - ip: "rvdprojects.synology.me", - password: env["RCON_PASS_192_168_1_128_27016"], region: "US_EAST", + ip: env["CS2_IP_SWT"], + port: env["CS2_RCON_PORT_SWT"], + password: env["CS2_RCON_PASS_SWT"], } - } + }, } }, { @@ -130,24 +117,6 @@ export const guildsConfigs = [ { // StillNoCake guildId: "1202439418204389417", - cs2: { - rconChannels: { - "1202439558952910871": { - port: 27015, - ip: "ts.stillnocake.com", - password: env["RCON_PASS_STILL_NO_CAKE"], - region: "US_EAST", - } - }, - chatChannels: { - "1202440139083882527": { - port: 27015, - ip: "ts.stillnocake.com", - password: env["RCON_PASS_STILL_NO_CAKE"], - region: "US_EAST", - }, - } - } }, { // Pankunai From 806693a6c05e6d776fe83cf8cd4c978fe93f9c24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Sun, 27 Oct 2024 13:01:26 -0400 Subject: [PATCH 07/14] configs --- src/configs/guildsConfigs.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/configs/guildsConfigs.ts b/src/configs/guildsConfigs.ts index 802aafe..0b9a2d5 100644 --- a/src/configs/guildsConfigs.ts +++ b/src/configs/guildsConfigs.ts @@ -60,7 +60,7 @@ export const guildsConfigs = [ cs2: { dockerAccess: ['cs2Admin'], rconChannels: { - "1185347837026914304": { + "1300142162817581116": { region: "US_EAST", ip: env["CS2_IP_SWT"], port: env["CS2_RCON_PORT_SWT"], @@ -68,7 +68,7 @@ export const guildsConfigs = [ }, }, chatChannels: { - "1185991869121957938": { + "1300142238109794365": { region: "US_EAST", ip: env["CS2_IP_SWT"], port: env["CS2_RCON_PORT_SWT"], From 0bc4f1b8bcdc64f1054ec7be12275ce9c726b0d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Sun, 27 Oct 2024 13:58:52 -0400 Subject: [PATCH 08/14] configs --- src/configs/guildsConfigs.ts | 97 +++++++++--------------------------- 1 file changed, 24 insertions(+), 73 deletions(-) diff --git a/src/configs/guildsConfigs.ts b/src/configs/guildsConfigs.ts index 0b9a2d5..60fc3f7 100644 --- a/src/configs/guildsConfigs.ts +++ b/src/configs/guildsConfigs.ts @@ -39,7 +39,11 @@ export const guildsConfigs = [ } }, { - // RaFuX + // StillNoCake + guildId: "1202439418204389417", + }, + { + // RVร-Projects guildId: "276931890735218689", welcome: { channelId: null, @@ -78,83 +82,30 @@ export const guildsConfigs = [ } }, { - //TempCity - guildId: "770057600867237898", - welcome: { - channelId: "1088581487470850140", - getContent: (params: any) => { - return `๐Ÿ–ฅ๏ธ ๐Ÿค– Greetings <@${params.member.id}> ! โšก Contact <@258071819108614144> or <@691686714976239726> if you need any help!๐Ÿ‘พ ๐Ÿ–ฅ๏ธ\n - - Informations et channel Franรงais plus bas - Contactez <@258071819108614144> ou <@691686714976239726> au besoin !`; - } - }, - goodbye: { - channelId: "1234280957192835092", - getContent: (params: any) => { - return `๐Ÿ–ฅ๏ธ ๐Ÿค– Goodbye <@${params.member.id}>! We'll miss you, not right now, but probably later!!! โšก ๐Ÿ–ฅ๏ธ\n\n`; - } - } - }, - { - //Smoking_Volcano - guildId: "1166437263543128144", - welcome: { - channelId: "1166437265501847584", - getContent: (params: any) => { - return `๐ŸŒ‹ ๐Ÿ”ฅ Greetings <@${params.member.id}>! ๐ŸŒ‹ Welcome to S_Smoking V_Volcano's Discord! Here, you'll dive into a volcanic mix of gaming, from Palworld to Minecraft, CS2, and beyond, as we explore different games from time to time! Dive into the lava of gaming and have a blast! ๐Ÿ”ฅ GLHF! ๐ŸŽฎ\n`; - } - }, - goodbye: { - channelId: "1234281655393452093", - card: { - getTitle: () => "Bye bye", - getMsg: () => "We'll miss him / her!" - }, - getContent: (params: any) => { - return `๐Ÿ–ฅ๏ธ ๐Ÿค– Goodbye <@${params.member.id}>! We'll miss you, not right now, but probably later!!! โšก ๐Ÿ–ฅ๏ธ\n\n`; - } - }, - }, - { - // StillNoCake - guildId: "1202439418204389417", - }, - { - // Pankunai - guildId: "1211321545109012561", - welcome: { - channelId: "1211321545226588209", - card: { - getTitle: () => "Bienvenue !!!", - getMsg: (params: any) => "Merci de nous avoir rejoints !" + // Should We Train + guildId: "1300153496108138496", + cs2: { + dockerAccess: ['cs2Admin'], + rconChannels: { + "1300153496548544562": { + region: "US_EAST", + ip: env["CS2_IP_SWT"], + port: env["CS2_RCON_PORT_SWT"], + password: env["CS2_RCON_PASS_SWT"], + }, }, - getContent: (params: any) => `๐Ÿค– Bienvenue <@${params.member.id}> ! โšก๐Ÿ‘พ` - }, - goodbye: { - channelId: "000000000000000" - } - }, - { - // RevolutionCraft - guildId: "1233759327110565968", - welcome: { - card: { - getTitle: () => "Bienvenue !!", - getMsg: (params: any) => "Trop content de t'accueillir!" + chatChannels: { + "1300153496548544563": { + region: "US_EAST", + ip: env["CS2_IP_SWT"], + port: env["CS2_RCON_PORT_SWT"], + password: env["CS2_RCON_PASS_SWT"], + } }, - channelId: "1233759327614013451", - getContent: (params: any) => { - return `๐Ÿ–ฅ๏ธ ๐Ÿค– Salutation <@${params.member.id}> ! โšก Bienvenue sur RevolutionCraft. Notre I.P. est: revocraft.org ๐Ÿ–ฅ๏ธ! \n\n Pour toutes questions, rejoindre <@258071819108614144> ou <@691686714976239726> en dm par ping! ๐Ÿ‘พ๐Ÿ‘พ ๐Ÿ–ฅ๏ธ`; - } - }, - goodbye: { - channelId: "1233906597743427684", - getContent: (params: any) => { - return `๐Ÿ–ฅ๏ธ ๐Ÿค– Goodbye <@${params.member.id}>! On va s'ennuyer, peut-รชtre pas tout de suite, mais plus tard j'en suis sur!!! โšก ๐Ÿ–ฅ๏ธ\n\n`; - } } }, { - //FC / FreakingClowning + // FC We Live looping guildId: "984305093010673684", welcome: { channelId: 984330000893345802, From 37341c8fcdedfdafc4053960d51c3c5829286868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Sun, 27 Oct 2024 16:16:12 -0400 Subject: [PATCH 09/14] ... --- environments.d.ts | 2 -- plugins/CS2/events/messageCreateCs2Chat.ts | 9 ++++++--- plugins/CS2/events/messageCreateCs2RCON.ts | 8 +++++--- src/configs/guildsConfigs.ts | 12 ++++++++---- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/environments.d.ts b/environments.d.ts index a3ba65e..e1909dc 100644 --- a/environments.d.ts +++ b/environments.d.ts @@ -7,8 +7,6 @@ declare global { botToken: string; guildIds: string; inviteUrl: string; - CS2_RCON_PASS_192_168_1_128_27015:string; - CS2_RCON_PASS_192_168_1_128_27016:string; DB_CONN_STRING:string, DB_NAME:string, } diff --git a/plugins/CS2/events/messageCreateCs2Chat.ts b/plugins/CS2/events/messageCreateCs2Chat.ts index 1011b74..c1c91b2 100644 --- a/plugins/CS2/events/messageCreateCs2Chat.ts +++ b/plugins/CS2/events/messageCreateCs2Chat.ts @@ -9,7 +9,7 @@ export default new Event("messageCreate", async (message) => { try { const configs = getGuildConfigsById(message.guildId)?.cs2?.chatChannels; - if (!configs?.length || !configs[message.channelId]) { + if (!(message.channelId in configs)) { return; } @@ -26,12 +26,15 @@ export default new Event("messageCreate", async (message) => { const connectionsParams = { ip: serverConf.ip, - port: serverConf.port, + port: parseInt(serverConf.port), timeout: 30000, - password: null + password: null, + debug: false }; + connectionsParams.port = parseInt(serverConf.rconPort); connectionsParams.password = serverConf.password; + const rcon = await RCON(connectionsParams); await rcon.exec(`say [${message.author.displayName}]: "${prompt.toString()}";`); rcon.destroy(); diff --git a/plugins/CS2/events/messageCreateCs2RCON.ts b/plugins/CS2/events/messageCreateCs2RCON.ts index a8fbfaf..669cbbf 100644 --- a/plugins/CS2/events/messageCreateCs2RCON.ts +++ b/plugins/CS2/events/messageCreateCs2RCON.ts @@ -11,7 +11,7 @@ export default new Event("messageCreate", async (message) => { try { const configs = getGuildConfigsById(message.guildId)?.cs2?.rconChannels; - if (!configs?.length || !configs[message.channelId]) { + if (!(message.channelId in configs)) { return; } @@ -27,9 +27,10 @@ export default new Event("messageCreate", async (message) => { const connectionsParams = { ip: serverConf.ip, - port: serverConf.port, + port: parseInt(serverConf.port), timeout: 30000, - password: null + password: null, + debug: false }; let server = null; @@ -58,6 +59,7 @@ export default new Event("messageCreate", async (message) => { break; default: + connectionsParams.port = parseInt(serverConf.rconPort); connectionsParams.password = serverConf.password; const rcon = await RCON(connectionsParams); consoleOut = await rcon.exec(prompt); diff --git a/src/configs/guildsConfigs.ts b/src/configs/guildsConfigs.ts index 60fc3f7..e9f4616 100644 --- a/src/configs/guildsConfigs.ts +++ b/src/configs/guildsConfigs.ts @@ -67,7 +67,8 @@ export const guildsConfigs = [ "1300142162817581116": { region: "US_EAST", ip: env["CS2_IP_SWT"], - port: env["CS2_RCON_PORT_SWT"], + port: env["CS2_PORT_SWT"], + rconPort: env["CS2_RCON_PORT_SWT"], password: env["CS2_RCON_PASS_SWT"], }, }, @@ -75,7 +76,8 @@ export const guildsConfigs = [ "1300142238109794365": { region: "US_EAST", ip: env["CS2_IP_SWT"], - port: env["CS2_RCON_PORT_SWT"], + port: env["CS2_PORT_SWT"], + rconPort: env["CS2_RCON_PORT_SWT"], password: env["CS2_RCON_PASS_SWT"], } }, @@ -90,7 +92,8 @@ export const guildsConfigs = [ "1300153496548544562": { region: "US_EAST", ip: env["CS2_IP_SWT"], - port: env["CS2_RCON_PORT_SWT"], + port: env["CS2_PORT_SWT"], + rconPort: env["CS2_RCON_PORT_SWT"], password: env["CS2_RCON_PASS_SWT"], }, }, @@ -98,7 +101,8 @@ export const guildsConfigs = [ "1300153496548544563": { region: "US_EAST", ip: env["CS2_IP_SWT"], - port: env["CS2_RCON_PORT_SWT"], + port: env["CS2_PORT_SWT"], + rconPort: env["CS2_RCON_PORT_SWT"], password: env["CS2_RCON_PASS_SWT"], } }, From babecca483e42099d617d814213cd3648120fb82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Sun, 27 Oct 2024 20:34:15 -0400 Subject: [PATCH 10/14] ... --- plugins/CS2/commands/csBoot.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CS2/commands/csBoot.ts b/plugins/CS2/commands/csBoot.ts index 088634d..9888603 100644 --- a/plugins/CS2/commands/csBoot.ts +++ b/plugins/CS2/commands/csBoot.ts @@ -11,7 +11,7 @@ export default new Command({ description: "Will do as you wish.", options: [ { - name: "server", description: "(default) 0: cs2-WeConnected-ns1, 1: cs2-WeConnected-ns2", + name: "server", description: "(default) 0: CS2-SWT", type: ApplicationCommandOptionType.Integer }, { From 1fbe2e44a6c775e23c041ece73e7ea3493f7077f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Sun, 27 Oct 2024 20:47:20 -0400 Subject: [PATCH 11/14] ... --- plugins/CS2/commands/csBoot.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/CS2/commands/csBoot.ts b/plugins/CS2/commands/csBoot.ts index 9888603..89bbb23 100644 --- a/plugins/CS2/commands/csBoot.ts +++ b/plugins/CS2/commands/csBoot.ts @@ -7,7 +7,7 @@ import { PATHS } from "../../../src"; export default new Command({ name: "cs-boot", - public: false, + public: true, description: "Will do as you wish.", options: [ { From 7f126e95f15453b6467e4d6d48e6a9eeaa1d5e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20Vigneault=20=C3=90=2E?= Date: Sun, 27 Oct 2024 21:00:13 -0400 Subject: [PATCH 12/14] ... --- plugins/CS2/commands/{csBoot.ts => csDocker.ts} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename plugins/CS2/commands/{csBoot.ts => csDocker.ts} (99%) diff --git a/plugins/CS2/commands/csBoot.ts b/plugins/CS2/commands/csDocker.ts similarity index 99% rename from plugins/CS2/commands/csBoot.ts rename to plugins/CS2/commands/csDocker.ts index 89bbb23..fc243c6 100644 --- a/plugins/CS2/commands/csBoot.ts +++ b/plugins/CS2/commands/csDocker.ts @@ -6,7 +6,7 @@ import { hasCs2DockerAccess } from "../../../src/configs/guildsConfigs"; import { PATHS } from "../../../src"; export default new Command({ - name: "cs-boot", + name: "cs-docker", public: true, description: "Will do as you wish.", options: [ From 1772cf8c634ce4d0c07c12d71c8b3ff100feba7d Mon Sep 17 00:00:00 2001 From: CtrlAiDel <40178706+CtrlAiDel@users.noreply.github.com> Date: Tue, 29 Oct 2024 07:33:40 -0400 Subject: [PATCH 13/14] DevNewList (#112) * update 79th model * newlist * Update ollamaPlugin.ts --- plugins/Ollama/ollamaPlugin.ts | 599 ++++++++++++--------------------- 1 file changed, 208 insertions(+), 391 deletions(-) diff --git a/plugins/Ollama/ollamaPlugin.ts b/plugins/Ollama/ollamaPlugin.ts index 5e2de87..a19b582 100644 --- a/plugins/Ollama/ollamaPlugin.ts +++ b/plugins/Ollama/ollamaPlugin.ts @@ -19,482 +19,299 @@ export type UserState = { export class OllamaPlugin { static Models: AIModel[] = [ { - "id": 1, - "name": "dnd:latest", - "alias": "dnd", - "description": "Dungeons & Dragons assistant for game mastering." + id: 1, + name: "aya-expanse:latest", + alias: "aya-expanse", + description: + "Size: 5.1 GB. Aya Expanse is a multilingual model supporting 23 languages.", }, { - "id": 2, - "name": "dolphin-llama3:latest", - "alias": "dolphin-llama3", - "description": "Dolphin LLama3 is a specialized model designed to assist with various tasks." + id: 2, + name: "dolphin-llama3:latest", + alias: "dolphin-llama3", + description: + "Size: 4.7 GB. Combines features of Dolphin and Llama3 for enhanced capabilities.", }, { - "id": 3, - "name": "dolphin-mistral:7b-v2.6-dpo-laser-q8_0", - "alias": "dolphin-mistral-q8", - "description": "Mistral model fine-tuned for specific queries with dolphin's twist." + id: 3, + name: "dolphin-phi:latest", + alias: "dolphin-phi", + description: + "Size: 1.6 GB. Combines Dolphin and Phi models for superior performance.", }, { - "id": 4, - "name": "dolphin-mistral:latest", - "alias": "dolphin-mistral", - "description": "The Mistral model with dolphin's touch." + id: 4, + name: "gemma2:2b", + alias: "gemma2", + description: + "Size: 1.6 GB. Gemma2 with 2B parameters for efficient tasks.", }, { - "id": 5, - "name": "hub/advertiser:latest", - "alias": "advertiser", - "description": "Model for advertising-related tasks." + id: 5, + name: "gemma2:9b", + alias: "gemma2-9b", + description: + "Size: 5.4 GB. Gemma2 with 9B parameters for complex applications.", }, { - "id": 6, - "name": "hub/ai-assisted-doctor:latest", - "alias": "ai-doctor", - "description": "AI-assisted doctor model for medical consultations." + id: 6, + name: "gemma2:latest", + alias: "gemma2-latest", + description: + "Size: 5.4 GB. Latest version of Gemma2 with enhanced features.", }, { - "id": 7, - "name": "hub/binx/marketing-expert:latest", - "alias": "marketing-expert", - "description": "Expert in marketing strategies and analysis." + id: 7, + name: "granite3-dense:2b", + alias: "granite3-dense", + description: + "Size: 1.6 GB. Granite3 Dense with 2B parameters for efficiency.", }, { - "id": 8, - "name": "hub/commentariat:latest", - "alias": "commentariat", - "description": "Model for generating comments or opinions." + id: 8, + name: "granite3-dense:8b", + alias: "granite3-dense-8b", + description: + "Size: 4.9 GB. Granite3 Dense with 8B parameters for complex tasks.", }, { - "id": 9, - "name": "hub/composer:latest", - "alias": "composer", - "description": "Your musical composition assistant." + id: 9, + name: "granite3-dense:latest", + alias: "granite3-dense-latest", + description: + "Size: 1.6 GB. Latest Granite3 Dense optimized for dense computations.", }, { - "id": 10, - "name": "hub/cyber-security-specialist:latest", - "alias": "cyber-security", - "description": "Model specialized in cyber security." + id: 10, + name: "granite3-moe:1b", + alias: "granite3-moe", + description: + "Size: 821 MB. Granite3 MoE with 1B parameters for lightweight applications.", }, { - "id": 11, - "name": "hub/dad:latest", - "alias": "dad", - "description": "Model for tasks related to being a dad." + id: 11, + name: "granite3-moe:3b", + alias: "granite3-moe-3b", + description: + "Size: 2.1 GB. Granite3 MoE with 3B parameters for specialized tasks.", }, { - "id": 12, - "name": "hub/dentist:latest", - "alias": "dentist", - "description": "Your dental assistant." + id: 12, + name: "granite3-moe:latest", + alias: "granite3-moe-latest", + description: "Size: 2.1 GB. Latest version of Granite3 MoE model.", }, { - "id": 13, - "name": "hub/doctor:latest", - "alias": "doctor", - "description": "Doctor assistant for medical consultations." + id: 13, + name: "llama-guard3:1b", + alias: "llamaguard3", + description: + "Size: 1.6 GB. Llama-Guard3 with 1B parameters for efficient security.", }, { - "id": 14, - "name": "hub/doge:latest", - "alias": "doge", - "description": "Such model, much assist." + id: 14, + name: "llama-guard3:latest", + alias: "llamaguard3-latest", + description: + "Size: 4.9 GB. Latest Llama-Guard3 providing robust protections.", }, { - "id": 15, - "name": "hub/javi/librarian:latest", - "alias": "librarian", - "description": "Model for library-related tasks." + id: 15, + name: "llama2-chinese:latest", + alias: "llama2-chinese", + description: + "Size: 3.8 GB. Llama2 fine-tuned for enhanced Chinese language capabilities.", }, { - "id": 16, - "name": "hub/jeff-bezos:latest", - "alias": "jeff-bezos", - "description": "Model for tasks related to Jeff Bezos." + id: 16, + name: "llama2-uncensored:latest", + alias: "llama2-uncensored", + description: + "Size: 3.8 GB. Uncensored version of Llama2 without content restrictions.", }, { - "id": 17, - "name": "hub/languages/french:latest", - "alias": "french", - "description": "Language assistant specialized in French." + id: 17, + name: "llama2:latest", + alias: "llama2", + description: + "Size: 3.8 GB. Llama2 is a versatile model for various language tasks.", }, { - "id": 18, - "name": "hub/languages/spanish:latest", - "alias": "spanish", - "description": "Language assistant specialized in Spanish." + id: 18, + name: "llama3-gradient:latest", + alias: "llama3-gradient", + description: + "Size: 4.7 GB. Optimized for gradient-based learning in Llama3.", }, { - "id": 19, - "name": "hub/magician:latest", - "alias": "magician", - "description": "Model for performing magic tricks." + id: 19, + name: "llama3.1:latest", + alias: "llama3.1", + description: + "Size: 4.7 GB. Updated version of Llama3 with performance improvements.", }, { - "id": 20, - "name": "hub/math-teacher:latest", - "alias": "math-teacher", - "description": "Model for teaching mathematics." + id: 20, + name: "llama3.2:1b", + alias: "llama3.2", + description: + "Size: 1.3 GB. Compact Llama3.2 with 1B parameters for quick tasks.", }, { - "id": 21, - "name": "hub/mlemasters2012/stable-diffusion-prompt:latest", - "alias": "sd-prompt", - "description": "Model for generating prompts with stable diffusion." + id: 21, + name: "llama3.2:3b", + alias: "llama3.2-3b", + description: + "Size: 2.0 GB. Llama3.2 with 3B parameters for balanced performance.", }, { - "id": 22, - "name": "hub/personal-trainer:latest", - "alias": "trainer", - "description": "Model for personal training and fitness advice." + id: 22, + name: "llama3.2:latest", + alias: "llama3.2-latest", + description: "Size: 2.0 GB. Latest Llama3.2 optimized for performance.", }, { - "id": 23, - "name": "hub/plagiarism-checker:latest", - "alias": "plagiarism", - "description": "Model for checking plagiarism in text." + id: 23, + name: "llama3:8b", + alias: "llama3-8b", + description: + "Size: 4.7 GB. Llama3 with 8B parameters for enhanced capabilities.", }, { - "id": 24, - "name": "hub/rapper:latest", - "alias": "rapper", - "description": "Model for creating rap lyrics." + id: 24, + name: "llama3:latest", + alias: "llama3", + description: + "Size: 4.7 GB. Llama3 advanced language model for general-purpose tasks.", }, { - "id": 25, - "name": "hub/recipe-maker:latest", - "alias": "recipe-maker", - "description": "Model for generating recipes." + id: 25, + name: "llava-llama3:latest", + alias: "llava-llama3", + description: + "Size: 5.5 GB. LLaVA-Llama3 optimized for visual and language tasks.", }, { - "id": 26, - "name": "hub/rocketcaptain/twd-text-based-game:latest", - "alias": "walking-dead", - "description": "Text-based game assistant based on 'The Walking Dead'." + id: 26, + name: "llava-phi3:latest", + alias: "llava-phi3", + description: + "Size: 2.9 GB. Combines LLaVA and Phi3 for advanced visual-language processing.", }, { - "id": 27, - "name": "hub/storyteller:latest", - "alias": "story", - "description": "Model for generating stories or narratives." + id: 27, + name: "llava:latest", + alias: "llava", + description: + "Size: 4.7 GB. LLaVA specializes in language and vision applications.", }, { - "id": 28, - "name": "hub/ten-tweets:latest", - "alias": "ten-tweets", - "description": "Model for generating tweets." + id: 28, + name: "mannix/gemma2-9b-simpo:latest", + alias: "gemma2-simpo", + description: + "Size: 5.5 GB. Gemma2 9B Simpo specialized for specific applications.", }, { - "id": 29, - "name": "hub/thepr0m3th3an/ghostwriter-braindump:latest", - "alias": "braindump", - "description": "Assistant for brainstorming and dumping ideas." + id: 29, + name: "mistral:latest", + alias: "mistral", + description: + "Size: 4.1 GB. Mistral is designed for high-performance language processing.", }, { - "id": 30, - "name": "hub/thepr0m3th3an/ghostwriter-character:latest", - "alias": "character", - "description": "Assistant for character development in writing." + id: 30, + name: "nemotron-mini:latest", + alias: "nemotron-mini", + description: + "Size: 2.7 GB. NemoTron Mini is a smaller model for efficient computations.", }, { - "id": 31, - "name": "hub/thepr0m3th3an/ghostwriter-draftprose:latest", - "alias": "draftprose", - "description": "Assistant for drafting prose and writing." + id: 31, + name: "nomic-embed-text:latest", + alias: "nomic-embed", + description: + "Size: 274 MB. Nomic Embed Text generates high-quality text embeddings.", }, { - "id": 32, - "name": "hub/thepr0m3th3an/ghostwriter-editor:latest", - "alias": "editor", - "description": "Assistant for editing and refining written content." + id: 32, + name: "phi3:latest", + alias: "phi3", + description: + "Size: 2.2 GB. Phi3 is a compact model with significant potential.", }, { - "id": 33, - "name": "hub/thepr0m3th3an/ghostwriter-finalprose:latest", - "alias": "finalprose", - "description": "Assistant for finalizing prose and written content." + id: 33, + name: "phi:latest", + alias: "phi", + description: + "Size: 1.6 GB. Phi is a foundational model for language understanding.", }, { - "id": 34, - "name": "hub/thepr0m3th3an/ghostwriter-outline:latest", - "alias": "outline", - "description": "Assistant for creating outlines and structuring writing." + id: 34, + name: "qwen2:0.5b", + alias: "qwen2", + description: + "Size: 352 MB. Lightweight Qwen2 model with 0.5B parameters.", }, { - "id": 35, - "name": "hub/thepr0m3th3an/ghostwriter-storybeats:latest", - "alias": "storybeats", - "description": "Assistant for developing story beats and plotlines." + id: 35, + name: "qwen2:1.5b", + alias: "qwen2-1.5b", + description: + "Size: 934 MB. Qwen2 with 1.5B parameters balancing speed and power.", }, { - "id": 36, - "name": "hub/thepr0m3th3an/ghostwriter-synopsis:latest", - "alias": "synopsis", - "description": "Assistant for creating synopses and summarizing content." + id: 36, + name: "qwen2:7b", + alias: "qwen2-7b", + description: + "Size: 4.4 GB. Qwen2 with 7B parameters for high-performance tasks.", }, { - "id": 37, - "name": "hub/weconnected/drum-sequencer-pro:latest", - "alias": "drum", - "description": "Model for creating drum sequences." + id: 37, + name: "qwen2:latest", + alias: "qwen2-latest", + description: "Size: 4.4 GB. Latest Qwen2 model with enhanced features.", }, { - "id": 38, - "name": "hub/zillomab/llama3-uncensored:latest", - "alias": "llama3-uncensored", - "description": "Uncensored version of Llama3 model." + id: 38, + name: "reader-lm:latest", + alias: "reader-lm", + description: + "Size: 934 MB. Reader-LM excels at reading comprehension tasks.", }, { - "id": 39, - "name": "llama2:latest", - "alias": "llama2", - "description": "Llama2 model for various tasks." + id: 39, + name: "shieldgemma:2b", + alias: "shieldgemma", + description: + "Size: 1.7 GB. ShieldGemma with 2B parameters for efficient protection.", }, { - "id": 40, - "name": "llama3-chatqa:latest", - "alias": "llama3-chatqa", - "description": "Llama3 model for chat-based question answering." + id: 40, + name: "shieldgemma:9b", + alias: "shieldgemma-9b", + description: + "Size: 5.8 GB. ShieldGemma with 9B parameters for advanced security.", }, { - "id": 41, - "name": "llama3:latest", - "alias": "llama3", - "description": "Llama3 model for various tasks." + id: 41, + name: "shieldgemma:latest", + alias: "shieldgemma-latest", + description: + "Size: 5.8 GB. Latest ShieldGemma with enhanced security features.", }, { - "id": 42, - "name": "llava-llama3:latest", - "alias": "llava-llama3", - "description": "Model for tasks related to Llava Llama3." + id: 42, + name: "tinydolphin:latest", + alias: "tinydolphin", + description: + "Size: 636 MB. TinyDolphin is a compact model suitable for lightweight tasks.", }, - { - "id": 43, - "name": "llava-phi3:latest", - "alias": "llava-phi3", - "description": "Model for tasks related to Llava Phi3." - }, - { - "id": 44, - "name": "mistral:latest", - "alias": "mistral", - "description": "Mistral model for various tasks." - }, - { - "id": 45, - "name": "nous-hermes:latest", - "alias": "nous-hermes", - "description": "Model for tasks related to Nous Hermes." - }, - { - "id": 46, - "name": "nous-hermes2:latest", - "alias": "nous-hermes2", - "description": "Hermes2 model for various tasks." - }, - { - "id": 47, - "name": "ollama.com/library/llama3:8b-instruct-fp16", - "alias": "ollama3-fp16", - "description": "LLama3 model with instructions for FP16 from Ollama.com library." - }, - { - "id": 48, - "name": "ollama.com/library/llama3:8b", - "alias": "ollama3", - "description": "LLama3 model from Ollama.com library." - }, - { - "id": 49, - "name": "openhermes2.5-mistral:latest", - "alias": "oh2.5-mistral", - "description": "Open Hermes 2.5 Mistral model." - }, - { - "id": 50, - "name": "starling-lm:latest", - "alias": "starling", - "description": "Starling model for various tasks." - }, - { - "id": 51, - "name": "gemma-2b", - "alias": "gemma-2b", - "description": "Gemma-2b is a family of lightweight, state-of-the-art open models built by Google DeepMind" - }, - { - "id": 52, - "name": "gemma:latest", - "alias": "gemma", - "description": "Gemma-7b is a family of lightweight, state-of-the-art open models built by Google DeepMind." - }, - { - "id": 53, - "name": "llama2-chinese:latest", - "alias": "chinese", - "description": "Llama 2 based model fine tuned to improve Chinese dialogue ability.." - }, - { - "id": 54, - "name": "faster-drum-sequencer:latest", - "alias": "drummer", - "description": "Our faster AI drum sequencer creates custom drum patterns instantly, perfect for musicians and producers." - }, - { - "id": 55, - "name": "phi3:latest", - "alias": "phi3", - "description": "This is a new small model with a lot of potential" - }, - { - "id": 56, - "name": "sentiments-llama3:latest", - "alias": "sentiments-llama3", - "description": "Fine-tuned LLaMA for sentiment analysis." - }, - { - "id": 57, - "name": "jimscard/whiterabbit-neo:latest", - "alias": "whiterabbit-neo", - "description": "Variant of White Rabbit Neo, a large language model." - }, - { - "id": 58, - "name": "blackhat-hacker:latest", - "alias": "blackhat-hacker", - "description": "A tool for ethical hacking and penetration testing." - }, - { - "id": 59, - "name": "openchat:latest", - "alias": "openchat", - "description": "An open-source chat platform for secure communication." - }, - { - "id": 60, - "name": "hub/darkstorm2150/Wilderness-Survivalist:latest", - "alias": "wilderness-survivalist", - "description": "A survival guide for wilderness adventures." - }, - { - "id": 61, - "name": "hub/darkstorm2150/Psychologist:latest", - "alias": "psychologist", - "description": "A tool for mental health professionals." - }, - { - "id": 62, - "name": "hub/darkstorm2150/Ooh-Ollama:latest", - "alias": "ooh-ollama", - "description": "A mysterious tool with unknown purposes." - }, - { - "id": 63, - "name": "hub/darkstorm2150/Doomsday-Survivalist:latest", - "alias": "doomsday-survivalist", - "description": "A guide for surviving catastrophic events." - }, - { - "id": 64, - "name": "hub/darkstorm2150/Urban-Survivalist:latest", - "alias": "urban-survivalist", - "description": "A guide for surviving in urban environments." - }, - { - "id": 65, - "name": "dolphin-mistral-7b-v2.6-dpo-laser.Q8_0.gguf:latest", - "alias": "dolphin-mistral-7b-v2.6-Q8", - "description": "A machine learning model for image processing." - }, - { - "id": 66, - "name": "dolphin-2_6-phi-2.Q6_K.gguf:latest", - "alias": "dolphin-2_6-phi-2-Q6", - "description": "A natural language processing tool." - }, - { - "id": 67, - "name": "dolphin-2.6-mistral-7b.Q4_K_M.gguf:latest", - "alias": "dolphin-2.6-mistral-7b-Q4", - "description": "A predictive model for data analysis." - }, - { - "id": 68, - "name": "whiterabbitneo-13b.Q5_K_M.gguf:latest", - "alias": "whiterabbitneo-13b-Q5", - "description": "A cybersecurity tool for threat detection." - }, - { - "id": 69, - "name": "aya:latest", - "alias": "aya", - "description": "Multilingual models that support 23 languages." - }, - { - "id": 70, - "name": "satani", - "alias": "satani", - "description": "Model for dark-themed tasks." - }, - { - "id": 71, - "name": "hub/dotslashgabut/genaiprompt:latest", - "alias": "genai", - "description": "AI model for generating prompts." - }, - { - "id": 72, - "name": "hub/mesharu/caelia---tarot-cards-reader:latest", - "alias": "tarot", - "description": "Model for reading tarot cards." - }, - { - "id": 73, - "name": "phi3:14b", - "alias": "phi3-14b", - "description": "Enhanced version of the Phi3 model." - }, - { - "id": 74, - "name": "hub/rouge/expert-japanese-to-english-translator:latest", - "alias": "rouge", - "description": "Expert translator for Japanese to English." - }, - { - "id": 75, - "name": "hub/weconnected/expert-spanish-to-english-translator:latest", - "alias": "spanishbywe", - "description": "Expert translator for Spanish to English." - }, - { - "id": 76, - "name": "hub/qwen2:0.5b", - "alias": "q0", - "description": "Qwen2 series large language model by Qwen team, Alibaba Cloud" - }, - { - "id": 77, - "name": "hub/qwen2:1.5b", - "alias": "q1", - "description": "Qwen2 series large language model by Qwen team, Alibaba Cloud" - }, - { - "id": 78, - "name": "hub/qwen2:7b", - "alias": "q7", - "description": "Qwen2 series large language model by Qwen team, Alibaba Cloud" - }, - { - "id": 79, - "name": "gemma2:latest", - "alias": "gemma2", - "description": "Gemma 2 is the newest generation in Google's Gemma series" - } ]; - static DefaultModel = OllamaPlugin.Models.find(m => m.alias === "gemma2"); + static DefaultModel = OllamaPlugin.Models.find((m) => m.alias === "llama3.1"); /** * Will check if the prefix contains a model name or id. From a968705d961274251bfdb363fe61e6577188c49b Mon Sep 17 00:00:00 2001 From: CtrlAiDel <40178706+CtrlAiDel@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:54:48 -0500 Subject: [PATCH 14/14] Masterllmupdate (#114) * llm update 09-12-2024 * update llm2 * rajout de 2 llm et suppression de 1 --- plugins/Ollama/ollamaPlugin.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/plugins/Ollama/ollamaPlugin.ts b/plugins/Ollama/ollamaPlugin.ts index a19b582..028c589 100644 --- a/plugins/Ollama/ollamaPlugin.ts +++ b/plugins/Ollama/ollamaPlugin.ts @@ -297,10 +297,10 @@ export class OllamaPlugin { }, { id: 41, - name: "shieldgemma:latest", - alias: "shieldgemma-latest", - description: - "Size: 5.8 GB. Latest ShieldGemma with enhanced security features.", + name: "llama3.2-vision:latest", + alias: "llama3-2-vision", + description: + "Size: 3.2 GB. Llama3.2 optimized for vision and language tasks." }, { id: 42, @@ -309,6 +309,13 @@ export class OllamaPlugin { description: "Size: 636 MB. TinyDolphin is a compact model suitable for lightweight tasks.", }, + { + id: 43, + name: "marco-o1:latest", + alias: "marco-o1", + description: + "Size: 1.2 GB. Marco-O1 designed for specialized operations." + } ]; static DefaultModel = OllamaPlugin.Models.find((m) => m.alias === "llama3.1");