fixes

server/src/domain/audit/audit.service.ts

@@ -167,7 +167,7 @@ export class AuditService {
       `Found ${libraryFiles.size} original files, ${thumbFiles.size} thumbnails, ${videoFiles.size} encoded videos, ${profileFiles.size} profile files`,
     );
     const pagination = usePagination(JOBS_ASSET_PAGINATION_SIZE, (options) =>
-      this.assetRepository.getAll(options, { withDeleted: true }),
+      this.assetRepository.getAll(options, { status: { withDeleted: true } }),
     );
 
     let assetCount = 0;

server/src/domain/download/download.service.ts

@@ -122,7 +122,7 @@ export class DownloadService {
       const userId = dto.userId;
       await this.access.requirePermission(auth, Permission.TIMELINE_DOWNLOAD, userId);
       return usePagination(PAGINATION_SIZE, (pagination) =>
-        this.assetRepository.getByUserId(pagination, userId, { isVisible: true }),
+        this.assetRepository.getByUserId(pagination, userId, { status: { isVisible: true } }),
       );
     }
 

server/src/domain/media/media.service.ts

@@ -240,7 +240,7 @@ export class MediaService {
 
     const assetPagination = usePagination(JOBS_ASSET_PAGINATION_SIZE, (pagination) => {
       return force
-        ? this.assetRepository.getAll(pagination, { type: AssetType.VIDEO })
+        ? this.assetRepository.getAll(pagination, { status: { type: AssetType.VIDEO } })
         : this.assetRepository.getWithout(pagination, WithoutProperty.ENCODED_VIDEO);
     });
 

server/src/domain/trash/trash.service.ts

@@ -33,7 +33,7 @@ export class TrashService {
 
   async restore(auth: AuthDto): Promise<void> {
     const assetPagination = usePagination(JOBS_ASSET_PAGINATION_SIZE, (pagination) =>
-      this.assetRepository.getByUserId(pagination, auth.user.id, { trashedBefore: DateTime.now().toJSDate() }),
+      this.assetRepository.getByUserId(pagination, auth.user.id, { date: { trashedBefore: DateTime.now().toJSDate() } }),
     );
 
     for await (const assets of assetPagination) {
@@ -44,7 +44,7 @@ export class TrashService {
 
   async empty(auth: AuthDto): Promise<void> {
     const assetPagination = usePagination(JOBS_ASSET_PAGINATION_SIZE, (pagination) =>
-      this.assetRepository.getByUserId(pagination, auth.user.id, { trashedBefore: DateTime.now().toJSDate() }),
+      this.assetRepository.getByUserId(pagination, auth.user.id, { date: { trashedBefore: DateTime.now().toJSDate() } }),
     );
 
     for await (const assets of assetPagination) {

server/src/infra/infra.utils.ts

@@ -124,10 +124,8 @@ export function ChunkedSet(options?: { paramIndex?: number }): MethodDecorator {
 
 export function searchAssetBuilder(
   builder: SelectQueryBuilder<AssetEntity>,
-  options: AssetSearchBuilderOptions,
+  { date, id, exif, path, relation, status }: AssetSearchBuilderOptions,
 ): SelectQueryBuilder<AssetEntity> {
-  const { date, id, exif, path, relation, status } = options;
-
   if (date) {
     builder.andWhere(
       _.omitBy(

server/src/infra/repositories/search.repository.ts

@@ -18,9 +18,9 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import _ from 'lodash';
 import { Repository } from 'typeorm';
+import { vectorExt } from '../database.config';
 import { DummyValue, GenerateSql } from '../infra.util';
 import { asVector, isValidInteger, paginatedBuilder, searchAssetBuilder } from '../infra.utils';
-import { vectorExt } from '../database.config';
 
 @Injectable()
 export class SearchRepository implements ISearchRepository {
@@ -70,23 +70,37 @@ export class SearchRepository implements ISearchRepository {
   }
 
   @GenerateSql({
-    params: [{ userIds: [DummyValue.UUID], embedding: Array.from({ length: 512 }, Math.random), numResults: 100 }],
+    params: [
+      {
+        pagination: { page: 0, size: 100 },
+        options: {
+          date: { takenAfter: DummyValue.DATE },
+          embedding: Array.from({ length: 512 }, Math.random),
+          exif: { cameraModel: DummyValue.STRING },
+          relation: { withStacked: true },
+          status: { isFavorite: true },
+          userIds: [DummyValue.UUID],
+        },
+      },
+    ],
   })
-  async searchCLIP(pagination: SearchPaginationOptions, options: SmartSearchOptions): Paginated<AssetEntity> {
+  async searchCLIP(
+    pagination: SearchPaginationOptions,
+    { embedding, userIds, ...options }: SmartSearchOptions,
+  ): Paginated<AssetEntity> {
     let results: PaginationResult<AssetEntity> = { items: [], hasNextPage: false };
 
     await this.assetRepository.manager.transaction(async (manager) => {
-      await manager.query(`SET LOCAL vectors.search_mode=vbase`);
       let builder = manager.createQueryBuilder(AssetEntity, 'asset');
       builder = searchAssetBuilder(builder, options);
       builder
-        .innerJoin('a.smartSearch', 's')
-        .andWhere('a.ownerId IN (:...userIds )')
-        .orderBy('s.embedding <=> :embedding')
-        .setParameters({ userIds: options.userIds, embedding: asVector(options.embedding) });
+        .innerJoin('asset.smartSearch', 'search')
+        .andWhere('asset.ownerId IN (:...userIds )')
+        .orderBy('search.embedding <=> :embedding')
+        .setParameters({ userIds, embedding: asVector(embedding) });
 
       await manager.query(this.getRuntimeConfig(pagination.size));
-      return paginatedBuilder<AssetEntity>(builder, {
+      results = await paginatedBuilder<AssetEntity>(builder, {
         mode: PaginationMode.LIMIT_OFFSET,
         skip: pagination.page * pagination.size,
         take: pagination.size,

server/src/infra/sql/search.repository.sql

@@ -0,0 +1,43 @@
+-- NOTE: This file is auto generated by ./sql-generator
+
+-- SearchRepository.searchFaces
+START TRANSACTION
+SET
+  LOCAL vectors.enable_prefilter = on;
+
+SET
+  LOCAL vectors.search_mode = basic;
+
+SET
+  LOCAL vectors.hnsw_ef_search = 100
+WITH
+  "cte" AS (
+    SELECT
+      "faces"."id" AS "id",
+      "faces"."assetId" AS "assetId",
+      "faces"."personId" AS "personId",
+      "faces"."imageWidth" AS "imageWidth",
+      "faces"."imageHeight" AS "imageHeight",
+      "faces"."boundingBoxX1" AS "boundingBoxX1",
+      "faces"."boundingBoxY1" AS "boundingBoxY1",
+      "faces"."boundingBoxX2" AS "boundingBoxX2",
+      "faces"."boundingBoxY2" AS "boundingBoxY2",
+      "faces"."embedding" <= > $1 AS "distance"
+    FROM
+      "asset_faces" "faces"
+      INNER JOIN "assets" "asset" ON "asset"."id" = "faces"."assetId"
+      AND ("asset"."deletedAt" IS NULL)
+    WHERE
+      "asset"."ownerId" IN ($2)
+    ORDER BY
+      "faces"."embedding" <= > $1 ASC
+    LIMIT
+      100
+  )
+SELECT
+  res.*
+FROM
+  "cte" "res"
+WHERE
+  res.distance <= $3
+COMMIT