@codebam/cf-workers-telegram-bot 5.10.0 → 5.13.0

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

@@ -7,6 +7,7 @@ export default class TelegramBot extends TelegramApi {
     get_set: KVNamespace;
     ai: any;
     db: D1Database;
+    bot_name: string;
     constructor(config: Config);
     sean: (update: TelegramUpdate, args: string[]) => Promise<Response>;
     clear: (update: TelegramUpdate) => Promise<Response>;

package/dist/main/src/telegram_bot.js

@@ -9,6 +9,7 @@ export default class TelegramBot extends TelegramApi {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ai;
     db;
+    bot_name;
     constructor(config) {
         super(config.commands, config.webhook, config.handler);
         this.url = config.url;
@@ -16,6 +17,7 @@ export default class TelegramBot extends TelegramApi {
         this.get_set = config.kv?.get_set;
         this.ai = config.ai;
         this.db = config.db;
+        this.bot_name = config.bot_name;
     }
     // bot command: /sean
     sean = async (update, args) => {
@@ -80,41 +82,66 @@ export default class TelegramBot extends TelegramApi {
     };
     // bot command: /question
     question = 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 = "[INST] " + args.join(" ") + "[/INST]";
+            prompt = args.join(" ");
         }
         if (prompt === "") {
-            prompt = "[INST] no prompt specified [/INST]";
+            prompt = "";
+        }
+        let _results;
+        if (this.db) {
+            _results = await this.db
+                .prepare("SELECT * FROM Messages WHERE userId=?")
+                .bind(update.message?.from.id)
+                .all();
+        }
+        const results = _results?.results;
+        let old_messages;
+        if (results) {
+            old_messages = results.map((col) => ({
+                role: "system",
+                content: col.content,
+            }));
         }
-        const { results } = await this.db
-            .prepare("SELECT * FROM Messages WHERE userId=?")
-            .bind(update.message?.from.id)
-            .all();
-        const old_messages = results.map((col) => ({
-            role: "system",
-            content: col.content,
-        }));
         const { response } = await ai.run("@cf/meta/llama-2-7b-chat-int8", {
             messages: [
+                {
+                    role: "system",
+                    content: `your name is ${this.bot_name}`,
+                },
                 {
                     role: "system",
                     content: `you are talking to ${update.message?.from.first_name}`,
                 },
-                ...old_messages,
+                {
+                    role: "system",
+                    content: `your source code is at https://github.com/codebam/cf-workers-telegram-bot`,
+                },
+                ...(() => {
+                    if (old_messages) {
+                        return old_messages;
+                    }
+                    return [];
+                })(),
                 { role: "user", content: prompt },
             ],
         });
-        const { success } = await this.db
-            .prepare("INSERT INTO Messages (id, userId, content) VALUES (?, ?, ?)")
-            .bind(crypto.randomUUID(), update.message?.from.id, prompt + "[SYS] " + response + "[/SYS]")
-            .run();
-        if (!success) {
-            console.log("failed to insert data into d1");
+        if (this.db) {
+            const { success } = await this.db
+                .prepare("INSERT INTO Messages (id, userId, content) VALUES (?, ?, ?)")
+                .bind(crypto.randomUUID(), update.message?.from.id, "[INST] " + prompt + " [/INST]" + "\n" + response)
+                .run();
+            if (!success) {
+                console.log("failed to insert data into d1");
+            }
         }
         if (response === "") {
             this.clear(update);

package/dist/worker/src/worker.js

@@ -2,7 +2,7 @@ import { TelegramCommands, Handler, TelegramWebhook, TelegramBot, } from "../../
 export default {
     fetch: async (request, env) => new Handler([
         {
-            bot_name: "cf-workers-telegram-bot",
+            bot_name: "@TuxRobot",
             api: TelegramBot,
             webhook: new TelegramWebhook(new URL(`https://api.telegram.org/bot${env.SECRET_TELEGRAM_API_TOKEN}`), env.SECRET_TELEGRAM_API_TOKEN, new URL(new URL(request.url).origin)),
             commands: {
@@ -47,6 +47,7 @@ export default {
                 "/start": TelegramCommands.commandList,
             },
             ai: env.AI,
+            db: env.DB,
         },
         {
             bot_name: "@ddggbot",
@@ -63,15 +64,17 @@ export default {
                 "/start": TelegramCommands.commandList,
             },
             ai: env.AI,
+            db: env.DB,
         },
         {
             bot_name: "@SeanB_robot",
             api: TelegramBot,
             webhook: new TelegramWebhook(new URL(`https://api.telegram.org/bot${env.SECRET_TELEGRAM_API_TOKEN4}`), env.SECRET_TELEGRAM_API_TOKEN4, new URL(new URL(request.url).origin)),
             commands: {
-                default: TelegramCommands.sean,
+                default: TelegramCommands.question,
             },
             ai: env.AI,
+            db: env.DB,
         },
     ]).handle(request),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "5.10.0",
+	"version": "5.13.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.20231002.0",
-		"@typescript-eslint/eslint-plugin": "^6.7.4",
-		"@typescript-eslint/parser": "^6.7.4",
+		"@cloudflare/workers-types": "^4.20231010.0",
+		"@typescript-eslint/eslint-plugin": "^6.7.5",
+		"@typescript-eslint/parser": "^6.7.5",
 		"eslint": "^8.51.0",
 		"eslint-config-prettier": "^9.0.0",
-		"lerna": "^7.3.0",
+		"lerna": "^7.3.1",
 		"prettier": "^3.0.3",
 		"typescript": "^5.2.2"
 	},
 	"dependencies": {
-		"@cloudflare/ai": "^1.0.15"
+		"@cloudflare/ai": "^1.0.16"
 	},
-	"gitHead": "27402e886cc18f7d94647fc97765ff0b62c94ce6"
+	"gitHead": "f0e63bfc828c86d0559c74d2c305fc0f7371996f"
 }