@codebam/cf-workers-telegram-bot 5.14.0 → 5.15.0

package/dist/main/src/handler.js

@@ -24,10 +24,10 @@ export default class Handler {
         POST: this.postResponse,
         default: () => new Promise(() => new Response()),
     };
-    getAccessKeys = async (configs) => Promise.all(configs.map((bot_config) => sha256(bot_config.webhook?.token ?? "").then((hash) => [
-        hash,
-        bot_config,
-    ]))).then((result) => Object.fromEntries(result));
+    getAccessKeys = async (configs) => Promise.all(configs.map((bot_config) => sha256(bot_config.webhook?.token ?? "").then((hash) => {
+        console.log(hash);
+        return [hash, bot_config];
+    }))).then((result) => Object.fromEntries(result));
     // handles the request
     handle = async (request) => this.getAccessKeys(this.configs).then((access_keys) => Object.keys(this.responses).includes(request.method)
         ? this.responses[request.method](request, ((key) => {

package/dist/main/src/telegram_api.js

@@ -13,14 +13,22 @@ export default class TelegramApi extends BotApi {
         message: this.messageUpdate,
         default: new Response(),
     };
-    update = async (update) => ((log({ update }) &&
-        update.message &&
-        this.updates.message(update)) ||
-        (update.inline_query &&
-            update.inline_query.query === "" &&
-            undefined) ||
-        this.updates.inline_query(update)) ??
-        this.updates.default;
+    update = async (update) => {
+        console.log({ update });
+        if (update) {
+            if (update.inline_query) {
+                if (update.inline_query.query !== "") {
+                    return this.updates.inline_query(update);
+                }
+            }
+            else {
+                if (update.message) {
+                    return this.updates.message(update);
+                }
+            }
+        }
+        return this.updates.default;
+    };
     // greet new users who join
     greetUsers = async (update) => update.message?.new_chat_members
         ? this.sendMessage(update.message.chat.id, `Welcome to ${update.message.chat.title}, ${update.message.from.username}`)

package/dist/main/src/telegram_bot.d.ts

@@ -10,6 +10,7 @@ export default class TelegramBot extends TelegramApi {
     r2: R2Bucket;
     bot_name: string;
     constructor(config: Config);
+    translate: (update: TelegramUpdate, args: string[]) => Promise<Response>;
     clear: (update: TelegramUpdate) => Promise<Response>;
     image: (update: TelegramUpdate, args: string[]) => Promise<Response>;
     question: (update: TelegramUpdate, args: string[]) => Promise<Response>;

package/dist/main/src/telegram_bot.js

@@ -21,6 +21,33 @@ export default class TelegramBot extends TelegramApi {
         this.r2 = config.r2;
         this.bot_name = config.bot_name;
     }
+    // bot command: /translate
+    translate = async (update, args) => {
+        if (this.ai === undefined) {
+            return new Response("ok");
+        }
+        const ai = new Ai(this.ai);
+        let _prompt;
+        if (args[0][0] === "/") {
+            _prompt = args.slice(1).join(" ");
+        }
+        else {
+            _prompt = args.join(" ");
+        }
+        if (_prompt === "") {
+            _prompt = "";
+        }
+        const langs = ["french", "arabic", "german", "spanish", "russian"];
+        const inline_articles = await Promise.all(langs.map(async (lang) => {
+            const response = await ai.run("@cf/meta/m2m100-1.2b", {
+                text: _prompt,
+                source_lang: lang,
+                target_lang: "english",
+            });
+            return new TelegramInlineQueryResultArticle(response.translated_text, `${lang}: ${response.translated_text}`);
+        }));
+        return this.answerInlineQuery(update.inline_query?.id ?? 0, inline_articles);
+    };
     // bot command: /clear
     // reset the llama2 session by deleting messages from d1
     clear = async (update) => {
@@ -110,9 +137,12 @@ export default class TelegramBot extends TelegramApi {
                 return acc + cur.content + "\n";
             }, "") +
             "</s>";
+        const p = system_prompt + "[INST]" + _prompt + "[/INST]";
+        const prompt = p.slice(p.length - 4096, p.length);
         const response = await ai
-            .run("@hf/thebloke/llama-2-13b-chat-awq", {
-            prompt: system_prompt + "[INST]" + _prompt + "[/INST]",
+            .run("@hf/thebloke/orca-2-13b-awq", {
+            prompt,
+            max_tokens: 596,
         })
             .then(({ response }) => response
             .replace(/(\[|)(\/|)INST(S|)(s|)(\]|)/, "")
@@ -155,6 +185,26 @@ export default class TelegramBot extends TelegramApi {
         if (_prompt === "") {
             _prompt = "";
         }
+        const results = await (async () => {
+            if (this.db) {
+                const { results } = await this.db
+                    .prepare("SELECT * FROM Messages WHERE userId=?")
+                    .bind(update.inline_query
+                    ? update.inline_query.from.id
+                    : update.message?.from.id)
+                    .all();
+                return results;
+            }
+        })();
+        const old_messages = (() => {
+            if (results) {
+                return results.map((col) => ({
+                    role: "system",
+                    content: col.content,
+                }));
+            }
+            return [];
+        })();
         const system_prompt = "<s>" +
             [
                 `Your name is ${this.bot_name}.`,
@@ -167,14 +217,32 @@ export default class TelegramBot extends TelegramApi {
             ].reduce((acc, cur) => {
                 return acc + cur + "\n";
             }) +
+            old_messages.reduce((acc, cur) => {
+                return acc + cur.content + "\n";
+            }, "") +
             "</s>";
+        const p = system_prompt + "[INST]" + _prompt + "[/INST]";
+        const prompt = p.slice(p.length - 4096, p.length);
         const response = await ai
-            .run("@hf/thebloke/llama-2-13b-chat-awq", {
-            prompt: system_prompt + "[INST]" + _prompt + "[/INST]",
+            .run("@hf/thebloke/orca-2-13b-awq", {
+            prompt,
+            max_tokens: 596,
         })
             .then(({ response }) => response
             .replace(/(\[|)(\/|)INST(S|)(s|)(\]|)/, "")
-            .replace(/<<(\/|)SYS>>/, ""));
+            .replace(/<<(\/|)SYS>>/, "")
+            .replace(/[OUT]/, ""));
+        if (this.db) {
+            const { success } = await this.db
+                .prepare("INSERT INTO Messages (id, userId, content) VALUES (?, ?, ?)")
+                .bind(crypto.randomUUID(), update.inline_query
+                ? update.inline_query.from.id
+                : update.message?.from.id, "[INST] " + _prompt + " [/INST]" + "\n" + response)
+                .run();
+            if (!success) {
+                console.log("failed to insert data into d1");
+            }
+        }
         if (update.inline_query) {
             return this.answerInlineQuery(update.inline_query.id, [
                 new TelegramInlineQueryResultArticle(response),
@@ -206,7 +274,7 @@ export default class TelegramBot extends TelegramApi {
                 ? [
                     new TelegramInlineQueryResultArticle(`${instant_answer_url}\n\n<a href="${addSearchParams(new URL(duckduckgo_url), {
                         q: args
-                            .slice(1)
+                            .slice(2)
                             .join(" ")
                             .replace(/^!\w* /, ""),
                     }).href}">Results From DuckDuckGo</a>`, instant_answer_url, "HTML", thumb_url),

package/dist/main/src/telegram_commands.d.ts

@@ -15,4 +15,5 @@ export default class TelegramCommands {
     static code: TelegramCommand;
     static commandList: TelegramCommand;
     static image: TelegramCommand;
+    static translate: TelegramCommand;
 }

package/dist/main/src/telegram_commands.js

@@ -14,4 +14,5 @@ export default class TelegramCommands {
     static code = async (bot, update) => bot.code(update);
     static commandList = async (bot, update) => bot.commandList(update);
     static image = async (bot, update, args) => bot.image(update, args);
+    static translate = async (bot, update, args) => bot.translate(update, args);
 }

package/dist/worker/src/worker.d.ts

@@ -6,6 +6,7 @@ interface Environment {
     SECRET_TELEGRAM_API_TOKEN2: string;
     SECRET_TELEGRAM_API_TOKEN3: string;
     SECRET_TELEGRAM_API_TOKEN4: string;
+    SECRET_TELEGRAM_API_TOKEN5: string;
     AI: string;
     DB: D1Database;
     R2: R2Bucket;

package/dist/worker/src/worker.js

@@ -23,7 +23,7 @@ export default {
                 "/clear": TelegramCommands.clear,
                 "/help": TelegramCommands.commandList,
                 "/image": TelegramCommands.image,
-                "/start": TelegramCommands.commandList,
+                "/start": TelegramCommands.question,
             },
             kv: { get_set: env.KV_GET_SET, uid_data: env.KV_UID_DATA },
             ai: env.AI,
@@ -76,5 +76,16 @@ export default {
             ai: env.AI,
             db: env.DB,
         },
+        {
+            bot_name: "@TranslatePartyBot",
+            api: TelegramBot,
+            webhook: new TelegramWebhook(new URL(`https://api.telegram.org/bot${env.SECRET_TELEGRAM_API_TOKEN5}`), env.SECRET_TELEGRAM_API_TOKEN5, new URL(new URL(request.url).origin)),
+            commands: {
+                default: TelegramCommands.translate,
+                inline: TelegramCommands.translate,
+                "/start": TelegramCommands.commandList,
+            },
+            ai: env.AI,
+        },
     ]).handle(request),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "5.14.0",
+	"version": "5.15.0",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main/src/main.js",
 	"module": "./dist/main/src/main.js",
@@ -29,17 +29,17 @@
 		"url": "https://github.com/codebam/cf-workers-telegram-bot.git"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20231121.0",
-		"@typescript-eslint/eslint-plugin": "^6.12.0",
-		"@typescript-eslint/parser": "^6.12.0",
-		"eslint": "^8.54.0",
-		"eslint-config-prettier": "^9.0.0",
-		"lerna": "^8.0.0",
-		"prettier": "^3.1.0",
-		"typescript": "^5.3.2"
+		"@cloudflare/workers-types": "^4.20240320.1",
+		"@typescript-eslint/eslint-plugin": "^7.4.0",
+		"@typescript-eslint/parser": "^7.4.0",
+		"eslint": "^8.57.0",
+		"eslint-config-prettier": "^9.1.0",
+		"lerna": "^8.1.2",
+		"prettier": "^3.2.5",
+		"typescript": "^5.4.3"
 	},
 	"dependencies": {
-		"@cloudflare/ai": "^1.0.33"
+		"@cloudflare/ai": "1.0.53"
 	},
-	"gitHead": "b61227dbb262c62ceb5c2401b71a353caa3e6346"
+	"gitHead": "f590f9423dda46b7b591d8344c13504f6fa69d6e"
 }