Merge branch 'main' into upload-to-album

2026-05-18 03:10:24 +03:00 · 2026-04-30 05:24:28 -05:00
parent a3674e2dc4 c1051c7ed2
commit d7aa2ae2d7
74 changed files with 1741 additions and 1473 deletions
@@ -1,5 +1,5 @@
 app_identifier "app.alextran.immich" # The bundle identifier of your app
-apple_id "alex.tran1502@gmail.com" # Your Apple email address
+apple_id "altran@futo.org" # Your Apple email address


 # For more information about the Appfile, see:
@@ -17,10 +17,11 @@ default_platform(:ios)

 platform :ios do
  # Constants
-  TEAM_ID = "2F67MQ8R79"
-  CODE_SIGN_IDENTITY = "Apple Distribution: Hau Tran (#{TEAM_ID})"
+  TEAM_ID = "2W7AC6T8T5"
+  CODE_SIGN_IDENTITY = "Apple Distribution: FUTO Holdings, Inc. (#{TEAM_ID})"
  BASE_BUNDLE_ID = "app.alextran.immich"
-  
+  DEV_BUNDLE_ID  = "tech.futo.immich.testflight"
+
  # Helper method to get App Store Connect API key
  def get_api_key
    app_store_connect_api_key(
@@ -44,47 +45,45 @@ def get_version_from_pubspec
 end
  
  # Helper method to configure code signing for all targets
-  def configure_code_signing(bundle_id_suffix: "", profile_name_main:, profile_name_share:, profile_name_widget:)
-    bundle_suffix = bundle_id_suffix.empty? ? "" : ".#{bundle_id_suffix}"
-    
+  def configure_code_signing(base_bundle_id:, profile_name_main:, profile_name_share:, profile_name_widget:)
    # Runner (main app)
    update_code_signing_settings(
      use_automatic_signing: false,
      path: "./Runner.xcodeproj",
      team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
      code_sign_identity: CODE_SIGN_IDENTITY,
-      bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}",
+      bundle_identifier: base_bundle_id,
      profile_name: profile_name_main,
      targets: ["Runner"]
    )
-    
+
    # ShareExtension
    update_code_signing_settings(
      use_automatic_signing: false,
      path: "./Runner.xcodeproj",
      team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
      code_sign_identity: CODE_SIGN_IDENTITY,
-      bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}.ShareExtension",
+      bundle_identifier: "#{base_bundle_id}.ShareExtension",
      profile_name: profile_name_share,
      targets: ["ShareExtension"]
    )
-    
+
    # WidgetExtension
    update_code_signing_settings(
      use_automatic_signing: false,
      path: "./Runner.xcodeproj",
      team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
      code_sign_identity: CODE_SIGN_IDENTITY,
-      bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}.Widget",
+      bundle_identifier: "#{base_bundle_id}.Widget",
      profile_name: profile_name_widget,
      targets: ["WidgetExtension"]
    )
  end
-  
+
  # Helper method to build and upload to TestFlight
  def build_and_upload(
    api_key:,
-    bundle_id_suffix: "",
+    base_bundle_id:,
    configuration: "Release",
    distribute_external: true,
    version_number: nil,
@@ -92,9 +91,8 @@ end
    profile_name_share:,
    profile_name_widget:
  )
-    bundle_suffix = bundle_id_suffix.empty? ? "" : ".#{bundle_id_suffix}"
-    app_identifier = "#{BASE_BUNDLE_ID}#{bundle_suffix}"
-    
+    app_identifier = base_bundle_id
+
    # Set version number if provided
    if version_number
      increment_version_number(version_number: version_number)
@@ -138,31 +136,31 @@ end
  desc "iOS Development Build to TestFlight (requires separate bundle ID)"
  lane :gha_testflight_dev do
    api_key = get_api_key
-    
+
    # Download and install provisioning profiles from App Store Connect
    # Certificate is imported by GHA workflow into build.keychain
    # Capture profile names after each sigh call
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development", force: true)
+    sigh(api_key: api_key, app_identifier: DEV_BUNDLE_ID, force: true)
    main_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.ShareExtension", force: true)
+
+    sigh(api_key: api_key, app_identifier: "#{DEV_BUNDLE_ID}.ShareExtension", force: true)
    share_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.Widget", force: true)
+
+    sigh(api_key: api_key, app_identifier: "#{DEV_BUNDLE_ID}.Widget", force: true)
    widget_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
+
    # Configure code signing for dev bundle IDs using the downloaded profile names
    configure_code_signing(
-      bundle_id_suffix: "development",
+      base_bundle_id: DEV_BUNDLE_ID,
      profile_name_main: main_profile_name,
      profile_name_share: share_profile_name,
      profile_name_widget: widget_profile_name
    )
-    
+
    # Build and upload
    build_and_upload(
      api_key: api_key,
-      bundle_id_suffix: "development",
+      base_bundle_id: DEV_BUNDLE_ID,
      configuration: "Profile",
      distribute_external: false,
      profile_name_main: main_profile_name,
@@ -189,6 +187,7 @@ end
    
    # Configure code signing for production bundle IDs
    configure_code_signing(
+      base_bundle_id: BASE_BUNDLE_ID,
      profile_name_main: main_profile_name,
      profile_name_share: share_profile_name,
      profile_name_widget: widget_profile_name
@@ -197,6 +196,7 @@ end
    # Build and upload with version number
    build_and_upload(
      api_key: api_key,
+      base_bundle_id: BASE_BUNDLE_ID,
      version_number: get_version_from_pubspec,
      distribute_external: false,
      profile_name_main: main_profile_name,
@@ -243,30 +243,30 @@ end

  desc "iOS Build Only (no TestFlight upload)"
  lane :gha_build_only do
-    # Use the same build process as production, just skip the upload
-    # This ensures PR builds validate the same way as production builds
-    
+    # Use the same build process as the dev TestFlight lane, just skip the upload
+    # This ensures PR builds validate the same way as dev TestFlight builds
+
    api_key = get_api_key
-    
+
    # Download and install provisioning profiles from App Store Connect
    # Certificate is imported by GHA workflow into build.keychain
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development", force: true)
+    sigh(api_key: api_key, app_identifier: DEV_BUNDLE_ID, force: true)
    main_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.ShareExtension", force: true)
+
+    sigh(api_key: api_key, app_identifier: "#{DEV_BUNDLE_ID}.ShareExtension", force: true)
    share_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.Widget", force: true)
+
+    sigh(api_key: api_key, app_identifier: "#{DEV_BUNDLE_ID}.Widget", force: true)
    widget_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
+
    # Configure code signing for dev bundle IDs
    configure_code_signing(
-      bundle_id_suffix: "development",
+      base_bundle_id: DEV_BUNDLE_ID,
      profile_name_main: main_profile_name,
      profile_name_share: share_profile_name,
      profile_name_widget: widget_profile_name
    )
-    
+
    # Build the app (same as gha_testflight_dev but without upload)
    build_app(
      scheme: "Runner",
@@ -277,9 +277,9 @@ end
      xcargs: "-skipMacroValidation CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual",
      export_options: {
        provisioningProfiles: {
-          "#{BASE_BUNDLE_ID}.development" => main_profile_name,
-          "#{BASE_BUNDLE_ID}.development.ShareExtension" => share_profile_name,
-          "#{BASE_BUNDLE_ID}.development.Widget" => widget_profile_name
+          DEV_BUNDLE_ID => main_profile_name,
+          "#{DEV_BUNDLE_ID}.ShareExtension" => share_profile_name,
+          "#{DEV_BUNDLE_ID}.Widget" => widget_profile_name
        },
        signingStyle: "manual",
        signingCertificate: CODE_SIGN_IDENTITY
@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/scroll_extensions.dart';
@@ -363,7 +364,8 @@ class _AssetPageState extends ConsumerState<AssetPage> {
    }

    BaseAsset displayAsset = asset;
-    final stackChildren = ref.watch(stackChildrenNotifier(asset)).valueOrNull;
+    final showAssetStack = ref.watch(timelineServiceProvider.select((s) => s.origin != TimelineOrigin.trash));
+    final stackChildren = showAssetStack ? ref.watch(stackChildrenNotifier(asset)).valueOrNull : null;
    if (stackChildren != null && stackChildren.isNotEmpty) {
      displayAsset = stackChildren.elementAt(stackIndex);
    }
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';

 class AssetStackRow extends ConsumerWidget {
  final List<RemoteAsset> stack;
@@ -15,6 +17,11 @@ class AssetStackRow extends ConsumerWidget {
      return const SizedBox.shrink();
    }

+    final hideAssetStack = ref.read(timelineServiceProvider).origin == TimelineOrigin.trash;
+    if (hideAssetStack) {
+      return const SizedBox.shrink();
+    }
+
    final showingControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
    double opacity = ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity)) * (showingControls ? 1 : 0);

@@ -21,6 +21,7 @@ class ThumbnailTile extends ConsumerStatefulWidget {
    this.showStorageIndicator = false,
    this.lockSelection = false,
    this.heroOffset,
+    this.showStackIndicator = false,
    super.key,
  });

@@ -30,6 +31,7 @@ class ThumbnailTile extends ConsumerStatefulWidget {
  final bool showStorageIndicator;
  final bool lockSelection;
  final int? heroOffset;
+  final bool showStackIndicator;

  @override
  ConsumerState<ThumbnailTile> createState() => _ThumbnailTileState();
@@ -139,7 +141,14 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
                    duration: Durations.short4,
                    child: Align(
                      alignment: Alignment.topRight,
-                      child: _AssetTypeIcons(asset: asset),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        crossAxisAlignment: CrossAxisAlignment.end,
+                        children: [
+                          _AssetTypeIcons(asset: asset),
+                          if (widget.showStackIndicator) _StackIndicator(asset: asset),
+                        ],
+                      ),
                    ),
                  ),
                if (storageIndicator && asset != null)
@@ -286,8 +295,8 @@ class _AssetTypeIcons extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    final hasStack = asset is RemoteAsset && (asset as RemoteAsset).stackId != null;
-    final isLivePhoto = asset is RemoteAsset && asset.livePhotoVideoId != null;
+    final remoteAsset = asset is RemoteAsset ? asset as RemoteAsset : null;
+    final isLivePhoto = remoteAsset?.livePhotoVideoId != null;

    return Column(
      mainAxisSize: MainAxisSize.min,
@@ -295,11 +304,6 @@ class _AssetTypeIcons extends StatelessWidget {
      children: [
        if (asset.isVideo)
          Padding(padding: const EdgeInsets.only(right: 10.0, top: 6.0), child: _VideoIndicator(asset.duration)),
-        if (hasStack)
-          const Padding(
-            padding: EdgeInsets.only(right: 10.0, top: 6.0),
-            child: _TileOverlayIcon(Icons.burst_mode_rounded),
-          ),
        if (isLivePhoto)
          const Padding(
            padding: EdgeInsets.only(right: 10.0, top: 6.0),
@@ -312,6 +316,24 @@ class _AssetTypeIcons extends StatelessWidget {
  }
 }

+class _StackIndicator extends StatelessWidget {
+  final BaseAsset asset;
+
+  const _StackIndicator({required this.asset});
+
+  @override
+  Widget build(BuildContext context) {
+    if (asset is! RemoteAsset || (asset as RemoteAsset).stackId == null) {
+      return const SizedBox.shrink();
+    }
+
+    return const Padding(
+      padding: EdgeInsets.only(right: 10.0, top: 6.0),
+      child: _TileOverlayIcon(Icons.burst_mode_rounded),
+    );
+  }
+}
+
 class _UploadProgressOverlay extends StatelessWidget {
  final double progress;

@@ -248,6 +248,7 @@ class _AssetTileWidget extends ConsumerWidget {
    final lockSelection = _getLockSelectionStatus(ref);
    final showStorageIndicator = ref.watch(timelineArgsProvider.select((args) => args.showStorageIndicator));
    final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);
+    final showStackIndicator = ref.read(timelineServiceProvider).origin != TimelineOrigin.trash;

    return RepaintBoundary(
      child: GestureDetector(
@@ -257,6 +258,7 @@ class _AssetTileWidget extends ConsumerWidget {
          asset,
          lockSelection: lockSelection,
          showStorageIndicator: showStorageIndicator,
+          showStackIndicator: showStackIndicator,
          heroOffset: heroOffset,
        ),
      ),
@@ -148,6 +148,7 @@ enum ActionButtonType {
            context.selectedCount == 1,
      ActionButtonType.unstack =>
        context.isOwner && //
+            context.timelineOrigin != TimelineOrigin.trash &&
            !context.isInLockedView && //
            context.isStacked,
      ActionButtonType.openInBrowser => context.asset.hasRemote && !context.isInLockedView,
@@ -183,15 +183,15 @@ class PeopleApi {
  /// * [String] closestPersonId:
  ///   Closest person ID for similarity search
  ///
-  /// * [num] page:
+  /// * [int] page:
  ///   Page number for pagination
  ///
-  /// * [num] size:
+  /// * [int] size:
  ///   Number of items per page
  ///
  /// * [bool] withHidden:
  ///   Include hidden people
-  Future<Response> getAllPeopleWithHttpInfo({ String? closestAssetId, String? closestPersonId, num? page, num? size, bool? withHidden, }) async {
+  Future<Response> getAllPeopleWithHttpInfo({ String? closestAssetId, String? closestPersonId, int? page, int? size, bool? withHidden, }) async {
    // ignore: prefer_const_declarations
    final apiPath = r'/people';

@@ -244,15 +244,15 @@ class PeopleApi {
  /// * [String] closestPersonId:
  ///   Closest person ID for similarity search
  ///
-  /// * [num] page:
+  /// * [int] page:
  ///   Page number for pagination
  ///
-  /// * [num] size:
+  /// * [int] size:
  ///   Number of items per page
  ///
  /// * [bool] withHidden:
  ///   Include hidden people
-  Future<PeopleResponseDto?> getAllPeople({ String? closestAssetId, String? closestPersonId, num? page, num? size, bool? withHidden, }) async {
+  Future<PeopleResponseDto?> getAllPeople({ String? closestAssetId, String? closestPersonId, int? page, int? size, bool? withHidden, }) async {
    final response = await getAllPeopleWithHttpInfo( closestAssetId: closestAssetId, closestPersonId: closestPersonId, page: page, size: size, withHidden: withHidden, );
    if (response.statusCode >= HttpStatus.badRequest) {
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -404,10 +404,10 @@ class SearchApi {
  /// * [List<String>] personIds:
  ///   Filter by person IDs
  ///
-  /// * [num] rating:
+  /// * [int] rating:
  ///   Filter by rating [1-5], or null for unrated
  ///
-  /// * [num] size:
+  /// * [int] size:
  ///   Number of results to return
  ///
  /// * [String] state:
@@ -443,7 +443,7 @@ class SearchApi {
  ///
  /// * [bool] withExif:
  ///   Include EXIF data in response
-  Future<Response> searchLargeAssetsWithHttpInfo({ List<String>? albumIds, String? city, String? country, DateTime? createdAfter, DateTime? createdBefore, bool? isEncoded, bool? isFavorite, bool? isMotion, bool? isNotInAlbum, bool? isOffline, String? lensModel, String? libraryId, String? make, int? minFileSize, String? model, String? ocr, List<String>? personIds, num? rating, num? size, String? state, List<String>? tagIds, DateTime? takenAfter, DateTime? takenBefore, DateTime? trashedAfter, DateTime? trashedBefore, AssetTypeEnum? type, DateTime? updatedAfter, DateTime? updatedBefore, AssetVisibility? visibility, bool? withDeleted, bool? withExif, }) async {
+  Future<Response> searchLargeAssetsWithHttpInfo({ List<String>? albumIds, String? city, String? country, DateTime? createdAfter, DateTime? createdBefore, bool? isEncoded, bool? isFavorite, bool? isMotion, bool? isNotInAlbum, bool? isOffline, String? lensModel, String? libraryId, String? make, int? minFileSize, String? model, String? ocr, List<String>? personIds, int? rating, int? size, String? state, List<String>? tagIds, DateTime? takenAfter, DateTime? takenBefore, DateTime? trashedAfter, DateTime? trashedBefore, AssetTypeEnum? type, DateTime? updatedAfter, DateTime? updatedBefore, AssetVisibility? visibility, bool? withDeleted, bool? withExif, }) async {
    // ignore: prefer_const_declarations
    final apiPath = r'/search/large-assets';

@@ -619,10 +619,10 @@ class SearchApi {
  /// * [List<String>] personIds:
  ///   Filter by person IDs
  ///
-  /// * [num] rating:
+  /// * [int] rating:
  ///   Filter by rating [1-5], or null for unrated
  ///
-  /// * [num] size:
+  /// * [int] size:
  ///   Number of results to return
  ///
  /// * [String] state:
@@ -658,7 +658,7 @@ class SearchApi {
  ///
  /// * [bool] withExif:
  ///   Include EXIF data in response
-  Future<List<AssetResponseDto>?> searchLargeAssets({ List<String>? albumIds, String? city, String? country, DateTime? createdAfter, DateTime? createdBefore, bool? isEncoded, bool? isFavorite, bool? isMotion, bool? isNotInAlbum, bool? isOffline, String? lensModel, String? libraryId, String? make, int? minFileSize, String? model, String? ocr, List<String>? personIds, num? rating, num? size, String? state, List<String>? tagIds, DateTime? takenAfter, DateTime? takenBefore, DateTime? trashedAfter, DateTime? trashedBefore, AssetTypeEnum? type, DateTime? updatedAfter, DateTime? updatedBefore, AssetVisibility? visibility, bool? withDeleted, bool? withExif, }) async {
+  Future<List<AssetResponseDto>?> searchLargeAssets({ List<String>? albumIds, String? city, String? country, DateTime? createdAfter, DateTime? createdBefore, bool? isEncoded, bool? isFavorite, bool? isMotion, bool? isNotInAlbum, bool? isOffline, String? lensModel, String? libraryId, String? make, int? minFileSize, String? model, String? ocr, List<String>? personIds, int? rating, int? size, String? state, List<String>? tagIds, DateTime? takenAfter, DateTime? takenBefore, DateTime? trashedAfter, DateTime? trashedBefore, AssetTypeEnum? type, DateTime? updatedAfter, DateTime? updatedBefore, AssetVisibility? visibility, bool? withDeleted, bool? withExif, }) async {
    final response = await searchLargeAssetsWithHttpInfo( albumIds: albumIds, city: city, country: country, createdAfter: createdAfter, createdBefore: createdBefore, isEncoded: isEncoded, isFavorite: isFavorite, isMotion: isMotion, isNotInAlbum: isNotInAlbum, isOffline: isOffline, lensModel: lensModel, libraryId: libraryId, make: make, minFileSize: minFileSize, model: model, ocr: ocr, personIds: personIds, rating: rating, size: size, state: state, tagIds: tagIds, takenAfter: takenAfter, takenBefore: takenBefore, trashedAfter: trashedAfter, trashedBefore: trashedBefore, type: type, updatedAfter: updatedAfter, updatedBefore: updatedBefore, visibility: visibility, withDeleted: withDeleted, withExif: withExif, );
    if (response.statusCode >= HttpStatus.badRequest) {
      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -37,12 +37,15 @@ class AssetBulkUpdateDto {

  /// Relative time offset in seconds
  ///
+  /// Minimum value: -9007199254740991
+  /// Maximum value: 9007199254740991
+  ///
  /// Please note: This property should have been non-nullable! Since the specification file
  /// does not include a default value (using the "default:" property), however, the generated
  /// source code must fall back to having a nullable type.
  /// Consider adding a "default:" property in the specification file to hide this note.
  ///
-  num? dateTimeRelative;
+  int? dateTimeRelative;

  /// Asset description
  ///
@@ -213,7 +216,7 @@ class AssetBulkUpdateDto {

      return AssetBulkUpdateDto(
        dateTimeOriginal: mapValueOfType<String>(json, r'dateTimeOriginal'),
-        dateTimeRelative: num.parse('${json[r'dateTimeRelative']}'),
+        dateTimeRelative: mapValueOfType<int>(json, r'dateTimeRelative'),
        description: mapValueOfType<String>(json, r'description'),
        duplicateId: mapValueOfType<String>(json, r'duplicateId'),
        ids: json[r'ids'] is Iterable
@@ -24,22 +24,26 @@ class AssetEditActionItemDtoParameters {
  /// Height of the crop
  ///
  /// Minimum value: 1
-  num height;
+  /// Maximum value: 9007199254740991
+  int height;

  /// Width of the crop
  ///
  /// Minimum value: 1
-  num width;
+  /// Maximum value: 9007199254740991
+  int width;

  /// Top-Left X coordinate of crop
  ///
  /// Minimum value: 0
-  num x;
+  /// Maximum value: 9007199254740991
+  int x;

  /// Top-Left Y coordinate of crop
  ///
  /// Minimum value: 0
-  num y;
+  /// Maximum value: 9007199254740991
+  int y;

  /// Rotation angle in degrees
  num angle;
@@ -88,10 +92,10 @@ class AssetEditActionItemDtoParameters {
      final json = value.cast<String, dynamic>();

      return AssetEditActionItemDtoParameters(
-        height: num.parse('${json[r'height']}'),
-        width: num.parse('${json[r'width']}'),
-        x: num.parse('${json[r'x']}'),
-        y: num.parse('${json[r'y']}'),
+        height: mapValueOfType<int>(json, r'height')!,
+        width: mapValueOfType<int>(json, r'width')!,
+        x: mapValueOfType<int>(json, r'x')!,
+        y: mapValueOfType<int>(json, r'y')!,
        angle: num.parse('${json[r'angle']}'),
        axis: MirrorAxis.fromJson(json[r'axis'])!,
      );
@@ -80,7 +80,8 @@ class AssetResponseDto {
  /// Asset height
  ///
  /// Minimum value: 0
-  num? height;
+  /// Maximum value: 9007199254740991
+  int? height;

  /// Asset ID
  String id;
@@ -165,7 +166,8 @@ class AssetResponseDto {
  /// Asset width
  ///
  /// Minimum value: 0
-  num? width;
+  /// Maximum value: 9007199254740991
+  int? width;

  @override
  bool operator ==(Object other) => identical(this, other) || other is AssetResponseDto &&
@@ -346,9 +348,7 @@ class AssetResponseDto {
        fileCreatedAt: mapDateTime(json, r'fileCreatedAt', r'')!,
        fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r'')!,
        hasMetadata: mapValueOfType<bool>(json, r'hasMetadata')!,
-        height: json[r'height'] == null
-            ? null
-            : num.parse('${json[r'height']}'),
+        height: mapValueOfType<int>(json, r'height'),
        id: mapValueOfType<String>(json, r'id')!,
        isArchived: mapValueOfType<bool>(json, r'isArchived')!,
        isEdited: mapValueOfType<bool>(json, r'isEdited')!,
@@ -372,9 +372,7 @@ class AssetResponseDto {
        unassignedFaces: AssetFaceWithoutPersonResponseDto.listFromJson(json[r'unassignedFaces']),
        updatedAt: mapDateTime(json, r'updatedAt', r'')!,
        visibility: AssetVisibility.fromJson(json[r'visibility'])!,
-        width: json[r'width'] == null
-            ? null
-            : num.parse('${json[r'width']}'),
+        width: mapValueOfType<int>(json, r'width'),
      );
    }
    return null;
@@ -22,22 +22,26 @@ class CropParameters {
  /// Height of the crop
  ///
  /// Minimum value: 1
-  num height;
+  /// Maximum value: 9007199254740991
+  int height;

  /// Width of the crop
  ///
  /// Minimum value: 1
-  num width;
+  /// Maximum value: 9007199254740991
+  int width;

  /// Top-Left X coordinate of crop
  ///
  /// Minimum value: 0
-  num x;
+  /// Maximum value: 9007199254740991
+  int x;

  /// Top-Left Y coordinate of crop
  ///
  /// Minimum value: 0
-  num y;
+  /// Maximum value: 9007199254740991
+  int y;

  @override
  bool operator ==(Object other) => identical(this, other) || other is CropParameters &&
@@ -75,10 +79,10 @@ class CropParameters {
      final json = value.cast<String, dynamic>();

      return CropParameters(
-        height: num.parse('${json[r'height']}'),
-        width: num.parse('${json[r'width']}'),
-        x: num.parse('${json[r'x']}'),
-        y: num.parse('${json[r'y']}'),
+        height: mapValueOfType<int>(json, r'height')!,
+        width: mapValueOfType<int>(json, r'width')!,
+        x: mapValueOfType<int>(json, r'x')!,
+        y: mapValueOfType<int>(json, r'y')!,
      );
    }
    return null;
@@ -27,7 +27,8 @@ class DatabaseBackupConfig {
  /// Keep last amount
  ///
  /// Minimum value: 1
-  num keepLastAmount;
+  /// Maximum value: 9007199254740991
+  int keepLastAmount;

  @override
  bool operator ==(Object other) => identical(this, other) || other is DatabaseBackupConfig &&
@@ -64,7 +65,7 @@ class DatabaseBackupConfig {
      return DatabaseBackupConfig(
        cronExpression: mapValueOfType<String>(json, r'cronExpression')!,
        enabled: mapValueOfType<bool>(json, r'enabled')!,
-        keepLastAmount: num.parse('${json[r'keepLastAmount']}'),
+        keepLastAmount: mapValueOfType<int>(json, r'keepLastAmount')!,
      );
    }
    return null;
@@ -22,7 +22,10 @@ class DatabaseBackupDto {
  String filename;

  /// Backup file size
-  num filesize;
+  ///
+  /// Minimum value: -9007199254740991
+  /// Maximum value: 9007199254740991
+  int filesize;

  /// Backup timezone
  String timezone;
@@ -61,7 +64,7 @@ class DatabaseBackupDto {

      return DatabaseBackupDto(
        filename: mapValueOfType<String>(json, r'filename')!,
-        filesize: num.parse('${json[r'filesize']}'),
+        filesize: mapValueOfType<int>(json, r'filesize')!,
        timezone: mapValueOfType<String>(json, r'timezone')!,
      );
    }
@@ -52,12 +52,14 @@ class ExifResponseDto {
  /// Image height in pixels
  ///
  /// Minimum value: 0
-  num? exifImageHeight;
+  /// Maximum value: 9007199254740991
+  int? exifImageHeight;

  /// Image width in pixels
  ///
  /// Minimum value: 0
-  num? exifImageWidth;
+  /// Maximum value: 9007199254740991
+  int? exifImageWidth;

  /// Exposure time
  String? exposureTime;
@@ -75,7 +77,10 @@ class ExifResponseDto {
  num? focalLength;

  /// ISO sensitivity
-  num? iso;
+  ///
+  /// Minimum value: -9007199254740991
+  /// Maximum value: 9007199254740991
+  int? iso;

  /// GPS latitude
  num? latitude;
@@ -102,7 +107,10 @@ class ExifResponseDto {
  String? projectionType;

  /// Rating
-  num? rating;
+  ///
+  /// Minimum value: -9007199254740991
+  /// Maximum value: 9007199254740991
+  int? rating;

  /// State/province name
  String? state;
@@ -292,12 +300,8 @@ class ExifResponseDto {
        country: mapValueOfType<String>(json, r'country'),
        dateTimeOriginal: mapDateTime(json, r'dateTimeOriginal', r''),
        description: mapValueOfType<String>(json, r'description'),
-        exifImageHeight: json[r'exifImageHeight'] == null
-            ? null
-            : num.parse('${json[r'exifImageHeight']}'),
-        exifImageWidth: json[r'exifImageWidth'] == null
-            ? null
-            : num.parse('${json[r'exifImageWidth']}'),
+        exifImageHeight: mapValueOfType<int>(json, r'exifImageHeight'),
+        exifImageWidth: mapValueOfType<int>(json, r'exifImageWidth'),
        exposureTime: mapValueOfType<String>(json, r'exposureTime'),
        fNumber: json[r'fNumber'] == null
            ? null
@@ -306,9 +310,7 @@ class ExifResponseDto {
        focalLength: json[r'focalLength'] == null
            ? null
            : num.parse('${json[r'focalLength']}'),
-        iso: json[r'iso'] == null
-            ? null
-            : num.parse('${json[r'iso']}'),
+        iso: mapValueOfType<int>(json, r'iso'),
        latitude: json[r'latitude'] == null
            ? null
            : num.parse('${json[r'latitude']}'),
@@ -321,9 +323,7 @@ class ExifResponseDto {
        modifyDate: mapDateTime(json, r'modifyDate', r''),
        orientation: mapValueOfType<String>(json, r'orientation'),
        projectionType: mapValueOfType<String>(json, r'projectionType'),
-        rating: json[r'rating'] == null
-            ? null
-            : num.parse('${json[r'rating']}'),
+        rating: mapValueOfType<int>(json, r'rating'),
        state: mapValueOfType<String>(json, r'state'),
        timeZone: mapValueOfType<String>(json, r'timeZone'),
      );
@@ -21,9 +21,13 @@ class MachineLearningAvailabilityChecksDto {
  /// Enabled
  bool enabled;

-  num interval;
+  /// Minimum value: -9007199254740991
+  /// Maximum value: 9007199254740991
+  int interval;

-  num timeout;
+  /// Minimum value: -9007199254740991
+  /// Maximum value: 9007199254740991
+  int timeout;

  @override
  bool operator ==(Object other) => identical(this, other) || other is MachineLearningAvailabilityChecksDto &&
@@ -59,8 +63,8 @@ class MachineLearningAvailabilityChecksDto {

      return MachineLearningAvailabilityChecksDto(
        enabled: mapValueOfType<bool>(json, r'enabled')!,
-        interval: num.parse('${json[r'interval']}'),
-        timeout: num.parse('${json[r'timeout']}'),
+        interval: mapValueOfType<int>(json, r'interval')!,
+        timeout: mapValueOfType<int>(json, r'timeout')!,
      );
    }
    return null;
@@ -20,7 +20,10 @@ class MaintenanceDetectInstallStorageFolderDto {
  });

  /// Number of files in the folder
-  num files;
+  ///
+  /// Minimum value: -9007199254740991
+  /// Maximum value: 9007199254740991
+  int files;

  StorageFolder folder;

@@ -66,7 +69,7 @@ class MaintenanceDetectInstallStorageFolderDto {
      final json = value.cast<String, dynamic>();

      return MaintenanceDetectInstallStorageFolderDto(
-        files: num.parse('${json[r'files']}'),
+        files: mapValueOfType<int>(json, r'files')!,
        folder: StorageFolder.fromJson(json[r'folder'])!,
        readable: mapValueOfType<bool>(json, r'readable')!,
        writable: mapValueOfType<bool>(json, r'writable')!,
@@ -32,13 +32,15 @@ class MaintenanceStatusResponseDto {
  ///
  String? error;

+  /// Minimum value: -9007199254740991
+  /// Maximum value: 9007199254740991
  ///
  /// Please note: This property should have been non-nullable! Since the specification file
  /// does not include a default value (using the "default:" property), however, the generated
  /// source code must fall back to having a nullable type.
  /// Consider adding a "default:" property in the specification file to hide this note.
  ///
-  num? progress;
+  int? progress;

  ///
  /// Please note: This property should have been non-nullable! Since the specification file
@@ -102,7 +104,7 @@ class MaintenanceStatusResponseDto {
        action: MaintenanceAction.fromJson(json[r'action'])!,
        active: mapValueOfType<bool>(json, r'active')!,
        error: mapValueOfType<String>(json, r'error'),
-        progress: num.parse('${json[r'progress']}'),
+        progress: mapValueOfType<int>(json, r'progress'),
        task: mapValueOfType<String>(json, r'task'),
      );
    }
@@ -215,13 +215,14 @@ class MetadataSearchDto {
  /// Page number
  ///
  /// Minimum value: 1
+  /// Maximum value: 9007199254740991
  ///
  /// Please note: This property should have been non-nullable! Since the specification file
  /// does not include a default value (using the "default:" property), however, the generated
  /// source code must fall back to having a nullable type.
  /// Consider adding a "default:" property in the specification file to hide this note.
  ///
-  num? page;
+  int? page;

  /// Filter by person IDs
  List<String> personIds;
@@ -239,7 +240,7 @@ class MetadataSearchDto {
  ///
  /// Minimum value: -1
  /// Maximum value: 5
-  num? rating;
+  int? rating;

  /// Number of results to return
  ///
@@ -251,7 +252,7 @@ class MetadataSearchDto {
  /// source code must fall back to having a nullable type.
  /// Consider adding a "default:" property in the specification file to hide this note.
  ///
-  num? size;
+  int? size;

  /// Filter by state/province name
  String? state;
@@ -724,15 +725,13 @@ class MetadataSearchDto {
        order: AssetOrder.fromJson(json[r'order']),
        originalFileName: mapValueOfType<String>(json, r'originalFileName'),
        originalPath: mapValueOfType<String>(json, r'originalPath'),
-        page: num.parse('${json[r'page']}'),
+        page: mapValueOfType<int>(json, r'page'),
        personIds: json[r'personIds'] is Iterable
            ? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
            : const [],
        previewPath: mapValueOfType<String>(json, r'previewPath'),
-        rating: json[r'rating'] == null
-            ? null
-            : num.parse('${json[r'rating']}'),
-        size: num.parse('${json[r'size']}'),
+        rating: mapValueOfType<int>(json, r'rating'),
+        size: mapValueOfType<int>(json, r'size'),
        state: mapValueOfType<String>(json, r'state'),
        tagIds: json[r'tagIds'] is Iterable
            ? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)
@@ -147,7 +147,7 @@ class RandomSearchDto {
  ///
  /// Minimum value: -1
  /// Maximum value: 5
-  num? rating;
+  int? rating;

  /// Number of results to return
  ///
@@ -159,7 +159,7 @@ class RandomSearchDto {
  /// source code must fall back to having a nullable type.
  /// Consider adding a "default:" property in the specification file to hide this note.
  ///
-  num? size;
+  int? size;

  /// Filter by state/province name
  String? state;
@@ -549,10 +549,8 @@ class RandomSearchDto {
        personIds: json[r'personIds'] is Iterable
            ? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
            : const [],
-        rating: json[r'rating'] == null
-            ? null
-            : num.parse('${json[r'rating']}'),
-        size: num.parse('${json[r'size']}'),
+        rating: mapValueOfType<int>(json, r'rating'),
+        size: mapValueOfType<int>(json, r'size'),
        state: mapValueOfType<String>(json, r'state'),
        tagIds: json[r'tagIds'] is Iterable
            ? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)
@@ -39,13 +39,14 @@ class SessionCreateDto {
  /// Session duration in seconds
  ///
  /// Minimum value: 1
+  /// Maximum value: 9007199254740991
  ///
  /// Please note: This property should have been non-nullable! Since the specification file
  /// does not include a default value (using the "default:" property), however, the generated
  /// source code must fall back to having a nullable type.
  /// Consider adding a "default:" property in the specification file to hide this note.
  ///
-  num? duration;
+  int? duration;

  @override
  bool operator ==(Object other) => identical(this, other) || other is SessionCreateDto &&
@@ -94,7 +95,7 @@ class SessionCreateDto {
      return SessionCreateDto(
        deviceOS: mapValueOfType<String>(json, r'deviceOS'),
        deviceType: mapValueOfType<String>(json, r'deviceType'),
-        duration: num.parse('${json[r'duration']}'),
+        duration: mapValueOfType<int>(json, r'duration'),
      );
    }
    return null;
@@ -154,13 +154,14 @@ class SmartSearchDto {
  /// Page number
  ///
  /// Minimum value: 1
+  /// Maximum value: 9007199254740991
  ///
  /// Please note: This property should have been non-nullable! Since the specification file
  /// does not include a default value (using the "default:" property), however, the generated
  /// source code must fall back to having a nullable type.
  /// Consider adding a "default:" property in the specification file to hide this note.
  ///
-  num? page;
+  int? page;

  /// Filter by person IDs
  List<String> personIds;
@@ -187,7 +188,7 @@ class SmartSearchDto {
  ///
  /// Minimum value: -1
  /// Maximum value: 5
-  num? rating;
+  int? rating;

  /// Number of results to return
  ///
@@ -199,7 +200,7 @@ class SmartSearchDto {
  /// source code must fall back to having a nullable type.
  /// Consider adding a "default:" property in the specification file to hide this note.
  ///
-  num? size;
+  int? size;

  /// Filter by state/province name
  String? state;
@@ -583,16 +584,14 @@ class SmartSearchDto {
        make: mapValueOfType<String>(json, r'make'),
        model: mapValueOfType<String>(json, r'model'),
        ocr: mapValueOfType<String>(json, r'ocr'),
-        page: num.parse('${json[r'page']}'),
+        page: mapValueOfType<int>(json, r'page'),
        personIds: json[r'personIds'] is Iterable
            ? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
            : const [],
        query: mapValueOfType<String>(json, r'query'),
        queryAssetId: mapValueOfType<String>(json, r'queryAssetId'),
-        rating: json[r'rating'] == null
-            ? null
-            : num.parse('${json[r'rating']}'),
-        size: num.parse('${json[r'size']}'),
+        rating: mapValueOfType<int>(json, r'rating'),
+        size: mapValueOfType<int>(json, r'size'),
        state: mapValueOfType<String>(json, r'state'),
        tagIds: json[r'tagIds'] is Iterable
            ? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)
@@ -152,7 +152,7 @@ class StatisticsSearchDto {
  ///
  /// Minimum value: -1
  /// Maximum value: 5
-  num? rating;
+  int? rating;

  /// Filter by state/province name
  String? state;
@@ -479,9 +479,7 @@ class StatisticsSearchDto {
        personIds: json[r'personIds'] is Iterable
            ? (json[r'personIds'] as Iterable).cast<String>().toList(growable: false)
            : const [],
-        rating: json[r'rating'] == null
-            ? null
-            : num.parse('${json[r'rating']}'),
+        rating: mapValueOfType<int>(json, r'rating'),
        state: mapValueOfType<String>(json, r'state'),
        tagIds: json[r'tagIds'] is Iterable
            ? (json[r'tagIds'] as Iterable).cast<String>().toList(growable: false)
@@ -57,7 +57,8 @@ class SystemConfigOAuthDto {
  /// Default storage quota
  ///
  /// Minimum value: 0
-  num? defaultStorageQuota;
+  /// Maximum value: 9007199254740991
+  int? defaultStorageQuota;

  /// Enabled
  bool enabled;
@@ -200,9 +201,7 @@ class SystemConfigOAuthDto {
        buttonText: mapValueOfType<String>(json, r'buttonText')!,
        clientId: mapValueOfType<String>(json, r'clientId')!,
        clientSecret: mapValueOfType<String>(json, r'clientSecret')!,
-        defaultStorageQuota: json[r'defaultStorageQuota'] == null
-            ? null
-            : num.parse('${json[r'defaultStorageQuota']}'),
+        defaultStorageQuota: mapValueOfType<int>(json, r'defaultStorageQuota'),
        enabled: mapValueOfType<bool>(json, r'enabled')!,
        endSessionEndpoint: mapValueOfType<String>(json, r'endSessionEndpoint')!,
        issuerUrl: mapValueOfType<String>(json, r'issuerUrl')!,
@@ -34,7 +34,7 @@ class SystemConfigSmtpTransportDto {
  ///
  /// Minimum value: 0
  /// Maximum value: 65535
-  num port;
+  int port;

  /// Whether to use secure connection (TLS/SSL)
  bool secure;
@@ -87,7 +87,7 @@ class SystemConfigSmtpTransportDto {
        host: mapValueOfType<String>(json, r'host')!,
        ignoreCert: mapValueOfType<bool>(json, r'ignoreCert')!,
        password: mapValueOfType<String>(json, r'password')!,
-        port: num.parse('${json[r'port']}'),
+        port: mapValueOfType<int>(json, r'port')!,
        secure: mapValueOfType<bool>(json, r'secure')!,
        username: mapValueOfType<String>(json, r'username')!,
      );
@@ -26,7 +26,10 @@ class WorkflowActionResponseDto {
  String id;

  /// Action order
-  num order;
+  ///
+  /// Minimum value: -9007199254740991
+  /// Maximum value: 9007199254740991
+  int order;

  /// Plugin action ID
  String pluginActionId;
@@ -79,7 +82,7 @@ class WorkflowActionResponseDto {
      return WorkflowActionResponseDto(
        actionConfig: mapCastOfType<String, Object>(json, r'actionConfig'),
        id: mapValueOfType<String>(json, r'id')!,
-        order: num.parse('${json[r'order']}'),
+        order: mapValueOfType<int>(json, r'order')!,
        pluginActionId: mapValueOfType<String>(json, r'pluginActionId')!,
        workflowId: mapValueOfType<String>(json, r'workflowId')!,
      );
@@ -26,7 +26,10 @@ class WorkflowFilterResponseDto {
  String id;

  /// Filter order
-  num order;
+  ///
+  /// Minimum value: -9007199254740991
+  /// Maximum value: 9007199254740991
+  int order;

  /// Plugin filter ID
  String pluginFilterId;
@@ -79,7 +82,7 @@ class WorkflowFilterResponseDto {
      return WorkflowFilterResponseDto(
        filterConfig: mapCastOfType<String, Object>(json, r'filterConfig'),
        id: mapValueOfType<String>(json, r'id')!,
-        order: num.parse('${json[r'order']}'),
+        order: mapValueOfType<int>(json, r'order')!,
        pluginFilterId: mapValueOfType<String>(json, r'pluginFilterId')!,
        workflowId: mapValueOfType<String>(json, r'workflowId')!,
      );