Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

use non-background downloader on non-root sessions (#895)

eugeneee0a8194f79f
diff --git a/crates/legacy/download-manager/src/backends/apple/apple_backend.rs b/crates/legacy/download-manager/src/backends/apple/apple_backend.rs
index a0ec2c2e3..3115db83f 100644
--- a/crates/legacy/download-manager/src/backends/apple/apple_backend.rs
+++ b/crates/legacy/download-manager/src/backends/apple/apple_backend.rs
@@ -25,6 +25,21 @@ use crate::{
file_download::DownloadConfig,
};
+#[cfg(target_os = "macos")]
+const CALLER_SECURITY_SESSION: u32 = u32::MAX;
+#[cfg(target_os = "macos")]
+const SESSION_IS_ROOT: u32 = 0x0001;
+
+#[cfg(target_os = "macos")]
+#[link(name = "Security", kind = "framework")]
+unsafe extern "C" {
+ fn SessionGetInfo(
+ session: u32,
+ session_id: *mut u32,
+ attributes: *mut u32,
+ ) -> i32;
+}
+
pub struct AppleBackend {
session: Retained<NSURLSession>,
_delegate_protocol_object: Retained<ProtocolObject<dyn NSURLSessionDelegate>>,
@@ -42,7 +57,7 @@ impl AppleBackend {
let delegate_protocol_object = ProtocolObject::<dyn NSURLSessionDelegate>::from_retained(
AppleSessionDelegate::new(Arc::clone(&event_registry)),
);
- let bundle_id = Self::bundle_identifier();
+ let bundle_id = Self::background_bundle_identifier();
let configuration = if bundle_id.is_empty() {
NSURLSessionConfiguration::ephemeralSessionConfiguration()
} else {
@@ -69,7 +84,15 @@ impl AppleBackend {
}
}
- pub fn bundle_identifier() -> String {
+ pub fn background_bundle_identifier() -> String {
+ #[cfg(target_os = "macos")]
+ {
+ let mut attributes = 0;
+ let status = unsafe { SessionGetInfo(CALLER_SECURITY_SESSION, std::ptr::null_mut(), &mut attributes) };
+ if status != 0 || attributes & SESSION_IS_ROOT != 0 {
+ return String::new();
+ }
+ }
NSBundle::mainBundle().bundleIdentifier().unwrap_or_default().to_string()
}
diff --git a/crates/legacy/download-manager/src/download_manager.rs b/crates/legacy/download-manager/src/download_manager.rs
index 18d264f26..0ea98ba47 100644
--- a/crates/legacy/download-manager/src/download_manager.rs
+++ b/crates/legacy/download-manager/src/download_manager.rs
@@ -36,7 +36,7 @@ impl DownloadManager {
DownloadManagerType::Universal => Arc::new(UniversalBackend::new(runtime_handle)),
};
#[cfg(target_vendor = "apple")]
- let bundle_id = crate::backends::AppleBackend::bundle_identifier();
+ let bundle_id = crate::backends::AppleBackend::background_bundle_identifier();
#[cfg(not(target_vendor = "apple"))]
let bundle_id = String::new();
let manager_id = if bundle_id.is_empty() {
diff --git a/crates/legacy/uzu/bindings/python/tests/test_engine.py b/crates/legacy/uzu/bindings/python/tests/test_engine.py
index b765195ee..eb1355028 100644
--- a/crates/legacy/uzu/bindings/python/tests/test_engine.py
+++ b/crates/legacy/uzu/bindings/python/tests/test_engine.py
@@ -1,6 +1,6 @@
import asyncio
-from uzu import ChatConfig, ChatMessage, ChatReplyConfig, Engine, EngineConfig
+from uzu import ChatConfig, ChatMessage, ChatReplyConfig, DownloadPhase, Engine, EngineConfig
def test_chat_reply_produces_text() -> None:
@@ -13,6 +13,10 @@ def test_chat_reply_produces_text() -> None:
async for update in (await engine.download(model)).iterator():
print(f"Download progress: {update.progress}")
+ state = await engine.download_state(model)
+ assert state is not None, "Download state not found"
+ assert isinstance(state.phase, DownloadPhase.Downloaded), getattr(state.phase, "message", state.name)
+
session = await engine.chat(model, ChatConfig.create())
messages = [