-
Empty Responses
+
+ Empty Responses - Separated by |
+
new EntityDetector(),
complexStringMatcher: () => new ComplexStringMatcher(),
echo: () => new Echo(),
+ variableReplacer: () => new VariableReplacer(),
SummarizeFacts: () => new SummarizeFacts(),
textToSpeech: () => new TextToSpeech(),
agentTextCompletion: () => new AgentTextCompletion(),
diff --git a/packages/core/src/components/entities/CustomTextCompletion.ts b/packages/core/src/components/entities/CustomTextCompletion.ts
index 43bc61ff7..47440f9b4 100644
--- a/packages/core/src/components/entities/CustomTextCompletion.ts
+++ b/packages/core/src/components/entities/CustomTextCompletion.ts
@@ -158,12 +158,6 @@ export class CustomTextCompletion extends ThothComponent<
data += (inputs['Static Chat'] as string) ?? '' + '\n'
data += inputs['Chat']
data += '\n' + agent + ':'
- data = data
- .replace(/ai/g, agent)
- .replace(/agent/g, agent)
- .replace(/human/g, speaker)
- .replace(/speaker/g, speaker)
- .replace(/\n/g, '\n')
const settings = ((rawInputs.settings && rawInputs.settings[0]) ??
{}) as any
diff --git a/packages/core/src/components/entities/InputDestructure.ts b/packages/core/src/components/entities/InputDestructure.ts
index 5dfadf4b7..7658432c8 100644
--- a/packages/core/src/components/entities/InputDestructure.ts
+++ b/packages/core/src/components/entities/InputDestructure.ts
@@ -32,6 +32,7 @@ type InputReturn = {
isBot: boolean
info3d: string
}[]
+ channel_type: string
}
export class InputDestructureComponent extends ThothComponent<
@@ -52,6 +53,7 @@ export class InputDestructureComponent extends ThothComponent<
channel: 'output',
entity: 'output',
roomInfo: 'output',
+ channel_type: 'output',
trigger: 'option',
},
init: (task = {} as Task, node: ThothNode) => {
@@ -78,6 +80,11 @@ export class InputDestructureComponent extends ThothComponent<
const channelId = new Rete.Output('channel', 'channel', stringSocket)
const entity = new Rete.Output('entity', 'entity', stringSocket)
const roomInfo = new Rete.Output('roomInfo', 'roomInfo', arraySocket)
+ const channel_type = new Rete.Output(
+ 'channel_type',
+ 'channel_type',
+ stringSocket
+ )
const dataOutput = new Rete.Output('trigger', 'Trigger', triggerSocket)
return node
@@ -89,6 +96,7 @@ export class InputDestructureComponent extends ThothComponent<
.addOutput(channelId)
.addOutput(entity)
.addOutput(roomInfo)
+ .addOutput(channel_type)
.addOutput(out)
.addOutput(dataOutput)
}
@@ -115,6 +123,7 @@ export class InputDestructureComponent extends ThothComponent<
channel: (input as any)['ChannelID'] ?? 'TestChannel',
entity: (input as any)['Entity'],
roomInfo: (input as any)['RoomInfo'],
+ channel_type: (input as any)['Channel'],
}
}
}
diff --git a/packages/core/src/components/utility/VariableReplacer.ts b/packages/core/src/components/utility/VariableReplacer.ts
new file mode 100644
index 000000000..05434ca14
--- /dev/null
+++ b/packages/core/src/components/utility/VariableReplacer.ts
@@ -0,0 +1,106 @@
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
+
+/* eslint-disable no-async-promise-executor */
+/* eslint-disable camelcase */
+/* eslint-disable @typescript-eslint/no-inferrable-types */
+/* eslint-disable no-console */
+/* eslint-disable require-await */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import axios from 'axios'
+import Rete from 'rete'
+
+import {
+ NodeData,
+ ThothNode,
+ ThothWorkerInputs,
+ ThothWorkerOutputs,
+ EngineContext,
+} from '../../../types'
+import { InputControl } from '../../dataControls/InputControl'
+import { SocketGeneratorControl } from '../../dataControls/SocketGenerator'
+import { triggerSocket, stringSocket, anySocket } from '../../sockets'
+import { ThothComponent } from '../../thoth-component'
+
+const info =
+ 'Variable Replacer is used to replace keywords with new values in a text input.'
+
+type WorkerReturn = {
+ output: string
+}
+
+export class VariableReplacer extends ThothComponent
> {
+ constructor() {
+ super('Variable Replacer')
+
+ this.task = {
+ outputs: {
+ output: 'output',
+ trigger: 'option',
+ },
+ }
+
+ this.category = 'Agents'
+ this.display = true
+ this.info = info
+ }
+
+ builder(node: ThothNode) {
+ const strInput = new Rete.Input('inp', 'Input', stringSocket)
+ const agentInput = new Rete.Input('agent', 'Agent', stringSocket)
+ const speakerInput = new Rete.Input('speaker', 'Speaker', stringSocket)
+ const dataInput = new Rete.Input('trigger', 'Trigger', triggerSocket, true)
+ const dataOutput = new Rete.Output('trigger', 'Trigger', triggerSocket)
+ const outp = new Rete.Output('output', 'output', stringSocket)
+
+ const inputGenerator = new SocketGeneratorControl({
+ connectionType: 'input',
+ name: 'Input Sockets',
+ ignored: ['trigger'],
+ })
+
+ node.inspector.add(inputGenerator)
+
+ return node
+ .addInput(strInput)
+ .addInput(agentInput)
+ .addInput(speakerInput)
+ .addInput(dataInput)
+ .addOutput(dataOutput)
+ .addOutput(outp)
+ }
+
+ async worker(
+ node: NodeData,
+ rawInputs: ThothWorkerInputs,
+ outputs: ThothWorkerOutputs,
+ { silent, thoth }: { silent: boolean; thoth: EngineContext }
+ ) {
+ let input = rawInputs['inp'][0] as string
+ const agent = rawInputs['agent'][0] as string
+ const speaker = rawInputs['speaker'][0] as string
+ const inputs: any = Object.entries(rawInputs).reduce(
+ (acc, [key, value]) => {
+ console.log('key:', key, 'value:', value)
+ acc[key] = value[0]
+ return acc
+ },
+ {} as Record
+ )
+
+ for (const key in inputs) {
+ if (input.includes(key)) {
+ if (key === 'agent') {
+ input = input.replace(key, agent)
+ } else if (key === 'speaker') {
+ input = input.replace(key, speaker)
+ } else {
+ input = input.replace(key, inputs[key])
+ }
+ }
+ }
+
+ return {
+ output: input,
+ }
+ }
+}
diff --git a/packages/server/src/databases/models/entities.ts b/packages/server/src/databases/models/entities.ts
index b906881ee..924bba55e 100644
--- a/packages/server/src/databases/models/entities.ts
+++ b/packages/server/src/databases/models/entities.ts
@@ -45,10 +45,10 @@ export interface entitiesAttributes {
twitter_tweet_rules?: string
twitter_auto_tweet_interval_min?: string
twitter_auto_tweet_interval_max?: string
- twitter_auto_tweet_start_phrases?: string
twitter_bot_name?: string
twitter_bot_name_regex?: string
twitter_spell_handler_incoming?: string
+ twitter_spell_handler_auto?: string
telegram_enabled?: boolean
telegram_bot_token?: string
telegram_bot_name?: string
@@ -136,10 +136,10 @@ export type entitiesOptionalAttributes =
| 'twitter_tweet_rules'
| 'twitter_auto_tweet_interval_min'
| 'twitter_auto_tweet_interval_max'
- | 'twitter_auto_tweet_start_phrases'
| 'twitter_bot_name'
| 'twitter_bot_name_regex'
| 'twitter_spell_handler_incoming'
+ | 'twitter_spell_handler_auto'
| 'telegram_enabled'
| 'telegram_bot_token'
| 'telegram_bot_name'
@@ -240,10 +240,10 @@ export class entities
twitter_tweet_rules?: string
twitter_auto_tweet_interval_min?: string
twitter_auto_tweet_interval_max?: string
- twitter_auto_tweet_start_phrases?: string
twitter_bot_name?: string
twitter_bot_name_regex?: string
twitter_spell_handler_incoming?: string
+ twitter_spell_handler_auto?: string
telegram_enabled?: boolean
telegram_bot_token?: string
telegram_bot_name?: string
@@ -465,10 +465,6 @@ export class entities
type: DataTypes.TEXT,
allowNull: true,
},
- twitter_auto_tweet_start_phrases: {
- type: DataTypes.TEXT,
- allowNull: true,
- },
twitter_bot_name: {
type: DataTypes.TEXT,
allowNull: true,
@@ -481,6 +477,10 @@ export class entities
type: DataTypes.TEXT,
allowNull: true,
},
+ twitter_spell_handler_auto: {
+ type: DataTypes.TEXT,
+ allowNull: true,
+ },
telegram_enabled: {
type: DataTypes.BOOLEAN,
allowNull: true,
diff --git a/packages/server/src/entities/CreateSpellHandler.ts b/packages/server/src/entities/CreateSpellHandler.ts
index 053825f9d..8c1626eab 100644
--- a/packages/server/src/entities/CreateSpellHandler.ts
+++ b/packages/server/src/entities/CreateSpellHandler.ts
@@ -138,7 +138,8 @@ export const CreateSpellHandler = async (props: {
inConversation: boolean
isBot: boolean
info3d: string
- }[]
+ }[],
+ channel: string
) {
const spellInputs = {
Input: message,
@@ -148,6 +149,7 @@ export const CreateSpellHandler = async (props: {
ChannelID: channelId,
Entity: entity,
RoomInfo: roomInfo,
+ Channel: channel,
} as any
// TODO: Remove this line
diff --git a/packages/server/src/entities/Entity.ts b/packages/server/src/entities/Entity.ts
index c09f95f9a..ab8882981 100644
--- a/packages/server/src/entities/Entity.ts
+++ b/packages/server/src/entities/Entity.ts
@@ -155,10 +155,10 @@ export class Entity {
twitter_tweet_rules: any,
twitter_auto_tweet_interval_min: any,
twitter_auto_tweet_interval_max: any,
- twitter_auto_tweet_start_phrases: any,
twitter_bot_name: any,
twitter_bot_name_regex: any,
twitter_spell_handler_incoming: any,
+ twitter_spell_handler_auto: any,
spell_version: string,
entity: any
) {
@@ -172,11 +172,16 @@ export class Entity {
spell: twitter_spell_handler_incoming,
version: spell_version,
})
+ const spellHandlerAuto = await CreateSpellHandler({
+ spell: twitter_spell_handler_auto,
+ version: spell_version,
+ })
this.twitter = new twitter_client()
console.log('createTwitterClient')
await this.twitter.createTwitterClient(
spellHandler,
+ spellHandlerAuto,
{
twitter_token,
twitter_id,
@@ -188,10 +193,10 @@ export class Entity {
twitter_tweet_rules,
twitter_auto_tweet_interval_min,
twitter_auto_tweet_interval_max,
- twitter_auto_tweet_start_phrases,
twitter_bot_name,
twitter_bot_name_regex,
twitter_spell_handler_incoming,
+ twitter_spell_handler_auto,
},
entity
)
@@ -346,7 +351,8 @@ export class Entity {
'loop',
'loop',
this,
- []
+ [],
+ 'auto'
)
if (resp && (resp as string)?.length > 0) {
console.log('Loop Response:', resp)
@@ -666,10 +672,10 @@ export class Entity {
data.twitter_tweet_rules,
data.twitter_auto_tweet_interval_min,
data.twitter_auto_tweet_interval_max,
- data.twitter_auto_tweet_start_phrases,
data.twitter_bot_name,
data.twitter_bot_name_regex,
data.twitter_spell_handler_incoming,
+ data.twitter_spell_handler_auto,
data.spell_version,
data
)
diff --git a/packages/server/src/entities/connectors/discord-voice.ts b/packages/server/src/entities/connectors/discord-voice.ts
index e5ae7a8fd..e2b3cdce9 100644
--- a/packages/server/src/entities/connectors/discord-voice.ts
+++ b/packages/server/src/entities/connectors/discord-voice.ts
@@ -62,7 +62,8 @@ export function initSpeechClient(
'discord',
channel.id,
entity,
- roomInfo
+ roomInfo,
+ 'voice'
)
)
if (response === undefined || !response || response.length <= 0) {
diff --git a/packages/server/src/entities/connectors/discord.ts b/packages/server/src/entities/connectors/discord.ts
index 7c4e07a19..389f3a38e 100644
--- a/packages/server/src/entities/connectors/discord.ts
+++ b/packages/server/src/entities/connectors/discord.ts
@@ -436,7 +436,8 @@ export class discord_client {
'discord',
message.channel.id,
this.entity,
- roomInfo
+ roomInfo,
+ 'msg'
)
this.handlePingSoloAgent(message.channel.id, message.id, response, false)
@@ -1330,7 +1331,8 @@ export class discord_client {
inConversation: boolean
isBot: boolean
info3d: string
- }[]
+ }[],
+ channel: string
) => Promise,
use_voice,
voice_provider,
diff --git a/packages/server/src/entities/connectors/handleInput.ts b/packages/server/src/entities/connectors/handleInput.ts
index 37a6ec344..0308ecc5e 100644
--- a/packages/server/src/entities/connectors/handleInput.ts
+++ b/packages/server/src/entities/connectors/handleInput.ts
@@ -12,7 +12,8 @@ export async function handleInput(
channelId: string,
entity: number,
spell_handler: string,
- spell_version: string = 'latest'
+ spell_version: string = 'latest',
+ channel: string = 'msg'
) {
if (spell_handler === undefined) {
spell_handler = 'default'
@@ -33,6 +34,7 @@ export async function handleInput(
Client: client,
ChannelID: channelId,
Entity: entity,
+ Channel: channel,
},
})
let index = undefined
diff --git a/packages/server/src/entities/connectors/instagram.ts b/packages/server/src/entities/connectors/instagram.ts
index 182373dab..3a7d60e59 100644
--- a/packages/server/src/entities/connectors/instagram.ts
+++ b/packages/server/src/entities/connectors/instagram.ts
@@ -43,7 +43,8 @@ export class instagram_client {
'instagram',
thread_v2_id,
settings.entity,
- []
+ [],
+ 'msg'
)
console.log('resp of spellHandler ::: ', resp)
const thread = ig.entity.directThread(userIds)
diff --git a/packages/server/src/entities/connectors/messenger.ts b/packages/server/src/entities/connectors/messenger.ts
index 7e8369599..811fc33f0 100644
--- a/packages/server/src/entities/connectors/messenger.ts
+++ b/packages/server/src/entities/connectors/messenger.ts
@@ -25,7 +25,8 @@ export class messenger_client {
'messenger',
senderPsid,
null,
- []
+ [],
+ 'msg'
)
this.callSendAPI(senderPsid, { text: resp }, resp)
}
diff --git a/packages/server/src/entities/connectors/reddit.ts b/packages/server/src/entities/connectors/reddit.ts
index 29318ddbd..8f88e640e 100644
--- a/packages/server/src/entities/connectors/reddit.ts
+++ b/packages/server/src/entities/connectors/reddit.ts
@@ -162,7 +162,8 @@ export class reddit_client {
'reddit',
chat_id,
this.entity,
- []
+ [],
+ 'msg'
)
await this.handleMessage(resp, id, chat_id, 'isPost', reddit)
} else {
@@ -178,7 +179,8 @@ export class reddit_client {
'reddit',
chat_id,
this.entity,
- []
+ [],
+ 'msg'
)
await this.handleMessage(resp, id, chat_id, 'isPost', reddit)
}
@@ -207,7 +209,8 @@ export class reddit_client {
'reddit',
chat_id,
this.entity,
- []
+ [],
+ 'msg'
)
await this.handleMessage(resp, id, chat_id, 'isPost', reddit)
} else {
@@ -223,7 +226,8 @@ export class reddit_client {
'reddit',
chat_id,
this.entity,
- []
+ [],
+ 'msg'
)
await this.handleMessage(resp, id, chat_id, 'isPost', reddit)
}
@@ -243,7 +247,8 @@ export class reddit_client {
'reddit',
chat_id,
this.entity,
- []
+ [],
+ 'msg'
)
await this.handleMessage(resp, id, chat_id, 'isChat', reddit)
}
diff --git a/packages/server/src/entities/connectors/slack.ts b/packages/server/src/entities/connectors/slack.ts
index 1fd0aaa89..1e5dc13e2 100644
--- a/packages/server/src/entities/connectors/slack.ts
+++ b/packages/server/src/entities/connectors/slack.ts
@@ -89,7 +89,8 @@ export class slack_client {
'slack',
channel,
this.entity,
- []
+ [],
+ 'msg'
)
say(response)
})
diff --git a/packages/server/src/entities/connectors/telegram.ts b/packages/server/src/entities/connectors/telegram.ts
index 4b824f76e..fec87a7ff 100644
--- a/packages/server/src/entities/connectors/telegram.ts
+++ b/packages/server/src/entities/connectors/telegram.ts
@@ -165,7 +165,8 @@ export class telegram_client {
'telegram',
msg.chat.id,
this.entity,
- []
+ [],
+ 'msg'
)
this.handleEditMessage(
msg.chat.id,
@@ -303,7 +304,8 @@ export class telegram_client {
'telegram',
msg.chat.id,
this.entity,
- []
+ [],
+ 'msg'
)
console.log('GOT RESPONSE:', resp)
this.handleEditMessage(
diff --git a/packages/server/src/entities/connectors/twilio.ts b/packages/server/src/entities/connectors/twilio.ts
index 60eb92bba..d64b9efe3 100644
--- a/packages/server/src/entities/connectors/twilio.ts
+++ b/packages/server/src/entities/connectors/twilio.ts
@@ -44,7 +44,8 @@ export class twilio_client {
'twilio',
req.body.From,
this.settings.entity,
- []
+ [],
+ 'msg'
)
await this.handleTwilioMsg(req.body.From, resp)
}
diff --git a/packages/server/src/entities/connectors/twitter.ts b/packages/server/src/entities/connectors/twitter.ts
index 7d7d6fc76..649a34201 100644
--- a/packages/server/src/entities/connectors/twitter.ts
+++ b/packages/server/src/entities/connectors/twitter.ts
@@ -7,7 +7,6 @@
import { database } from '../../database'
import { TwitterApi, ETwitterStreamEvent } from 'twitter-api-v2'
-import { handleInput } from './handleInput'
import { randomInt } from './utils'
function log(...s: (string | boolean)[]) {
@@ -45,21 +44,18 @@ export class twitter_client {
this.twitter_auto_tweet_interval_min,
this.twitter_auto_tweet_interval_max
) * 60000
- sleep(interval)
-
- const input =
- this.twitter_auto_tweet_start_phrases[
- randomInt(0, this.twitter_auto_tweet_start_phrases.length - 1)
- ]
+ console.log('await interval:', interval)
+ await sleep(interval)
const resp = await spellHandler(
- input,
+ '',
'user',
this.settings.twitter_bot_name ?? 'Agent',
'twitter',
'auto_tweet',
this.settings.entity,
- []
+ [],
+ 'auto'
)
console.log('generated automatic tweet:', resp)
@@ -67,9 +63,9 @@ export class twitter_client {
this.automatic_tweet(spellHandler)
}
- async handleMessage(response, chat_id, args, twitter, twitterV1, localUser) {
+ async handleMessage(response, chat_id, args) {
if (args === 'DM') {
- const dmSent = await twitterV1.v1.sendDm({
+ const dmSent = await this.twitterV1.v1.sendDm({
recipient_id: chat_id,
text: response,
})
@@ -96,17 +92,23 @@ export class twitter_client {
twitterv1: TwitterApi
twitterv2: TwitterApi
spellHandler
+ spellHandlerAuto
settings
entity
twitter_enable_twits: boolean = false
twitter_tweet_rules: string = ''
twitter_auto_tweet_interval_min: number = 0
twitter_auto_tweet_interval_max: number = 0
- twitter_auto_tweet_start_phrases: string[] = []
- createTwitterClient = async (spellHandler, settings, entity) => {
+ createTwitterClient = async (
+ spellHandler,
+ spellHandlerAuto,
+ settings,
+ entity
+ ) => {
console.log('TWITTER SETTINGS:', settings)
this.spellHandler = spellHandler
+ this.spellHandlerAuto = spellHandlerAuto
this.settings = settings
this.entity = entity
this.twitter_enable_twits =
@@ -129,14 +131,6 @@ export class twitter_client {
this.twitter_auto_tweet_interval_max = parseInt(temp_max)
}
- if (
- settings.twitter_auto_tweet_start_phrases &&
- settings.twitter_auto_tweet_start_phrases?.length > 0
- ) {
- this.twitter_auto_tweet_start_phrases =
- settings.twitter_auto_tweet_start_phrases.split('|')
- }
-
const bearerToken = settings.twitter_token
const twitterUser = settings.twitter_id
const twitterAppToken = settings.twitter_app_token
@@ -164,17 +158,17 @@ export class twitter_client {
twitterAccessTokenSecret
)
console.log('creating v2')
- /*
+
this.twitterv2 = createTwitterClientV2(bearerToken)
const localUser = await this.twitterv2.v2.userByUsername(twitterUser)
- setInterval(async () => {
+ /*setInterval(async () => {
const tv1 = this.twitterv1
try {
console.log('requesting events')
const eventsPaginator = await this.twitterv1.v1.listDmEvents()
console.log('events:', eventsPaginator)
for await (const event of eventsPaginator) {
- log(
+ log(p
'Event: ' + JSON.stringify(event.message_create.message_data.text)
)
if (event.type == 'message_create') {
@@ -196,15 +190,13 @@ export class twitter_client {
'twitter',
event.id,
settings.entity,
- []
+ [],
+ 'dm'
)
/* await this.handleMessage(
resp,
event.id,
'DM',
- twitter,
- tv1,
- localUser
)
}
}
@@ -216,11 +208,10 @@ export class twitter_client {
if (
this.twitter_auto_tweet_interval_min > 0 &&
this.twitter_auto_tweet_interval_max > 0 &&
- this.twitter_auto_tweet_start_phrases.length > 0 &&
this.twitter_auto_tweet_interval_min <
this.twitter_auto_tweet_interval_max
) {
- this.automatic_tweet(spellHandler)
+ this.automatic_tweet(spellHandlerAuto)
}
if (this.twitter_enable_twits) {
@@ -231,7 +222,7 @@ export class twitter_client {
delete: { ids: rules.data.map(rule => rule.id) },
})
}
- const tweetRules = 'digital,being,digital being'.split(',')
+ const tweetRules = this.twitter_tweet_rules.split(',')
const _rules = []
const regex = []
for (let x in tweetRules) {
@@ -280,16 +271,10 @@ export class twitter_client {
'twitter',
twit.data.id,
settings.entity,
- []
- )
- await this.handleMessage(
- resp,
- twit.data.id,
- 'Twit',
- this.twitter,
- null,
- localUser
+ [],
+ 'tweet'
)
+ await this.handleMessage(resp, twit.data.id, 'Twit')
database.instance.setDataHandled(twit.data.id, 'twitter')
}
diff --git a/packages/server/src/entities/connectors/xrengine.ts b/packages/server/src/entities/connectors/xrengine.ts
index 58e957820..9b338147d 100644
--- a/packages/server/src/entities/connectors/xrengine.ts
+++ b/packages/server/src/entities/connectors/xrengine.ts
@@ -426,8 +426,7 @@ export class xrengine_client {
channelId,
this.entity,
roomInfo,
- this.settings.xrengine_spell_handler_incoming,
- this.spell_version
+ 'msg'
)
console.log('got response:', response)
diff --git a/packages/server/src/entities/connectors/zoom.ts b/packages/server/src/entities/connectors/zoom.ts
index 0d60af60d..5e23e0ca0 100644
--- a/packages/server/src/entities/connectors/zoom.ts
+++ b/packages/server/src/entities/connectors/zoom.ts
@@ -191,7 +191,8 @@ export class zoom {
'zoom',
this.settings.zoom_invitation_link,
this.entity,
- []
+ [],
+ 'msg'
)
const tempResp = response
console.log('RESP:', response)