Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Forward Rust logs in Ensu

Manav Rathi37dd27d85973
diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dart
index 40ced2512c..13964bb09f 100644
--- a/mobile/apps/photos/lib/main.dart
+++ b/mobile/apps/photos/lib/main.dart
@@ -59,7 +59,7 @@ import 'package:photos/services/sync/local_sync_service.dart';
import 'package:photos/services/sync/remote_sync_service.dart';
import "package:photos/services/sync/sync_service.dart";
import "package:photos/services/video_preview_service.dart";
-import "package:photos/src/rust/api/logs.dart" as photos_rust_logs;
+import "package:photos/src/rust/api/log.dart" as photos_rust_log;
import "package:photos/src/rust/frb_generated.dart";
import "package:photos/utils/device_info.dart";
import "package:photos/utils/email_util.dart";
@@ -570,7 +570,7 @@ void _attachRustLogStream() {
attachLogStream().listen((entry) {
_logRustEntry(logger, entry.level.name, entry.target, entry.message);
});
- photos_rust_logs.attachLogStream().listen((entry) {
+ photos_rust_log.attachLogStream().listen((entry) {
_logRustEntry(logger, entry.level.name, entry.target, entry.message);
});
}
diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppViewModel.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppViewModel.kt
index 4d66c7c4c2..e752ff3f82 100644
--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppViewModel.kt
+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/AppViewModel.kt
@@ -14,7 +14,6 @@ import io.ente.ensu.config.loadConfigDefaults
import io.ente.ensu.llm.LlmProvider
import io.ente.ensu.assets.AssetStore
import io.ente.ensu.llm.ModelSettingsState
-import io.ente.ensu.logging.FileLogRepository
import io.ente.ensu.storage.CredentialStore
import io.ente.ensu.logging.LogLevel
import io.ente.ensu.AppStore
@@ -36,7 +35,7 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
private val transcriber = (application as EnsuApplication).transcriber
val configDefaults = loadConfigDefaults()
- val logRepository = FileLogRepository(application)
+ val logRepository = (application as EnsuApplication).logRepository
private val assetStore = (application as EnsuApplication).assetStore
private val _isReady = MutableStateFlow(!assetStore.needsMigration())
val isReady = _isReady.asStateFlow()
diff --git a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/EnsuApplication.kt b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/EnsuApplication.kt
index e2aeb57aed..3b3ae80560 100644
--- a/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/EnsuApplication.kt
+++ b/mobile/native/android/apps/ensu/app/src/main/java/io/ente/ensu/EnsuApplication.kt
@@ -1,13 +1,19 @@
package io.ente.ensu
import android.app.Application
+import io.ente.ensu.bindings.RustLogLevel
+import io.ente.ensu.bindings.RustLogSink
import io.ente.ensu.bindings.Transcriber
+import io.ente.ensu.bindings.initRustLogging
import io.ente.ensu.bindings.transcriptionModelAsset
import io.ente.ensu.bindings.voiceActivityModelAsset
import io.ente.ensu.assets.AssetStore
import io.ente.ensu.knowledge.KnowledgeProvider
+import io.ente.ensu.logging.FileLogRepository
+import io.ente.ensu.logging.LogLevel
class EnsuApplication : Application() {
+ val logRepository by lazy { FileLogRepository(this) }
val assetStore by lazy { AssetStore(this) }
val knowledgeProvider by lazy { KnowledgeProvider(assetStore) }
val transcriber by lazy {
@@ -19,4 +25,22 @@ class EnsuApplication : Application() {
store.voiceActivityModelPath(voiceActivity).absolutePath
)
}
+
+ override fun onCreate() {
+ super.onCreate()
+ initRustLogging(EnsuRustLogSink(logRepository))
+ }
+}
+
+private class EnsuRustLogSink(
+ private val logRepository: FileLogRepository
+) : RustLogSink {
+ override fun log(level: RustLogLevel, target: String, message: String) {
+ val mappedLevel = when (level) {
+ RustLogLevel.ERROR -> LogLevel.Error
+ RustLogLevel.WARN -> LogLevel.Warning
+ RustLogLevel.INFO -> LogLevel.Info
+ }
+ logRepository.log(mappedLevel, "[$target] $message", tag = "rust")
+ }
}
diff --git a/mobile/native/apple/apps/ensu/Ensu/Services/Logging/EnsuLogging.swift b/mobile/native/apple/apps/ensu/Ensu/Services/Logging/EnsuLogging.swift
index 85b9ae0ed7..e5daa6edff 100644
--- a/mobile/native/apple/apps/ensu/Ensu/Services/Logging/EnsuLogging.swift
+++ b/mobile/native/apple/apps/ensu/Ensu/Services/Logging/EnsuLogging.swift
@@ -68,6 +68,8 @@ final class EnsuLogging {
let launchMessage = self.buildAppLaunchMessage()
self.log(level: .info, tag: "App", message: launchMessage)
}
+
+ initRustLogging(sink: EnsuRustLogSink())
}
func logger(_ tag: String) -> EnsuLogger {
@@ -227,6 +229,20 @@ struct EnsuLogger {
}
}
+private final class EnsuRustLogSink: RustLogSink, @unchecked Sendable {
+ func log(level: RustLogLevel, target: String, message: String) {
+ let line = "[\(target)] \(message)"
+ switch level {
+ case .error:
+ EnsuLogging.shared.log(level: .error, tag: "rust", message: line)
+ case .warn:
+ EnsuLogging.shared.log(level: .warning, tag: "rust", message: line)
+ case .info:
+ EnsuLogging.shared.log(level: .info, tag: "rust", message: line)
+ }
+ }
+}
+
private enum EnsuLogSanitizer {
private static let emailPattern = "[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}"
private static let bearerPattern = "(?i)bearer\\s+[A-Za-z0-9._-]+"
diff --git a/mobile/packages/rust/lib/ente_rust.dart b/mobile/packages/rust/lib/ente_rust.dart
index 1d4a5aac01..028f364f67 100644
--- a/mobile/packages/rust/lib/ente_rust.dart
+++ b/mobile/packages/rust/lib/ente_rust.dart
@@ -1,5 +1,5 @@
library;
export 'src/rust/api/contacts.dart';
-export 'src/rust/api/logs.dart';
+export 'src/rust/api/log.dart';
export 'src/rust/frb_generated.dart' show EnteRust;
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index e93054b7c2..463d20c65f 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2445,6 +2445,7 @@ version = "0.0.0"
dependencies = [
"ente-assets",
"ente-ensu",
+ "log",
"thiserror 2.0.18",
"uniffi",
"uuid",
diff --git a/rust/bindings/frb/ente-rust/src/api/init.rs b/rust/bindings/frb/ente-rust/src/api/init.rs
index f91e300164..c38134a3ec 100644
--- a/rust/bindings/frb/ente-rust/src/api/init.rs
+++ b/rust/bindings/frb/ente-rust/src/api/init.rs
@@ -7,6 +7,6 @@
pub fn init_app() {
// Install before FRB claims the process logger.
#[cfg(feature = "flutter")]
- crate::api::logs::install();
+ crate::api::log::install();
flutter_rust_bridge::setup_default_user_utils();
}
diff --git a/rust/bindings/frb/ente-rust/src/api/logs.rs b/rust/bindings/frb/ente-rust/src/api/log.rs
similarity index 63%
rename from rust/bindings/frb/ente-rust/src/api/logs.rs
rename to rust/bindings/frb/ente-rust/src/api/log.rs
index 04f76296ef..b3acca8a7b 100644
--- a/rust/bindings/frb/ente-rust/src/api/logs.rs
+++ b/rust/bindings/frb/ente-rust/src/api/log.rs
@@ -13,14 +13,14 @@ pub enum LogLevel {
Trace,
}
-impl From<log::Level> for LogLevel {
- fn from(level: log::Level) -> Self {
+impl From<::log::Level> for LogLevel {
+ fn from(level: ::log::Level) -> Self {
match level {
- log::Level::Error => LogLevel::Error,
- log::Level::Warn => LogLevel::Warn,
- log::Level::Info => LogLevel::Info,
- log::Level::Debug => LogLevel::Debug,
- log::Level::Trace => LogLevel::Trace,
+ ::log::Level::Error => LogLevel::Error,
+ ::log::Level::Warn => LogLevel::Warn,
+ ::log::Level::Info => LogLevel::Info,
+ ::log::Level::Debug => LogLevel::Debug,
+ ::log::Level::Trace => LogLevel::Trace,
}
}
}
@@ -36,12 +36,12 @@ static LOGGER: StreamLogger = StreamLogger;
struct StreamLogger;
-impl log::Log for StreamLogger {
- fn enabled(&self, metadata: &log::Metadata) -> bool {
- metadata.level() <= log::max_level()
+impl ::log::Log for StreamLogger {
+ fn enabled(&self, metadata: &::log::Metadata) -> bool {
+ metadata.level() <= ::log::max_level()
}
- fn log(&self, record: &log::Record) {
+ fn log(&self, record: &::log::Record) {
if !self.enabled(record.metadata()) {
return;
}
@@ -58,13 +58,13 @@ impl log::Log for StreamLogger {
}
pub(crate) fn install() {
- if log::set_logger(&LOGGER).is_ok() {
- log::set_max_level(log::LevelFilter::Info);
+ if ::log::set_logger(&LOGGER).is_ok() {
+ ::log::set_max_level(::log::LevelFilter::Info);
}
}
pub fn attach_log_stream(sink: StreamSink<LogEntry>) {
*SINK.write().unwrap() = Some(sink);
// FRB resets the process-wide maximum after this logger is installed.
- log::set_max_level(log::LevelFilter::Info);
+ ::log::set_max_level(::log::LevelFilter::Info);
}
diff --git a/rust/bindings/frb/ente-rust/src/api/mod.rs b/rust/bindings/frb/ente-rust/src/api/mod.rs
index ed3c126945..1c20b8fcfd 100644
--- a/rust/bindings/frb/ente-rust/src/api/mod.rs
+++ b/rust/bindings/frb/ente-rust/src/api/mod.rs
@@ -3,5 +3,5 @@
pub mod contacts;
pub mod init;
#[cfg(any(feature = "flutter", frb_expand))]
-pub mod logs;
+pub mod log;
pub mod urls;
diff --git a/rust/bindings/frb/photos/src/api/init.rs b/rust/bindings/frb/photos/src/api/init.rs
index 1847872772..ac8b07a8d1 100644
--- a/rust/bindings/frb/photos/src/api/init.rs
+++ b/rust/bindings/frb/photos/src/api/init.rs
@@ -2,7 +2,7 @@
pub fn init_app() {
// Install before FRB claims the process logger.
#[cfg(feature = "flutter")]
- crate::api::logs::install();
+ crate::api::log::install();
flutter_rust_bridge::setup_default_user_utils();
}
diff --git a/rust/bindings/frb/photos/src/api/logs.rs b/rust/bindings/frb/photos/src/api/log.rs
similarity index 63%
rename from rust/bindings/frb/photos/src/api/logs.rs
rename to rust/bindings/frb/photos/src/api/log.rs
index 04f76296ef..b3acca8a7b 100644
--- a/rust/bindings/frb/photos/src/api/logs.rs
+++ b/rust/bindings/frb/photos/src/api/log.rs
@@ -13,14 +13,14 @@ pub enum LogLevel {
Trace,
}
-impl From<log::Level> for LogLevel {
- fn from(level: log::Level) -> Self {
+impl From<::log::Level> for LogLevel {
+ fn from(level: ::log::Level) -> Self {
match level {
- log::Level::Error => LogLevel::Error,
- log::Level::Warn => LogLevel::Warn,
- log::Level::Info => LogLevel::Info,
- log::Level::Debug => LogLevel::Debug,
- log::Level::Trace => LogLevel::Trace,
+ ::log::Level::Error => LogLevel::Error,
+ ::log::Level::Warn => LogLevel::Warn,
+ ::log::Level::Info => LogLevel::Info,
+ ::log::Level::Debug => LogLevel::Debug,
+ ::log::Level::Trace => LogLevel::Trace,
}
}
}
@@ -36,12 +36,12 @@ static LOGGER: StreamLogger = StreamLogger;
struct StreamLogger;
-impl log::Log for StreamLogger {
- fn enabled(&self, metadata: &log::Metadata) -> bool {
- metadata.level() <= log::max_level()
+impl ::log::Log for StreamLogger {
+ fn enabled(&self, metadata: &::log::Metadata) -> bool {
+ metadata.level() <= ::log::max_level()
}
- fn log(&self, record: &log::Record) {
+ fn log(&self, record: &::log::Record) {
if !self.enabled(record.metadata()) {
return;
}
@@ -58,13 +58,13 @@ impl log::Log for StreamLogger {
}
pub(crate) fn install() {
- if log::set_logger(&LOGGER).is_ok() {
- log::set_max_level(log::LevelFilter::Info);
+ if ::log::set_logger(&LOGGER).is_ok() {
+ ::log::set_max_level(::log::LevelFilter::Info);
}
}
pub fn attach_log_stream(sink: StreamSink<LogEntry>) {
*SINK.write().unwrap() = Some(sink);
// FRB resets the process-wide maximum after this logger is installed.
- log::set_max_level(log::LevelFilter::Info);
+ ::log::set_max_level(::log::LevelFilter::Info);
}
diff --git a/rust/bindings/frb/photos/src/api/mod.rs b/rust/bindings/frb/photos/src/api/mod.rs
index 4e40f39da2..0a41546cb8 100644
--- a/rust/bindings/frb/photos/src/api/mod.rs
+++ b/rust/bindings/frb/photos/src/api/mod.rs
@@ -1,7 +1,7 @@
pub mod image_processing_api;
pub mod init;
#[cfg(any(feature = "flutter", frb_expand))]
-pub mod logs;
+pub mod log;
pub mod ml_indexing_api;
pub mod motion_photo_api;
pub mod usearch_api;
diff --git a/rust/bindings/napi/photos/src/lib.rs b/rust/bindings/napi/photos/src/lib.rs
index 967f8e4889..9e93d9bb5a 100644
--- a/rust/bindings/napi/photos/src/lib.rs
+++ b/rust/bindings/napi/photos/src/lib.rs
@@ -5,8 +5,8 @@ use ente_photos::ml::{
use napi::bindgen_prelude::*;
use napi_derive::napi;
-mod logs;
-pub use logs::init_logging;
+mod log;
+pub use log::init_logging;
#[napi]
pub fn init_ort(dylib_path: String) -> Result<()> {
diff --git a/rust/bindings/napi/photos/src/logs.rs b/rust/bindings/napi/photos/src/log.rs
similarity index 80%
rename from rust/bindings/napi/photos/src/logs.rs
rename to rust/bindings/napi/photos/src/log.rs
index 8fa8ffa65a..720256ccd3 100644
--- a/rust/bindings/napi/photos/src/logs.rs
+++ b/rust/bindings/napi/photos/src/log.rs
@@ -19,12 +19,12 @@ static SINK: RwLock<Option<LogSink>> = RwLock::new(None);
struct NapiLogger;
-impl log::Log for NapiLogger {
- fn enabled(&self, metadata: &log::Metadata) -> bool {
- metadata.level() <= log::max_level()
+impl ::log::Log for NapiLogger {
+ fn enabled(&self, metadata: &::log::Metadata) -> bool {
+ metadata.level() <= ::log::max_level()
}
- fn log(&self, record: &log::Record) {
+ fn log(&self, record: &::log::Record) {
if self.enabled(record.metadata())
&& let Some(sink) = SINK.read().unwrap().as_ref()
{
@@ -52,8 +52,9 @@ pub fn init_logging(sink: Function<'_, FnArgs<(String, String, String)>, ()>) ->
let entry = ctx.value;
Ok(FnArgs::from((entry.level, entry.target, entry.message)))
})?;
- log::set_logger(&LOGGER).map_err(|_| Error::from_reason("Rust logger already initialized"))?;
+ ::log::set_logger(&LOGGER)
+ .map_err(|_| Error::from_reason("Rust logger already initialized"))?;
*SINK.write().unwrap() = Some(sink);
- log::set_max_level(log::LevelFilter::Info);
+ ::log::set_max_level(::log::LevelFilter::Info);
Ok(())
}
diff --git a/rust/bindings/uniffi/ensu/Cargo.toml b/rust/bindings/uniffi/ensu/Cargo.toml
index 68c2df3b2a..75d3e192cf 100644
--- a/rust/bindings/uniffi/ensu/Cargo.toml
+++ b/rust/bindings/uniffi/ensu/Cargo.toml
@@ -9,6 +9,7 @@ crate-type = ["staticlib", "cdylib"]
[dependencies]
ente-assets.workspace = true
ente-ensu = { workspace = true, features = ["transcription"] }
+log.workspace = true
thiserror.workspace = true
uniffi = { workspace = true, features = ["tokio"] }
uuid = { version = "1" }
diff --git a/rust/bindings/uniffi/ensu/src/lib.rs b/rust/bindings/uniffi/ensu/src/lib.rs
index 32a99e8f84..036e13e6b7 100644
--- a/rust/bindings/uniffi/ensu/src/lib.rs
+++ b/rust/bindings/uniffi/ensu/src/lib.rs
@@ -5,5 +5,6 @@ pub mod config;
pub mod db;
pub mod image;
pub mod llm;
+pub mod log;
pub mod retrieval;
pub mod transcription;
diff --git a/rust/bindings/uniffi/ensu/src/log.rs b/rust/bindings/uniffi/ensu/src/log.rs
new file mode 100644
index 0000000000..5eb62a5ccf
--- /dev/null
+++ b/rust/bindings/uniffi/ensu/src/log.rs
@@ -0,0 +1,52 @@
+use std::sync::RwLock;
+
+#[derive(uniffi::Enum)]
+pub enum RustLogLevel {
+ Error,
+ Warn,
+ Info,
+}
+
+#[uniffi::export(callback_interface)]
+pub trait RustLogSink: Send + Sync {
+ fn log(&self, level: RustLogLevel, target: String, message: String);
+}
+
+static LOGGER: UniffiLogger = UniffiLogger;
+static SINK: RwLock<Option<Box<dyn RustLogSink>>> = RwLock::new(None);
+
+struct UniffiLogger;
+
+impl ::log::Log for UniffiLogger {
+ fn enabled(&self, metadata: &::log::Metadata) -> bool {
+ metadata.level() <= ::log::Level::Info
+ }
+
+ fn log(&self, record: &::log::Record) {
+ if !self.enabled(record.metadata()) {
+ return;
+ }
+ let level = match record.level() {
+ ::log::Level::Error => RustLogLevel::Error,
+ ::log::Level::Warn => RustLogLevel::Warn,
+ ::log::Level::Info => RustLogLevel::Info,
+ ::log::Level::Debug | ::log::Level::Trace => return,
+ };
+ if let Some(sink) = SINK.read().unwrap().as_ref() {
+ sink.log(
+ level,
+ record.target().to_string(),
+ record.args().to_string(),
+ );
+ }
+ }
+
+ fn flush(&self) {}
+}
+
+#[uniffi::export]
+pub fn init_rust_logging(sink: Box<dyn RustLogSink>) {
+ *SINK.write().unwrap() = Some(sink);
+ let _ = ::log::set_logger(&LOGGER);
+ ::log::set_max_level(::log::LevelFilter::Info);
+}