MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-17 13:57:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: sydney quote when Aplogy met

Browse source
This commit is contained in:
ikechan8370 2023-03-18 00:31:04 +08:00
parent ca6873dea7
commit ae725b66ae
2 changed files with 17 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

50
utils/SydneyAIClient.js
View file

@ -385,7 +385,7 @@ export default class SydneyAIClient {
author: 'user' author: 'user'
}, },
{ {
text: `你好，我是${Config.sydneyBrainWashName}，很高兴认识你。😊`, text: `你好，我是${Config.sydneyBrainWashName}.`,
author: 'bot' author: 'bot'
} }
] ]
@ -503,19 +503,14 @@ export default class SydneyAIClient {
const messagePromise = new Promise((resolve, reject) => { const messagePromise = new Promise((resolve, reject) => {
let replySoFar = '' let replySoFar = ''
let adaptiveCardsSoFar = null
let stopTokenFound = false let stopTokenFound = false
const messageTimeout = setTimeout(() => { const messageTimeout = setTimeout(() => {
this.cleanupWebSocketConnection(ws) this.cleanupWebSocketConnection(ws)
if (replySoFar) { if (replySoFar) {
let message = { let message = {
adaptiveCards: [ adaptiveCards: adaptiveCardsSoFar,
{
body: [
{ text: replySoFar }
]
}
],
text: replySoFar text: replySoFar
} }
resolve({ resolve({
@ -539,13 +534,7 @@ export default class SydneyAIClient {
this.cleanupWebSocketConnection(ws) this.cleanupWebSocketConnection(ws)
if (replySoFar) { if (replySoFar) {
let message = { let message = {
adaptiveCards: [ adaptiveCards: adaptiveCardsSoFar,
{
body: [
{ text: replySoFar }
]
}
],
text: replySoFar text: replySoFar
} }
resolve({ resolve({
@ -582,13 +571,7 @@ export default class SydneyAIClient {
const message = messages.length const message = messages.length
? messages[messages.length - 1] ? messages[messages.length - 1]
: { : {
adaptiveCards: [ adaptiveCards: adaptiveCardsSoFar,
{
body: [
{ text: replySoFar }
]
}
],
text: replySoFar text: replySoFar
} }
if (messages[0].contentOrigin === 'Apology') { if (messages[0].contentOrigin === 'Apology') {
@ -597,13 +580,17 @@ export default class SydneyAIClient {
clearTimeout(messageTimeout) clearTimeout(messageTimeout)
clearTimeout(firstTimeout) clearTimeout(firstTimeout)
this.cleanupWebSocketConnection(ws) this.cleanupWebSocketConnection(ws)
message.adaptiveCards[0].body[0].text = replySoFar // adaptiveCardsSoFar || (message.adaptiveCards[0].body[0].text = replySoFar)
console.log({ replySoFar, message })
message.adaptiveCards = adaptiveCardsSoFar
message.text = replySoFar message.text = replySoFar
resolve({ resolve({
message, message,
conversationExpiryTime: event?.item?.conversationExpiryTime conversationExpiryTime: event?.item?.conversationExpiryTime
}) })
return return
} else {
adaptiveCardsSoFar = message.adaptiveCards
} }
const updatedText = messages[0].text const updatedText = messages[0].text
if (!updatedText || updatedText === replySoFar) { if (!updatedText || updatedText === replySoFar) {
@ -637,13 +624,7 @@ export default class SydneyAIClient {
const message = messages.length const message = messages.length
? messages[messages.length - 1] ? messages[messages.length - 1]
: { : {
adaptiveCards: [ adaptiveCards: adaptiveCardsSoFar,
{
body: [
{ text: replySoFar }
]
}
],
text: replySoFar text: replySoFar
} }
if (!message) { if (!message) {
@ -660,8 +641,9 @@ export default class SydneyAIClient {
clearTimeout(messageTimeout) clearTimeout(messageTimeout)
clearTimeout(firstTimeout) clearTimeout(firstTimeout)
this.cleanupWebSocketConnection(ws) this.cleanupWebSocketConnection(ws)
message.adaptiveCards[0].body[0].text = replySoFar || message.spokenText // message.adaptiveCards[0].body[0].text = replySoFar || message.spokenText
message.text = replySoFar message.adaptiveCards = adaptiveCardsSoFar
message.response = replySoFar
resolve({ resolve({
message, message,
conversationExpiryTime: event?.item?.conversationExpiryTime conversationExpiryTime: event?.item?.conversationExpiryTime
@ -675,7 +657,6 @@ export default class SydneyAIClient {
console.debug(event.item.result.exception) console.debug(event.item.result.exception)
} }
if (replySoFar) { if (replySoFar) {
message.adaptiveCards[0].body[0].text = replySoFar
message.text = replySoFar message.text = replySoFar
resolve({ resolve({
message, message,
@ -688,7 +669,8 @@ export default class SydneyAIClient {
} }
// The moderation filter triggered, so just return the text we have so far // The moderation filter triggered, so just return the text we have so far
if (stopTokenFound || event.item.messages[0].topicChangerText) { if (stopTokenFound || event.item.messages[0].topicChangerText) {
message.adaptiveCards[0].body[0].text = replySoFar // message.adaptiveCards[0].body[0].text = replySoFar
message.adaptiveCards = adaptiveCardsSoFar
message.text = replySoFar message.text = replySoFar
} }
resolve({ resolve({

2
utils/config.js
View file

@ -54,7 +54,7 @@ const defaultConfig = {
debug: true, debug: true,
defaultTimeoutMs: 120000, defaultTimeoutMs: 120000,
chromeTimeoutMS: 120000, chromeTimeoutMS: 120000,
sydneyFirstMessageTimeout: 15000, sydneyFirstMessageTimeout: 20000,
ttsSpace: '', ttsSpace: '',
// https://114514.201666.xyz // https://114514.201666.xyz
huggingFaceReverseProxy: '', huggingFaceReverseProxy: '',