Backend ai fixes

backend/.development.env

@@ -57,11 +57,6 @@ JWT_SECRET=MySuperSecretJwtSecret
 
 TEMPORARY_JWT_SECRET=MySuperSecretTemporaryJwtSecret
 
-# session secret for storing ai history
-# you need it if you want to use openai service
-# required if OPENAI_API_KEY is set
-SESSION_SECRET=MySuperSecretSessionSecret
-
 # for authorization with google
 GOOGLE_CLIENT_ID=
 

backend/package.json

@@ -48,7 +48,6 @@
     "@sentry/minimal": "^6.19.7",
     "@sentry/node": "8.52.0",
     "@types/crypto-js": "^4.2.2",
-    "@types/express-session": "^1.18.2",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/multer": "^2.0.0",
     "@types/nodemailer": "^6.4.17",
@@ -71,7 +70,6 @@
     "eslint-plugin-security": "3.0.1",
     "express": "5.1.0",
     "express-rate-limit": "7.5.1",
-    "express-session": "^1.18.1",
     "fetch-blob": "^4.0.0",
     "helmet": "8.1.0",
     "ip-range-check": "0.2.0",

backend/src/common/application/global-database-context.interface.ts

@@ -1,52 +1,54 @@
 import { Repository } from 'typeorm';
 import { IAgentRepository } from '../../entities/agent/repository/agent.repository.interface.js';
+import { IAiResponsesToUserRepository } from '../../entities/ai/ai-data-entities/ai-reponses-to-user/ai-responses-to-user-repository.interface.js';
+import { AiResponsesToUserEntity } from '../../entities/ai/ai-data-entities/ai-reponses-to-user/ai-responses-to-user.entity.js';
+import { IAiUserFilesRepository } from '../../entities/ai/ai-data-entities/ai-user-files/ai-user-files-repository.interface.js';
+import { AiUserFileEntity } from '../../entities/ai/ai-data-entities/ai-user-files/ai-user-files.entity.js';
+import { IAiUserThreadsRepository } from '../../entities/ai/ai-data-entities/ai-user-threads/ai-user-threads-repository.interface.js';
+import { AiUserThreadEntity } from '../../entities/ai/ai-data-entities/ai-user-threads/ai-user-threads.entity.js';
+import { UserApiKeyEntity } from '../../entities/api-key/api-key.entity.js';
+import { IUserApiKeyRepository } from '../../entities/api-key/repository/user-api-key-repository.interface.js';
+import { CompanyFaviconEntity } from '../../entities/company-favicon/company-favicon.entity.js';
+import { CompanyInfoEntity } from '../../entities/company-info/company-info.entity.js';
+import { InvitationInCompanyEntity } from '../../entities/company-info/invitation-in-company/invitation-in-company.entity.js';
+import { IInvitationInCompanyRepository } from '../../entities/company-info/invitation-in-company/repository/invitation-repository.interface.js';
+import { ICompanyInfoRepository } from '../../entities/company-info/repository/company-info-repository.interface.js';
+import { CompanyLogoEntity } from '../../entities/company-logo/company-logo.entity.js';
+import { CompanyTabTitleEntity } from '../../entities/company-tab-title/company-tab-title.entity.js';
 import { IConnectionPropertiesRepository } from '../../entities/connection-properties/repository/connection-properties.repository.interface.js';
+import { ConnectionEntity } from '../../entities/connection/connection.entity.js';
 import { IConnectionRepository } from '../../entities/connection/repository/connection.repository.interface.js';
 import { ICustomFieldsRepository } from '../../entities/custom-field/repository/custom-fields-repository.interface.js';
 import { IEmailVerificationRepository } from '../../entities/email/repository/email-verification.repository.interface.js';
 import { IGroupRepository } from '../../entities/group/repository/group.repository.interface.js';
 import { ILogOutRepository } from '../../entities/log-out/repository/log-out-repository.interface.js';
 import { IPermissionRepository } from '../../entities/permission/repository/permission.repository.interface.js';
+import { ActionEventsEntity } from '../../entities/table-actions/table-action-events-module/action-event.entity.js';
+import { IActionEventsRepository } from '../../entities/table-actions/table-action-events-module/repository/action-events-custom-repository.interface.js';
+import { ActionRulesEntity } from '../../entities/table-actions/table-action-rules-module/action-rules.entity.js';
+import { IActionRulesRepository } from '../../entities/table-actions/table-action-rules-module/repository/action-rules-custom-repository.interface.js';
 import { ITableActionRepository } from '../../entities/table-actions/table-actions-module/repository/table-action-custom-repository.interface.js';
+import { TableActionEntity } from '../../entities/table-actions/table-actions-module/table-action.entity.js';
 import { TableFieldInfoEntity } from '../../entities/table-field-info/table-field-info.entity.js';
+import { ITableFiltersCustomRepository } from '../../entities/table-filters/repository/table-filters-custom-repository.interface.js';
+import { TableFiltersEntity } from '../../entities/table-filters/table-filters.entity.js';
 import { TableInfoEntity } from '../../entities/table-info/table-info.entity.js';
 import { ITableLogsRepository } from '../../entities/table-logs/repository/table-logs-repository.interface.js';
 import { ITableSettingsRepository } from '../../entities/table-settings/repository/table-settings.repository.interface.js';
+import { TableSettingsEntity } from '../../entities/table-settings/table-settings.entity.js';
 import { IUserAccessRepository } from '../../entities/user-access/repository/user-access.repository.interface.js';
 import { IUserActionRepository } from '../../entities/user-actions/repository/user-action.repository.interface.js';
 import { IUserRepository } from '../../entities/user/repository/user.repository.interface.js';
 import { IEmailChangeRepository } from '../../entities/user/user-email/repository/email-change.repository.interface.js';
+import { IUserGitHubIdentifierRepository } from '../../entities/user/user-github-identifier/repository/user-github-identifier-repository.interface.js';
 import { IUserInvitationRepository } from '../../entities/user/user-invitation/repository/user-invitation-repository.interface.js';
 import { IPasswordResetRepository } from '../../entities/user/user-password/repository/password-reset-repository.interface.js';
-import { ITableWidgetsRepository } from '../../entities/widget/repository/table-widgets-repository.interface.js';
-import { IDatabaseContext } from '../database-context.interface.js';
-import { IUserGitHubIdentifierRepository } from '../../entities/user/user-github-identifier/repository/user-github-identifier-repository.interface.js';
-import { CompanyInfoEntity } from '../../entities/company-info/company-info.entity.js';
-import { ICompanyInfoRepository } from '../../entities/company-info/repository/company-info-repository.interface.js';
-import { InvitationInCompanyEntity } from '../../entities/company-info/invitation-in-company/invitation-in-company.entity.js';
-import { IInvitationInCompanyRepository } from '../../entities/company-info/invitation-in-company/repository/invitation-repository.interface.js';
 import { IUserSessionSettings } from '../../entities/user/user-session-settings/reposiotory/user-session-settings-repository.interface.js';
 import { UserSessionSettingsEntity } from '../../entities/user/user-session-settings/user-session-settings.entity.js';
 import { UserEntity } from '../../entities/user/user.entity.js';
-import { ConnectionEntity } from '../../entities/connection/connection.entity.js';
-import { ActionRulesEntity } from '../../entities/table-actions/table-action-rules-module/action-rules.entity.js';
-import { IActionRulesRepository } from '../../entities/table-actions/table-action-rules-module/repository/action-rules-custom-repository.interface.js';
-import { IActionEventsRepository } from '../../entities/table-actions/table-action-events-module/repository/action-events-custom-repository.interface.js';
-import { UserApiKeyEntity } from '../../entities/api-key/api-key.entity.js';
-import { IUserApiKeyRepository } from '../../entities/api-key/repository/user-api-key-repository.interface.js';
-import { ActionEventsEntity } from '../../entities/table-actions/table-action-events-module/action-event.entity.js';
-import { TableActionEntity } from '../../entities/table-actions/table-actions-module/table-action.entity.js';
-import { IAiUserThreadsRepository } from '../../entities/ai/ai-data-entities/ai-user-threads/ai-user-threads-repository.interface.js';
-import { AiUserThreadEntity } from '../../entities/ai/ai-data-entities/ai-user-threads/ai-user-threads.entity.js';
-import { IAiUserFilesRepository } from '../../entities/ai/ai-data-entities/ai-user-files/ai-user-files-repository.interface.js';
-import { AiUserFileEntity } from '../../entities/ai/ai-data-entities/ai-user-files/ai-user-files.entity.js';
-import { CompanyLogoEntity } from '../../entities/company-logo/company-logo.entity.js';
-import { CompanyFaviconEntity } from '../../entities/company-favicon/company-favicon.entity.js';
-import { CompanyTabTitleEntity } from '../../entities/company-tab-title/company-tab-title.entity.js';
-import { TableFiltersEntity } from '../../entities/table-filters/table-filters.entity.js';
-import { ITableFiltersCustomRepository } from '../../entities/table-filters/repository/table-filters-custom-repository.interface.js';
-import { TableSettingsEntity } from '../../entities/table-settings/table-settings.entity.js';
+import { ITableWidgetsRepository } from '../../entities/widget/repository/table-widgets-repository.interface.js';
 import { TableWidgetEntity } from '../../entities/widget/table-widget.entity.js';
+import { IDatabaseContext } from '../database-context.interface.js';
 
 export interface IGlobalDatabaseContext extends IDatabaseContext {
   userRepository: Repository<UserEntity> & IUserRepository;
@@ -82,4 +84,5 @@ export interface IGlobalDatabaseContext extends IDatabaseContext {
   companyFaviconRepository: Repository<CompanyFaviconEntity>;
   companyTabTitleRepository: Repository<CompanyTabTitleEntity>;
   tableFiltersRepository: Repository<TableFiltersEntity> & ITableFiltersCustomRepository;
+  aiResponsesToUserRepository: Repository<AiResponsesToUserEntity> & IAiResponsesToUserRepository;
 }

backend/src/common/application/global-database-context.ts

@@ -90,6 +90,9 @@ import { CompanyTabTitleEntity } from '../../entities/company-tab-title/company-
 import { TableFiltersEntity } from '../../entities/table-filters/table-filters.entity.js';
 import { ITableFiltersCustomRepository } from '../../entities/table-filters/repository/table-filters-custom-repository.interface.js';
 import { tableFiltersCustomRepositoryExtension } from '../../entities/table-filters/repository/table-filters-custom-repository-extension.js';
+import { IAiResponsesToUserRepository } from '../../entities/ai/ai-data-entities/ai-reponses-to-user/ai-responses-to-user-repository.interface.js';
+import { AiResponsesToUserEntity } from '../../entities/ai/ai-data-entities/ai-reponses-to-user/ai-responses-to-user.entity.js';
+import { aiResponsesToUserRepositoryExtension } from '../../entities/ai/ai-data-entities/ai-reponses-to-user/ai-reponses-to-user-repository.extension.js';
 
 @Injectable({ scope: Scope.REQUEST })
 export class GlobalDatabaseContext implements IGlobalDatabaseContext {
@@ -128,6 +131,7 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
   private _companyFaviconRepository: Repository<CompanyFaviconEntity>;
   private _companyTabTitleRepository: Repository<CompanyTabTitleEntity>;
   private _tableFiltersRepository: Repository<TableFiltersEntity> & ITableFiltersCustomRepository;
+  private _aiResponsesToUserRepository: Repository<AiResponsesToUserEntity> & IAiResponsesToUserRepository;
 
   public constructor(
     @Inject(BaseType.DATA_SOURCE)
@@ -216,6 +220,9 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
     this._tableFiltersRepository = this.appDataSource
       .getRepository(TableFiltersEntity)
       .extend(tableFiltersCustomRepositoryExtension);
+    this._aiResponsesToUserRepository = this.appDataSource
+      .getRepository(AiResponsesToUserEntity)
+      .extend(aiResponsesToUserRepositoryExtension);
   }
 
   public get userRepository(): Repository<UserEntity> & IUserRepository {
@@ -350,6 +357,10 @@ export class GlobalDatabaseContext implements IGlobalDatabaseContext {
     return this._tableFiltersRepository;
   }
 
+  public get aiResponsesToUserRepository(): Repository<AiResponsesToUserEntity> & IAiResponsesToUserRepository {
+    return this._aiResponsesToUserRepository;
+  }
+
   public startTransaction(): Promise<void> {
     this._queryRunner = this.appDataSource.createQueryRunner();
     this._queryRunner.startTransaction();

backend/src/entities/ai/ai-data-entities/ai-reponses-to-user/ai-reponses-to-user-repository.extension.ts

@@ -0,0 +1,19 @@
+import { IAiResponsesToUserRepository } from './ai-responses-to-user-repository.interface.js';
+import { AiResponsesToUserEntity } from './ai-responses-to-user.entity.js';
+
+export const aiResponsesToUserRepositoryExtension: IAiResponsesToUserRepository = {
+  async findResponsesByUserId(userId: string): Promise<Array<AiResponsesToUserEntity>> {
+    return await this.createQueryBuilder('ai_responses_to_user')
+      .leftJoin('ai_responses_to_user.user', 'user')
+      .where('user.id = :userId', { userId })
+      .getMany();
+  },
+
+  async findResponseByIdAndUserId(responseId: string, userId: string): Promise<AiResponsesToUserEntity> {
+    return await this.createQueryBuilder('ai_responses_to_user')
+      .leftJoin('ai_responses_to_user.user', 'user')
+      .where('user.id = :userId', { userId })
+      .andWhere('ai_responses_to_user.id = :responseId', { responseId })
+      .getOne();
+  },
+};

backend/src/entities/ai/ai-data-entities/ai-reponses-to-user/ai-responses-to-user-repository.interface.ts

@@ -0,0 +1,7 @@
+import { AiResponsesToUserEntity } from './ai-responses-to-user.entity.js';
+
+export interface IAiResponsesToUserRepository {
+  findResponsesByUserId(userId: string): Promise<Array<AiResponsesToUserEntity>>;
+
+  findResponseByIdAndUserId(responseId: string, userId: string): Promise<AiResponsesToUserEntity>;
+}

backend/src/entities/ai/ai-data-entities/ai-reponses-to-user/ai-responses-to-user.entity.ts

@@ -0,0 +1,29 @@
+import { BeforeUpdate, Column, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, Relation } from 'typeorm';
+import { UserEntity } from '../../../user/user.entity.js';
+
+@Entity('ai_responses_to_user')
+export class AiResponsesToUserEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column({ type: 'varchar', length: 128, nullable: true })
+  ai_response_id: string;
+
+  @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+  createdAt: Date;
+
+  @Column({ type: 'timestamp', default: null, nullable: true })
+  updatedAt: Date;
+
+  @Column()
+  user_id: string;
+
+  @ManyToOne((_) => UserEntity, (user) => user.ai_responses, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'user_id' })
+  user: Relation<UserEntity>;
+
+  @BeforeUpdate()
+  updateTimestamp() {
+    this.updatedAt = new Date();
+  }
+}

backend/src/entities/ai/application/data-structures/request-info-from-table.ds.ts

@@ -9,4 +9,5 @@ export class RequestInfoFromTableDS {
 
 export class RequestInfoFromTableDSV2 extends RequestInfoFromTableDS {
   response: Response;
+  ai_thread_id?: string | null;
 }