feat: fix bing "Success: null" error

using a fork of node-chatgpt-api as [this PR](waylaidwanderer/node-chatgpt-api#481) hasnt been merged yet. will revert to the main package as soon as this gets merged. this fork also implements the feat in [this PR](waylaidwanderer/node-chatgpt-api#452) but it's not yet implemented
WAppAI · Oct 5, 2023 · 72cf4f7 · 72cf4f7
1 parent 8f05116
commit 72cf4f7
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 72 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "@prisma/client": "5.3.1",
     "@types/common-tags": "^1.8.2",
     "@types/node-schedule": "^2.1.1",
-    "@waylaidwanderer/chatgpt-api": "^1.37.3",
+    "@waylaidwanderer/chatgpt-api": "github:veigamann/node-chatgpt-api",
     "common-tags": "^1.8.2",
     "dayjs": "^1.11.10",
     "dotenv": "^16.3.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/prisma/migrations/20231004194819_fix_bing_encrypted_signature/migration.sql b/prisma/migrations/20231004194819_fix_bing_encrypted_signature/migration.sql
@@ -0,0 +1,26 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `signature` on the `BingConversation` table. All the data in the column will be lost.
+  - Added the required column `encryptedSignature` to the `BingConversation` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_BingConversation" (
+    "waChatId" TEXT NOT NULL PRIMARY KEY,
+    "waMessageId" TEXT NOT NULL,
+    "id" TEXT NOT NULL,
+    "clientId" TEXT NOT NULL,
+    "jailbreakId" TEXT,
+    "parentMessageId" TEXT,
+    "invocationId" INTEGER NOT NULL,
+    "encryptedSignature" TEXT NOT NULL,
+    "expiryTime" TEXT NOT NULL,
+    CONSTRAINT "BingConversation_waChatId_fkey" FOREIGN KEY ("waChatId") REFERENCES "WAChat" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+INSERT INTO "new_BingConversation" ("clientId", "expiryTime", "id", "invocationId", "jailbreakId", "parentMessageId", "waChatId", "waMessageId") SELECT "clientId", "expiryTime", "id", "invocationId", "jailbreakId", "parentMessageId", "waChatId", "waMessageId" FROM "BingConversation";
+DROP TABLE "BingConversation";
+ALTER TABLE "new_BingConversation" RENAME TO "BingConversation";
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -26,8 +26,8 @@ model BingConversation {
   parentMessageId String?
   invocationId    Int
 
-  signature  String
-  expiryTime String
+  encryptedSignature String
+  expiryTime         String
 
   waChat WAChat? @relation(fields: [waChatId], references: [id])
 }

diff --git a/src/crud/conversation.ts b/src/crud/conversation.ts
@@ -12,7 +12,7 @@ export async function createConversation(
     data: {
       id: completion.conversationId,
       clientId: completion.clientId,
-      signature: completion.conversationSignature,
+      encryptedSignature: completion.encryptedConversationSignature,
       invocationId: completion.invocationId,
       jailbreakId: completion.jailbreakConversationId,
       parentMessageId: completion.messageId,

diff --git a/src/handlers/completion.ts b/src/handlers/completion.ts
@@ -9,13 +9,7 @@ import type {
 import { Message } from "whatsapp-web.js";
 import { prisma } from "../clients/prisma";
 import { bing } from "../clients/bing";
-import {
-  ENABLE_SOURCES,
-  ENABLE_SUGGESTIONS,
-  STREAM_REMINDERS,
-  STREAM_RESPONSES,
-  SYSTEM_MESSAGE,
-} from "../constants";
+import { STREAM_REMINDERS, STREAM_RESPONSES, SYSTEM_MESSAGE } from "../constants";
 import { createConversation, getConversationFor } from "../crud/conversation";
 import { createChat, getChatFor } from "../crud/chat";
 
@@ -95,7 +89,7 @@ async function generateCompletionFor(
       });
     else
       completion = await bing.sendMessage(message.body, {
-        conversationSignature: conversation.signature,
+        encryptedConversationSignature: conversation.encryptedSignature,
         conversationId: conversation.id,
         clientId: conversation.clientId,
         invocationId: conversation.invocationId,

diff --git a/src/handlers/context/index.ts b/src/handlers/context/index.ts
@@ -15,12 +15,6 @@ export async function createContextFromMessage(message: Message) {
   const timezone = dayjs.tz.guess();
   const timestampUTC = dayjs().utc();
   const timestampLocal = timestampUTC.tz(timezone).format();
-  console.log({
-    publicUserName,
-    timezone,
-    timestampUTC,
-    timestampLocal,
-  });
 
   const context = stripIndent`[system](#context)
   - The user's name is '${publicUserName}'

diff --git a/src/types/bing-ai-client.d.ts b/src/types/bing-ai-client.d.ts
@@ -8,6 +8,8 @@ declare module "@waylaidwanderer/chatgpt-api" {
       message: string,
       options?: BingAIClientSendMessageOptions
     ): Promise<BingAIClientResponse>;
+
+    uploadImage(imageBase64: string): Promise<string>;
   }
 
   interface BingAIClientOptions {
@@ -22,7 +24,7 @@ declare module "@waylaidwanderer/chatgpt-api" {
   interface BingAIClientSendMessageOptions {
     jailbreakConversationId?: boolean | string;
     conversationId?: string;
-    conversationSignature?: string;
+    encryptedConversationSignature?: string;
     clientId?: string;
     toneStyle?: "balanced" | "creative" | "precise" | "fast";
     invocationId?: number;
@@ -36,7 +38,7 @@ declare module "@waylaidwanderer/chatgpt-api" {
     jailbreakConversationId?: string;
     messageId?: string;
     conversationId: string;
-    conversationSignature: string;
+    encryptedConversationSignature: string;
     clientId: string;
     invocationId: number;
     conversationExpiryTime: string;