From 5b4d2d989a3f79d1d500a3baa995acbcd6a8a441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Malfait?= Date: Thu, 4 Jul 2024 10:21:33 +0200 Subject: [PATCH] Hotfix tests after AI PR (#6124) I merged https://github.com/twentyhq/twenty/pull/5788 too quickly and didn't noticed it was broken with https://github.com/twentyhq/twenty/pull/6069 --- .../core-modules/ai-sql-query/ai-sql-query.service.ts | 11 ++++------- .../integrations/environment/environment-variables.ts | 2 +- .../interfaces/llm-chat-model.interface.ts | 2 +- .../llm-chat-model/llm-chat-model.module-factory.ts | 4 +--- .../llm-chat-model/llm-chat-model.module.ts | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/twenty-server/src/engine/core-modules/ai-sql-query/ai-sql-query.service.ts b/packages/twenty-server/src/engine/core-modules/ai-sql-query/ai-sql-query.service.ts index b1c939847..465f9a0a4 100644 --- a/packages/twenty-server/src/engine/core-modules/ai-sql-query/ai-sql-query.service.ts +++ b/packages/twenty-server/src/engine/core-modules/ai-sql-query/ai-sql-query.service.ts @@ -8,8 +8,6 @@ import { zodToJsonSchema } from 'zod-to-json-schema'; import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions'; import groupBy from 'lodash.groupby'; -import { PartialFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface'; - import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service'; import { WorkspaceQueryRunnerService } from 'src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service'; import { LLMChatModelService } from 'src/engine/integrations/llm-chat-model/llm-chat-model.service'; @@ -17,7 +15,6 @@ import { LLMTracingService } from 'src/engine/integrations/llm-tracing/llm-traci import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; import { DEFAULT_LABEL_IDENTIFIER_FIELD_NAME } from 'src/engine/metadata-modules/object-metadata/object-metadata.constants'; import { StandardObjectFactory } from 'src/engine/workspace-manager/workspace-sync-metadata/factories/standard-object.factory'; -import { standardObjectMetadataDefinitions } from 'src/engine/workspace-manager/workspace-sync-metadata/standard-objects'; import { AISQLQueryResult } from 'src/engine/core-modules/ai-sql-query/dtos/ai-sql-query-result.dto'; import { sqlGenerationPromptTemplate } from 'src/engine/core-modules/ai-sql-query/ai-sql-query.prompt-templates'; @@ -43,7 +40,7 @@ export class AISQLQueryService { fieldMetadata.id === objectMetadata.labelIdentifierFieldMetadataId, ); - const standardObjectMetadataCollection = this.standardObjectFactory.create( + /* const standardObjectMetadataCollection = this.standardObjectFactory.create( standardObjectMetadataDefinitions, { workspaceId, dataSourceId }, workspaceFeatureFlagsMap, @@ -58,11 +55,11 @@ export class AISQLQueryService { ?.fields.find( (field: PartialFieldMetadata) => field.name === DEFAULT_LABEL_IDENTIFIER_FIELD_NAME, - ) as PartialFieldMetadata; + ) as PartialFieldMetadata; */ const labelIdentifierFieldMetadata = - customObjectLabelIdentifierFieldMetadata ?? - standardObjectLabelIdentifierFieldMetadata; + customObjectLabelIdentifierFieldMetadata; /*?? + standardObjectLabelIdentifierFieldMetadata*/ return ( labelIdentifierFieldMetadata?.name ?? DEFAULT_LABEL_IDENTIFIER_FIELD_NAME diff --git a/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts b/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts index 544045b65..2be0f2c75 100644 --- a/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts +++ b/packages/twenty-server/src/engine/integrations/environment/environment-variables.ts @@ -371,7 +371,7 @@ export class EnvironmentVariables { OPENROUTER_API_KEY: string; - LLM_CHAT_MODEL_DRIVER: LLMChatModelDriver = LLMChatModelDriver.OpenAI; + LLM_CHAT_MODEL_DRIVER: LLMChatModelDriver; OPENAI_API_KEY: string; diff --git a/packages/twenty-server/src/engine/integrations/llm-chat-model/interfaces/llm-chat-model.interface.ts b/packages/twenty-server/src/engine/integrations/llm-chat-model/interfaces/llm-chat-model.interface.ts index 35a731a4d..5c6edbcd0 100644 --- a/packages/twenty-server/src/engine/integrations/llm-chat-model/interfaces/llm-chat-model.interface.ts +++ b/packages/twenty-server/src/engine/integrations/llm-chat-model/interfaces/llm-chat-model.interface.ts @@ -9,6 +9,6 @@ export interface LLMChatModelModuleOptions { } export type LLMChatModelModuleAsyncOptions = { - useFactory: (...args: any[]) => LLMChatModelModuleOptions; + useFactory: (...args: any[]) => LLMChatModelModuleOptions | undefined; } & Pick & Pick; diff --git a/packages/twenty-server/src/engine/integrations/llm-chat-model/llm-chat-model.module-factory.ts b/packages/twenty-server/src/engine/integrations/llm-chat-model/llm-chat-model.module-factory.ts index b89a7c983..2d91f280c 100644 --- a/packages/twenty-server/src/engine/integrations/llm-chat-model/llm-chat-model.module-factory.ts +++ b/packages/twenty-server/src/engine/integrations/llm-chat-model/llm-chat-model.module-factory.ts @@ -12,8 +12,6 @@ export const llmChatModelModuleFactory = ( return { type: LLMChatModelDriver.OpenAI }; } default: - throw new Error( - `Invalid LLM chat model driver (${driver}), check your .env file`, - ); + // `No LLM chat model driver (${driver})`); } }; diff --git a/packages/twenty-server/src/engine/integrations/llm-chat-model/llm-chat-model.module.ts b/packages/twenty-server/src/engine/integrations/llm-chat-model/llm-chat-model.module.ts index 536c7fcba..279993f72 100644 --- a/packages/twenty-server/src/engine/integrations/llm-chat-model/llm-chat-model.module.ts +++ b/packages/twenty-server/src/engine/integrations/llm-chat-model/llm-chat-model.module.ts @@ -17,7 +17,7 @@ export class LLMChatModelModule { useFactory: (...args: any[]) => { const config = options.useFactory(...args); - switch (config.type) { + switch (config?.type) { case LLMChatModelDriver.OpenAI: { return new OpenAIDriver(); }