Merge branch 'main' into s3-widget-secure-paths-upload-fix

Author: gugu

backend/src/ai-core/providers/langchain-bedrock.provider.ts

@@ -185,7 +185,7 @@ export class LangchainBedrockProvider implements IAIProvider {
 		stream: AsyncIterable<AIMessageChunk>,
 	): Promise<IterableReadableStream<AIStreamChunk>> {
 		async function* generateChunks(): AsyncGenerator<AIStreamChunk> {
-			let currentToolCalls: Map<number, AIToolCall> = new Map();
+			let currentToolCalls: Map<number, { id: string; name: string; argsString: string }> = new Map();
 
 			for await (const chunk of stream) {
 				if (chunk.tool_call_chunks && chunk.tool_call_chunks.length > 0) {
@@ -196,7 +196,7 @@ export class LangchainBedrockProvider implements IAIProvider {
 							currentToolCalls.set(index, {
 								id: toolCallChunk.id || '',
 								name: toolCallChunk.name || '',
-								arguments: {},
+								argsString: '',
 							});
 						}
 
@@ -209,12 +209,7 @@ export class LangchainBedrockProvider implements IAIProvider {
 							currentCall.name = toolCallChunk.name;
 						}
 						if (toolCallChunk.args) {
-							try {
-								const parsedArgs = JSON.parse(toolCallChunk.args);
-								currentCall.arguments = { ...currentCall.arguments, ...parsedArgs };
-							} catch {
-								// Accumulate partial JSON - will be parsed when complete
-							}
+							currentCall.argsString += toolCallChunk.args;
 						}
 					}
 				}
@@ -231,11 +226,24 @@ export class LangchainBedrockProvider implements IAIProvider {
 				}
 			}
 
-			for (const toolCall of currentToolCalls.values()) {
-				if (toolCall.name) {
+			for (const toolCallData of currentToolCalls.values()) {
+				if (toolCallData.name) {
+					let parsedArgs: Record<string, unknown> = {};
+					if (toolCallData.argsString) {
+						try {
+							parsedArgs = JSON.parse(toolCallData.argsString);
+						} catch {
+							// Failed to parse args, use empty object
+						}
+					}
+
 					yield {
 						type: 'tool_call',
-						toolCall,
+						toolCall: {
+							id: toolCallData.id,
+							name: toolCallData.name,
+							arguments: parsedArgs,
+						},
 					};
 				}
 			}

backend/src/ai-core/providers/langchain-openai.provider.ts

@@ -18,8 +18,8 @@ import { getOptionalEnvVariable, getRequiredEnvVariable } from '../../helpers/ap
 
 @Injectable()
 export class LangchainOpenAIProvider implements IAIProvider {
-	private readonly defaultModelId = 'gpt-4o';
-	private readonly responsesApiModel = 'gpt-4o';
+	private readonly defaultModelId = 'gpt-5';
+	private readonly responsesApiModel = 'gpt-5';
 	private openaiClient: OpenAI;
 
 	constructor() {

backend/src/app.controller.ts

@@ -1,11 +1,13 @@
 import { Controller, Get, Inject, UseInterceptors } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { UseCaseType } from './common/data-injection.tokens.js';
+import { Timeout } from './decorators/timeout.decorator.js';
 import { InTransactionEnum } from './enums/index.js';
 import { SentryInterceptor } from './interceptors/index.js';
 import { IGetHello } from './use-cases-app/use-cases-app.interface.js';
 
 @UseInterceptors(SentryInterceptor)
+@Timeout()
 @Controller()
 @ApiTags('app')
 export class AppController {

backend/src/app.module.ts

@@ -1,5 +1,5 @@
 import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
-import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core';
+import { APP_GUARD } from '@nestjs/core';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';
 import { AppController } from './app.controller.js';
@@ -36,7 +36,7 @@ import { UserActionModule } from './entities/user-actions/user-action.module.js'
 import { UserSecretModule } from './entities/user-secret/user-secret.module.js';
 import { SignInAuditModule } from './entities/user-sign-in-audit/sign-in-audit.module.js';
 import { TableWidgetModule } from './entities/widget/table-widget.module.js';
-import { TimeoutInterceptor } from './interceptors/index.js';
+
 import { SaaSGatewayModule } from './microservices/gateways/saas-gateway.ts/saas-gateway.module.js';
 import { SaasModule } from './microservices/saas-microservice/saas.module.js';
 import { AppLoggerMiddleware } from './middlewares/logging-middleware/app-logger-middlewate.js';
@@ -101,10 +101,6 @@ import { DashboardWidgetModule } from './entities/visualizations/dashboard-widge
 	],
 	controllers: [AppController],
 	providers: [
-		{
-			provide: APP_INTERCEPTOR,
-			useClass: TimeoutInterceptor,
-		},
 		{
 			provide: APP_GUARD,
 			useClass: ThrottlerGuard,

backend/src/common/data-injection.tokens.ts

@@ -158,6 +158,7 @@ export enum UseCaseType {
 	DELETE_API_KEY = 'DELETE_API_KEY',
 
 	REQUEST_INFO_FROM_TABLE_WITH_AI_V2 = 'REQUEST_INFO_FROM_TABLE_WITH_AI_V2',
+	REQUEST_INFO_FROM_TABLE_WITH_AI_V3 = 'REQUEST_INFO_FROM_TABLE_WITH_AI_V3',
 	REQUEST_AI_SETTINGS_AND_WIDGETS_CREATION = 'REQUEST_AI_SETTINGS_AND_WIDGETS_CREATION',
 
 	CREATE_TABLE_FILTERS = 'CREATE_TABLE_FILTERS',

backend/src/decorators/index.ts

@@ -7,3 +7,4 @@ export { BodyUuid } from './body-uuid.decorator.js';
 export { QueryUuid } from './query-uuid.decorator.js';
 export { BodyEmail } from './body-email.decorator.js';
 export { QueryTableName } from './query-table-name.decorator.js';
+export { Timeout, TIMEOUT_KEY, TimeoutDefaults } from './timeout.decorator.js';

backend/src/decorators/timeout.decorator.ts

@@ -0,0 +1,17 @@
+import { SetMetadata, applyDecorators, UseInterceptors } from '@nestjs/common';
+import { TimeoutInterceptor } from '../interceptors/timeout.interceptor.js';
+
+export const TIMEOUT_KEY = 'custom_timeout';
+
+export const TimeoutDefaults = {
+	DEFAULT: 15000,
+	DEFAULT_TEST: 200000,
+	EXTENDED: 60000,
+	EXTENDED_TEST: 300000,
+	AI: 300000,
+	AI_TEST: 600000,
+} as const;
+
+export function Timeout(timeoutMs?: number): MethodDecorator & ClassDecorator {
+	return applyDecorators(SetMetadata(TIMEOUT_KEY, timeoutMs), UseInterceptors(TimeoutInterceptor));
+}

backend/src/entities/ai/ai.module.ts

@@ -8,6 +8,7 @@ import { UserEntity } from '../user/user.entity.js';
 import { AiService } from './ai.service.js';
 import { RequestAISettingsAndWidgetsCreationUseCase } from './use-cases/request-ai-settings-and-widgets-creation.use.case.js';
 import { RequestInfoFromTableWithAIUseCaseV5 } from './use-cases/request-info-from-table-with-ai-v5.use.case.js';
+import { RequestInfoFromTableWithAIUseCaseV6 } from './use-cases/request-info-from-table-with-ai-v6.use.case.js';
 import { UserAIRequestsControllerV2 } from './user-ai-requests-v2.controller.js';
 
 @Global()
@@ -22,6 +23,10 @@ import { UserAIRequestsControllerV2 } from './user-ai-requests-v2.controller.js'
 			provide: UseCaseType.REQUEST_INFO_FROM_TABLE_WITH_AI_V2,
 			useClass: RequestInfoFromTableWithAIUseCaseV5,
 		},
+		{
+			provide: UseCaseType.REQUEST_INFO_FROM_TABLE_WITH_AI_V3,
+			useClass: RequestInfoFromTableWithAIUseCaseV6,
+		},
 		{
 			provide: UseCaseType.REQUEST_AI_SETTINGS_AND_WIDGETS_CREATION,
 			useClass: RequestAISettingsAndWidgetsCreationUseCase,
@@ -37,6 +42,7 @@ export class AIModule implements NestModule {
 			.apply(AuthMiddleware)
 			.forRoutes(
 				{ path: '/ai/v2/request/:connectionId', method: RequestMethod.POST },
+				{ path: '/ai/v3/request/:connectionId', method: RequestMethod.POST },
 				{ path: '/ai/v2/setup/:connectionId', method: RequestMethod.GET },
 			);
 	}

backend/src/entities/ai/use-cases/request-info-from-table-with-ai-v5.use.case.ts

@@ -33,7 +33,7 @@ export class RequestInfoFromTableWithAIUseCaseV5
 	extends AbstractUseCase<RequestInfoFromTableDSV2, void>
 	implements IRequestInfoFromTableV2
 {
-	private readonly maxDepth: number = 5;
+	private readonly maxDepth: number = 10;
 
 	constructor(
 		@Inject(BaseType.GLOBAL_DB_CONTEXT)