Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(lume): add progressHandler parameter to pull function signatures (#1232)

ddupontd5e1209d0ed9
diff --git a/libs/lume/src/ContainerRegistry/GCSImageRegistry.swift b/libs/lume/src/ContainerRegistry/GCSImageRegistry.swift
index f44df41e91..b75ecaae44 100644
--- a/libs/lume/src/ContainerRegistry/GCSImageRegistry.swift
+++ b/libs/lume/src/ContainerRegistry/GCSImageRegistry.swift
@@ -31,7 +31,8 @@ class GCSImageRegistry: ImageRegistry, @unchecked Sendable {
image: String,
name: String?,
locationName: String?,
- force: Bool = false
+ force: Bool = false,
+ progressHandler: (@Sendable (Double) -> Void)? = nil
) async throws -> VMDirectory {
// Parse image name and tag
let components = image.split(separator: ":")
diff --git a/libs/lume/src/ContainerRegistry/ImageContainerRegistry.swift b/libs/lume/src/ContainerRegistry/ImageContainerRegistry.swift
index f35a9ee805..50225f151d 100644
--- a/libs/lume/src/ContainerRegistry/ImageContainerRegistry.swift
+++ b/libs/lume/src/ContainerRegistry/ImageContainerRegistry.swift
@@ -772,7 +772,8 @@ class ImageContainerRegistry: ImageRegistry, @unchecked Sendable {
image: String,
name: String?,
locationName: String? = nil,
- force: Bool = false
+ force: Bool = false,
+ progressHandler: (@Sendable (Double) -> Void)? = nil
) async throws -> VMDirectory {
guard !image.isEmpty else {
throw ValidationError("Image name cannot be empty")
diff --git a/libs/lume/src/ContainerRegistry/ImageRegistry.swift b/libs/lume/src/ContainerRegistry/ImageRegistry.swift
index 32f0afec60..d3218b4772 100644
--- a/libs/lume/src/ContainerRegistry/ImageRegistry.swift
+++ b/libs/lume/src/ContainerRegistry/ImageRegistry.swift
@@ -13,7 +13,8 @@ protocol ImageRegistry: Sendable {
image: String,
name: String?,
locationName: String?,
- force: Bool
+ force: Bool,
+ progressHandler: (@Sendable (Double) -> Void)?
) async throws -> VMDirectory
/// Push a VM to the registry
@@ -44,8 +45,8 @@ protocol ImageRegistry: Sendable {
// Default implementations for optional parameters
extension ImageRegistry {
- func pull(image: String, name: String? = nil, locationName: String? = nil, force: Bool = false) async throws -> VMDirectory {
- try await pull(image: image, name: name, locationName: locationName, force: force)
+ func pull(image: String, name: String? = nil, locationName: String? = nil, force: Bool = false, progressHandler: (@Sendable (Double) -> Void)? = nil) async throws -> VMDirectory {
+ try await pull(image: image, name: name, locationName: locationName, force: force, progressHandler: progressHandler)
}
func push(
diff --git a/libs/lume/src/LumeController.swift b/libs/lume/src/LumeController.swift
index 2a6ce0fe99..9940888d9c 100644
--- a/libs/lume/src/LumeController.swift
+++ b/libs/lume/src/LumeController.swift
@@ -1157,7 +1157,8 @@ final class LumeController {
storage: String? = nil,
username: String? = nil,
password: String? = nil,
- force: Bool = false
+ force: Bool = false,
+ progressHandler: (@Sendable (Double) -> Void)? = nil
) async throws {
do {
// Split the image to get name and tag
@@ -1198,7 +1199,8 @@ final class LumeController {
image: image,
name: vmName,
locationName: storage,
- force: force)
+ force: force,
+ progressHandler: progressHandler)
Logger.debug(
"Setting new VM mac address",