From 1cb7b02f2efd96d1f7b1202e47549d46de599589 Mon Sep 17 00:00:00 2001 From: yodamaster726 Date: Fri, 22 Nov 2024 19:44:46 -0500 Subject: [PATCH 1/5] fix: ci errors - ILogObjMeta and ILogObj never used --- packages/core/src/logger.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/logger.ts b/packages/core/src/logger.ts index ae9b3a19852..918c9f2e6b7 100644 --- a/packages/core/src/logger.ts +++ b/packages/core/src/logger.ts @@ -1,5 +1,5 @@ import settings from "./settings.ts"; -import { Logger, ILogObjMeta, ILogObj } from "tslog"; +import { Logger } from "tslog"; interface IElizaLogger extends Logger { progress(message: string): void; From 7c3aeac241069e370042e024937082bd95383baa Mon Sep 17 00:00:00 2001 From: yodamaster726 Date: Fri, 22 Nov 2024 19:51:43 -0500 Subject: [PATCH 2/5] fix: Use "@ts-expect-error" instead of "@ts-ignore", --- packages/core/src/logger.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/core/src/logger.ts b/packages/core/src/logger.ts index 918c9f2e6b7..03f657bb0a7 100644 --- a/packages/core/src/logger.ts +++ b/packages/core/src/logger.ts @@ -180,7 +180,7 @@ class ElizaLogger implements IElizaLogger { } } - // @ts-ignore - custom implementation + // @ts-expect-error - custom implementation log(...strings) { this.#logWithStyle(strings, { fg: "white", @@ -190,7 +190,7 @@ class ElizaLogger implements IElizaLogger { }); } - // @ts-ignore - custom implementation + // @ts-expect-error - custom implementation warn(...strings) { this.#logWithStyle(strings, { fg: "yellow", @@ -200,7 +200,7 @@ class ElizaLogger implements IElizaLogger { }); } - // @ts-ignore - custom implementation + // @ts-expect-error - custom implementation error(...strings) { this.#logWithStyle(strings, { fg: "red", @@ -210,7 +210,7 @@ class ElizaLogger implements IElizaLogger { }); } - // @ts-ignore - custom implementation + // @ts-expect-error - custom implementation info(...strings) { this.#logWithStyle(strings, { fg: "blue", @@ -220,7 +220,7 @@ class ElizaLogger implements IElizaLogger { }); } - // @ts-ignore - custom implementation + // @ts-expect-error - custom implementation debug(...strings) { if (!this.verbose) return; this.#logWithStyle(strings, { From 2e1bfb9f848c5bdb858b21e4a3265ea9a9aa582b Mon Sep 17 00:00:00 2001 From: yodamaster726 Date: Fri, 22 Nov 2024 19:59:08 -0500 Subject: [PATCH 3/5] fix: missing tslog dpenendency --- packages/core/package.json | 1 + packages/core/src/logger.ts | 5 ----- pnpm-lock.yaml | 14 ++++++++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index f1ba762e2d1..248a38c66b5 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -75,6 +75,7 @@ "tiktoken": "1.0.17", "tinyld": "1.3.4", "together-ai": "^0.7.0", + "tslog": "^4.9.3", "unique-names-generator": "4.7.1", "uuid": "11.0.2", "zod": "^3.23.8" diff --git a/packages/core/src/logger.ts b/packages/core/src/logger.ts index 03f657bb0a7..e03c88c6ed4 100644 --- a/packages/core/src/logger.ts +++ b/packages/core/src/logger.ts @@ -180,7 +180,6 @@ class ElizaLogger implements IElizaLogger { } } - // @ts-expect-error - custom implementation log(...strings) { this.#logWithStyle(strings, { fg: "white", @@ -190,7 +189,6 @@ class ElizaLogger implements IElizaLogger { }); } - // @ts-expect-error - custom implementation warn(...strings) { this.#logWithStyle(strings, { fg: "yellow", @@ -200,7 +198,6 @@ class ElizaLogger implements IElizaLogger { }); } - // @ts-expect-error - custom implementation error(...strings) { this.#logWithStyle(strings, { fg: "red", @@ -210,7 +207,6 @@ class ElizaLogger implements IElizaLogger { }); } - // @ts-expect-error - custom implementation info(...strings) { this.#logWithStyle(strings, { fg: "blue", @@ -220,7 +216,6 @@ class ElizaLogger implements IElizaLogger { }); } - // @ts-expect-error - custom implementation debug(...strings) { if (!this.verbose) return; this.#logWithStyle(strings, { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9994e7715d1..eccbfe91c82 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -583,6 +583,9 @@ importers: together-ai: specifier: ^0.7.0 version: 0.7.0(encoding@0.1.13) + tslog: + specifier: ^4.9.3 + version: 4.9.3 unique-names-generator: specifier: 4.7.1 version: 4.7.1 @@ -679,7 +682,7 @@ importers: version: 2.79.2 ts-jest: specifier: 29.2.5 - version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.8.4)(ts-node@10.9.2(@swc/core@1.9.2(@swc/helpers@0.5.15))(@types/node@22.8.4)(typescript@5.6.3)))(typescript@5.6.3) + version: 29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.24.0)(jest@29.7.0(@types/node@22.8.4)(ts-node@10.9.2(@swc/core@1.9.2(@swc/helpers@0.5.15))(@types/node@22.8.4)(typescript@5.6.3)))(typescript@5.6.3) ts-node: specifier: 10.9.2 version: 10.9.2(@swc/core@1.9.2(@swc/helpers@0.5.15))(@types/node@22.8.4)(typescript@5.6.3) @@ -13660,6 +13663,10 @@ packages: tslib@2.8.0: resolution: {integrity: sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==} + tslog@4.9.3: + resolution: {integrity: sha512-oDWuGVONxhVEBtschLf2cs/Jy8i7h1T+CpdkTNWQgdAF7DhRo2G8vMCgILKe7ojdEkLhICWgI1LYSSKaJsRgcw==} + engines: {node: '>=16'} + tsup@8.3.5: resolution: {integrity: sha512-Tunf6r6m6tnZsG9GYWndg0z8dEV7fD733VBFzFJ5Vcm1FtlXB8xBD/rtrBi2a3YKEV7hHtxiZtW5EAVADoe1pA==} engines: {node: '>=18'} @@ -30689,7 +30696,7 @@ snapshots: ts-interface-checker@0.1.13: {} - ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(jest@29.7.0(@types/node@22.8.4)(ts-node@10.9.2(@swc/core@1.9.2(@swc/helpers@0.5.15))(@types/node@22.8.4)(typescript@5.6.3)))(typescript@5.6.3): + ts-jest@29.2.5(@babel/core@7.26.0)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.0))(esbuild@0.24.0)(jest@29.7.0(@types/node@22.8.4)(ts-node@10.9.2(@swc/core@1.9.2(@swc/helpers@0.5.15))(@types/node@22.8.4)(typescript@5.6.3)))(typescript@5.6.3): dependencies: bs-logger: 0.2.6 ejs: 3.1.10 @@ -30707,6 +30714,7 @@ snapshots: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 babel-jest: 29.7.0(@babel/core@7.26.0) + esbuild: 0.24.0 ts-mixer@6.0.4: {} @@ -30742,6 +30750,8 @@ snapshots: tslib@2.8.0: {} + tslog@4.9.3: {} + tsup@8.3.5(@swc/core@1.9.2(@swc/helpers@0.5.15))(jiti@2.4.0)(postcss@8.4.49)(typescript@5.6.3)(yaml@2.6.1): dependencies: bundle-require: 5.0.0(esbuild@0.24.0) From 330bbdc8d39ffac1d25a5fbaf3dfd49e114ff3f4 Mon Sep 17 00:00:00 2001 From: yodamaster726 Date: Sat, 23 Nov 2024 00:36:12 -0500 Subject: [PATCH 4/5] fix: put back defaultcharacter.ts and ci issues with logger.ts --- packages/core/src/logger.ts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/packages/core/src/logger.ts b/packages/core/src/logger.ts index e03c88c6ed4..847ac4b4237 100644 --- a/packages/core/src/logger.ts +++ b/packages/core/src/logger.ts @@ -243,17 +243,6 @@ class ElizaLogger implements IElizaLogger { groupTitle: ` ${this.assertsTitle}`, }); } - - progress(message: string) { - if (this.isNode) { - // Clear the current line and move cursor to beginning - process.stdout.clearLine(0); - process.stdout.cursorTo(0); - process.stdout.write(message); - } else { - console.log(message); - } - } } export const elizaLogger = new ElizaLogger(); From 95d1dd36440e9fe51ce16438d22d0bd53cd5c38a Mon Sep 17 00:00:00 2001 From: yodamaster726 Date: Sat, 23 Nov 2024 00:36:18 -0500 Subject: [PATCH 5/5] fix: defaultCharacter and get the CI / CD pipeline working --- packages/core/package.json | 1 - packages/core/src/defaultCharacter.ts | 2 +- packages/core/src/logger.ts | 18 ++++++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 248a38c66b5..f1ba762e2d1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -75,7 +75,6 @@ "tiktoken": "1.0.17", "tinyld": "1.3.4", "together-ai": "^0.7.0", - "tslog": "^4.9.3", "unique-names-generator": "4.7.1", "uuid": "11.0.2", "zod": "^3.23.8" diff --git a/packages/core/src/defaultCharacter.ts b/packages/core/src/defaultCharacter.ts index 1a1b4e75834..2ca1bf0179c 100644 --- a/packages/core/src/defaultCharacter.ts +++ b/packages/core/src/defaultCharacter.ts @@ -5,7 +5,7 @@ export const defaultCharacter: Character = { username: "eliza", plugins: [], clients: [], - modelProvider: ModelProviderName.OLLAMA, + modelProvider: ModelProviderName.OPENAI, settings: { secrets: {}, voice: { diff --git a/packages/core/src/logger.ts b/packages/core/src/logger.ts index 847ac4b4237..a2bd21971e3 100644 --- a/packages/core/src/logger.ts +++ b/packages/core/src/logger.ts @@ -1,11 +1,6 @@ import settings from "./settings.ts"; -import { Logger } from "tslog"; -interface IElizaLogger extends Logger { - progress(message: string): void; -} - -class ElizaLogger implements IElizaLogger { +class ElizaLogger { constructor() { // Check if we're in Node.js environment this.isNode = @@ -243,6 +238,17 @@ class ElizaLogger implements IElizaLogger { groupTitle: ` ${this.assertsTitle}`, }); } + + progress(message: string) { + if (this.isNode) { + // Clear the current line and move cursor to beginning + process.stdout.clearLine(0); + process.stdout.cursorTo(0); + process.stdout.write(message); + } else { + console.log(message); + } + } } export const elizaLogger = new ElizaLogger();