mirror of
				https://github.com/immich-app/immich.git
				synced 2025-10-31 13:57:39 +09:00 
			
		
		
		
	feat(server): lighter buckets (#17831)
	
		
			
	
		
	
	
		
	
		
			Some checks are pending
		
		
	
	
		
			
				
	
				CodeQL / Analyze (javascript) (push) Waiting to run
				
			
		
			
				
	
				CodeQL / Analyze (python) (push) Waiting to run
				
			
		
			
				
	
				Docker / pre-job (push) Waiting to run
				
			
		
			
				
	
				Docker / Re-Tag ML () (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Re-Tag ML (-armnn) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Re-Tag ML (-cuda) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Re-Tag ML (-openvino) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Re-Tag ML (-rknn) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Re-Tag ML (-rocm) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Re-Tag Server () (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Build and Push ML (armnn, linux/arm64, -armnn) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Build and Push ML (cpu, ) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Build and Push ML (cuda, linux/amd64, -cuda) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Build and Push ML (openvino, linux/amd64, -openvino) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Build and Push ML (rknn, linux/arm64, -rknn) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Build and Push ML (rocm, linux/amd64, {"linux/amd64": "mich"}, -rocm) (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Build and Push Server (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Docker Build & Push Server Success (push) Blocked by required conditions
				
			
		
			
				
	
				Docker / Docker Build & Push ML Success (push) Blocked by required conditions
				
			
		
			
				
	
				Docs build / pre-job (push) Waiting to run
				
			
		
			
				
	
				Docs build / Docs Build (push) Blocked by required conditions
				
			
		
			
				
	
				Static Code Analysis / pre-job (push) Waiting to run
				
			
		
			
				
	
				Static Code Analysis / Run Dart Code Analysis (push) Blocked by required conditions
				
			
		
			
				
	
				Static Code Analysis / zizmor (push) Waiting to run
				
			
		
			
				
	
				Test / pre-job (push) Waiting to run
				
			
		
			
				
	
				Test / Test & Lint Server (push) Blocked by required conditions
				
			
		
			
				
	
				Test / Unit Test CLI (push) Blocked by required conditions
				
			
		
			
				
	
				Test / Unit Test CLI (Windows) (push) Blocked by required conditions
				
			
		
			
				
	
				Test / Lint Web (push) Blocked by required conditions
				
			
		
			
				
	
				Test / Test Web (push) Blocked by required conditions
				
			
		
			
				
	
				Test / Test i18n (push) Blocked by required conditions
				
			
		
			
				
	
				Test / End-to-End Lint (push) Blocked by required conditions
				
			
		
			
				
	
				Test / Medium Tests (Server) (push) Blocked by required conditions
				
			
		
			
				
	
				Test / End-to-End Tests (Server & CLI) (ubuntu-24.04-arm) (push) Blocked by required conditions
				
			
		
			
				
	
				Test / End-to-End Tests (Server & CLI) (ubuntu-latest) (push) Blocked by required conditions
				
			
		
			
				
	
				Test / End-to-End Tests (Web) (ubuntu-24.04-arm) (push) Blocked by required conditions
				
			
		
			
				
	
				Test / End-to-End Tests (Web) (ubuntu-latest) (push) Blocked by required conditions
				
			
		
			
				
	
				Test / End-to-End Tests Success (push) Blocked by required conditions
				
			
		
			
				
	
				Test / Unit Test Mobile (push) Blocked by required conditions
				
			
		
			
				
	
				Test / Unit Test ML (push) Blocked by required conditions
				
			
		
			
				
	
				Test / .github Files Formatting (push) Blocked by required conditions
				
			
		
			
				
	
				Test / ShellCheck (push) Waiting to run
				
			
		
			
				
	
				Test / OpenAPI Clients (push) Waiting to run
				
			
		
			
				
	
				Test / SQL Schema Checks (push) Waiting to run
				
			
		
		
	
	
				
					
				
			
		
			Some checks are pending
		
		
	
	CodeQL / Analyze (javascript) (push) Waiting to run
				
			CodeQL / Analyze (python) (push) Waiting to run
				
			Docker / pre-job (push) Waiting to run
				
			Docker / Re-Tag ML () (push) Blocked by required conditions
				
			Docker / Re-Tag ML (-armnn) (push) Blocked by required conditions
				
			Docker / Re-Tag ML (-cuda) (push) Blocked by required conditions
				
			Docker / Re-Tag ML (-openvino) (push) Blocked by required conditions
				
			Docker / Re-Tag ML (-rknn) (push) Blocked by required conditions
				
			Docker / Re-Tag ML (-rocm) (push) Blocked by required conditions
				
			Docker / Re-Tag Server () (push) Blocked by required conditions
				
			Docker / Build and Push ML (armnn, linux/arm64, -armnn) (push) Blocked by required conditions
				
			Docker / Build and Push ML (cpu, ) (push) Blocked by required conditions
				
			Docker / Build and Push ML (cuda, linux/amd64, -cuda) (push) Blocked by required conditions
				
			Docker / Build and Push ML (openvino, linux/amd64, -openvino) (push) Blocked by required conditions
				
			Docker / Build and Push ML (rknn, linux/arm64, -rknn) (push) Blocked by required conditions
				
			Docker / Build and Push ML (rocm, linux/amd64, {"linux/amd64": "mich"}, -rocm) (push) Blocked by required conditions
				
			Docker / Build and Push Server (push) Blocked by required conditions
				
			Docker / Docker Build & Push Server Success (push) Blocked by required conditions
				
			Docker / Docker Build & Push ML Success (push) Blocked by required conditions
				
			Docs build / pre-job (push) Waiting to run
				
			Docs build / Docs Build (push) Blocked by required conditions
				
			Static Code Analysis / pre-job (push) Waiting to run
				
			Static Code Analysis / Run Dart Code Analysis (push) Blocked by required conditions
				
			Static Code Analysis / zizmor (push) Waiting to run
				
			Test / pre-job (push) Waiting to run
				
			Test / Test & Lint Server (push) Blocked by required conditions
				
			Test / Unit Test CLI (push) Blocked by required conditions
				
			Test / Unit Test CLI (Windows) (push) Blocked by required conditions
				
			Test / Lint Web (push) Blocked by required conditions
				
			Test / Test Web (push) Blocked by required conditions
				
			Test / Test i18n (push) Blocked by required conditions
				
			Test / End-to-End Lint (push) Blocked by required conditions
				
			Test / Medium Tests (Server) (push) Blocked by required conditions
				
			Test / End-to-End Tests (Server & CLI) (ubuntu-24.04-arm) (push) Blocked by required conditions
				
			Test / End-to-End Tests (Server & CLI) (ubuntu-latest) (push) Blocked by required conditions
				
			Test / End-to-End Tests (Web) (ubuntu-24.04-arm) (push) Blocked by required conditions
				
			Test / End-to-End Tests (Web) (ubuntu-latest) (push) Blocked by required conditions
				
			Test / End-to-End Tests Success (push) Blocked by required conditions
				
			Test / Unit Test Mobile (push) Blocked by required conditions
				
			Test / Unit Test ML (push) Blocked by required conditions
				
			Test / .github Files Formatting (push) Blocked by required conditions
				
			Test / ShellCheck (push) Waiting to run
				
			Test / OpenAPI Clients (push) Waiting to run
				
			Test / SQL Schema Checks (push) Waiting to run
				
			* feat(web): lighter timeline buckets * GalleryViewer * weird ssr * Remove generics from AssetInteraction * ensure keys on getAssetInfo, alt-text * empty - trigger ci * re-add alt-text * test fix * update tests * tests * missing import * feat(server): lighter buckets * fix: flappy e2e test * lint * revert settings * unneeded cast * fix after merge * Adapt web client to consume new server response format * test * missing import * lint * Use nulls, make-sql * openapi battle * date->string * tests * tests * lint/tests * lint * test * push aggregation to query * openapi * stack as tuple * openapi * update references to description * update alt text tests * update sql * update sql * update timeline tests * linting, fix expected response * string tuple * fix spec * fix * silly generator * rename patch * minimize sorting * review * lint * lint * sql * test * avoid abbreviations * review comment - type safety in test * merge conflicts * lint * lint/abbreviations * remove unncessary code * review comments * sql * re-add package-lock * use booleans, fix visibility in openapi spec, less cursed controller * update sql * no need to use sql template * array access actually doesn't seem to matter * remove redundant code * re-add sql decorator * unused type * remove null assertions * bad merge * Fix test * shave * extra clean shave * use decorator for content type * redundant types * redundant comment * update comment * unnecessary res --------- Co-authored-by: mertalev <101130780+mertalev@users.noreply.github.com> Co-authored-by: Alex <alex.tran1502@gmail.com>
This commit is contained in:
		| @@ -1420,7 +1420,25 @@ export type TagBulkAssetsResponseDto = { | ||||
| export type TagUpdateDto = { | ||||
|     color?: string | null; | ||||
| }; | ||||
| export type TimeBucketResponseDto = { | ||||
| export type TimeBucketAssetResponseDto = { | ||||
|     city: (string | null)[]; | ||||
|     country: (string | null)[]; | ||||
|     duration: (string | null)[]; | ||||
|     id: string[]; | ||||
|     isFavorite: boolean[]; | ||||
|     isImage: boolean[]; | ||||
|     isTrashed: boolean[]; | ||||
|     livePhotoVideoId: (string | null)[]; | ||||
|     localDateTime: string[]; | ||||
|     ownerId: string[]; | ||||
|     projectionType: (string | null)[]; | ||||
|     ratio: number[]; | ||||
|     /** (stack ID, stack asset count) tuple */ | ||||
|     stack?: (string[] | null)[]; | ||||
|     thumbhash: (string | null)[]; | ||||
|     visibility: AssetVisibility[]; | ||||
| }; | ||||
| export type TimeBucketsResponseDto = { | ||||
|     count: number; | ||||
|     timeBucket: string; | ||||
| }; | ||||
| @@ -3367,14 +3385,15 @@ export function tagAssets({ id, bulkIdsDto }: { | ||||
|         body: bulkIdsDto | ||||
|     }))); | ||||
| } | ||||
| export function getTimeBucket({ albumId, isFavorite, isTrashed, key, order, personId, size, tagId, timeBucket, userId, visibility, withPartners, withStacked }: { | ||||
| export function getTimeBucket({ albumId, isFavorite, isTrashed, key, order, page, pageSize, personId, tagId, timeBucket, userId, visibility, withPartners, withStacked }: { | ||||
|     albumId?: string; | ||||
|     isFavorite?: boolean; | ||||
|     isTrashed?: boolean; | ||||
|     key?: string; | ||||
|     order?: AssetOrder; | ||||
|     page?: number; | ||||
|     pageSize?: number; | ||||
|     personId?: string; | ||||
|     size: TimeBucketSize; | ||||
|     tagId?: string; | ||||
|     timeBucket: string; | ||||
|     userId?: string; | ||||
| @@ -3384,15 +3403,16 @@ export function getTimeBucket({ albumId, isFavorite, isTrashed, key, order, pers | ||||
| }, opts?: Oazapfts.RequestOpts) { | ||||
|     return oazapfts.ok(oazapfts.fetchJson<{ | ||||
|         status: 200; | ||||
|         data: AssetResponseDto[]; | ||||
|         data: TimeBucketAssetResponseDto; | ||||
|     }>(`/timeline/bucket${QS.query(QS.explode({ | ||||
|         albumId, | ||||
|         isFavorite, | ||||
|         isTrashed, | ||||
|         key, | ||||
|         order, | ||||
|         page, | ||||
|         pageSize, | ||||
|         personId, | ||||
|         size, | ||||
|         tagId, | ||||
|         timeBucket, | ||||
|         userId, | ||||
| @@ -3403,14 +3423,13 @@ export function getTimeBucket({ albumId, isFavorite, isTrashed, key, order, pers | ||||
|         ...opts | ||||
|     })); | ||||
| } | ||||
| export function getTimeBuckets({ albumId, isFavorite, isTrashed, key, order, personId, size, tagId, userId, visibility, withPartners, withStacked }: { | ||||
| export function getTimeBuckets({ albumId, isFavorite, isTrashed, key, order, personId, tagId, userId, visibility, withPartners, withStacked }: { | ||||
|     albumId?: string; | ||||
|     isFavorite?: boolean; | ||||
|     isTrashed?: boolean; | ||||
|     key?: string; | ||||
|     order?: AssetOrder; | ||||
|     personId?: string; | ||||
|     size: TimeBucketSize; | ||||
|     tagId?: string; | ||||
|     userId?: string; | ||||
|     visibility?: AssetVisibility; | ||||
| @@ -3419,7 +3438,7 @@ export function getTimeBuckets({ albumId, isFavorite, isTrashed, key, order, per | ||||
| }, opts?: Oazapfts.RequestOpts) { | ||||
|     return oazapfts.ok(oazapfts.fetchJson<{ | ||||
|         status: 200; | ||||
|         data: TimeBucketResponseDto[]; | ||||
|         data: TimeBucketsResponseDto[]; | ||||
|     }>(`/timeline/buckets${QS.query(QS.explode({ | ||||
|         albumId, | ||||
|         isFavorite, | ||||
| @@ -3427,7 +3446,6 @@ export function getTimeBuckets({ albumId, isFavorite, isTrashed, key, order, per | ||||
|         key, | ||||
|         order, | ||||
|         personId, | ||||
|         size, | ||||
|         tagId, | ||||
|         userId, | ||||
|         visibility, | ||||
| @@ -3921,7 +3939,3 @@ export enum OAuthTokenEndpointAuthMethod { | ||||
|     ClientSecretPost = "client_secret_post", | ||||
|     ClientSecretBasic = "client_secret_basic" | ||||
| } | ||||
| export enum TimeBucketSize { | ||||
|     Day = "DAY", | ||||
|     Month = "MONTH" | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user