From 4000c03e1ea96c956b17ba46e4261769989c4607 Mon Sep 17 00:00:00 2001 From: ponderingdemocritus Date: Sat, 2 Nov 2024 08:21:29 +1100 Subject: [PATCH 1/2] update --- core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/package.json b/core/package.json index a1da1771518..09628c970ff 100644 --- a/core/package.json +++ b/core/package.json @@ -8,7 +8,7 @@ "scripts": { "build": "tsc", "lint": "eslint . --fix", - "start": "node --loader ts-node/esm src/index.ts", + "start": "node --loader ts-node/esm src/index.ts --characters=\"../characters/blobert.character.json\"", "start:arok": "node --loader ts-node/esm src/index.ts --characters=\"characters/arok.character.json\"", "start:service:ruby": "pm2 start npm --name=\"ruby\" --restart-delay=3000 --max-restarts=10 -- run start:ruby", "stop:service:ruby": "pm2 stop ruby", From 2ba0aafa596cc4ec9e8e7eb1c92859f7122f88c0 Mon Sep 17 00:00:00 2001 From: ponderingdemocritus Date: Sat, 2 Nov 2024 08:58:50 +1100 Subject: [PATCH 2/2] export types --- core/package.json | 2 +- core/src/actions/index.ts | 16 ++++++++++ core/src/adapters/index.ts | 2 ++ core/src/clients/index.ts | 10 +++++++ core/src/clients/telegram/index.ts | 1 + core/src/clients/twitter/index.ts | 3 ++ core/src/index.ts | 5 ++++ core/src/lib.ts | 48 ------------------------------ 8 files changed, 38 insertions(+), 49 deletions(-) create mode 100644 core/src/actions/index.ts create mode 100644 core/src/adapters/index.ts create mode 100644 core/src/clients/index.ts create mode 100644 core/src/clients/telegram/index.ts create mode 100644 core/src/clients/twitter/index.ts delete mode 100644 core/src/lib.ts diff --git a/core/package.json b/core/package.json index 09628c970ff..a1da1771518 100644 --- a/core/package.json +++ b/core/package.json @@ -8,7 +8,7 @@ "scripts": { "build": "tsc", "lint": "eslint . --fix", - "start": "node --loader ts-node/esm src/index.ts --characters=\"../characters/blobert.character.json\"", + "start": "node --loader ts-node/esm src/index.ts", "start:arok": "node --loader ts-node/esm src/index.ts --characters=\"characters/arok.character.json\"", "start:service:ruby": "pm2 start npm --name=\"ruby\" --restart-delay=3000 --max-restarts=10 -- run start:ruby", "stop:service:ruby": "pm2 stop ruby", diff --git a/core/src/actions/index.ts b/core/src/actions/index.ts new file mode 100644 index 00000000000..c6b530a3ca3 --- /dev/null +++ b/core/src/actions/index.ts @@ -0,0 +1,16 @@ +export * from "./ask_claude.ts"; +export * from "./follow_room.ts"; +export * from "./imageGeneration.ts"; +export * from "./mute_room.ts"; +export * from "./swap.ts"; +export * from "./unfollow_room.ts"; +export * from "./unmute_room.ts"; +export * from "./mute_room.ts"; +export * from "./continue.ts"; +export * from "./follow_room.ts"; +export * from "./ignore.ts"; +export * from "./imageGenerationUtils.ts"; +export * from "./pumpfun.ts"; +export * from "./swap.ts"; +export * from "./swapUtils.ts"; +export * from "./take_order.ts"; diff --git a/core/src/adapters/index.ts b/core/src/adapters/index.ts new file mode 100644 index 00000000000..600a7df2028 --- /dev/null +++ b/core/src/adapters/index.ts @@ -0,0 +1,2 @@ +export { PostgresDatabaseAdapter } from "./postgres.ts"; +export { SqliteDatabaseAdapter } from "./sqlite.ts"; diff --git a/core/src/clients/index.ts b/core/src/clients/index.ts new file mode 100644 index 00000000000..58cfd246815 --- /dev/null +++ b/core/src/clients/index.ts @@ -0,0 +1,10 @@ +import DirectClient from "./direct"; + +export { + TwitterGenerationClient, + TwitterInteractionClient, + TwitterSearchClient, +} from "./twitter"; +export { TelegramClient } from "./telegram"; +export { DiscordClient } from "./discord"; +export { DirectClient }; diff --git a/core/src/clients/telegram/index.ts b/core/src/clients/telegram/index.ts new file mode 100644 index 00000000000..387f6cc2a02 --- /dev/null +++ b/core/src/clients/telegram/index.ts @@ -0,0 +1 @@ +export { TelegramClient } from "./src/index.ts"; diff --git a/core/src/clients/twitter/index.ts b/core/src/clients/twitter/index.ts new file mode 100644 index 00000000000..605224f2c95 --- /dev/null +++ b/core/src/clients/twitter/index.ts @@ -0,0 +1,3 @@ +export { TwitterGenerationClient } from "./generate.ts"; +export { TwitterSearchClient } from "./search.ts"; +export { TwitterInteractionClient } from "./interactions.ts"; diff --git a/core/src/index.ts b/core/src/index.ts index 879afc352ac..64b321723c6 100644 --- a/core/src/index.ts +++ b/core/src/index.ts @@ -1,3 +1,8 @@ +// Exports +export * from "./actions/index.ts"; +export * from "./clients/index.ts"; +export * from "./adapters/index.ts"; + import Database from "better-sqlite3"; import fs from "fs"; import yargs from "yargs"; diff --git a/core/src/lib.ts b/core/src/lib.ts deleted file mode 100644 index 84aaf776969..00000000000 --- a/core/src/lib.ts +++ /dev/null @@ -1,48 +0,0 @@ -import Database from "better-sqlite3"; -import fs from "fs"; -import yargs from "yargs"; -import askClaude from "./actions/ask_claude.ts"; -import follow_room from "./actions/follow_room.ts"; -import imageGeneration from "./actions/imageGeneration.ts"; -import mute_room from "./actions/mute_room.ts"; -import swap from "./actions/swap.ts"; -import unfollow_room from "./actions/unfollow_room.ts"; -import unmute_room from "./actions/unmute_room.ts"; -import { PostgresDatabaseAdapter } from "./adapters/postgres.ts"; -import { SqliteDatabaseAdapter } from "./adapters/sqlite.ts"; -import DirectClient from "./clients/direct/index.ts"; -import { DiscordClient } from "./clients/discord/index.ts"; -import { TelegramClient } from "./clients/telegram/src/index.ts"; // Added Telegram import -import { TwitterGenerationClient } from "./clients/twitter/generate.ts"; -import { TwitterInteractionClient } from "./clients/twitter/interactions.ts"; -import { TwitterSearchClient } from "./clients/twitter/search.ts"; -import { wait } from "./clients/twitter/utils.ts"; -import { defaultActions } from "./core/actions.ts"; -import defaultCharacter from "./core/defaultCharacter.ts"; -import { AgentRuntime } from "./core/runtime.ts"; -import settings from "./core/settings.ts"; -import { Character, IAgentRuntime, ModelProvider } from "./core/types.ts"; // Added IAgentRuntime -import boredomProvider from "./providers/boredom.ts"; -import timeProvider from "./providers/time.ts"; -import walletProvider from "./providers/wallet.ts"; -import readline from "readline"; -import orderbook from "./providers/order_book.ts"; -import tokenProvider from "./providers/token.ts"; - -export { - askClaude, - follow_room, - imageGeneration, - mute_room, - swap, - unfollow_room, - unmute_room, - PostgresDatabaseAdapter, - SqliteDatabaseAdapter, - DirectClient, - DiscordClient, - TelegramClient, - TwitterGenerationClient, - TwitterInteractionClient, - TwitterSearchClient, -};