From d9aa0cd997dcb59b8e0a5a13a67f310fd17fbcf6 Mon Sep 17 00:00:00 2001 From: odilitime Date: Sat, 28 Dec 2024 04:08:48 +0000 Subject: [PATCH 1/4] Revert "lint: fix EmbeddingProvider already defined error (via claude)" This reverts commit bbbf3255311c7ac582555ff514b9eb9bbdd43ad0. --- packages/core/src/embedding.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/core/src/embedding.ts b/packages/core/src/embedding.ts index dab1f5fea43..a45439894b0 100644 --- a/packages/core/src/embedding.ts +++ b/packages/core/src/embedding.ts @@ -14,22 +14,22 @@ interface EmbeddingOptions { provider?: string; } -// Define the providers as a const object -export const EMBEDDING_PROVIDERS = { +export const EmbeddingProvider = { OpenAI: "OpenAI", Ollama: "Ollama", GaiaNet: "GaiaNet", BGE: "BGE", } as const; -// Create type from the values -export type EmbeddingProvider = typeof EMBEDDING_PROVIDERS[keyof typeof EMBEDDING_PROVIDERS]; +export type EmbeddingProvider = + (typeof EmbeddingProvider)[keyof typeof EmbeddingProvider]; -// If you need individual types, use type aliases instead of namespace -export type OpenAIProvider = typeof EMBEDDING_PROVIDERS.OpenAI; -export type OllamaProvider = typeof EMBEDDING_PROVIDERS.Ollama; -export type GaiaNetProvider = typeof EMBEDDING_PROVIDERS.GaiaNet; -export type BGEProvider = typeof EMBEDDING_PROVIDERS.BGE; +export namespace EmbeddingProvider { + export type OpenAI = typeof EmbeddingProvider.OpenAI; + export type Ollama = typeof EmbeddingProvider.Ollama; + export type GaiaNet = typeof EmbeddingProvider.GaiaNet; + export type BGE = typeof EmbeddingProvider.BGE; +} export type EmbeddingConfig = { readonly dimensions: number; From 3a4b4ebd7bab9b23f4a06152086ab197b0ea8c1a Mon Sep 17 00:00:00 2001 From: odilitime Date: Wed, 1 Jan 2025 08:25:24 +0000 Subject: [PATCH 2/4] fix evm deps --- turbo.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/turbo.json b/turbo.json index d0aa3b96dea..190a7abdddc 100644 --- a/turbo.json +++ b/turbo.json @@ -25,6 +25,10 @@ "outputs": ["dist/**"], "dependsOn": ["@elizaos/plugin-node#build"] }, + "@elizaos/plugin-evm#build": { + "outputs": ["dist/**"], + "dependsOn": ["@elizaos/plugin-tee#build"] + }, "eliza-docs#build": { "outputs": ["build/**"] }, From c84cc308489267ccd10581eefd1ca80a9d64389c Mon Sep 17 00:00:00 2001 From: odilitime Date: Wed, 1 Jan 2025 08:25:55 +0000 Subject: [PATCH 3/4] fix bad merge --- packages/core/src/embedding.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/embedding.ts b/packages/core/src/embedding.ts index 427e1762fe9..09cf1447ed5 100644 --- a/packages/core/src/embedding.ts +++ b/packages/core/src/embedding.ts @@ -34,7 +34,7 @@ export namespace EmbeddingProvider { export type EmbeddingConfig = { readonly dimensions: number; readonly model: string; - readonly provider: EmbeddingProviderType; + readonly provider: EmbeddingProvider; }; export const getEmbeddingConfig = (): EmbeddingConfig => ({ From d2b652c7af19819f886bef19bb7776ffcff42662 Mon Sep 17 00:00:00 2001 From: odilitime Date: Wed, 1 Jan 2025 08:29:14 +0000 Subject: [PATCH 4/4] remove claude changes --- packages/core/src/embedding.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/core/src/embedding.ts b/packages/core/src/embedding.ts index 09cf1447ed5..659001b0c29 100644 --- a/packages/core/src/embedding.ts +++ b/packages/core/src/embedding.ts @@ -21,20 +21,13 @@ export const EmbeddingProvider = { BGE: "BGE", } as const; -export type EmbeddingProvider = +export type EmbeddingProviderType = (typeof EmbeddingProvider)[keyof typeof EmbeddingProvider]; -export namespace EmbeddingProvider { - export type OpenAI = typeof EmbeddingProvider.OpenAI; - export type Ollama = typeof EmbeddingProvider.Ollama; - export type GaiaNet = typeof EmbeddingProvider.GaiaNet; - export type BGE = typeof EmbeddingProvider.BGE; -} - export type EmbeddingConfig = { readonly dimensions: number; readonly model: string; - readonly provider: EmbeddingProvider; + readonly provider: EmbeddingProviderType; }; export const getEmbeddingConfig = (): EmbeddingConfig => ({