mirror of
https://github.com/immich-app/immich.git
synced 2025-01-09 21:36:46 +01:00
d3a5490e71
* Allow submission of null country * Update searchAssetBuilder to handle nulls andWhere({country:null}) produces `"exifInfo"."country" = NULL`. We want `"exifInfo"."country" IS NULL`, so we have to treat NULL as a special case * Allow null country in frontend * Make the query code a bit more straightforward * Remove unused brackets import * Remove log message * Don't change whitespace for no reason * Fix prettier style issue * Update search.dto.ts validators per @jrasm91's recommendation * Update api types * Combine null country and state into one guard clause * chore: clean up * chore: add e2e for null/empty city, state, country search * refactor: server returns suggestion for null values * chore: clean up --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com> Co-authored-by: Alex Tran <alex.tran1502@gmail.com> Co-authored-by: Jason Rasmussen <jason@rasm.me>
172 lines
6.8 KiB
TypeScript
172 lines
6.8 KiB
TypeScript
import { BadRequestException, Inject, Injectable } from '@nestjs/common';
|
|
import { SystemConfigCore } from 'src/cores/system-config.core';
|
|
import { AssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
|
|
import { AuthDto } from 'src/dtos/auth.dto';
|
|
import { PersonResponseDto } from 'src/dtos/person.dto';
|
|
import {
|
|
MetadataSearchDto,
|
|
PlacesResponseDto,
|
|
SearchPeopleDto,
|
|
SearchPlacesDto,
|
|
SearchResponseDto,
|
|
SearchSuggestionRequestDto,
|
|
SearchSuggestionType,
|
|
SmartSearchDto,
|
|
mapPlaces,
|
|
} from 'src/dtos/search.dto';
|
|
import { AssetOrder } from 'src/entities/album.entity';
|
|
import { AssetEntity } from 'src/entities/asset.entity';
|
|
import { IAssetRepository } from 'src/interfaces/asset.interface';
|
|
import { ILoggerRepository } from 'src/interfaces/logger.interface';
|
|
import { IMachineLearningRepository } from 'src/interfaces/machine-learning.interface';
|
|
import { IMetadataRepository } from 'src/interfaces/metadata.interface';
|
|
import { IPartnerRepository } from 'src/interfaces/partner.interface';
|
|
import { IPersonRepository } from 'src/interfaces/person.interface';
|
|
import { ISearchRepository, SearchExploreItem } from 'src/interfaces/search.interface';
|
|
import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
|
|
import { getMyPartnerIds } from 'src/utils/asset.util';
|
|
import { isSmartSearchEnabled } from 'src/utils/misc';
|
|
|
|
@Injectable()
|
|
export class SearchService {
|
|
private configCore: SystemConfigCore;
|
|
|
|
constructor(
|
|
@Inject(ISystemMetadataRepository) systemMetadataRepository: ISystemMetadataRepository,
|
|
@Inject(IMachineLearningRepository) private machineLearning: IMachineLearningRepository,
|
|
@Inject(IPersonRepository) private personRepository: IPersonRepository,
|
|
@Inject(ISearchRepository) private searchRepository: ISearchRepository,
|
|
@Inject(IAssetRepository) private assetRepository: IAssetRepository,
|
|
@Inject(IPartnerRepository) private partnerRepository: IPartnerRepository,
|
|
@Inject(IMetadataRepository) private metadataRepository: IMetadataRepository,
|
|
@Inject(ILoggerRepository) private logger: ILoggerRepository,
|
|
) {
|
|
this.logger.setContext(SearchService.name);
|
|
this.configCore = SystemConfigCore.create(systemMetadataRepository, logger);
|
|
}
|
|
|
|
async searchPerson(auth: AuthDto, dto: SearchPeopleDto): Promise<PersonResponseDto[]> {
|
|
return this.personRepository.getByName(auth.user.id, dto.name, { withHidden: dto.withHidden });
|
|
}
|
|
|
|
async searchPlaces(dto: SearchPlacesDto): Promise<PlacesResponseDto[]> {
|
|
const places = await this.searchRepository.searchPlaces(dto.name);
|
|
return places.map((place) => mapPlaces(place));
|
|
}
|
|
|
|
async getExploreData(auth: AuthDto): Promise<SearchExploreItem<AssetResponseDto>[]> {
|
|
const options = { maxFields: 12, minAssetsPerField: 5 };
|
|
const results = await Promise.all([
|
|
this.assetRepository.getAssetIdByCity(auth.user.id, options),
|
|
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)]));
|
|
|
|
return results.map(({ fieldName, items }) => ({
|
|
fieldName,
|
|
items: items.map(({ value, data }) => ({ value, data: assetMap.get(data) as AssetResponseDto })),
|
|
}));
|
|
}
|
|
|
|
async searchMetadata(auth: AuthDto, dto: MetadataSearchDto): Promise<SearchResponseDto> {
|
|
let checksum: Buffer | undefined;
|
|
const userIds = await this.getUserIdsToSearch(auth);
|
|
|
|
if (dto.checksum) {
|
|
const encoding = dto.checksum.length === 28 ? 'base64' : 'hex';
|
|
checksum = Buffer.from(dto.checksum, encoding);
|
|
}
|
|
|
|
const page = dto.page ?? 1;
|
|
const size = dto.size || 250;
|
|
const enumToOrder = { [AssetOrder.ASC]: 'ASC', [AssetOrder.DESC]: 'DESC' } as const;
|
|
const { hasNextPage, items } = await this.searchRepository.searchMetadata(
|
|
{ page, size },
|
|
{
|
|
...dto,
|
|
checksum,
|
|
userIds,
|
|
orderDirection: dto.order ? enumToOrder[dto.order] : 'DESC',
|
|
},
|
|
);
|
|
|
|
return this.mapResponse(items, hasNextPage ? (page + 1).toString() : null);
|
|
}
|
|
|
|
async searchSmart(auth: AuthDto, dto: SmartSearchDto): Promise<SearchResponseDto> {
|
|
const { machineLearning } = await this.configCore.getConfig({ withCache: false });
|
|
if (!isSmartSearchEnabled(machineLearning)) {
|
|
throw new BadRequestException('Smart search is not enabled');
|
|
}
|
|
|
|
const userIds = await this.getUserIdsToSearch(auth);
|
|
|
|
const embedding = await this.machineLearning.encodeText(machineLearning.url, dto.query, machineLearning.clip);
|
|
const page = dto.page ?? 1;
|
|
const size = dto.size || 100;
|
|
const { hasNextPage, items } = await this.searchRepository.searchSmart(
|
|
{ page, size },
|
|
{ ...dto, userIds, embedding },
|
|
);
|
|
|
|
return this.mapResponse(items, hasNextPage ? (page + 1).toString() : null);
|
|
}
|
|
|
|
async getAssetsByCity(auth: AuthDto): Promise<AssetResponseDto[]> {
|
|
const userIds = await this.getUserIdsToSearch(auth);
|
|
const assets = await this.searchRepository.getAssetsByCity(userIds);
|
|
return assets.map((asset) => mapAsset(asset));
|
|
}
|
|
|
|
async getSearchSuggestions(auth: AuthDto, dto: SearchSuggestionRequestDto) {
|
|
const results = await this.getSuggestions(auth.user.id, dto);
|
|
return results.filter((result) => (dto.includeNull ? true : result !== null));
|
|
}
|
|
|
|
private getSuggestions(userId: string, dto: SearchSuggestionRequestDto) {
|
|
switch (dto.type) {
|
|
case SearchSuggestionType.COUNTRY: {
|
|
return this.metadataRepository.getCountries(userId);
|
|
}
|
|
case SearchSuggestionType.STATE: {
|
|
return this.metadataRepository.getStates(userId, dto.country);
|
|
}
|
|
case SearchSuggestionType.CITY: {
|
|
return this.metadataRepository.getCities(userId, dto.country, dto.state);
|
|
}
|
|
case SearchSuggestionType.CAMERA_MAKE: {
|
|
return this.metadataRepository.getCameraMakes(userId, dto.model);
|
|
}
|
|
case SearchSuggestionType.CAMERA_MODEL: {
|
|
return this.metadataRepository.getCameraModels(userId, dto.make);
|
|
}
|
|
default: {
|
|
return [];
|
|
}
|
|
}
|
|
}
|
|
|
|
private async getUserIdsToSearch(auth: AuthDto): Promise<string[]> {
|
|
const partnerIds = await getMyPartnerIds({
|
|
userId: auth.user.id,
|
|
repository: this.partnerRepository,
|
|
timelineEnabled: true,
|
|
});
|
|
return [auth.user.id, ...partnerIds];
|
|
}
|
|
|
|
private mapResponse(assets: AssetEntity[], nextPage: string | null): SearchResponseDto {
|
|
return {
|
|
albums: { total: 0, count: 0, items: [], facets: [] },
|
|
assets: {
|
|
total: assets.length,
|
|
count: assets.length,
|
|
items: assets.map((asset) => mapAsset(asset)),
|
|
facets: [],
|
|
nextPage,
|
|
},
|
|
};
|
|
}
|
|
}
|