Merge branch 'main' into chore/workflow-number-bounds

mise.lock

@@ -184,6 +184,33 @@ checksum = "sha256:b5e1d2a1ad3c03229ddc89823848f4a1c11f9c6402a51fa26f0aaa5f1d7a2
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-windows.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288925833"
 
+[[tools.java]]
+version = "21.0.2"
+backend = "core:java"
+
+[tools.java.options]
+shorthand_vendor = "openjdk"
+
+[tools.java."platforms.linux-arm64"]
+checksum = "sha256:08db1392a48d4eb5ea5315cf8f18b89dbaf36cda663ba882cf03c704c9257ec2"
+url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-aarch64_bin.tar.gz"
+
+[tools.java."platforms.linux-x64"]
+checksum = "sha256:a2def047a73941e01a73739f92755f86b895811afb1f91243db214cff5bdac3f"
+url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz"
+
+[tools.java."platforms.macos-arm64"]
+checksum = "sha256:b3d588e16ec1e0ef9805d8a696591bd518a5cea62567da8f53b5ce32d11d22e4"
+url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-aarch64_bin.tar.gz"
+
+[tools.java."platforms.macos-x64"]
+checksum = "sha256:8fd09e15dc406387a0aba70bf5d99692874e999bf9cd9208b452b5d76ac922d3"
+url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-x64_bin.tar.gz"
+
+[tools.java."platforms.windows-x64"]
+checksum = "sha256:b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664"
+url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"
+
 [[tools.node]]
 version = "24.15.0"
 backend = "core:node"

mise.toml

@@ -23,7 +23,7 @@ opentofu = "1.11.6"
 "github:extism/cli" = "1.6.3"
 "github:webassembly/binaryen" = "version_124"
 "github:extism/js-pdk" = "1.6.0"
-java = "21.0.11+10.0.LTS"
+java = "21.0.2"
 
 [tools."github:jellyfin/jellyfin-ffmpeg"]
 version = "7.1.3-6"

mobile/android/app/src/main/cpp/native_image.c

@@ -107,67 +107,3 @@ Java_app_alextran_immich_NativeImage_rotate(
   }
   return (jlong) dst;
 }
-
-// Convert an RGBA_1010102 buffer to densely-packed RGBA_8888, matching Skia's
-// Bitmap.copy(ARGB_8888) byte-for-byte so it's a drop-in for the intermediate 8888 bitmap.
-// Each source pixel is a native (little-endian on every Android ABI) u32 with R in bits 0-9,
-// G in 10-19, B in 20-29, A in 30-31 (standard RGB10_A2). Each 10-bit channel maps to 8-bit via
-// round(v*255/1023). The 2-bit alpha maps to a*85. Both are kept as plain arithmetic as the whole
-// loop auto-vectorizes to NEON and measures faster than a LUT on-device. Output is R,G,B,A bytes
-// per pixel, i.e. Android ARGB_8888 memory == Dart PixelFormat.rgba8888.
-static void convert_1010102(const uint8_t *src, int srcStride, uint32_t *dst, int w, int h) {
-  for (int y = 0; y < h; y++) {
-    const uint32_t *srcRow = (const uint32_t *) (src + (size_t) y * srcStride);
-    uint32_t *dstRow = dst + (size_t) y * w;
-    for (int x = 0; x < w; x++) {
-      uint32_t px = srcRow[x];
-      uint32_t r = ((px & 0x3FF) * 16336u + 32768u) >> 16;
-      uint32_t g = (((px >> 10) & 0x3FF) * 16336u + 32768u) >> 16;
-      uint32_t b = (((px >> 20) & 0x3FF) * 16336u + 32768u) >> 16;
-      uint32_t a = ((px >> 30) & 0x3) * 85u;
-      dstRow[x] = r | (g << 8) | (b << 16) | (a << 24);
-    }
-  }
-}
-
-// Converts an RGBA_1010102 bitmap (what a 10-bit HEIC/AVIF decodes to on API 33+) into a freshly
-// malloc'd RGBA_8888 buffer. Fills outInfo with {width, height, rowBytes} and returns the buffer
-// address, or 0 (so the caller falls back to a Skia copy) if the bitmap isn't 1010102 or can't be
-// locked. Same ownership contract as rotate: free the returned buffer via NativeBuffer.free.
-JNIEXPORT jlong JNICALL
-Java_app_alextran_immich_NativeImage_convert1010102(
-    JNIEnv *env, jclass clazz, jobject bitmap, jintArray outInfo) {
-  AndroidBitmapInfo info;
-  if (AndroidBitmap_getInfo(env, bitmap, &info) != ANDROID_BITMAP_RESULT_SUCCESS) {
-    return 0;
-  }
-  if (info.format != ANDROID_BITMAP_FORMAT_RGBA_1010102) {
-    return 0;
-  }
-
-  int w = (int) info.width;
-  int h = (int) info.height;
-
-  uint32_t *dst = (uint32_t *) malloc((size_t) w * h * 4);
-  if (dst == NULL) {
-    return 0;
-  }
-
-  void *srcPixels = NULL;
-  if (AndroidBitmap_lockPixels(env, bitmap, &srcPixels) != ANDROID_BITMAP_RESULT_SUCCESS) {
-    free(dst);
-    return 0;
-  }
-
-  convert_1010102((const uint8_t *) srcPixels, (int) info.stride, dst, w, h);
-
-  AndroidBitmap_unlockPixels(env, bitmap);
-
-  jint dims[3] = {w, h, w * 4};
-  (*env)->SetIntArrayRegion(env, outInfo, 0, 3, dims);
-  if ((*env)->ExceptionCheck(env)) {
-    free(dst);
-    return 0;
-  }
-  return (jlong) dst;
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/NativeImage.kt

@@ -16,14 +16,4 @@ object NativeImage {
    */
   @JvmStatic
   external fun rotate(bitmap: Bitmap, orientation: Int, outInfo: IntArray): Long
-
-  /**
-   * Converts an RGBA_1010102 [bitmap] (what a 10-bit HEIC/AVIF decodes to on API 33+) to RGBA_8888,
-   * writing the result into a freshly malloc'd native buffer in one pass, with no intermediate
-   * ARGB_8888 bitmap. Returns the buffer address (free it with [NativeBuffer.free]) and fills
-   * [outInfo] with {width, height, rowBytes}. Returns 0 when the bitmap isn't RGBA_1010102 so the
-   * caller can fall back to a Skia copy.
-   */
-  @JvmStatic
-  external fun convert1010102(bitmap: Bitmap, outInfo: IntArray): Long
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/images/LocalImagesImpl.kt

@@ -46,47 +46,22 @@ inline fun ImageDecoder.Source.decodeBitmap(target: Size = Size(0, 0)): Bitmap {
 }
 
 fun Bitmap.toNativeBuffer(): Map<String, Long>  {
-  // Dart reads the buffer as rgba8888, but 10-bit sources decode to RGBA_1010102, which garbles
-  // colors when copied verbatim. Convert those straight into the output buffer in native code -
-  // one pass, no intermediate ARGB_8888 bitmap.
-  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && config == Bitmap.Config.RGBA_1010102) {
-    val info = IntArray(3)
-    val pointer = NativeImage.convert1010102(this, info)
-    if (pointer != 0L) {
-      recycle()
-      return mapOf(
-        "pointer" to pointer,
-        "width" to info[0].toLong(),
-        "height" to info[1].toLong(),
-        "rowBytes" to info[2].toLong()
-      )
-    }
-    // native convert declined (OOM/lock) -> fall through to the Skia copy path below.
-  }
-  // Other non-8888 configs (e.g. HDR F16) still need Skia's convert; 8-bit is copied as-is.
-  val bitmap = if (config != Bitmap.Config.ARGB_8888) {
-    val converted = copy(Bitmap.Config.ARGB_8888, false)
-    recycle()
-    converted ?: throw IOException("could not convert bitmap to ARGB_8888")
-  } else {
-    this
-  }
-  val size = bitmap.width * bitmap.height * 4
+  val size = width * height * 4
   val pointer = NativeBuffer.allocate(size)
   try {
     val buffer = NativeBuffer.wrap(pointer, size)
-    bitmap.copyPixelsToBuffer(buffer)
+    copyPixelsToBuffer(buffer)
     return mapOf(
       "pointer" to pointer,
-      "width" to bitmap.width.toLong(),
-      "height" to bitmap.height.toLong(),
-      "rowBytes" to (bitmap.width * 4).toLong()
+      "width" to width.toLong(),
+      "height" to height.toLong(),
+      "rowBytes" to (width * 4).toLong()
     )
-  } catch (e: Throwable) {
+  } catch (e: Exception) {
     NativeBuffer.free(pointer)
     throw e
   } finally {
-    bitmap.recycle()
+    recycle()
   }
 }
 

mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImagesImpl.kt

@@ -1,8 +1,6 @@
 package app.alextran.immich.images
 
 import android.content.Context
-import android.graphics.ImageDecoder
-import android.os.Build
 import android.os.CancellationSignal
 import android.os.OperationCanceledException
 import app.alextran.immich.INITIAL_BUFFER_SIZE
@@ -24,7 +22,6 @@ import java.io.File
 import java.io.IOException
 import java.nio.ByteBuffer
 import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.Executors
 
 private const val MAX_PREALLOC_BYTES = 128 * 1024 * 1024
 
@@ -39,16 +36,12 @@ class RemoteImagesImpl(context: Context) : RemoteImageApi {
 
   companion object {
     val CANCELLED = Result.success<Map<String, Long>?>(null)
-
-    // Shared, process-lifetime pool: RemoteImagesImpl is re-created per FlutterEngine, so a
-    // per-instance pool would leak threads across engine restarts.
-    private val decodeExecutor = Executors.newFixedThreadPool(2)
   }
 
   override fun requestImage(
     url: String,
     requestId: Long,
-    preferEncoded: Boolean,
+    @Suppress("UNUSED_PARAMETER") preferEncoded: Boolean, // always returns encoded; setting has no effect on Android
     callback: (Result<Map<String, Long>?>) -> Unit
   ) {
     val signal = CancellationSignal()
@@ -58,51 +51,12 @@ class RemoteImagesImpl(context: Context) : RemoteImageApi {
       url,
       signal,
       onSuccess = { buffer ->
+        requestMap.remove(requestId)
         if (signal.isCanceled) {
-          requestMap.remove(requestId)
-          buffer.free()
+          NativeBuffer.free(buffer.pointer)
           return@fetch callback(CANCELLED)
         }
 
-        // Decode natively when the caller wants pixels: Flutter's fallback decoder copies
-        // 10-bit bitmaps (RGBA_1010102) as if they were rgba8888, garbling colors. Decode on a
-        // dedicated pool - the fetch callback threads are shared with video streaming. On any
-        // decode failure (including OOM on huge originals), hand Flutter the encoded bytes as
-        // before.
-        if (!preferEncoded && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-          decodeExecutor.execute {
-            val res = if (signal.isCanceled) null else try {
-              val source = ImageDecoder.createSource(NativeBuffer.wrap(buffer.pointer, buffer.offset))
-              source.decodeBitmap().toNativeBuffer()
-            } catch (_: Throwable) {
-              null
-            }
-            requestMap.remove(requestId)
-            when {
-              // Deliver even if the request was cancelled meanwhile: re-checking here would orphan
-              // res's malloc, and Dart frees the buffer itself when it sees the cancel.
-              res != null -> {
-                buffer.free()
-                callback(Result.success(res))
-              }
-              signal.isCanceled -> {
-                buffer.free()
-                callback(CANCELLED)
-              }
-              else -> callback(
-                Result.success(
-                  mapOf(
-                    "pointer" to buffer.pointer,
-                    "length" to buffer.offset.toLong()
-                  )
-                )
-              )
-            }
-          }
-          return@fetch
-        }
-
-        requestMap.remove(requestId)
         callback(
           Result.success(
             mapOf(

mobile/lib/infrastructure/loaders/remote_image_request.dart

@@ -12,7 +12,7 @@ class RemoteImageRequest extends ImageRequest {
     }
 
     final info = await remoteImageApi.requestImage(uri, requestId: requestId, preferEncoded: false);
-    // Android falls back to encoded data if native decoding fails, so check for both shapes of the response.
+    // Android always returns encoded data, so we need to check for both shapes of the response.
     final frame = switch (info) {
       {'pointer': int pointer, 'length': int length} => await _fromEncodedPlatformImage(pointer, length),
       {'pointer': int pointer, 'width': int width, 'height': int height, 'rowBytes': int rowBytes} =>

packages/plugin-core/manifest.json

@@ -163,19 +163,26 @@
             "description": "Filter by distance to a coordinate",
             "properties": {
               "latitude": {
-                "type": "string",
+                "type": "number",
                 "title": "Latitude",
-                "description": "GPS latitude of a coordinate which the asset must be close to"
+                "description": "GPS latitude of a coordinate which the asset must be close to",
+                "minimum": -90,
+                "maximum": 90,
+                "precision": 0.000001
               },
               "longitude": {
-                "type": "string",
+                "type": "number",
                 "title": "Longitude",
-                "description": "GPS longitude of a coordinate which the asset must be close to"
+                "description": "GPS longitude of a coordinate which the asset must be close to",
+                "minimum": -180,
+                "maximum": 180,
+                "precision": 0.000001
               },
               "radius": {
                 "type": "number",
                 "title": "Maximum distance",
-                "description": "How close in kilometres the asset must be to the given point"
+                "description": "How close in kilometres the asset must be to the given point",
+                "minimum": 0
               }
             }
           }

packages/plugin-core/src/index.ts

@@ -96,10 +96,10 @@ const methods = wrapper<Manifest>({
       return { workflow: { continue: false } };
     }
 
-    const configLat = Number.parseFloat(config.coordinate?.latitude ?? '');
-    const configLon = Number.parseFloat(config.coordinate?.longitude ?? '');
+    const configLat = config.coordinate?.latitude;
+    const configLon = config.coordinate?.longitude;
 
-    if (Number.isNaN(configLat) || Number.isNaN(configLat)) {
+    if (configLat === undefined || configLon === undefined) {
       return { workflow: { continue: true } };
     }
 

server/src/dtos/json-schema.dto.ts

@@ -12,6 +12,9 @@ const JsonSchemaPropertySchema = z
     description: z.string().describe('Description'),
     default: z.any().optional().describe('Default value'),
     enum: z.array(z.string()).optional().describe('Valid choices for enum types'),
+    minimum: z.number().optional().describe('Minimum value for number types'),
+    maximum: z.number().optional().describe('Maximum value for number types'),
+    precision: z.number().default(1).optional().describe('Smallest interval (granularity) for number types'),
     array: z.boolean().optional().describe('Type is an array type'),
     required: z.array(z.string()).optional().describe('A list of required properties'),
     uiHint: z

web/src/lib/components/SchemaConfiguration.svelte

@@ -100,7 +100,7 @@
   </Field>
 {:else if schema.type === 'number'}
   <Field {label} {description}>
-    <NumberInput bind:value={getNumber, setValue} />
+    <NumberInput bind:value={getNumber, setValue} step={schema.precision} min={schema.minimum} max={schema.maximum} />
   </Field>
 {:else if schema.type === 'string'}
   <Field {label} {description}>

web/src/lib/types.ts

@@ -93,6 +93,9 @@ export type JSONSchemaProperty = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   default?: any;
   enum?: string[];
+  minimum?: number;
+  maximum?: number;
+  precision?: number;
   array?: boolean;
   properties?: Record<string, JSONSchemaProperty>;
   required?: string[];