refactor: remove smart info table (#13985)

e2e/src/api/specs/search.e2e-spec.ts

@@ -473,10 +473,7 @@ describe('/search', () => {
         .get('/search/explore')
         .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(200);
-      expect(body).toEqual([
+      expect(body).toEqual([{ fieldName: 'exifInfo.city', items: [] }]);
-        { fieldName: 'exifInfo.city', items: [] },
-        { fieldName: 'smartInfo.tags', items: [] },
-      ]);
     });
   });
 

open-api/immich-openapi-specs.json

@@ -8402,9 +8402,6 @@
             "description": "This property was deprecated in v1.113.0",
             "type": "boolean"
           },
-          "smartInfo": {
-            "$ref": "#/components/schemas/SmartInfoResponseDto"
-          },
           "stack": {
             "allOf": [
               {
@@ -11284,25 +11281,6 @@
         ],
         "type": "object"
       },
-      "SmartInfoResponseDto": {
-        "properties": {
-          "objects": {
-            "items": {
-              "type": "string"
-            },
-            "nullable": true,
-            "type": "array"
-          },
-          "tags": {
-            "items": {
-              "type": "string"
-            },
-            "nullable": true,
-            "type": "array"
-          }
-        },
-        "type": "object"
-      },
       "SmartSearchDto": {
         "properties": {
           "city": {

open-api/typescript-sdk/src/fetch-client.ts

@@ -221,10 +221,6 @@ export type PersonWithFacesResponseDto = {
     /** This property was added in v1.107.0 */
     updatedAt?: string;
 };
-export type SmartInfoResponseDto = {
-    objects?: string[] | null;
-    tags?: string[] | null;
-};
 export type AssetStackResponseDto = {
     assetCount: number;
     id: string;
@@ -267,7 +263,6 @@ export type AssetResponseDto = {
     people?: PersonWithFacesResponseDto[];
     /** This property was deprecated in v1.113.0 */
     resized?: boolean;
-    smartInfo?: SmartInfoResponseDto;
     stack?: (AssetStackResponseDto) | null;
     tags?: TagResponseDto[];
     thumbhash: string | null;

server/src/dtos/asset-response.dto.ts

@@ -12,7 +12,6 @@ import { TagResponseDto, mapTag } from 'src/dtos/tag.dto';
 import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { AssetEntity } from 'src/entities/asset.entity';
-import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 import { AssetType } from 'src/enum';
 import { mimeTypes } from 'src/utils/mime-types';
 
@@ -45,7 +44,6 @@ export class AssetResponseDto extends SanitizedAssetResponseDto {
   isTrashed!: boolean;
   isOffline!: boolean;
   exifInfo?: ExifResponseDto;
-  smartInfo?: SmartInfoResponseDto;
   tags?: TagResponseDto[];
   people?: PersonWithFacesResponseDto[];
   unassignedFaces?: AssetFaceWithoutPersonResponseDto[];
@@ -141,7 +139,6 @@ export function mapAsset(entity: AssetEntity, options: AssetMapOptions = {}): As
     isTrashed: !!entity.deletedAt,
     duration: entity.duration ?? '0:00:00.00000',
     exifInfo: entity.exifInfo ? mapExif(entity.exifInfo) : undefined,
-    smartInfo: entity.smartInfo ? mapSmartInfo(entity.smartInfo) : undefined,
     livePhotoVideoId: entity.livePhotoVideoId,
     tags: entity.tags?.map((tag) => mapTag(tag)),
     people: peopleWithFaces(entity.faces),
@@ -161,15 +158,3 @@ export class MemoryLaneResponseDto {
 
   assets!: AssetResponseDto[];
 }
-
-export class SmartInfoResponseDto {
-  tags?: string[] | null;
-  objects?: string[] | null;
-}
-
-export function mapSmartInfo(entity: SmartInfoEntity): SmartInfoResponseDto {
-  return {
-    tags: entity.tags,
-    objects: entity.objects,
-  };
-}

server/src/entities/asset.entity.ts

@@ -5,7 +5,6 @@ import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';
 import { ExifEntity } from 'src/entities/exif.entity';
 import { LibraryEntity } from 'src/entities/library.entity';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
-import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 import { SmartSearchEntity } from 'src/entities/smart-search.entity';
 import { StackEntity } from 'src/entities/stack.entity';
 import { TagEntity } from 'src/entities/tag.entity';
@@ -143,9 +142,6 @@ export class AssetEntity {
   @OneToOne(() => ExifEntity, (exifEntity) => exifEntity.asset)
   exifInfo?: ExifEntity;
 
-  @OneToOne(() => SmartInfoEntity, (smartInfoEntity) => smartInfoEntity.asset)
-  smartInfo?: SmartInfoEntity;
-
   @OneToOne(() => SmartSearchEntity, (smartSearchEntity) => smartSearchEntity.asset)
   smartSearch?: SmartSearchEntity;
 

server/src/entities/index.ts

@@ -18,7 +18,6 @@ import { PartnerEntity } from 'src/entities/partner.entity';
 import { PersonEntity } from 'src/entities/person.entity';
 import { SessionEntity } from 'src/entities/session.entity';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
-import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 import { SmartSearchEntity } from 'src/entities/smart-search.entity';
 import { StackEntity } from 'src/entities/stack.entity';
 import { SystemMetadataEntity } from 'src/entities/system-metadata.entity';
@@ -46,7 +45,6 @@ export const entities = [
   PartnerEntity,
   PersonEntity,
   SharedLinkEntity,
-  SmartInfoEntity,
   SmartSearchEntity,
   StackEntity,
   SystemMetadataEntity,

server/src/entities/smart-info.entity.ts

@@ -1,18 +0,0 @@
-import { AssetEntity } from 'src/entities/asset.entity';
-import { Column, Entity, JoinColumn, OneToOne, PrimaryColumn } from 'typeorm';
-
-@Entity('smart_info', { synchronize: false })
-export class SmartInfoEntity {
-  @OneToOne(() => AssetEntity, { onDelete: 'CASCADE', nullable: true })
-  @JoinColumn({ name: 'assetId', referencedColumnName: 'id' })
-  asset?: AssetEntity;
-
-  @PrimaryColumn()
-  assetId!: string;
-
-  @Column({ type: 'text', array: true, nullable: true })
-  tags!: string[] | null;
-
-  @Column({ type: 'text', array: true, nullable: true })
-  objects!: string[] | null;
-}

server/src/interfaces/asset.interface.ts

@@ -28,9 +28,7 @@ export enum WithoutProperty {
   EXIF = 'exif',
   SMART_SEARCH = 'smart-search',
   DUPLICATE = 'duplicate',
-  OBJECT_TAGS = 'object-tags',
   FACES = 'faces',
-  PERSON = 'person',
   SIDECAR = 'sidecar',
 }
 
@@ -94,7 +92,6 @@ export type AssetWithoutRelations = Omit<
   | 'library'
   | 'exifInfo'
   | 'sharedLinks'
-  | 'smartInfo'
   | 'smartSearch'
   | 'tags'
 >;
@@ -190,7 +187,6 @@ export interface IAssetRepository {
   upsertExif(exif: Partial<ExifEntity>): Promise<void>;
   upsertJobStatus(...jobStatus: Partial<AssetJobStatusEntity>[]): Promise<void>;
   getAssetIdByCity(userId: string, options: AssetExploreFieldOptions): Promise<SearchExploreItem<string>>;
-  getAssetIdByTag(userId: string, options: AssetExploreFieldOptions): Promise<SearchExploreItem<string>>;
   getDuplicates(options: AssetBuilderOptions): Promise<AssetEntity[]>;
   getAllForUserFullSync(options: AssetFullSyncOptions): Promise<AssetEntity[]>;
   getChangedDeltaSync(options: AssetDeltaSyncOptions): Promise<AssetEntity[]>;

server/src/interfaces/search.interface.ts

@@ -68,7 +68,6 @@ export interface SearchStatusOptions {
 
 export interface SearchOneToOneRelationOptions {
   withExif?: boolean;
-  withSmartInfo?: boolean;
   withStacked?: boolean;
 }
 

server/src/migrations/1730989238718-DropSmartInfoTable.ts

@@ -0,0 +1,11 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class DropSmartInfoTable1730989238718 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE smart_info`);
+  }
+
+  public async down(): Promise<void> {
+    // not implemented
+  }
+}

server/src/queries/asset.repository.sql

@@ -183,9 +183,6 @@ SELECT
   "AssetEntity__AssetEntity_exifInfo"."bitsPerSample" AS "AssetEntity__AssetEntity_exifInfo_bitsPerSample",
   "AssetEntity__AssetEntity_exifInfo"."rating" AS "AssetEntity__AssetEntity_exifInfo_rating",
   "AssetEntity__AssetEntity_exifInfo"."fps" AS "AssetEntity__AssetEntity_exifInfo_fps",
-  "AssetEntity__AssetEntity_smartInfo"."assetId" AS "AssetEntity__AssetEntity_smartInfo_assetId",
-  "AssetEntity__AssetEntity_smartInfo"."tags" AS "AssetEntity__AssetEntity_smartInfo_tags",
-  "AssetEntity__AssetEntity_smartInfo"."objects" AS "AssetEntity__AssetEntity_smartInfo_objects",
   "AssetEntity__AssetEntity_tags"."id" AS "AssetEntity__AssetEntity_tags_id",
   "AssetEntity__AssetEntity_tags"."value" AS "AssetEntity__AssetEntity_tags_value",
   "AssetEntity__AssetEntity_tags"."createdAt" AS "AssetEntity__AssetEntity_tags_createdAt",
@@ -252,7 +249,6 @@ SELECT
 FROM
   "assets" "AssetEntity"
   LEFT JOIN "exif" "AssetEntity__AssetEntity_exifInfo" ON "AssetEntity__AssetEntity_exifInfo"."assetId" = "AssetEntity"."id"
-  LEFT JOIN "smart_info" "AssetEntity__AssetEntity_smartInfo" ON "AssetEntity__AssetEntity_smartInfo"."assetId" = "AssetEntity"."id"
   LEFT JOIN "tag_asset" "AssetEntity_AssetEntity__AssetEntity_tags" ON "AssetEntity_AssetEntity__AssetEntity_tags"."assetsId" = "AssetEntity"."id"
   LEFT JOIN "tags" "AssetEntity__AssetEntity_tags" ON "AssetEntity__AssetEntity_tags"."id" = "AssetEntity_AssetEntity__AssetEntity_tags"."tagsId"
   LEFT JOIN "asset_faces" "AssetEntity__AssetEntity_faces" ON "AssetEntity__AssetEntity_faces"."assetId" = "AssetEntity"."id"
@@ -932,36 +928,6 @@ WHERE
 LIMIT
   12
 
--- AssetRepository.getAssetIdByTag
-WITH
-  "random_tags" AS (
-    SELECT
-      unnest(tags) AS "tag"
-    FROM
-      "smart_info" "si"
-    GROUP BY
-      tag
-    HAVING
-      count(*) >= $1
-  )
-SELECT DISTINCT
-  ON (unnest("si"."tags")) "asset"."id" AS "data",
-  unnest("si"."tags") AS "value"
-FROM
-  "assets" "asset"
-  INNER JOIN "smart_info" "si" ON "asset"."id" = si."assetId"
-  INNER JOIN "random_tags" "t" ON "si"."tags" @> ARRAY[t.tag]
-WHERE
-  (
-    "asset"."isVisible" = true
-    AND "asset"."type" = $2
-    AND "asset"."ownerId" IN ($3)
-    AND "asset"."isArchived" = $4
-  )
-  AND ("asset"."deletedAt" IS NULL)
-LIMIT
-  12
-
 -- AssetRepository.getAllForUserFullSync
 SELECT
   "asset"."id" AS "asset_id",

server/src/repositories/asset.repository.ts

@@ -5,7 +5,6 @@ import { AssetFileEntity } from 'src/entities/asset-files.entity';
 import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';
 import { AssetEntity } from 'src/entities/asset.entity';
 import { ExifEntity } from 'src/entities/exif.entity';
-import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 import { AssetFileType, AssetOrder, AssetStatus, AssetType, PaginationMode } from 'src/enum';
 import {
   AssetBuilderOptions,
@@ -60,7 +59,6 @@ export class AssetRepository implements IAssetRepository {
     @InjectRepository(AssetFileEntity) private fileRepository: Repository<AssetFileEntity>,
     @InjectRepository(ExifEntity) private exifRepository: Repository<ExifEntity>,
     @InjectRepository(AssetJobStatusEntity) private jobStatusRepository: Repository<AssetJobStatusEntity>,
-    @InjectRepository(SmartInfoEntity) private smartInfoRepository: Repository<SmartInfoEntity>,
   ) {}
 
   async upsertExif(exif: Partial<ExifEntity>): Promise<void> {
@@ -119,7 +117,6 @@ export class AssetRepository implements IAssetRepository {
       where: { id: In(ids) },
       relations: {
         exifInfo: true,
-        smartInfo: true,
         tags: true,
         faces: {
           person: true,
@@ -422,22 +419,6 @@ export class AssetRepository implements IAssetRepository {
         break;
       }
 
-      case WithoutProperty.OBJECT_TAGS: {
-        relations = {
-          smartInfo: true,
-        };
-        where = {
-          jobStatus: {
-            previewAt: Not(IsNull()),
-          },
-          isVisible: true,
-          smartInfo: {
-            tags: IsNull(),
-          },
-        };
-        break;
-      }
-
       case WithoutProperty.FACES: {
         relations = {
           faces: true,
@@ -457,23 +438,6 @@ export class AssetRepository implements IAssetRepository {
         break;
       }
 
-      case WithoutProperty.PERSON: {
-        relations = {
-          faces: true,
-        };
-        where = {
-          jobStatus: {
-            previewAt: Not(IsNull()),
-          },
-          isVisible: true,
-          faces: {
-            assetId: Not(IsNull()),
-            personId: IsNull(),
-          },
-        };
-        break;
-      }
-
       case WithoutProperty.SIDECAR: {
         where = [
           { sidecarPath: IsNull(), isVisible: true },
@@ -611,35 +575,6 @@ export class AssetRepository implements IAssetRepository {
     return { fieldName: 'exifInfo.city', items };
   }
 
-  @GenerateSql({ params: [DummyValue.UUID, { minAssetsPerField: 5, maxFields: 12 }] })
-  async getAssetIdByTag(
-    ownerId: string,
-    { minAssetsPerField, maxFields }: AssetExploreFieldOptions,
-  ): Promise<SearchExploreItem<string>> {
-    const cte = this.smartInfoRepository
-      .createQueryBuilder('si')
-      .select('unnest(tags)', 'tag')
-      .groupBy('tag')
-      .having('count(*) >= :minAssetsPerField', { minAssetsPerField });
-
-    const items = await this.getBuilder({
-      userIds: [ownerId],
-      exifInfo: false,
-      assetType: AssetType.IMAGE,
-      isArchived: false,
-    })
-      .select('unnest(si.tags)', 'value')
-      .addSelect('asset.id', 'data')
-      .distinctOn(['unnest(si.tags)'])
-      .innerJoin('smart_info', 'si', 'asset.id = si."assetId"')
-      .addCommonTableExpression(cte, 'random_tags')
-      .innerJoin('random_tags', 't', 'si.tags @> ARRAY[t.tag]')
-      .limit(maxFields)
-      .getRawMany();
-
-    return { fieldName: 'smartInfo.tags', items };
-  }
-
   private getBuilder(options: AssetBuilderOptions) {
     const builder = this.repository.createQueryBuilder('asset').where('asset.isVisible = true');
 

server/src/repositories/search.repository.ts

@@ -6,7 +6,6 @@ import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { AssetEntity } from 'src/entities/asset.entity';
 import { ExifEntity } from 'src/entities/exif.entity';
 import { GeodataPlacesEntity } from 'src/entities/geodata-places.entity';
-import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 import { SmartSearchEntity } from 'src/entities/smart-search.entity';
 import { AssetType, PaginationMode } from 'src/enum';
 import { IConfigRepository } from 'src/interfaces/config.interface';
@@ -34,7 +33,6 @@ export class SearchRepository implements ISearchRepository {
   private assetsByCityQuery: string;
 
   constructor(
-    @InjectRepository(SmartInfoEntity) private repository: Repository<SmartInfoEntity>,
     @InjectRepository(AssetEntity) private assetRepository: Repository<AssetEntity>,
     @InjectRepository(ExifEntity) private exifRepository: Repository<ExifEntity>,
     @InjectRepository(AssetFaceEntity) private assetFaceRepository: Repository<AssetFaceEntity>,
@@ -278,7 +276,7 @@ export class SearchRepository implements ISearchRepository {
   @GenerateSql({ params: [[DummyValue.UUID]] })
   async getAssetsByCity(userIds: string[]): Promise<AssetEntity[]> {
     const parameters = [userIds, true, false, AssetType.IMAGE];
-    const rawRes = await this.repository.query(this.assetsByCityQuery, parameters);
+    const rawRes = await this.assetRepository.query(this.assetsByCityQuery, parameters);
 
     const items: AssetEntity[] = [];
     for (const res of rawRes) {

server/src/services/asset.service.ts

@@ -94,7 +94,6 @@ export class AssetService extends BaseService {
       {
         exifInfo: true,
         sharedLinks: true,
-        smartInfo: true,
         tags: true,
         owner: true,
         faces: {
@@ -162,7 +161,6 @@ export class AssetService extends BaseService {
     const asset = await this.assetRepository.getById(id, {
       exifInfo: true,
       owner: true,
-      smartInfo: true,
       tags: true,
       faces: {
         person: true,

server/src/services/search.service.spec.ts

@@ -47,14 +47,9 @@ describe(SearchService.name, () => {
         fieldName: 'exifInfo.city',
         items: [{ value: 'Paris', data: assetStub.image.id }],
       });
-      assetMock.getAssetIdByTag.mockResolvedValue({
-        fieldName: 'smartInfo.tags',
-        items: [{ value: 'train', data: assetStub.imageFrom2015.id }],
-      });
       assetMock.getByIdsWithAllRelations.mockResolvedValue([assetStub.image, assetStub.imageFrom2015]);
       const expectedResponse = [
         { fieldName: 'exifInfo.city', items: [{ value: 'Paris', data: mapAsset(assetStub.image) }] },
-        { fieldName: 'smartInfo.tags', items: [{ value: 'train', data: mapAsset(assetStub.imageFrom2015) }] },
       ];
 
       const result = await sut.getExploreData(authStub.user1);

server/src/services/search.service.ts

@@ -34,10 +34,8 @@ export class SearchService extends BaseService {
 
   async getExploreData(auth: AuthDto): Promise<SearchExploreItem<AssetResponseDto>[]> {
     const options = { maxFields: 12, minAssetsPerField: 5 };
-    const results = await Promise.all([
+    const result = await this.assetRepository.getAssetIdByCity(auth.user.id, options);
-      this.assetRepository.getAssetIdByCity(auth.user.id, options),
+    const results = [result];
-      this.assetRepository.getAssetIdByTag(auth.user.id, options),
-    ]);
     const assetIds = new Set<string>(results.flatMap((field) => field.items.map((item) => item.data)));
     const assets = await this.assetRepository.getByIdsWithAllRelations([...assetIds]);
     const assetMap = new Map<string, AssetResponseDto>(assets.map((asset) => [asset.id, mapAsset(asset)]));

server/src/utils/database.ts

@@ -90,7 +90,6 @@ export function searchAssetBuilder(
     isNotInAlbum,
     withFaces,
     withPeople,
-    withSmartInfo,
     personIds,
     withStacked,
     trashedAfter,
@@ -123,10 +122,6 @@ export function searchAssetBuilder(
     builder.leftJoinAndSelect('faces.person', 'person');
   }
 
-  if (withSmartInfo) {
-    builder.leftJoinAndSelect(`${builder.alias}.smartInfo`, 'smartInfo');
-  }
-
   if (personIds && personIds.length > 0) {
     const cte = builder
       .createQueryBuilder()

server/test/fixtures/shared-link.stub.ts

@@ -62,10 +62,6 @@ const assetResponse: AssetResponseDto = {
   updatedAt: today,
   isFavorite: false,
   isArchived: false,
-  smartInfo: {
-    tags: [],
-    objects: ['a', 'b', 'c'],
-  },
   duration: '0:00:00.00000',
   exifInfo: assetInfo,
   livePhotoVideoId: null,
@@ -205,12 +201,6 @@ export const sharedLinkStub = {
           isArchived: false,
           isExternal: false,
           isOffline: false,
-          smartInfo: {
-            assetId: 'id_1',
-            tags: [],
-            objects: ['a', 'b', 'c'],
-            asset: null as any,
-          },
           files: [],
           thumbhash: null,
           encodedVideoPath: '',

server/test/repositories/asset.repository.mock.ts

@@ -33,7 +33,6 @@ export const newAssetRepositoryMock = (): Mocked<IAssetRepository> => {
     getTimeBucket: vitest.fn(),
     getTimeBuckets: vitest.fn(),
     getAssetIdByCity: vitest.fn(),
-    getAssetIdByTag: vitest.fn(),
     getAllForUserFullSync: vitest.fn(),
     getChangedDeltaSync: vitest.fn(),
     getDuplicates: vitest.fn(),

web/src/routes/(user)/explore/+page.svelte

@@ -16,8 +16,6 @@
 
   enum Field {
     CITY = 'exifInfo.city',
-    TAGS = 'smartInfo.tags',
-    OBJECTS = 'smartInfo.objects',
   }
 
   const getFieldItems = (items: SearchExploreResponseDto[], field: Field) => {