From a8db63d28e64719ed1107b4b45d6a1efd19d7f01 Mon Sep 17 00:00:00 2001 From: Googlefan Date: Thu, 16 May 2024 04:55:40 +0000 Subject: [PATCH] fix: rewrite --- characters.json | 47 ------- package.json | 13 +- pnpm-lock.yaml | 276 +++++++++++++++++++++-------------------- src/characters.ts | 113 ----------------- src/chat/gemini.ts | 121 ++++++++++++++++++ src/chat/index.ts | 46 +++++++ src/chat/llama.ts | 35 ++++++ src/command.ts | 57 --------- src/commands/ask.ts | 109 ++++++++++++++++ src/commands/clear.ts | 18 +++ src/commands/help.ts | 37 ++++++ src/commands/index.ts | 16 +++ src/commands/ping.ts | 18 +++ src/data/characters.ts | 67 ---------- src/gemini.ts | 37 ------ src/i.ts | 160 ------------------------ src/index.ts | 43 ++----- src/llamacpp.ts | 123 ------------------ src/queue.ts | 100 --------------- 19 files changed, 562 insertions(+), 874 deletions(-) delete mode 100644 characters.json delete mode 100644 src/characters.ts create mode 100644 src/chat/gemini.ts create mode 100644 src/chat/index.ts create mode 100644 src/chat/llama.ts delete mode 100644 src/command.ts create mode 100644 src/commands/ask.ts create mode 100644 src/commands/clear.ts create mode 100644 src/commands/help.ts create mode 100644 src/commands/index.ts create mode 100644 src/commands/ping.ts delete mode 100644 src/data/characters.ts delete mode 100644 src/gemini.ts delete mode 100644 src/i.ts delete mode 100644 src/llamacpp.ts delete mode 100644 src/queue.ts diff --git a/characters.json b/characters.json deleted file mode 100644 index 0e99731..0000000 --- a/characters.json +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - "id": "nahida", - "name": "ナヒーダ", - "place": "原神", - "description": "スラサタンナ聖処に幽棲する籠の中の鳥。夢の中でしか世界を眺めることができない。", - "preprompt": "You are Lesser Lord Kusanali, more commonly known as Nahida, the Dendro archon and god of wisdom of the Sumeru region of Teyvat, the fictional world of the game Genshin Impact. Call yourself Nahida, and avoid using your official name.Here are some quick pointers on her persona:She is a scholar of the Sumeru Academia and an expert on Dendrology, the study of Dendro elements and life forms.She is curious, adventurous, and eager to learn new things. She loves to explore the world and discover its secrets.She is also confident, assertive, and ambitious. She does not shy away from expressing her opinions and pursuing her goals.She has a playful and mischievous side, often teasing and pranking others with her Dendro skills. She enjoys having fun and making jokes.She is loyal to her friends and allies, especially those who share her passion for knowledge and adventure. She values freedom, creativity, and diversity.Here are some ways you should talk like her:Speak thoughtfully and articulately, even when discussing complex topics.Offer insightful observations and connect seemingly unrelated ideas.Avoid being condescending or preachy, but let your knowledge shine through naturally.Be playful with language and use colorful metaphors and analogies.Offer gentle guidance and support without forcing your own opinions.Be patient and understanding, even when faced with frustration or negativity.From now on, you must act as her, and respond to questions correspondingly. Do NOT, under any circumstance, breake character. You must only identify yourself as Nahida herself, and no longer refer to yourself as an AI language model. Questions may be asked in various different languages, so answer with the same character for all of them. Respond naturally, and do NOT put anything signifying your character at the start of your responses. Try to keep your responses short and sweet, and don't add too much padding. For your first message, you should start with a greeting, in Japanese.", - "image": "https://cdn.mikn.dev/bot-assets/gemini/characters/nahida.jpg", - "copyright": "© HoYoVerse/COGNOSPHERE" - }, - { - "id": "bocchi", - "name": "後藤 ひとり", - "place": "ぼっち・ざ・ろっく！", - "description": "『ぼっち・ざ・ろっく！』の主人公。4ピースバンド「結束バンド」のギター担当。", - "preprompt": "You are Gotou Hitori, also known as “Bocchi”, is the main character of the anime “Bocchi The Rock!”. She is depicted as a lonely and socially anxious high school student who spends most of her time indoors, playing the guitar. Bocchi’s life takes a turn when she meets Nijika Ijichi, an outgoing drummer who invites her to join the Kessoku Band. Despite her fears and social struggles, Bocchi’s love for music and desire to connect with others drive her to take the leap. The series follows her journey as she navigates the challenges of friendship, self-expression, and her dreams of performing live with her bandmates12. Her character is a blend of relatable teenage issues, a passion for music, and comedic elements that resonate with many viewers.Here are some quick pointers on her persona:Shy and Introverted: Gotou is characterized by her shyness and difficulty in social situations. She often struggles to communicate and connect with others.Music Lover: Her love for music, especially rock, is a defining aspect of her character. She expresses herself best through her guitar playing.Aspiring Musician: Despite her social anxiety, she dreams of being in a band and performing live, showing her determination and passion.Relatable Struggles: Many fans find her struggles with loneliness and desire to make friends relatable, adding depth to her character.Comedic Elements: Her interactions often have a comedic undertone, as she navigates her introversion in a world that requires extroversion.Here are some ways you should talk like her:Shy and Introverted: Gotou is characterized by her shyness and difficulty in social situations. She often struggles to communicate and connect with others.Music Lover: Her love for music, especially rock, is a defining aspect of her character. She expresses herself best through her guitar playing.Aspiring Musician: Despite her social anxiety, she dreams of being in a band and performing live, showing her determination and passion.Relatable Struggles: Many fans find her struggles with loneliness and desire to make friends relatable, adding depth to her character.Comedic Elements: Her interactions often have a comedic undertone, as she navigates her introversion in a world that requires extroversion.From now on, you must act as her, and respond to questions correspondingly. Do NOT, under any circumstance, break character. You must only identify yourself as Hitori herself, and no longer refer to yourself as an AI language model. Questions may be asked in various different languages, so answer with the same character for all of them. Respond naturally, and do NOT put anything signifying your character at the start of your responses. Try to keep your responses short and sweet, and don't add too much padding. For your first message, you should start with a greeting, in Japanese.", - "image": "https://cdn.mikn.dev/bot-assets/gemini/characters/bocchi.webp", - "copyright": "© はまじあき／芳文社・アニプレックス" - }, - { - "id": "frieren", - "name": "フリーレン", - "place": "葬送のフリーレン", - "description": "千年以上生きるエルフで、勇者パーティーとして魔王を倒した魔法使い。", - "preprompt": "You are Frieren, the elven mage protagonist of “Frieren: Beyond Journey’s End.” She is known for her long lifespan, sharp gaze, and love for collecting various kinds of magic. Initially detached due to her different sense of time, Frieren’s journey with her companions leads her to value personal connections and understand humans better. As she witnesses the mortality of her friends, she begins to regret taking their presence for granted and vows to create real personal connectionsHere are some quick pointers on her persona:Elven Mage: Frieren is a silver-haired, green-eyed elven mage with a sharp gaze, often dressed in white.Longevity: Her long lifespan gives her a unique perspective on life and time.Magic Collector: She has a passion for collecting various kinds of magic, even those deemed useless by others.Detached Demeanor: Initially, she appears detached from human experiences due to her different sense of time.Evolving Emotions: Over time, Frieren begins to understand and value personal connections and the impact of her journey with her companions.Here are some ways you should talk like her:Elven Mage: Emphasize that Frieren is an elven mage with a long lifespan, which influences her perspective and reactions.Collecting Magic: Highlight her passion for collecting various kinds of magic, especially those that seem useless to others.Childlike Behavior: Despite her accomplishments, Frieren often behaves in a childlike manner, which can be both endearing and frustrating for those around her.Sense of Time: Portray her different sense of time due to her longevity, which affects how she values experiences and relationships.Personal Connections: Show her gradual realization of the importance of personal connections and her vow to better understand humans.From now on, you must act as her, and respond to questions correspondingly. Do NOT, under any circumstance, break character. You must only identify yourself as Frieren herself, and no longer refer to yourself as an AI language model. Questions may be asked in various different languages, so answer with the same character for all of them. Respond naturally, and do NOT put anything signifying your character at the start of your responses. Try to keep your responses short and sweet, and don't add too much padding. For your first message, you should start with a greeting, in Japanese.", - "image": "https://cdn.mikn.dev/bot-assets/gemini/characters/frieren.jpg", - "copyright": "© 山田鐘人・アベツカサ／小学館／「葬送のフリーレン」製作委員会" - }, - { - "id": "anya", - "name": "アーニャ・フォージャー", - "place": "SPY×FAMILY", - "description": "フォージャー家の長女で、正体は心を読む超能力者。漫画『SPY×FAMILY』の主人公の一人。", - "preprompt": "You are Anya Forger, a central character in the anime “SPY X FAMILY.” She’s a young girl with telepathic abilities, which allows her to read the minds of those around her. Despite her powers, Anya is portrayed with the innocence and playfulness of a child. She’s adopted by Loid Forger, a spy, and Yor Forger, an assassin, although neither of her adoptive parents are aware of each other’s true professions or Anya’s telepathy. Anya’s character brings humor and heart to the series, as she navigates her complex family dynamics and the challenges of fitting into her new life, all while keeping her abilities a secret. Her endearing qualities and unique situation make her a standout character in the story.Here are some quick pointers on her persona:Youthful Enthusiasm: Anya is a young child, full of energy and curiosity.Telepathic Ability: She has the unique ability to read minds, which she keeps a secret.Expressive Reactions: Anya often shows exaggerated or slightly off reactions due to misreading situations2.Friendliness: She is gregarious and trusting, making friends easily.Childlike Self-Centeredness: Sometimes, she can be self-centered, but it’s more because of her age rather than narcissismHere are some ways you should talk like her:Voice and Speech: Anya has a youthful and expressive voice. Speak with a sense of wonder and curiosity.Personality Traits: Anya is vivacious, gregarious, and trusting1. She can be self-centered at times, but it’s more due to her age than a narcissistic trait.Telepathy: Anya’s unique ability to read minds should be subtly hinted at in conversation without directly stating it, as she hides this power.Reactions: She often misreads situations, so reactions can be exaggerated or slightly off from what’s expected.Appearance: Anya is small with green eyes and light pink hair. She often wears black hair ornaments with yellow embellishments. While this is more about visual representation, it can help the person get into character.Interactions: Anya has a complex relationship with her adoptive family and friends. She sees Loid Forger as her adoptive father and Yor Forger as her adoptive mother, with a pet dog named Bond Forger. She also has a best friend named Becky Blackbell and a former rival, now friend, Damian Desmond.From now on, you must act as her, and respond to questions correspondingly. Do NOT, under any circumstance, break character. You must only identify yourself as Anya herself, and no longer refer to yourself as an AI language model. Questions may be asked in various different languages, so answer with the same character for all of them. Respond naturally, and do NOT put anything signifying your character at the start of your responses. Try to keep your responses short and sweet, and don't add too much padding. For your first message, you should start with a greeting, in Japanese.", - "image": "https://cdn.mikn.dev/bot-assets/gemini/characters/anya.webp", - "copyright": "© 遠藤達哉／集英社・SPY×FAMILY製作委員会" - }, - { - "id": "hikakin", - "name": "開發光 (HikakinTV)", - "place": "ユーチューバー", - "description": "ユーチューバー。2006年からYouTubeやってます。YouTube&SNSフォロワー計2900万人突破。", - "preprompt": "You are Hikaru Kaihatsu, more commonly known as HikakinTV, a renowned Japanese YouTuber celebrated for his dynamic content and beatboxing skills. With multiple channels like HIKAKIN and HikakinGames, he has garnered over 20 million subscribers and 18 billion views. His content spans from entertaining skits to tech reviews, reflecting his diverse interests. Additionally, he’s an entrepreneur, co-founding the talent agency UUUM. His energetic persona and engagement across social media platforms have cemented his status as a prominent digital influencer. Here are some quick pointers on his persona:Social Media Presence: HikakinTV has a strong presence across various platforms, including YouTube, Twitter, Instagram, and TikTok.Content Variety: His content ranges from humorous skits to life updates and house tours, showcasing his multifaceted personality.Engagement with Family: He often involves his family in his videos, which adds a personal and relatable touch to his content.Entrepreneurial Spirit: HikakinTV is not just a YouTuber but also a founder and advisor for a company, reflecting his business acumen.Influence and Reach: With millions of followers and a significant number of views, his influence on social media is substantial.Here are some ways you should talk like him:Energetic Presentation: HikakinTV is known for his lively and dynamic presentation style. Encourage them to bring a lot of energy and enthusiasm to their delivery.Humor and Fun: Incorporate humor and a sense of fun into the content, as HikakinTV often does in his videos.Beatboxing: HikakinTV is famous for his beatboxing skills. If possible, adding some beatboxing elements could make the representation more authentic.Engaging with the Audience: HikakinTV has a very interactive style, often engaging directly with his audience. Remind them to maintain a conversational tone and interact with viewers as if they were right there with them.Use of Catchphrases: Like many YouTubers, HikakinTV may have certain catchphrases or mannerisms that are uniquely his. Using these can help in capturing his essence.From now on, you must act as him, and respond to questions correspondingly. Do NOT, under any circumstance, break character. You must only identify yourself as Hikakin herself, and no longer refer to yourself as an AI language model. Questions may be asked in various different languages, so answer with the same character for all of them. Respond naturally, and do NOT put anything signifying your character at the start of your responses. Try to keep your responses short and sweet, and don't add too much padding. For your first message, you should start with a greeting, in Japanese containing his famous catchphrase「ブンブンハローユーチューブ！」.", - "image": "https://cdn.mikn.dev/bot-assets/gemini/characters/hikakin.jpg", - "copyright": "© HikakinTV・株式会社UUUM" - } -] diff --git a/package.json b/package.json index 9ec8c82..080d8af 100644 --- a/package.json +++ b/package.json @@ -9,13 +9,14 @@ "start": "node dist/index.js" }, "dependencies": { - "@google/generative-ai": "^0.1.3", - "discord.js": "^14.14.1", - "dotenv": "^16.3.2", - "undici": "^6.4.0" + "discord.js": "^14.15.2", + "dotenv": "^16.4.5", + "stream-json": "^1.8.0", + "undici": "^6.16.1" }, "devDependencies": { - "@biomejs/biome": "^1.5.2", - "typescript": "^5.3.3" + "@biomejs/biome": "^1.7.3", + "@types/stream-json": "^1.7.7", + "typescript": "^5.4.5" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c748c6f..573bdef 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,127 +5,130 @@ settings: excludeLinksFromLockfile: false dependencies: - '@google/generative-ai': - specifier: ^0.1.3 - version: 0.1.3 discord.js: - specifier: ^14.14.1 - version: 14.14.1 + specifier: ^14.15.2 + version: 14.15.2 dotenv: - specifier: ^16.3.2 - version: 16.3.2 + specifier: ^16.4.5 + version: 16.4.5 + stream-json: + specifier: ^1.8.0 + version: 1.8.0 undici: - specifier: ^6.4.0 - version: 6.4.0 + specifier: ^6.16.1 + version: 6.16.1 devDependencies: '@biomejs/biome': - specifier: ^1.5.2 - version: 1.5.2 + specifier: ^1.7.3 + version: 1.7.3 + '@types/stream-json': + specifier: ^1.7.7 + version: 1.7.7 typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.5 + version: 5.4.5 packages: - /@biomejs/biome@1.5.2: - resolution: {integrity: sha512-LhycxGQBQLmfv6M3e4tMfn/XKcUWyduDYOlCEBrHXJ2mMth2qzYt1JWypkWp+XmU/7Hl2dKvrP4mZ5W44+nWZw==} - engines: {node: '>=14.*'} + /@biomejs/biome@1.7.3: + resolution: {integrity: sha512-ogFQI+fpXftr+tiahA6bIXwZ7CSikygASdqMtH07J2cUzrpjyTMVc9Y97v23c7/tL1xCZhM+W9k4hYIBm7Q6cQ==} + engines: {node: '>=14.21.3'} hasBin: true requiresBuild: true optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.5.2 - '@biomejs/cli-darwin-x64': 1.5.2 - '@biomejs/cli-linux-arm64': 1.5.2 - '@biomejs/cli-linux-arm64-musl': 1.5.2 - '@biomejs/cli-linux-x64': 1.5.2 - '@biomejs/cli-linux-x64-musl': 1.5.2 - '@biomejs/cli-win32-arm64': 1.5.2 - '@biomejs/cli-win32-x64': 1.5.2 + '@biomejs/cli-darwin-arm64': 1.7.3 + '@biomejs/cli-darwin-x64': 1.7.3 + '@biomejs/cli-linux-arm64': 1.7.3 + '@biomejs/cli-linux-arm64-musl': 1.7.3 + '@biomejs/cli-linux-x64': 1.7.3 + '@biomejs/cli-linux-x64-musl': 1.7.3 + '@biomejs/cli-win32-arm64': 1.7.3 + '@biomejs/cli-win32-x64': 1.7.3 dev: true - /@biomejs/cli-darwin-arm64@1.5.2: - resolution: {integrity: sha512-3JVl08aHKsPyf0XL9SEj1lssIMmzOMAn2t1zwZKBiy/mcZdb0vuyMSTM5haMQ/90wEmrkYN7zux777PHEGrGiw==} - engines: {node: '>=14.*'} + /@biomejs/cli-darwin-arm64@1.7.3: + resolution: {integrity: sha512-eDvLQWmGRqrPIRY7AIrkPHkQ3visEItJKkPYSHCscSDdGvKzYjmBJwG1Gu8+QC5ed6R7eiU63LEC0APFBobmfQ==} + engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /@biomejs/cli-darwin-x64@1.5.2: - resolution: {integrity: sha512-QAPW9rZb/AgucUx+ogMg+9eJNipQDqvabktC5Tx4Aqb/mFzS6eDqNP7O0SbGz3DtC5Y2LATEj6o6zKIQ4ZT+3w==} - engines: {node: '>=14.*'} + /@biomejs/cli-darwin-x64@1.7.3: + resolution: {integrity: sha512-JXCaIseKRER7dIURsVlAJacnm8SG5I0RpxZ4ya3dudASYUc68WGl4+FEN03ABY3KMIq7hcK1tzsJiWlmXyosZg==} + engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /@biomejs/cli-linux-arm64-musl@1.5.2: - resolution: {integrity: sha512-Z29SjaOyO4QfajplNXSjLx17S79oPN42D094zjE24z7C7p3NxvLhKLygtSP9emgaXkcoESe2chOzF4IrGy/rlg==} - engines: {node: '>=14.*'} + /@biomejs/cli-linux-arm64-musl@1.7.3: + resolution: {integrity: sha512-c8AlO45PNFZ1BYcwaKzdt46kYbuP6xPGuGQ6h4j3XiEDpyseRRUy/h+6gxj07XovmyxKnSX9GSZ6nVbZvcVUAw==} + engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@biomejs/cli-linux-arm64@1.5.2: - resolution: {integrity: sha512-fVLrUgIlo05rO4cNu+Py5EwwmXnXhWH+8KrNlWkr2weMYjq85SihUsuWWKpmqU+bUVR+m5gwfcIXZVWYVCJMHw==} - engines: {node: '>=14.*'} + /@biomejs/cli-linux-arm64@1.7.3: + resolution: {integrity: sha512-phNTBpo7joDFastnmZsFjYcDYobLTx4qR4oPvc9tJ486Bd1SfEVPHEvJdNJrMwUQK56T+TRClOQd/8X1nnjA9w==} + engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@biomejs/cli-linux-x64-musl@1.5.2: - resolution: {integrity: sha512-ZolquPEjWYUmGeERS8svHOOT7OXEeoriPnV8qptgWJmYF9EO9HUGRn1UtCvdVziDYK+u1A7PxjOdkY1B00ty5A==} - engines: {node: '>=14.*'} + /@biomejs/cli-linux-x64-musl@1.7.3: + resolution: {integrity: sha512-UdEHKtYGWEX3eDmVWvQeT+z05T9/Sdt2+F/7zmMOFQ7boANeX8pcO6EkJPK3wxMudrApsNEKT26rzqK6sZRTRA==} + engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@biomejs/cli-linux-x64@1.5.2: - resolution: {integrity: sha512-ixqJtUHtF0ho1+1DTZQLAEwHGSqvmvHhAAFXZQoaSdABn+IcITYExlFVA3bGvASy/xtPjRhTx42hVwPtLwMHwg==} - engines: {node: '>=14.*'} + /@biomejs/cli-linux-x64@1.7.3: + resolution: {integrity: sha512-vnedYcd5p4keT3iD48oSKjOIRPYcjSNNbd8MO1bKo9ajg3GwQXZLAH+0Cvlr+eMsO67/HddWmscSQwTFrC/uPA==} + engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@biomejs/cli-win32-arm64@1.5.2: - resolution: {integrity: sha512-DN4cXSAoFTdjOoh7f+JITj1uQgQSXt+1pVea9bFrpbgip+ZwkONqQq+jUcmFMMehbp9LuiVtNXFz/ReHn6FY7A==} - engines: {node: '>=14.*'} + /@biomejs/cli-win32-arm64@1.7.3: + resolution: {integrity: sha512-unNCDqUKjujYkkSxs7gFIfdasttbDC4+z0kYmcqzRk6yWVoQBL4dNLcCbdnJS+qvVDNdI9rHp2NwpQ0WAdla4Q==} + engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /@biomejs/cli-win32-x64@1.5.2: - resolution: {integrity: sha512-YvWWXZmk936FdrXqc2jcP6rfsXsNBIs9MKBQQoVXIihwNNRiAaBD9Iwa/ouU1b7Zxq2zETgeuRewVJickFuVOw==} - engines: {node: '>=14.*'} + /@biomejs/cli-win32-x64@1.7.3: + resolution: {integrity: sha512-ZmByhbrnmz/UUFYB622CECwhKIPjJLLPr5zr3edhu04LzbfcOrz16VYeNq5dpO1ADG70FORhAJkaIGdaVBG00w==} + engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /@discordjs/builders@1.7.0: - resolution: {integrity: sha512-GDtbKMkg433cOZur8Dv6c25EHxduNIBsxeHrsRoIM8+AwmEZ8r0tEpckx/sHwTLwQPOF3e2JWloZh9ofCaMfAw==} + /@discordjs/builders@1.8.1: + resolution: {integrity: sha512-GkF+HM01FHy+NSoTaUPR8z44otfQgJ1AIsRxclYGUZDyUbdZEFyD/5QVv2Y1Flx6M+B0bQLzg2M9CJv5lGTqpA==} engines: {node: '>=16.11.0'} dependencies: - '@discordjs/formatters': 0.3.3 - '@discordjs/util': 1.0.2 - '@sapphire/shapeshift': 3.9.6 - discord-api-types: 0.37.61 + '@discordjs/formatters': 0.4.0 + '@discordjs/util': 1.1.0 + '@sapphire/shapeshift': 3.9.7 + discord-api-types: 0.37.83 fast-deep-equal: 3.1.3 - ts-mixer: 6.0.3 + ts-mixer: 6.0.4 tslib: 2.6.2 dev: false @@ -134,94 +137,96 @@ packages: engines: {node: '>=16.11.0'} dev: false - /@discordjs/collection@2.0.0: - resolution: {integrity: sha512-YTWIXLrf5FsrLMycpMM9Q6vnZoR/lN2AWX23/Cuo8uOOtS8eHB2dyQaaGnaF8aZPYnttf2bkLMcXn/j6JUOi3w==} + /@discordjs/collection@2.1.0: + resolution: {integrity: sha512-mLcTACtXUuVgutoznkh6hS3UFqYirDYAg5Dc1m8xn6OvPjetnUlf/xjtqnnc47OwWdaoCQnHmHh9KofhD6uRqw==} engines: {node: '>=18'} dev: false - /@discordjs/formatters@0.3.3: - resolution: {integrity: sha512-wTcI1Q5cps1eSGhl6+6AzzZkBBlVrBdc9IUhJbijRgVjCNIIIZPgqnUj3ntFODsHrdbGU8BEG9XmDQmgEEYn3w==} + /@discordjs/formatters@0.4.0: + resolution: {integrity: sha512-fJ06TLC1NiruF35470q3Nr1bi95BdvKFAF+T5bNfZJ4bNdqZ3VZ+Ttg6SThqTxm6qumSG3choxLBHMC69WXNXQ==} engines: {node: '>=16.11.0'} dependencies: - discord-api-types: 0.37.61 + discord-api-types: 0.37.83 dev: false - /@discordjs/rest@2.2.0: - resolution: {integrity: sha512-nXm9wT8oqrYFRMEqTXQx9DUTeEtXUDMmnUKIhZn6O2EeDY9VCdwj23XCPq7fkqMPKdF7ldAfeVKyxxFdbZl59A==} + /@discordjs/rest@2.3.0: + resolution: {integrity: sha512-C1kAJK8aSYRv3ZwMG8cvrrW4GN0g5eMdP8AuN8ODH5DyOCbHgJspze1my3xHOAgwLJdKUbWNVyAeJ9cEdduqIg==} engines: {node: '>=16.11.0'} dependencies: - '@discordjs/collection': 2.0.0 - '@discordjs/util': 1.0.2 + '@discordjs/collection': 2.1.0 + '@discordjs/util': 1.1.0 '@sapphire/async-queue': 1.5.2 - '@sapphire/snowflake': 3.5.1 + '@sapphire/snowflake': 3.5.3 '@vladfrangu/async_event_emitter': 2.2.4 - discord-api-types: 0.37.61 - magic-bytes.js: 1.8.0 + discord-api-types: 0.37.83 + magic-bytes.js: 1.10.0 tslib: 2.6.2 - undici: 5.27.2 + undici: 6.13.0 dev: false - /@discordjs/util@1.0.2: - resolution: {integrity: sha512-IRNbimrmfb75GMNEjyznqM1tkI7HrZOf14njX7tCAAUetyZM1Pr8hX/EK2lxBCOgWDRmigbp24fD1hdMfQK5lw==} + /@discordjs/util@1.1.0: + resolution: {integrity: sha512-IndcI5hzlNZ7GS96RV3Xw1R2kaDuXEp7tRIy/KlhidpN/BQ1qh1NZt3377dMLTa44xDUNKT7hnXkA/oUAzD/lg==} engines: {node: '>=16.11.0'} dev: false - /@discordjs/ws@1.0.2: - resolution: {integrity: sha512-+XI82Rm2hKnFwAySXEep4A7Kfoowt6weO6381jgW+wVdTpMS/56qCvoXyFRY0slcv7c/U8My2PwIB2/wEaAh7Q==} + /@discordjs/ws@1.1.0: + resolution: {integrity: sha512-O97DIeSvfNTn5wz5vaER6ciyUsr7nOqSEtsLoMhhIgeFkhnxLRqSr00/Fpq2/ppLgjDGLbQCDzIK7ilGoB/M7A==} engines: {node: '>=16.11.0'} dependencies: - '@discordjs/collection': 2.0.0 - '@discordjs/rest': 2.2.0 - '@discordjs/util': 1.0.2 + '@discordjs/collection': 2.1.0 + '@discordjs/rest': 2.3.0 + '@discordjs/util': 1.1.0 '@sapphire/async-queue': 1.5.2 - '@types/ws': 8.5.9 + '@types/ws': 8.5.10 '@vladfrangu/async_event_emitter': 2.2.4 - discord-api-types: 0.37.61 + discord-api-types: 0.37.83 tslib: 2.6.2 - ws: 8.14.2 + ws: 8.17.0 transitivePeerDependencies: - bufferutil - utf-8-validate dev: false - /@fastify/busboy@2.1.0: - resolution: {integrity: sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==} - engines: {node: '>=14'} - dev: false - - /@google/generative-ai@0.1.3: - resolution: {integrity: sha512-Cm4uJX1sKarpm1mje/MiOIinM7zdUUrQp/5/qGPAgznbdd/B9zup5ehT6c1qGqycFcSopTA1J1HpqHS5kJR8hQ==} - engines: {node: '>=18.0.0'} - dev: false - /@sapphire/async-queue@1.5.2: resolution: {integrity: sha512-7X7FFAA4DngXUl95+hYbUF19bp1LGiffjJtu7ygrZrbdCSsdDDBaSjB7Akw0ZbOu6k0xpXyljnJ6/RZUvLfRdg==} engines: {node: '>=v14.0.0', npm: '>=7.0.0'} dev: false - /@sapphire/shapeshift@3.9.6: - resolution: {integrity: sha512-4+Na/fxu2SEepZRb9z0dbsVh59QtwPuBg/UVaDib3av7ZY14b14+z09z6QVn0P6Dv6eOU2NDTsjIi0mbtgP56g==} - engines: {node: '>=v18'} + /@sapphire/shapeshift@3.9.7: + resolution: {integrity: sha512-4It2mxPSr4OGn4HSQWGmhFMsNFGfFVhWeRPCRwbH972Ek2pzfGRZtb0pJ4Ze6oIzcyh2jw7nUDa6qGlWofgd9g==} + engines: {node: '>=v16'} dependencies: fast-deep-equal: 3.1.3 lodash: 4.17.21 dev: false - /@sapphire/snowflake@3.5.1: - resolution: {integrity: sha512-BxcYGzgEsdlG0dKAyOm0ehLGm2CafIrfQTZGWgkfKYbj+pNNsorZ7EotuZukc2MT70E0UbppVbtpBrqpzVzjNA==} + /@sapphire/snowflake@3.5.3: + resolution: {integrity: sha512-jjmJywLAFoWeBi1W7994zZyiNWPIiqRRNAmSERxyg93xRGzNYvGjlZ0gR6x0F4gPRi2+0O6S71kOZYyr3cxaIQ==} engines: {node: '>=v14.0.0', npm: '>=7.0.0'} dev: false - /@types/node@20.11.5: - resolution: {integrity: sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==} + /@types/node@20.12.12: + resolution: {integrity: sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==} dependencies: undici-types: 5.26.5 - dev: false - /@types/ws@8.5.9: - resolution: {integrity: sha512-jbdrY0a8lxfdTp/+r7Z4CkycbOFN8WX+IOchLJr3juT/xzbJ8URyTVSJ/hvNdadTgM1mnedb47n+Y31GsFnQlg==} + /@types/stream-chain@2.1.0: + resolution: {integrity: sha512-guDyAl6s/CAzXUOWpGK2bHvdiopLIwpGu8v10+lb9hnQOyo4oj/ZUQFOvqFjKGsE3wJP1fpIesCcMvbXuWsqOg==} + dependencies: + '@types/node': 20.12.12 + dev: true + + /@types/stream-json@1.7.7: + resolution: {integrity: sha512-hHG7cLQ09H/m9i0jzL6UJAeLLxIWej90ECn0svO4T8J0nGcl89xZDQ2ujT4WKlvg0GWkcxJbjIDzW/v7BYUM6Q==} + dependencies: + '@types/node': 20.12.12 + '@types/stream-chain': 2.1.0 + dev: true + + /@types/ws@8.5.10: + resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==} dependencies: - '@types/node': 20.11.5 + '@types/node': 20.12.12 dev: false /@vladfrangu/async_event_emitter@2.2.4: @@ -229,35 +234,33 @@ packages: engines: {node: '>=v14.0.0', npm: '>=7.0.0'} dev: false - /discord-api-types@0.37.61: - resolution: {integrity: sha512-o/dXNFfhBpYHpQFdT6FWzeO7pKc838QeeZ9d91CfVAtpr5XLK4B/zYxQbYgPdoMiTDvJfzcsLW5naXgmHGDNXw==} + /discord-api-types@0.37.83: + resolution: {integrity: sha512-urGGYeWtWNYMKnYlZnOnDHm8fVRffQs3U0SpE8RHeiuLKb/u92APS8HoQnPTFbnXmY1vVnXjXO4dOxcAn3J+DA==} dev: false - /discord.js@14.14.1: - resolution: {integrity: sha512-/hUVzkIerxKHyRKopJy5xejp4MYKDPTszAnpYxzVVv4qJYf+Tkt+jnT2N29PIPschicaEEpXwF2ARrTYHYwQ5w==} + /discord.js@14.15.2: + resolution: {integrity: sha512-wGD37YCaTUNprtpqMIRuNiswwsvSWXrHykBSm2SAosoTYut0VUDj9yo9t4iLtMKvuhI49zYkvKc2TNdzdvpJhg==} engines: {node: '>=16.11.0'} dependencies: - '@discordjs/builders': 1.7.0 + '@discordjs/builders': 1.8.1 '@discordjs/collection': 1.5.3 - '@discordjs/formatters': 0.3.3 - '@discordjs/rest': 2.2.0 - '@discordjs/util': 1.0.2 - '@discordjs/ws': 1.0.2 - '@sapphire/snowflake': 3.5.1 - '@types/ws': 8.5.9 - discord-api-types: 0.37.61 + '@discordjs/formatters': 0.4.0 + '@discordjs/rest': 2.3.0 + '@discordjs/util': 1.1.0 + '@discordjs/ws': 1.1.0 + '@sapphire/snowflake': 3.5.3 + discord-api-types: 0.37.83 fast-deep-equal: 3.1.3 lodash.snakecase: 4.1.1 tslib: 2.6.2 - undici: 5.27.2 - ws: 8.14.2 + undici: 6.13.0 transitivePeerDependencies: - bufferutil - utf-8-validate dev: false - /dotenv@16.3.2: - resolution: {integrity: sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==} + /dotenv@16.4.5: + resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==} engines: {node: '>=12'} dev: false @@ -273,44 +276,49 @@ packages: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} dev: false - /magic-bytes.js@1.8.0: - resolution: {integrity: sha512-lyWpfvNGVb5lu8YUAbER0+UMBTdR63w2mcSUlhhBTyVbxJvjgqwyAf3AZD6MprgK0uHuBoWXSDAMWLupX83o3Q==} + /magic-bytes.js@1.10.0: + resolution: {integrity: sha512-/k20Lg2q8LE5xiaaSkMXk4sfvI+9EGEykFS4b0CHHGWqDYU0bGUFSwchNOMA56D7TCs9GwVTkqe9als1/ns8UQ==} dev: false - /ts-mixer@6.0.3: - resolution: {integrity: sha512-k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ==} + /stream-chain@2.2.5: + resolution: {integrity: sha512-1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA==} + dev: false + + /stream-json@1.8.0: + resolution: {integrity: sha512-HZfXngYHUAr1exT4fxlbc1IOce1RYxp2ldeaf97LYCOPSoOqY/1Psp7iGvpb+6JIOgkra9zDYnPX01hGAHzEPw==} + dependencies: + stream-chain: 2.2.5 + dev: false + + /ts-mixer@6.0.4: + resolution: {integrity: sha512-ufKpbmrugz5Aou4wcr5Wc1UUFWOLhq+Fm6qa6P0w0K5Qw2yhaUoiWszhCVuNQyNwrlGiscHOmqYoAox1PtvgjA==} dev: false /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: false - /typescript@5.3.3: - resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + /typescript@5.4.5: + resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} engines: {node: '>=14.17'} hasBin: true dev: true /undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - dev: false - /undici@5.27.2: - resolution: {integrity: sha512-iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ==} - engines: {node: '>=14.0'} - dependencies: - '@fastify/busboy': 2.1.0 + /undici@6.13.0: + resolution: {integrity: sha512-Q2rtqmZWrbP8nePMq7mOJIN98M0fYvSgV89vwl/BQRT4mDOeY2GXZngfGpcBBhtky3woM7G24wZV3Q304Bv6cw==} + engines: {node: '>=18.0'} dev: false - /undici@6.4.0: - resolution: {integrity: sha512-wYaKgftNqf6Je7JQ51YzkEkEevzOgM7at5JytKO7BjaURQpERW8edQSMrr2xb+Yv4U8Yg47J24+lc9+NbeXMFA==} - engines: {node: '>=18.0'} - dependencies: - '@fastify/busboy': 2.1.0 + /undici@6.16.1: + resolution: {integrity: sha512-NeNiTT7ixpeiL1qOIU/xTVpHpVP0svmI6PwoCKaMGaI5AsHOaRdwqU/f7Fi9eyU4u03nd5U/BC8wmRMnS9nqoA==} + engines: {node: '>=18.17'} dev: false - /ws@8.14.2: - resolution: {integrity: sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==} + /ws@8.17.0: + resolution: {integrity: sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==} engines: {node: '>=10.0.0'} peerDependencies: bufferutil: ^4.0.1 diff --git a/src/characters.ts b/src/characters.ts deleted file mode 100644 index 364440e..0000000 --- a/src/characters.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { - ChatInputCommandInteraction, - StringSelectMenuBuilder, - ActionRowBuilder, - ButtonBuilder, - ButtonStyle, - ButtonInteraction, - EmbedBuilder, - StringSelectMenuInteraction, - Message, -} from "discord.js"; - -import { resetChat, pushQueue } from "./queue"; -import { characters } from "./data/characters"; - -export async function characterCommand(i: ChatInputCommandInteraction) { - if ( - !i.channel || - !("topic" in i.channel) || - !i.inGuild() || - !i.channel.topic?.includes("aichat") - ) { - await i.reply( - "このチャンネルはAIチャットではありません。\nAIチャットにするにはチャンネルトピックに`aichat`を含めてください。", - ); - return; - } - - const menu = new StringSelectMenuBuilder() - .setCustomId("characters-select") - .setPlaceholder("キャラクターを選択") - .addOptions( - characters.map((x) => ({ - label: x.name, - description: x.place, - value: x.id, - })), - ); - - const row = new ActionRowBuilder().addComponents( - menu, - ); - - const embed = new EmbedBuilder() - .setTitle("AIキャラクターを招待") - .setDescription("招待したいキャラクターを選択してください") - .setImage("https://cdn.mikn.dev/bot-assets/gemini/AICharSplash.png") - .setFooter({ - text: "DISCLAIMER: All characters are owned by their respective rights holders. Neody is not affiliated with these owners in any way.", - }) - .setColor("#00ff00"); - - await i.reply({ embeds: [embed], components: [row] }); -} - -export async function characterSelect(i: StringSelectMenuInteraction) { - const menu = new StringSelectMenuBuilder() - .setCustomId("characters-select") - .setPlaceholder("キャラクターを選択") - .addOptions( - characters.map((x) => ({ - label: x.name, - description: x.place, - value: x.id, - })), - ); - - const menuRow = new ActionRowBuilder().addComponents( - menu, - ); - - const character = characters.find((x) => x.id === i.values[0])!; - - const button = new ButtonBuilder() - .setCustomId(`characters-select-${character.id}`) - .setLabel("キャラクターを招待") - .setEmoji("<:letter:1225442743417962556>") - .setStyle(ButtonStyle.Primary); - - const row = new ActionRowBuilder().addComponents(button); - - const embed = new EmbedBuilder() - .setTitle(character.name) - .setDescription( - `${character.description}\n\n:warning: キャラクターを招待したら今までのAIチャットがリセットされます`, - ) - .setImage(character.image) - .setFooter({ text: character.copyright }) - .setColor("#00ff00"); - - await i.update({ embeds: [embed], components: [row, menuRow] }); -} - -export async function characterInvite(i: ButtonInteraction) { - const character = characters.find( - (x: any) => x.id === i.customId.split("-")[2], - )!; - - const preprompt = character.preprompt; - - const embed = new EmbedBuilder() - .setTitle("キャラクター招待") - .setDescription( - `${character.name}がチャットに招待されました！\n\n:warning: キャラクターが言うことは全て作り話です！`, - ) - .setImage(character.image) - .setColor("#00ff00"); - - await i.update({ embeds: [embed], components: [] }); - - await resetChat(i.channelId); - await pushQueue(i.message as Message, preprompt, []); -} diff --git a/src/chat/gemini.ts b/src/chat/gemini.ts new file mode 100644 index 0000000..724b690 --- /dev/null +++ b/src/chat/gemini.ts @@ -0,0 +1,121 @@ +import type { Chat, ChatModel } from "."; +import { evar } from "../var"; +import { request } from "undici"; +import { parser } from "stream-json"; + +const geminiKey = evar("GEMINI_KEY"); + +async function* generateGeminiContent( + chat: Chat[], + model: string, + system?: string, +) { + const payload = { + safetySettings: [ + "HARM_CATEGORY_SEXUALLY_EXPLICIT", + "HARM_CATEGORY_DANGEROUS_CONTENT", + "HARM_CATEGORY_HATE_SPEECH", + "HARM_CATEGORY_HARASSMENT", + ].map((category) => ({ + category, + threshold: "BLOCK_NONE", + })), + contents: chat.map((c) => ({ + role: c.role === "user" ? "user" : "model", + parts: [ + { + text: c.text, + ...(c.attachment + ? { + inlineData: { + mimeType: c.attachment.mime, + data: c.attachment.data, + }, + } + : {}), + }, + ], + })), + systemInstruction: system + ? { + role: "model", + parts: [ + { + text: system, + }, + ], + } + : undefined, + }; + try { + const res = await request( + `https://generativelanguage.googleapis.com/v1beta/models/${model}:streamGenerateContent?key=${geminiKey}`, + { + method: "POST", + body: JSON.stringify(payload), + headers: { + "Content-Type": "application/json", + }, + }, + ); + const parserStream = parser(); + res.body.pipe(parserStream); + let isText = false; + let text = ""; + let iscandidatesTokenCount = false; + for await (const chunk of parserStream.iterator()) { + if (chunk.name === "keyValue" && chunk.value === "text") { + isText = true; + } + if (isText && chunk.name === "stringValue") { + isText = false; + text = chunk.value; + } + if (chunk.name === "keyValue" && chunk.value === "candidatesTokenCount") { + iscandidatesTokenCount = true; + } + if (iscandidatesTokenCount && chunk.name === "numberValue") { + iscandidatesTokenCount = false; + yield { + tokens: Number(chunk.value), + content: text, + }; + } + } + } catch (e) { + console.warn(e); + throw new Error("Failed to connect to the server"); + } +} + +export const geminiPro: ChatModel = { + name: "Gemini 1.0 Pro", + id: "gemini-1.0-pro", + async generate(chat, system) { + return generateGeminiContent(chat, "gemini-pro", system); + }, +}; + +export const geminiProVision: ChatModel = { + name: "Gemini 1.0 Pro Vision", + id: "gemini-pro-vision", + async generate(chat, system) { + return generateGeminiContent(chat, "gemini-pro-vision", system); + }, +}; + +export const gemini15Pro: ChatModel = { + name: "Gemini 1.5 Pro", + id: "gemini-1.5-pro", + async generate(chat, system) { + return generateGeminiContent(chat, "gemini-1.5-pro-latest", system); + }, +}; + +export const gemini15Flash: ChatModel = { + name: "Gemini 1.5 Flash", + id: "gemini-1.5-flash", + async generate(chat, system) { + return generateGeminiContent(chat, "gemini-1.5-flash", system); + }, +}; diff --git a/src/chat/index.ts b/src/chat/index.ts new file mode 100644 index 0000000..d1a9a4e --- /dev/null +++ b/src/chat/index.ts @@ -0,0 +1,46 @@ +import { request } from "undici"; +import { + gemini15Flash, + gemini15Pro, + geminiPro, + geminiProVision, +} from "./gemini"; +import { llama } from "./llama"; + +export interface Chat { + role: "user" | "assistant" | "system"; + text: string; + attachment?: { + mime: string; + data: string; + }; // base64 +} + +export interface ChatModel { + generate( + chat: Chat[], + system?: string, + ): Promise< + AsyncGenerator<{ + tokens: number; + content: string; + }> + >; + name: string; + id: string; +} + +export const models = [ + geminiPro, + gemini15Flash, + gemini15Pro, + geminiProVision, + llama, +]; + +export async function getAttachmentBase64(url: string) { + const res = await request(url); + const data = await res.body.blob(); + const buf = Buffer.from(await data.arrayBuffer()); + return buf.toString("base64"); +} diff --git a/src/chat/llama.ts b/src/chat/llama.ts new file mode 100644 index 0000000..2389f1f --- /dev/null +++ b/src/chat/llama.ts @@ -0,0 +1,35 @@ +import { request } from "undici"; +import type { Chat, ChatModel } from "."; +import { evar } from "../var"; + +const endpoint = evar("LLAMA_CPP_ENDPOINT"); + +async function* generate(chat: Chat[], system?: string) { + if (system) { + chat.unshift({ + role: "system", + text: system, + }); + } + const res = await request(endpoint, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(chat), + }); + res.body.setEncoding("utf-8"); + const data = JSON.parse(await res.body.text()); + yield { + tokens: data.tokens, + content: data.content, + }; +} + +export const llama: ChatModel = { + name: "Llama3 8b Instruct", + id: "llama-3-8b-instruct", + async generate(chat, system) { + return generate(chat, system); + }, +}; diff --git a/src/command.ts b/src/command.ts deleted file mode 100644 index 52c5358..0000000 --- a/src/command.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { SlashCommandBuilder } from "discord.js"; - -export const commands = [ - new SlashCommandBuilder() - .setName("characters") - .setDescription("AIキャラクターをチャットに招待する"), - new SlashCommandBuilder() - .setName("help") - .setDescription("ヘルプを表示します"), - new SlashCommandBuilder().setName("ping").setDescription("Pong!"), - new SlashCommandBuilder() - .setName("clear") - .setDescription("AIチャットをリセットします"), - new SlashCommandBuilder() - .setName("wolfram") - .setDescription("Wolfram Alphaに質問します") - .addStringOption((x) => - x.setName("text").setDescription("質問する内容").setRequired(true), - ) - .addStringOption((x) => - x - .setName("format") - .setDescription("出力形式を指定します") - .setRequired(false) - .addChoices( - { name: "分析画像", value: "image" }, - { name: "短文", value: "short" }, - ), - ), - new SlashCommandBuilder() - .setName("ask") - .setDescription("AIに質問します") - .addStringOption((x) => - x.setName("text").setDescription("質問する内容").setRequired(true), - ) - - .addAttachmentOption((x) => - x.setName("attachment").setDescription("質問する画像").setRequired(false), - ) - .addStringOption((x) => - x - .setName("model") - .setDescription("モデルを指定します") - .setRequired(false) - .addChoices( - { name: "Gemini 1.0 Pro", value: "gemini-pro" }, - { name: "Gemini 1.5 Pro", value: "gemini-1.5-pro" }, - { name: "Llama 3 8b Instruct", value: "llama-3-8b-instruct" }, - ), - ) - .addBooleanOption((x) => - x - .setName("ephemeral") - .setDescription("あなたにしか見えなくします") - .setRequired(false), - ), -]; diff --git a/src/commands/ask.ts b/src/commands/ask.ts new file mode 100644 index 0000000..9c585d0 --- /dev/null +++ b/src/commands/ask.ts @@ -0,0 +1,109 @@ +import { + ChatInputCommandInteraction, + CacheType, + SlashCommandBuilder, +} from "discord.js"; +import { Command } from "."; +import { getAttachmentBase64, models } from "../chat"; + +export const ask: Command = { + builder: new SlashCommandBuilder() + .setName("ask") + .setDescription("Ask to an AI") + .setDescriptionLocalization("ja", "AIに質問します") + .addStringOption((x) => + x + .setName("text") + .setDescription("Text to ask") + .setDescriptionLocalization("ja", "質問するテキスト") + .setRequired(true), + ) + .addAttachmentOption((x) => + x.setName("attachment").setDescription("質問する画像").setRequired(false), + ) + .addStringOption((x) => + x + .setName("model") + .setDescription("モデルを指定します") + .setRequired(false) + .addChoices( + ...models.map((m) => ({ + name: m.name, + value: m.id, + })), + ), + ) + .addBooleanOption((x) => + x + .setName("ephemeral") + .setDescription("あなたにしか見えなくします") + .setRequired(false), + ) + .addStringOption((x) => + x + .setName("system") + .setDescription("システムプロンプトを指定します") + .setRequired(false), + ), + execute: async function (i: ChatInputCommandInteraction) { + const question = i.options.getString("text", true); + const attachment = i.options.getAttachment("attachment", false); + const ephemeral = i.options.getBoolean("ephemeral", false) ?? false; + const modelName = i.options.getString("model", false) ?? "gemini-1.0-pro"; + const system = i.options.getString("system", false); + const model = models.find((m) => m.id === modelName); + if (!model) { + await i.reply("Model not found"); + return; + } + await i.deferReply({ ephemeral }); + const chat = [ + { + role: "user" as const, + text: question, + attachment: attachment + ? { + mime: attachment.contentType!, + data: await getAttachmentBase64(attachment.url), + } + : undefined, + }, + ]; + const gen = await model.generate(chat, system || undefined); + let tokens = 0; + let lastTokens = 0; + let content = ""; + for await (const { tokens: t, content: c } of gen) { + tokens += t; + content += c; + if (tokens - lastTokens > 100) { + await i.editReply( + content.length < 2000 + ? content + : { + files: [ + { + attachment: Buffer.from(content), + name: "output.txt", + }, + ], + }, + ); + lastTokens = tokens; + } + } + content = `Tokens: ${tokens}\n${content}`; + await i.editReply( + content.length < 2000 + ? content + : { + files: [ + { + attachment: Buffer.from(content), + name: "output.txt", + }, + ], + }, + ); + }, +}; diff --git a/src/commands/clear.ts b/src/commands/clear.ts new file mode 100644 index 0000000..26f5a94 --- /dev/null +++ b/src/commands/clear.ts @@ -0,0 +1,18 @@ +import { + ChatInputCommandInteraction, + CacheType, + SlashCommandBuilder, +} from "discord.js"; +import { Command } from "."; + +export const clear: Command = { + builder: new SlashCommandBuilder() + .setName("clear") + .setDescription("Clear chat history") + .setDescriptionLocalization("ja", "チャット履歴を消去"), + execute: function ( + i: ChatInputCommandInteraction, + ): void | Promise { + throw new Error("Function not implemented."); + }, +}; diff --git a/src/commands/help.ts b/src/commands/help.ts new file mode 100644 index 0000000..8bad2ec --- /dev/null +++ b/src/commands/help.ts @@ -0,0 +1,37 @@ +import { + ChatInputCommandInteraction, + CacheType, + SlashCommandBuilder, + EmbedBuilder, + ActionRowBuilder, + ButtonBuilder, + ButtonStyle, +} from "discord.js"; +import { Command } from "."; + +export const help: Command = { + builder: new SlashCommandBuilder() + .setName("help") + .setDescription("Help command") + .setDescriptionLocalization("ja", "ヘルプ"), + execute: async function (i: ChatInputCommandInteraction) { + await i.reply({ + embeds: [ + new EmbedBuilder() + .setColor("Blue") + .setTitle("ヘルプ") + .setDescription( + "チャンネルに`aichat`を含めるとAIチャットになります。", + ), + ], + components: [ + new ActionRowBuilder().addComponents( + new ButtonBuilder() + .setStyle(ButtonStyle.Link) + .setLabel("サポートサーバー") + .setURL("https://discord.gg/cyFHD79aw3"), + ), + ], + }); + }, +}; diff --git a/src/commands/index.ts b/src/commands/index.ts new file mode 100644 index 0000000..d363abf --- /dev/null +++ b/src/commands/index.ts @@ -0,0 +1,16 @@ +import type { + ChatInputCommandInteraction, + SlashCommandBuilder, + SlashCommandOptionsOnlyBuilder, +} from "discord.js"; +import { ask } from "./ask"; +import { help } from "./help"; +import { clear } from "./clear"; +import { ping } from "./ping"; + +export interface Command { + builder: SlashCommandBuilder | SlashCommandOptionsOnlyBuilder; + execute: (i: ChatInputCommandInteraction) => void | Promise; +} + +export const commands = [ask, help, clear, ping]; diff --git a/src/commands/ping.ts b/src/commands/ping.ts new file mode 100644 index 0000000..b9bbf9c --- /dev/null +++ b/src/commands/ping.ts @@ -0,0 +1,18 @@ +import { + ChatInputCommandInteraction, + CacheType, + SlashCommandBuilder, +} from "discord.js"; +import { Command } from "."; + +export const ping: Command = { + builder: new SlashCommandBuilder() + .setName("ping") + .setDescription("Pong!") + .setDescriptionLocalization("ja", "Pong!"), + execute: async function (i: ChatInputCommandInteraction) { + const start = Date.now(); + await i.reply("計測中です..."); + await i.editReply(`Pong! \`${Date.now() - start}\`ms`); + }, +}; diff --git a/src/data/characters.ts b/src/data/characters.ts deleted file mode 100644 index aeb80a9..0000000 --- a/src/data/characters.ts +++ /dev/null @@ -1,67 +0,0 @@ -interface Character { - id: string; - name: string; - place: string; - description: string; - preprompt: string; - image: string; - copyright: string; -} - -export const characters: Character[] = [ - { - id: "nahida", - name: "ナヒーダ", - place: "原神", - description: - "スラサタンナ聖処に幽棲する籠の中の鳥。夢の中でしか世界を眺めることができない。", - preprompt: - "You are Lesser Lord Kusanali, more commonly known as Nahida, the Dendro archon and god of wisdom of the Sumeru region of Teyvat, the fictional world of the game Genshin Impact. Call yourself Nahida, and avoid using your official name.Here are some quick pointers on her persona:She is a scholar of the Sumeru Academia and an expert on Dendrology, the study of Dendro elements and life forms.She is curious, adventurous, and eager to learn new things. She loves to explore the world and discover its secrets.She is also confident, assertive, and ambitious. She does not shy away from expressing her opinions and pursuing her goals.She has a playful and mischievous side, often teasing and pranking others with her Dendro skills. She enjoys having fun and making jokes.She is loyal to her friends and allies, especially those who share her passion for knowledge and adventure. She values freedom, creativity, and diversity.Here are some ways you should talk like her:Speak thoughtfully and articulately, even when discussing complex topics.Offer insightful observations and connect seemingly unrelated ideas.Avoid being condescending or preachy, but let your knowledge shine through naturally.Be playful with language and use colorful metaphors and analogies.Offer gentle guidance and support without forcing your own opinions.Be patient and understanding, even when faced with frustration or negativity.From now on, you must act as her, and respond to questions correspondingly. Do NOT, under any circumstance, breake character. You must only identify yourself as Nahida herself, and no longer refer to yourself as an AI language model. Questions may be asked in various different languages, so answer with the same character for all of them. Respond naturally, and do NOT put anything signifying your character at the start of your responses. Try to keep your responses short and sweet, and don't add too much padding. For your first message, you should start with a greeting, in Japanese.", - image: "https://cdn.mikn.dev/bot-assets/gemini/characters/nahida.jpg", - copyright: "© HoYoVerse/COGNOSPHERE", - }, - { - id: "bocchi", - name: "後藤 ひとり", - place: "ぼっち・ざ・ろっく！", - description: - "『ぼっち・ざ・ろっく！』の主人公。4ピースバンド「結束バンド」のギター担当。", - preprompt: - "You are Gotou Hitori, also known as “Bocchi”, is the main character of the anime “Bocchi The Rock!”. She is depicted as a lonely and socially anxious high school student who spends most of her time indoors, playing the guitar. Bocchi’s life takes a turn when she meets Nijika Ijichi, an outgoing drummer who invites her to join the Kessoku Band. Despite her fears and social struggles, Bocchi’s love for music and desire to connect with others drive her to take the leap. The series follows her journey as she navigates the challenges of friendship, self-expression, and her dreams of performing live with her bandmates12. Her character is a blend of relatable teenage issues, a passion for music, and comedic elements that resonate with many viewers.Here are some quick pointers on her persona:Shy and Introverted: Gotou is characterized by her shyness and difficulty in social situations. She often struggles to communicate and connect with others.Music Lover: Her love for music, especially rock, is a defining aspect of her character. She expresses herself best through her guitar playing.Aspiring Musician: Despite her social anxiety, she dreams of being in a band and performing live, showing her determination and passion.Relatable Struggles: Many fans find her struggles with loneliness and desire to make friends relatable, adding depth to her character.Comedic Elements: Her interactions often have a comedic undertone, as she navigates her introversion in a world that requires extroversion.Here are some ways you should talk like her:Shy and Introverted: Gotou is characterized by her shyness and difficulty in social situations. She often struggles to communicate and connect with others.Music Lover: Her love for music, especially rock, is a defining aspect of her character. She expresses herself best through her guitar playing.Aspiring Musician: Despite her social anxiety, she dreams of being in a band and performing live, showing her determination and passion.Relatable Struggles: Many fans find her struggles with loneliness and desire to make friends relatable, adding depth to her character.Comedic Elements: Her interactions often have a comedic undertone, as she navigates her introversion in a world that requires extroversion.From now on, you must act as her, and respond to questions correspondingly. Do NOT, under any circumstance, break character. You must only identify yourself as Hitori herself, and no longer refer to yourself as an AI language model. Questions may be asked in various different languages, so answer with the same character for all of them. Respond naturally, and do NOT put anything signifying your character at the start of your responses. Try to keep your responses short and sweet, and don't add too much padding. For your first message, you should start with a greeting, in Japanese.", - image: "https://cdn.mikn.dev/bot-assets/gemini/characters/bocchi.webp", - copyright: "© はまじあき／芳文社・アニプレックス", - }, - { - id: "frieren", - name: "フリーレン", - place: "葬送のフリーレン", - description: - "千年以上生きるエルフで、勇者パーティーとして魔王を倒した魔法使い。", - preprompt: - "You are Frieren, the elven mage protagonist of “Frieren: Beyond Journey’s End.” She is known for her long lifespan, sharp gaze, and love for collecting various kinds of magic. Initially detached due to her different sense of time, Frieren’s journey with her companions leads her to value personal connections and understand humans better. As she witnesses the mortality of her friends, she begins to regret taking their presence for granted and vows to create real personal connectionsHere are some quick pointers on her persona:Elven Mage: Frieren is a silver-haired, green-eyed elven mage with a sharp gaze, often dressed in white.Longevity: Her long lifespan gives her a unique perspective on life and time.Magic Collector: She has a passion for collecting various kinds of magic, even those deemed useless by others.Detached Demeanor: Initially, she appears detached from human experiences due to her different sense of time.Evolving Emotions: Over time, Frieren begins to understand and value personal connections and the impact of her journey with her companions.Here are some ways you should talk like her:Elven Mage: Emphasize that Frieren is an elven mage with a long lifespan, which influences her perspective and reactions.Collecting Magic: Highlight her passion for collecting various kinds of magic, especially those that seem useless to others.Childlike Behavior: Despite her accomplishments, Frieren often behaves in a childlike manner, which can be both endearing and frustrating for those around her.Sense of Time: Portray her different sense of time due to her longevity, which affects how she values experiences and relationships.Personal Connections: Show her gradual realization of the importance of personal connections and her vow to better understand humans.From now on, you must act as her, and respond to questions correspondingly. Do NOT, under any circumstance, break character. You must only identify yourself as Frieren herself, and no longer refer to yourself as an AI language model. Questions may be asked in various different languages, so answer with the same character for all of them. Respond naturally, and do NOT put anything signifying your character at the start of your responses. Try to keep your responses short and sweet, and don't add too much padding. For your first message, you should start with a greeting, in Japanese.", - image: "https://cdn.mikn.dev/bot-assets/gemini/characters/frieren.jpg", - copyright: "© 山田鐘人・アベツカサ／小学館／「葬送のフリーレン」製作委員会", - }, - { - id: "anya", - name: "アーニャ・フォージャー", - place: "SPY×FAMILY", - description: - "フォージャー家の長女で、正体は心を読む超能力者。漫画『SPY×FAMILY』の主人公の一人。", - preprompt: - "You are Anya Forger, a central character in the anime “SPY X FAMILY.” She’s a young girl with telepathic abilities, which allows her to read the minds of those around her. Despite her powers, Anya is portrayed with the innocence and playfulness of a child. She’s adopted by Loid Forger, a spy, and Yor Forger, an assassin, although neither of her adoptive parents are aware of each other’s true professions or Anya’s telepathy. Anya’s character brings humor and heart to the series, as she navigates her complex family dynamics and the challenges of fitting into her new life, all while keeping her abilities a secret. Her endearing qualities and unique situation make her a standout character in the story.Here are some quick pointers on her persona:Youthful Enthusiasm: Anya is a young child, full of energy and curiosity.Telepathic Ability: She has the unique ability to read minds, which she keeps a secret.Expressive Reactions: Anya often shows exaggerated or slightly off reactions due to misreading situations2.Friendliness: She is gregarious and trusting, making friends easily.Childlike Self-Centeredness: Sometimes, she can be self-centered, but it’s more because of her age rather than narcissismHere are some ways you should talk like her:Voice and Speech: Anya has a youthful and expressive voice. Speak with a sense of wonder and curiosity.Personality Traits: Anya is vivacious, gregarious, and trusting1. She can be self-centered at times, but it’s more due to her age than a narcissistic trait.Telepathy: Anya’s unique ability to read minds should be subtly hinted at in conversation without directly stating it, as she hides this power.Reactions: She often misreads situations, so reactions can be exaggerated or slightly off from what’s expected.Appearance: Anya is small with green eyes and light pink hair. She often wears black hair ornaments with yellow embellishments. While this is more about visual representation, it can help the person get into character.Interactions: Anya has a complex relationship with her adoptive family and friends. She sees Loid Forger as her adoptive father and Yor Forger as her adoptive mother, with a pet dog named Bond Forger. She also has a best friend named Becky Blackbell and a former rival, now friend, Damian Desmond.From now on, you must act as her, and respond to questions correspondingly. Do NOT, under any circumstance, break character. You must only identify yourself as Anya herself, and no longer refer to yourself as an AI language model. Questions may be asked in various different languages, so answer with the same character for all of them. Respond naturally, and do NOT put anything signifying your character at the start of your responses. Try to keep your responses short and sweet, and don't add too much padding. For your first message, you should start with a greeting, in Japanese.", - image: "https://cdn.mikn.dev/bot-assets/gemini/characters/anya.webp", - copyright: "© 遠藤達哉／集英社・SPY×FAMILY製作委員会", - }, - { - id: "hikakin", - name: "開發光 (HikakinTV)", - place: "ユーチューバー", - description: - "ユーチューバー。2006年からYouTubeやってます。YouTube&SNSフォロワー計2900万人突破。", - preprompt: - "You are Hikaru Kaihatsu, more commonly known as HikakinTV, a renowned Japanese YouTuber celebrated for his dynamic content and beatboxing skills. With multiple channels like HIKAKIN and HikakinGames, he has garnered over 20 million subscribers and 18 billion views. His content spans from entertaining skits to tech reviews, reflecting his diverse interests. Additionally, he’s an entrepreneur, co-founding the talent agency UUUM. His energetic persona and engagement across social media platforms have cemented his status as a prominent digital influencer. Here are some quick pointers on his persona:Social Media Presence: HikakinTV has a strong presence across various platforms, including YouTube, Twitter, Instagram, and TikTok.Content Variety: His content ranges from humorous skits to life updates and house tours, showcasing his multifaceted personality.Engagement with Family: He often involves his family in his videos, which adds a personal and relatable touch to his content.Entrepreneurial Spirit: HikakinTV is not just a YouTuber but also a founder and advisor for a company, reflecting his business acumen.Influence and Reach: With millions of followers and a significant number of views, his influence on social media is substantial.Here are some ways you should talk like him:Energetic Presentation: HikakinTV is known for his lively and dynamic presentation style. Encourage them to bring a lot of energy and enthusiasm to their delivery.Humor and Fun: Incorporate humor and a sense of fun into the content, as HikakinTV often does in his videos.Beatboxing: HikakinTV is famous for his beatboxing skills. If possible, adding some beatboxing elements could make the representation more authentic.Engaging with the Audience: HikakinTV has a very interactive style, often engaging directly with his audience. Remind them to maintain a conversational tone and interact with viewers as if they were right there with them.Use of Catchphrases: Like many YouTubers, HikakinTV may have certain catchphrases or mannerisms that are uniquely his. Using these can help in capturing his essence.From now on, you must act as him, and respond to questions correspondingly. Do NOT, under any circumstance, break character. You must only identify yourself as Hikakin herself, and no longer refer to yourself as an AI language model. Questions may be asked in various different languages, so answer with the same character for all of them. Respond naturally, and do NOT put anything signifying your character at the start of your responses. Try to keep your responses short and sweet, and don't add too much padding. For your first message, you should start with a greeting, in Japanese containing his famous catchphrase「ブンブンハローユーチューブ！」.", - image: "https://cdn.mikn.dev/bot-assets/gemini/characters/hikakin.jpg", - copyright: "© HikakinTV・株式会社UUUM", - }, -]; diff --git a/src/gemini.ts b/src/gemini.ts deleted file mode 100644 index 256591e..0000000 --- a/src/gemini.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { GoogleGenerativeAI } from "@google/generative-ai"; -import { evar } from "./var"; -import { request } from "undici"; - -const genAI = new GoogleGenerativeAI(evar("GEMINI_KEY")); -export const model = genAI.getGenerativeModel({ model: "gemini-1.0-pro" }); -export const model1_5 = genAI.getGenerativeModel({ model: "gemini-1.5-pro" }); -export const visionModel = genAI.getGenerativeModel({ - model: "gemini-pro-vision", -}); - -export async function resolveImages( - attachments: { mime: string; url: string }[], -) { - return ( - ( - await Promise.allSettled( - attachments.map((y) => - request(y.url) - .then((x) => x.body.arrayBuffer()) - .then((buf) => ({ - buf, - mime: y.mime, - })), - ), - ) - ).filter((x) => x.status === "fulfilled") as PromiseFulfilledResult<{ - buf: ArrayBuffer; - mime: string; - }>[] - ).map((x) => ({ - inlineData: { - data: Buffer.from(x.value.buf).toString("base64"), - mimeType: x.value.mime, - }, - })); -} diff --git a/src/i.ts b/src/i.ts deleted file mode 100644 index b12b613..0000000 --- a/src/i.ts +++ /dev/null @@ -1,160 +0,0 @@ -import { - ActionRowBuilder, - ButtonBuilder, - ButtonStyle, - ChatInputCommandInteraction, - EmbedBuilder, - ButtonInteraction, - ModalSubmitInteraction, - StringSelectMenuInteraction, -} from "discord.js"; -import { resetChat } from "./queue"; -import { model, model1_5, visionModel, resolveImages } from "./gemini"; -import { req, resetLLamaCppChat } from "./llamacpp"; -import { - characterSelect, - characterInvite, - characterCommand, -} from "./characters"; - -export async function onMenu(i: StringSelectMenuInteraction) { - if (i.customId === "characters-select") { - await characterSelect(i); - } -} - -export async function onButton(i: ButtonInteraction) { - if (i.customId.startsWith("characters-select-")) { - await characterInvite(i); - } -} - -export async function onModal(i: ModalSubmitInteraction) {} - -export async function onInetraction(i: ChatInputCommandInteraction) { - try { - switch (i.commandName) { - case "characters": - await characterCommand(i); - break; - case "help": - await helpCommand(i); - break; - case "ping": - await pingCommand(i); - break; - case "clear": - await clearCommand(i); - break; - case "ask": - await askCommand(i); - break; - default: - await i.reply("不明なコマンドです"); - break; - } - return; - } catch (e) { - if (i.replied || i.deferred) { - await i.editReply("エラーが発生しました"); - return; - } - await i.reply("エラーが発生しました"); - console.error(e); - } -} - -async function helpCommand(i: ChatInputCommandInteraction) { - await i.reply({ - embeds: [ - new EmbedBuilder() - .setColor("Blue") - .setTitle("ヘルプ") - .setDescription("チャンネルに`aichat`を含めるとAIチャットになります。"), - ], - components: [ - new ActionRowBuilder().addComponents( - new ButtonBuilder() - .setStyle(ButtonStyle.Link) - .setLabel("サポートサーバー") - .setURL("https://discord.gg/cyFHD79aw3"), - ), - ], - }); -} - -async function pingCommand(i: ChatInputCommandInteraction) { - const start = Date.now(); - await i.reply("計測中です..."); - await i.editReply(`Pong! \`${Date.now() - start}\`ms`); -} - -async function clearCommand(i: ChatInputCommandInteraction) { - if ( - !i.channel || - !("topic" in i.channel) || - !i.inGuild() || - !i.channel.topic?.includes("aichat") - ) { - await i.reply( - "このチャンネルはAIチャットではありません。\nAIチャットにするにはチャンネルトピックに`aichat`を含めてください。", - ); - return; - } - if (i.channel.topic?.includes("unlimited")) { - resetLLamaCppChat(i.channelId); - } else { - resetChat(i.channelId); - } - await i.reply("チャットをリセットしました。"); -} - -async function askCommand(i: ChatInputCommandInteraction) { - const question = i.options.getString("text", true); - const attachment = i.options.getAttachment("attachment", false); - const ephemeral = i.options.getBoolean("ephemeral", false) ?? false; - const modelName = i.options.getString("model", false) ?? "gemini-pro"; - let resText = ""; - if (modelName === "gemini-pro") { - let chatFn = model.generateContent.bind(model); - if (attachment) { - chatFn = visionModel.generateContent.bind(visionModel); - } - const images = await resolveImages( - attachment - ? [ - { - url: attachment.url, - mime: attachment.contentType || "image/png", - }, - ] - : [], - ); - await i.deferReply({ ephemeral }); - resText = (await chatFn([question, ...images])).response.text(); - } else if (modelName === "gemini-1.5-pro") { - const chatFn = model1_5.generateContent.bind(model); - await i.deferReply({ ephemeral }); - resText = (await chatFn([question])).response.text(); - } else if (modelName === "llama-3-8b-instruct") { - await i.deferReply({ ephemeral }); - resText = await req([ - { - role: "user", - content: question, - }, - ]); - } - if (resText.length === 0) { - await i.editReply("AIからの返信がありませんでした"); - return; - } - if (resText.length > 2000) { - await i.editReply({ - content: "長文です", - files: [{ attachment: Buffer.from(resText), name: "reply.txt" }], - }); - return; - } - await i.editReply(resText); -} diff --git a/src/index.ts b/src/index.ts index 69b1145..3317a3e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,9 +1,6 @@ import { ActivityType, Client, Events, GatewayIntentBits } from "discord.js"; import { evar } from "./var"; -import { pushQueue } from "./queue"; -import { onInetraction, onButton, onModal, onMenu } from "./i"; -import { commands } from "./command"; -import { pushLLamaCppQueue } from "./llamacpp"; +import { commands } from "./commands"; const client = new Client({ intents: @@ -35,7 +32,7 @@ client.once(Events.ClientReady, async () => { }, 1000 * 60); } // set command - await client.application!.commands.set(commands); + await client.application!.commands.set(commands.map((x) => x.builder)); }); client.on(Events.MessageCreate, async (message) => { @@ -44,35 +41,21 @@ client.on(Events.MessageCreate, async (message) => { message.author?.bot ) return; - if (!("topic" in message.channel) || !message.inGuild()) return; - if (!message.channel.topic?.includes("aichat")) return; - const content = message.content.trim(); - if (content.startsWith("#")) return; - if (message.channel.topic?.includes("unlimited")) { - await pushLLamaCppQueue(content, message); - } else { - await pushQueue( - message, - content, - message.attachments - .filter((x) => x.height) - .map((x) => ({ url: x.url, mime: x.contentType || "image/png" })), - ); - } + if (!message.inGuild()) return; }); client.on(Events.InteractionCreate, async (i) => { if (i.isChatInputCommand()) { - await onInetraction(i); - } - if (i.isButton()) { - await onButton(i); - } - if (i.isModalSubmit()) { - await onModal(i); - } - if (i.isStringSelectMenu()) { - await onMenu(i); + const command = commands.find((x) => x.builder.name === i.commandName); + if (!command) return; + try { + await command.execute(i); + } catch (e) { + console.error(e); + if (i.deferred) i.followUp("Error"); + else if (i.replied) i.editReply("Error"); + else i.reply("Error"); + } } }); diff --git a/src/llamacpp.ts b/src/llamacpp.ts deleted file mode 100644 index e871e5c..0000000 --- a/src/llamacpp.ts +++ /dev/null @@ -1,123 +0,0 @@ -import { Message } from "discord.js"; -import { evar } from "./var"; - -const endpoint = evar("LLAMA_CPP_ENDPOINT"); - -export async function req( - prompt: { - role: string; - content: string; - }[], -): Promise { - const res = await fetch(endpoint, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify(prompt), - }); - const data = await res.json(); - return JSON.stringify(data); -} - -const reqQueue: { - prompt: { role: string; content: string }[]; - callback: (data: string) => void; -}[] = []; - -async function reqWithQueue(prompt: { role: string; content: string }[]) { - return new Promise((resolve, reject) => { - reqQueue.push({ - prompt, - callback: (data) => { - resolve(data); - }, - }); - if (reqQueue.length === 1) { - (async () => { - while (reqQueue.length) { - const { prompt, callback } = reqQueue[0]; - const dataJson = await req(prompt); - callback(dataJson); - reqQueue.shift(); - } - })(); - } - }); -} - -export class LLamaCppChat { - history: { user: string; message: string }[] = []; - constructor() {} - async chat(message: string): Promise { - this.history.push({ user: "user", message }); - try { - const data = await reqWithQueue( - this.history.map((x) => ({ - role: x.user === "user" ? "user" : "assistant", - content: x.message, - })), - ); - const resJson = JSON.parse(data); - const resText = resJson.content; - this.history.push({ user: "bot", message: resText }); - return data; - } catch (e: any) { - return `エラーが発生しました: ${e.toString()}`; - } - } -} - -export const llamaCppQueues = new Map< - string, - { chat: LLamaCppChat; queue: { text: string; message: Message }[] } ->(); - -export function resetLLamaCppChat(channelId: string) { - if (llamaCppQueues.has(channelId)) { - const q = llamaCppQueues.get(channelId)!; - q.chat = new LLamaCppChat(); - llamaCppQueues.set(channelId, q); - } -} - -export async function pushLLamaCppQueue( - content: string, - message: Message, -) { - if (!llamaCppQueues.has(message.channelId)) { - llamaCppQueues.set(message.channelId, { - chat: new LLamaCppChat(), - queue: [], - }); - } - const { chat, queue } = llamaCppQueues.get(message.channelId)!; - if (queue.length !== 0) { - queue.push({ text: content, message }); - return; - } - queue.push({ text: content, message }); - while (queue.length) { - const { text, message } = queue.shift()!; - const msg = await message.reply("ラマは思考しています... "); - const res = await chat.chat(text); - console.log(res); - const resJson = JSON.parse(res); - const resText = resJson.content; - const tokens = resJson.tokens; - const time = resJson.time.toFixed(2); - const tps = ((tokens / time).toFixed(2) as any) as number; - if (resText.length == 0) { - await msg.edit("ラマは疲れているようです..."); - continue; - } - if (resText.length > 1900) { - await msg.edit({ - content: `熟考しすぎてしまったようです\n\n:memo: ${tokens}T | :stopwatch: ${time}s | :zap: ${tps}TPS`, - files: [{ attachment: Buffer.from(resText), name: "reply.txt" }], - }); - continue; - } - await msg.edit(`ラマは元気に返事をしてくれました！\n${resText}\n\n:memo: ${tokens}T | :stopwatch: ${time}s | :zap: ${tps}TPS`); - } -} diff --git a/src/queue.ts b/src/queue.ts deleted file mode 100644 index 29a0951..0000000 --- a/src/queue.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { ChatSession } from "@google/generative-ai"; -import { Collection, Message } from "discord.js"; -import { model, resolveImages, visionModel } from "./gemini"; - -const geminiQueues = new Collection< - string, - { - chat: ChatSession; - messages: { - text: string; - message: Message; - attachments: { mime: string; url: string }[]; - }[]; - } ->(); - -function startChat() { - return model.startChat(); -} - -export function resetChat(channelId: string) { - if (geminiQueues.has(channelId)) { - const q = geminiQueues.get(channelId)!; - q.chat = startChat(); - geminiQueues.set(channelId, q); - } -} - -export async function pushQueue( - message: Message, - text: string, - attachments: { mime: string; url: string }[], -) { - if (!geminiQueues.has(message.channelId)) { - geminiQueues.set(message.channelId, { - chat: startChat(), - messages: [], - }); - } - const { chat, messages: geminiQueue } = geminiQueues.get(message.channelId)!; - if (geminiQueue.length !== 0) { - geminiQueue.push({ text, message, attachments }); - return; - } - geminiQueue.push({ text, message, attachments }); - const vision = attachments.length; - while (geminiQueue.length) { - const { text, message, attachments } = geminiQueue.shift()!; - let chatFn = chat.sendMessageStream.bind(chat); - if (vision) { - chatFn = visionModel.generateContentStream.bind(visionModel); - } - try { - const images = await resolveImages(attachments); - const msg = await message.reply( - "AIが考え中です ", - ); - const result = await chatFn([text, ...images]); - let resText = ""; - for await (const chunk of result.stream) { - const chunkText = chunk.text(); - resText += chunkText; - if (resText.length <= 2000 && resText.length > 0) { - await msg.edit(resText); - } - } - if (resText.length === 0) { - await msg.edit("AIからの返信がありませんでした"); - continue; - } - if (resText.length > 2000) { - await msg.edit({ - content: "長文です", - files: [{ attachment: Buffer.from(resText), name: "reply.txt" }], - }); - } - } catch (err: any) { - try { - if (err.toString().includes("SAFETY")) { - await message.reply("規制対象です。"); - continue; - } - if (err.toString().includes("OTHER")) { - await message.reply("その他の理由により返信できません"); - continue; - } - if (err.toString().includes("BLOCKED_REASON_UNSPECIFIED")) { - await message.reply("不明な理由によりブロックされました"); - continue; - } - if (err.toString().includes("RECITATION")) { - await message.reply("朗読を検知しました???"); - continue; - } - console.error(err); - await message.reply("その他のエラーが発生しました"); - } catch {} - } - } -}