Improve callsites of threshold logging (#113)

lzell · web-flow · commit 92d37e413102 · 2025-03-06T10:22:13.000-08:00
diff --git a/Sources/AIProxy/AIProxy.swift b/Sources/AIProxy/AIProxy.swift
@@ -885,19 +885,19 @@ public struct AIProxy {
         do {
             return try await AnonymousAccountStorage.sync()
         } catch {
-            if ll(.critical) { aiproxyLogger.critical("Could not configure an AIProxy anonymous account: \(error.localizedDescription)") }
+            logIf(.critical)?.critical("Could not configure an AIProxy anonymous account: \(error.localizedDescription)")
         }
         return nil
     }
 
     public static func base64EncodeAudioPCMBuffer(from buffer: AVAudioPCMBuffer) -> String? {
         guard buffer.format.channelCount == 1 else {
-            if ll(.error) { aiproxyLogger.error("This encoding routine assumes a single channel") }
+            logIf(.error)?.error("This encoding routine assumes a single channel")
             return nil
         }
 
         guard let audioBufferPtr = buffer.audioBufferList.pointee.mBuffers.mData else {
-            if ll(.error) { aiproxyLogger.error("No audio buffer list available to encode") }
+            logIf(.error)?.error("No audio buffer list available to encode")
             return nil
         }
 
diff --git a/Sources/AIProxy/AIProxyCertificatePinning.swift b/Sources/AIProxy/AIProxyCertificatePinning.swift
@@ -70,12 +70,12 @@ open class AIProxyCertificatePinningDelegate: NSObject, URLSessionDelegate, URLS
       _ challenge: URLAuthenticationChallenge
    ) -> (URLSession.AuthChallengeDisposition, URLCredential?) {
       guard let secTrust = challenge.protectionSpace.serverTrust else {
-         if ll(.error) { aiproxyLogger.error("Could not access the server's security space") }
+         logIf(.error)?.error("Could not access the server's security space")
          return (.cancelAuthenticationChallenge, nil)
       }
 
       guard let certificate = getServerCert(secTrust: secTrust) else {
-         if ll(.error) { aiproxyLogger.error("Could not access the server's TLS cert") }
+         logIf(.error)?.error("Could not access the server's TLS cert")
          return (.cancelAuthenticationChallenge, nil)
       }
 
diff --git a/Sources/AIProxy/AIProxyDeviceCheck.swift b/Sources/AIProxy/AIProxyDeviceCheck.swift
@@ -34,7 +34,7 @@ struct AIProxyDeviceCheck {
     internal static func getToken() async -> String? {
         guard DCDevice.current.isSupported else {
             if ProcessInfo.processInfo.environment["AIPROXY_DEVICE_CHECK_BYPASS"] == nil {
-                if ll(.warning) { aiproxyLogger.warning("\(deviceCheckWarning, privacy: .public)") }
+                logIf(.warning)?.warning("\(deviceCheckWarning, privacy: .public)")
             }
             return nil
         }
@@ -43,7 +43,7 @@ struct AIProxyDeviceCheck {
             let data = try await DCDevice.current.generateToken()
             return data.base64EncodedString()
         } catch {
-            if ll(.error) { aiproxyLogger.error("Could not create DeviceCheck token. Are you using an explicit bundle identifier?") }
+            logIf(.error)?.error("Could not create DeviceCheck token. Are you using an explicit bundle identifier?")
             return nil
         }
     }
diff --git a/Sources/AIProxy/AIProxyLogger.swift b/Sources/AIProxy/AIProxyLogger.swift
@@ -18,10 +18,13 @@ internal let aiproxyLogger = Logger(
     category: "AIProxy"
 )
 
-// Why not create a wrapper around OSLog instead of forcing log callsites to include an `if ll(<level>)` check?
+// Why not create a wrapper around OSLog instead of forcing log callsites to include an `logIf(<level>)` check?
 // Because I like the Xcode log feature that links to the source location of the log.
 // If you create a wrapper, even one that is inlined, the Xcode source feature always links to the wrapper location.
+//
+// H/T Quinn the Eskimo!
+// https://developer.apple.com/forums/thread/774931
 @inline(__always)
-internal func ll(_ logLevel: AIProxyLogLevel) -> Bool {
-    return logLevel.isAtOrAboveThresholdLevel(aiproxyCallerDesiredLogLevel)
+internal func logIf(_ logLevel: AIProxyLogLevel) -> Logger? {
+    logLevel.isAtOrAboveThresholdLevel(aiproxyCallerDesiredLogLevel) ? aiproxyLogger : nil
 }
diff --git a/Sources/AIProxy/AnonymousAccount/AIProxyKeychain.swift b/Sources/AIProxy/AnonymousAccount/AIProxyKeychain.swift
@@ -132,7 +132,7 @@ struct AIProxyKeychain {
         if status == noErr {
             return queryResult as? Data
         }
-        if ll(.error) { aiproxyLogger.error("Unexpected keychain error in searchKeychainCopyMatching: \(status)") }
+        logIf(.error)?.error("Unexpected keychain error in searchKeychainCopyMatching: \(status)")
         return nil
     }
 
diff --git a/Sources/AIProxy/AnonymousAccount/AnonymousAccountStorage.swift b/Sources/AIProxy/AnonymousAccount/AnonymousAccountStorage.swift
@@ -66,7 +66,7 @@ final class AnonymousAccountStorage {
         // meaning the one that was created earliest. The design of this class is to eventually resolve out
         // to the earliest account across multiple devices.
         if !AIProxyStorage.ukvsSync() {
-            if ll(.error) { aiproxyLogger.error("Could not synchronize NSUbiquitousKeyValueStore. Please ensure you enabled the key/value store in Target > Signing & Capabilities > iCloud > Key-Value storage?") }
+            logIf(.error)?.error("Could not synchronize NSUbiquitousKeyValueStore. Please ensure you enabled the key/value store in Target > Signing & Capabilities > iCloud > Key-Value storage?")
         }
         if let ukvsAccountData = AIProxyStorage.ukvsAccountData() {
             let ukvsAccount = try AnonymousAccount.deserialize(from: ukvsAccountData)
@@ -78,7 +78,7 @@ final class AnonymousAccountStorage {
                     localAccount = ukvsAccount
                     self.localAccountChain.append(ukvsAccount)
                     if try await AIProxyStorage.updateLocalAccountChainInKeychain(self.localAccountChain) != noErr {
-                        if ll(.warning) { aiproxyLogger.warning("Could not update the local account chain") }
+                        logIf(.warning)?.warning("Could not update the local account chain")
                     }
                 } else {
                     try AIProxyStorage.updateUKVS(localAccount)
@@ -108,17 +108,17 @@ final class AnonymousAccountStorage {
                         localAccount = remoteAccount
                         self.localAccountChain.append(remoteAccount)
                         if try await AIProxyStorage.updateLocalAccountChainInKeychain(self.localAccountChain) != noErr {
-                            if ll(.warning) { aiproxyLogger.warning("Could not update the local account chain") }
+                            logIf(.warning)?.warning("Could not update the local account chain")
                         }
                         try AIProxyStorage.updateUKVS(localAccount)
                     } else {
                         if try await AIProxyStorage.updateRemoteAccountInKeychain(localAccount) != noErr {
-                            if ll(.warning) { aiproxyLogger.warning("Could not update the remote account") }
+                            logIf(.warning)?.warning("Could not update the remote account")
                         }
                     }
                 }
             } else {
-                if ll(.warning) { aiproxyLogger.warning("Keychain cloud sync claims that there is a duplicate item, but we can't fetch it.") }
+                logIf(.warning)?.warning("Keychain cloud sync claims that there is a duplicate item, but we can't fetch it.")
             }
         }
 
@@ -129,8 +129,8 @@ final class AnonymousAccountStorage {
                                                name: NSUbiquitousKeyValueStore.didChangeExternallyNotification,
                                                object: NSUbiquitousKeyValueStore.default)
 
-        if ll(.debug) { aiproxyLogger.debug("Local account chain is \(localAccountChain)") }
-        if ll(.debug) { aiproxyLogger.debug("Anonymous account identifier is \(self.resolvedAccount?.uuid ?? "unknown")") }
+        logIf(.debug)?.debug("Local account chain is \(localAccountChain)")
+        logIf(.debug)?.debug("Anonymous account identifier is \(self.resolvedAccount?.uuid ?? "unknown")")
 
         return localAccount.uuid
     }
@@ -154,10 +154,10 @@ final class AnonymousAccountStorage {
         }
 
         switch changeReason.intValue {
-        case NSUbiquitousKeyValueStoreServerChange: if ll(.info) { aiproxyLogger.info("AIProxy account changed due to remote server change") }
-        case NSUbiquitousKeyValueStoreInitialSyncChange: if ll(.info) { aiproxyLogger.info("AIProxy account changed due to initial sync change") }
-        case NSUbiquitousKeyValueStoreQuotaViolationChange: if ll(.info) { aiproxyLogger.info("AIProxy account changed due to quota violation") }
-        case NSUbiquitousKeyValueStoreAccountChange: if ll(.info) { aiproxyLogger.info("AIProxy account changed due to icloud account change") }
+        case NSUbiquitousKeyValueStoreServerChange: logIf(.info)?.info("AIProxy account changed due to remote server change")
+        case NSUbiquitousKeyValueStoreInitialSyncChange: logIf(.info)?.info("AIProxy account changed due to initial sync change")
+        case NSUbiquitousKeyValueStoreQuotaViolationChange: logIf(.info)?.info("AIProxy account changed due to quota violation")
+        case NSUbiquitousKeyValueStoreAccountChange: logIf(.info)?.info("AIProxy account changed due to icloud account change")
         default:
             return
         }
@@ -172,12 +172,12 @@ final class AnonymousAccountStorage {
         }
 
         guard ukvsAccount != resolvedAccount else {
-            if ll(.info) { aiproxyLogger.info("UKVS remote sync is already up to date") }
+            logIf(.info)?.info("UKVS remote sync is already up to date")
             return
         }
 
         if ukvsAccount.timestamp <= resolvedAccount.timestamp {
-            if ll(.info) { aiproxyLogger.info("UKVS account is older than our existing resolved account. Switching to the older account.") }
+            logIf(.info)?.info("UKVS account is older than our existing resolved account. Switching to the older account.")
             self.resolvedAccount = ukvsAccount
             self.localAccountChain.append(ukvsAccount)
             DispatchQueue.main.async {
@@ -187,16 +187,16 @@ final class AnonymousAccountStorage {
             Task.detached {
                 let updateLocal = try? await AIProxyStorage.updateLocalAccountChainInKeychain(self.localAccountChain)
                 if updateLocal == nil || updateLocal! != noErr {
-                    if ll(.warning) { aiproxyLogger.warning("Could not update the local account chain") }
+                    logIf(.warning)?.warning("Could not update the local account chain")
                 }
 
                 let updateRemote = try? await AIProxyStorage.updateRemoteAccountInKeychain(ukvsAccount)
                 if updateRemote == nil || updateRemote! != noErr {
-                    if ll(.warning) { aiproxyLogger.warning("Could not update the remote account") }
+                    logIf(.warning)?.warning("Could not update the remote account")
                 }
             }
         } else {
-            if ll(.info) { aiproxyLogger.info("UKVS account is newer than our existing resolved account. Updating UKVS to use the older account.") }
+            logIf(.info)?.info("UKVS account is newer than our existing resolved account. Updating UKVS to use the older account.")
             try? AIProxyStorage.updateUKVS(resolvedAccount)
         }
     }
diff --git a/Sources/AIProxy/Anthropic/AnthropicMessageStreamingContentBlockStart.swift b/Sources/AIProxy/Anthropic/AnthropicMessageStreamingContentBlockStart.swift
@@ -17,7 +17,7 @@ internal struct AnthropicMessageStreamingContentBlockStart: Decodable {
         guard let chunkJSON = line.dropFirst(6).data(using: .utf8),
               let chunk = try? JSONDecoder().decode(Self.self, from: chunkJSON) else
         {
-            if ll(.warning) { aiproxyLogger.warning("Received unexpected JSON from Anthropic: \(line)") }
+            logIf(.warning)?.warning("Received unexpected JSON from Anthropic: \(line)")
             return nil
         }
         return chunk
diff --git a/Sources/AIProxy/Anthropic/AnthropicMessageStreamingDeltaBlock.swift b/Sources/AIProxy/Anthropic/AnthropicMessageStreamingDeltaBlock.swift
@@ -19,7 +19,7 @@ internal struct AnthropicMessageStreamingDeltaBlock: Decodable {
         guard let chunkJSON = line.dropFirst(6).data(using: .utf8),
               let chunk = try? JSONDecoder().decode(Self.self, from: chunkJSON) else
         {
-            if ll(.warning) { aiproxyLogger.warning("Received unexpected JSON from Anthropic: \(line)") }
+            logIf(.warning)?.warning("Received unexpected JSON from Anthropic: \(line)")
             return nil
         }
         return chunk
diff --git a/Sources/AIProxy/AudioPCMPlayer.swift b/Sources/AIProxy/AudioPCMPlayer.swift
@@ -81,13 +81,13 @@ open class AudioPCMPlayer {
     }
 
     deinit {
-        if ll(.debug) { aiproxyLogger.debug("AudioPCMPlayer is being freed") }
+        logIf(.debug)?.debug("AudioPCMPlayer is being freed")
         self.audioEngine.stop()
     }
 
     public func playPCM16Audio(from base64String: String) {
         guard let audioData = Data(base64Encoded: base64String) else {
-            if ll(.error) { aiproxyLogger.error("Could not decode base64 string for audio playback") }
+            logIf(.error)?.error("Could not decode base64 string for audio playback")
             return
         }
 
@@ -106,35 +106,35 @@ open class AudioPCMPlayer {
             pcmFormat: self.inputFormat,
             bufferListNoCopy: &bufferList
         ) else {
-            if ll(.error) { aiproxyLogger.error("Could not create input buffer for audio playback") }
+            logIf(.error)?.error("Could not create input buffer for audio playback")
             return
         }
 
         guard let outPCMBuf = AVAudioPCMBuffer(
             pcmFormat: self.playableFormat,
             frameCapacity: AVAudioFrameCount(self.playableFormat.sampleRate * 2.0)
         ) else {
-            if ll(.error) { aiproxyLogger.error("Could not create output buffer for audio playback") }
+            logIf(.error)?.error("Could not create output buffer for audio playback")
             return
         }
 
         guard let converter = AVAudioConverter(from: self.inputFormat, to: self.playableFormat) else {
-            if ll(.error) { aiproxyLogger.error("Could not create audio converter needed to map from pcm16int to pcm32float") }
+            logIf(.error)?.error("Could not create audio converter needed to map from pcm16int to pcm32float")
             return
         }
 
         do {
             try converter.convert(to: outPCMBuf, from: inPCMBuf)
         } catch {
-            if ll(.error) { aiproxyLogger.error("Could not map from pcm16int to pcm32float: \(error.localizedDescription)") }
+            logIf(.error)?.error("Could not map from pcm16int to pcm32float: \(error.localizedDescription)")
             return
         }
 
         if !self.audioEngine.isRunning {
             do {
                 try self.audioEngine.start()
             } catch {
-                if ll(.error) { aiproxyLogger.error("Could not start audio engine: \(error.localizedDescription)") }
+                logIf(.error)?.error("Could not start audio engine: \(error.localizedDescription)")
                 return
             }
         }
@@ -150,7 +150,7 @@ open class AudioPCMPlayer {
     }
 
     public func interruptPlayback() {
-        if ll(.debug) { aiproxyLogger.debug("Interrupting playback") }
+        logIf(.debug)?.debug("Interrupting playback")
         self.playerNode.stop()
     }
 }
diff --git a/Sources/AIProxy/Deserializable.swift b/Sources/AIProxy/Deserializable.swift
@@ -24,20 +24,20 @@ extension Decodable {
         guard line.hasPrefix("data: ") else {
             // Special case to ignore OpenRouter and DeepSeek SSE comments
             if line != ": OPENROUTER PROCESSING" && line != ": keep-alive" {
-                if ll(.warning) { aiproxyLogger.warning("Received unexpected line from aiproxy: \(line)") }
+                logIf(.warning)?.warning("Received unexpected line from aiproxy: \(line)")
             }
             return nil
         }
 
         guard line != "data: [DONE]" else {
-            if ll(.debug) { aiproxyLogger.debug("Streaming response has finished") }
+            logIf(.debug)?.debug("Streaming response has finished")
             return nil
         }
 
         guard let chunkJSON = line.dropFirst(6).data(using: .utf8),
               let chunk = try? JSONDecoder().decode(Self.self, from: chunkJSON) else
         {
-            if ll(.warning) { aiproxyLogger.warning("Received unexpected JSON from aiproxy: \(line)") }
+            logIf(.warning)?.warning("Received unexpected JSON from aiproxy: \(line)")
             return nil
         }
 
diff --git a/Sources/AIProxy/FireworksAI/FireworksAIDirectService.swift b/Sources/AIProxy/FireworksAI/FireworksAIDirectService.swift
@@ -33,7 +33,7 @@ open class FireworksAIDirectService: FireworksAIService, DirectService {
         secondsToWait: Int
     ) async throws -> DeepSeekChatCompletionResponseBody {
         if body.model != "accounts/fireworks/models/deepseek-r1" {
-            if ll(.warning) { aiproxyLogger.warning("Attempting to use deepSeekR1Request with an unknown model") }
+            logIf(.warning)?.warning("Attempting to use deepSeekR1Request with an unknown model")
         }
         var body = body
         body.stream = false
@@ -67,7 +67,7 @@ open class FireworksAIDirectService: FireworksAIService, DirectService {
         secondsToWait: Int
     ) async throws -> AsyncCompactMapSequence<AsyncLineSequence<URLSession.AsyncBytes>, DeepSeekChatCompletionChunk> {
         if body.model != "accounts/fireworks/models/deepseek-r1" {
-            if ll(.warning) { aiproxyLogger.warning("Attempting to use deepSeekR1Request with an unknown model") }
+            logIf(.warning)?.warning("Attempting to use deepSeekR1Request with an unknown model")
         }
         var body = body
         body.stream = true
diff --git a/Sources/AIProxy/FireworksAI/FireworksAIProxiedService.swift b/Sources/AIProxy/FireworksAI/FireworksAIProxiedService.swift
@@ -39,7 +39,7 @@ open class FireworksAIProxiedService: FireworksAIService, ProxiedService {
         secondsToWait: Int
     ) async throws -> DeepSeekChatCompletionResponseBody {
         if body.model != "accounts/fireworks/models/deepseek-r1" {
-            if ll(.warning) { aiproxyLogger.warning("Attempting to use deepSeekR1Request with an unknown model") }
+            logIf(.warning)?.warning("Attempting to use deepSeekR1Request with an unknown model")
         }
         var body = body
         body.stream = false
@@ -71,7 +71,7 @@ open class FireworksAIProxiedService: FireworksAIService, ProxiedService {
         secondsToWait: Int
     ) async throws -> AsyncCompactMapSequence<AsyncLineSequence<URLSession.AsyncBytes>, DeepSeekChatCompletionChunk> {
         if body.model != "accounts/fireworks/models/deepseek-r1" {
-            if ll(.warning) { aiproxyLogger.warning("Attempting to use deepSeekR1Request with an unknown model") }
+            logIf(.warning)?.warning("Attempting to use deepSeekR1Request with an unknown model")
         }
         var body = body
         body.stream = true
diff --git a/Sources/AIProxy/MicrophonePCMSampleVendor.swift b/Sources/AIProxy/MicrophonePCMSampleVendor.swift
diff --git a/Sources/AIProxy/OpenAI/OpenAIRealtimeSession.swift b/Sources/AIProxy/OpenAI/OpenAIRealtimeSession.swift
diff --git a/Sources/AIProxy/Replicate/ReplicateService.swift b/Sources/AIProxy/Replicate/ReplicateService.swift

Original file line number	Diff line number	Diff line change
`@@ -885,19 +885,19 @@ public struct AIProxy {`
`885`	`885`	`do {`
`886`	`886`	`return try await AnonymousAccountStorage.sync()`
`887`	`887`	`} catch {`
`888`		`- if ll(.critical) { aiproxyLogger.critical("Could not configure an AIProxy anonymous account: \(error.localizedDescription)") }`
	`888`	`+ logIf(.critical)?.critical("Could not configure an AIProxy anonymous account: \(error.localizedDescription)")`
`889`	`889`	`}`
`890`	`890`	`return nil`
`891`	`891`	`}`
`892`	`892`
`893`	`893`	`public static func base64EncodeAudioPCMBuffer(from buffer: AVAudioPCMBuffer) -> String? {`
`894`	`894`	`guard buffer.format.channelCount == 1 else {`
`895`		`- if ll(.error) { aiproxyLogger.error("This encoding routine assumes a single channel") }`
	`895`	`+ logIf(.error)?.error("This encoding routine assumes a single channel")`
`896`	`896`	`return nil`
`897`	`897`	`}`
`898`	`898`
`899`	`899`	`guard let audioBufferPtr = buffer.audioBufferList.pointee.mBuffers.mData else {`
`900`		`- if ll(.error) { aiproxyLogger.error("No audio buffer list available to encode") }`
	`900`	`+ logIf(.error)?.error("No audio buffer list available to encode")`
`901`	`901`	`return nil`
`902`	`902`	`}`
`903`	`903`
Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,12 @@ open class AIProxyCertificatePinningDelegate: NSObject, URLSessionDelegate, URLS`
`70`	`70`	`_ challenge: URLAuthenticationChallenge`
`71`	`71`	`) -> (URLSession.AuthChallengeDisposition, URLCredential?) {`
`72`	`72`	`guard let secTrust = challenge.protectionSpace.serverTrust else {`
`73`		`- if ll(.error) { aiproxyLogger.error("Could not access the server's security space") }`
	`73`	`+ logIf(.error)?.error("Could not access the server's security space")`
`74`	`74`	`return (.cancelAuthenticationChallenge, nil)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`guard let certificate = getServerCert(secTrust: secTrust) else {`
`78`		`- if ll(.error) { aiproxyLogger.error("Could not access the server's TLS cert") }`
	`78`	`+ logIf(.error)?.error("Could not access the server's TLS cert")`
`79`	`79`	`return (.cancelAuthenticationChallenge, nil)`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ struct AIProxyDeviceCheck {`
`34`	`34`	`internal static func getToken() async -> String? {`
`35`	`35`	`guard DCDevice.current.isSupported else {`
`36`	`36`	`if ProcessInfo.processInfo.environment["AIPROXY_DEVICE_CHECK_BYPASS"] == nil {`
`37`		`- if ll(.warning) { aiproxyLogger.warning("\(deviceCheckWarning, privacy: .public)") }`
	`37`	`+ logIf(.warning)?.warning("\(deviceCheckWarning, privacy: .public)")`
`38`	`38`	`}`
`39`	`39`	`return nil`
`40`	`40`	`}`
`@@ -43,7 +43,7 @@ struct AIProxyDeviceCheck {`
`43`	`43`	`let data = try await DCDevice.current.generateToken()`
`44`	`44`	`return data.base64EncodedString()`
`45`	`45`	`} catch {`
`46`		`- if ll(.error) { aiproxyLogger.error("Could not create DeviceCheck token. Are you using an explicit bundle identifier?") }`
	`46`	`+ logIf(.error)?.error("Could not create DeviceCheck token. Are you using an explicit bundle identifier?")`
`47`	`47`	`return nil`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ struct AIProxyKeychain {`
`132`	`132`	`if status == noErr {`
`133`	`133`	`return queryResult as? Data`
`134`	`134`	`}`
`135`		`- if ll(.error) { aiproxyLogger.error("Unexpected keychain error in searchKeychainCopyMatching: \(status)") }`
	`135`	`+ logIf(.error)?.error("Unexpected keychain error in searchKeychainCopyMatching: \(status)")`
`136`	`136`	`return nil`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ final class AnonymousAccountStorage {`
`66`	`66`	`// meaning the one that was created earliest. The design of this class is to eventually resolve out`
`67`	`67`	`// to the earliest account across multiple devices.`
`68`	`68`	`if !AIProxyStorage.ukvsSync() {`
`69`		`- if ll(.error) { aiproxyLogger.error("Could not synchronize NSUbiquitousKeyValueStore. Please ensure you enabled the key/value store in Target > Signing & Capabilities > iCloud > Key-Value storage?") }`
	`69`	`+ logIf(.error)?.error("Could not synchronize NSUbiquitousKeyValueStore. Please ensure you enabled the key/value store in Target > Signing & Capabilities > iCloud > Key-Value storage?")`
`70`	`70`	`}`
`71`	`71`	`if let ukvsAccountData = AIProxyStorage.ukvsAccountData() {`
`72`	`72`	`let ukvsAccount = try AnonymousAccount.deserialize(from: ukvsAccountData)`
`@@ -78,7 +78,7 @@ final class AnonymousAccountStorage {`
`78`	`78`	`localAccount = ukvsAccount`
`79`	`79`	`self.localAccountChain.append(ukvsAccount)`
`80`	`80`	`if try await AIProxyStorage.updateLocalAccountChainInKeychain(self.localAccountChain) != noErr {`
`81`		`- if ll(.warning) { aiproxyLogger.warning("Could not update the local account chain") }`
	`81`	`+ logIf(.warning)?.warning("Could not update the local account chain")`
`82`	`82`	`}`
`83`	`83`	`} else {`
`84`	`84`	`try AIProxyStorage.updateUKVS(localAccount)`
`@@ -108,17 +108,17 @@ final class AnonymousAccountStorage {`
`108`	`108`	`localAccount = remoteAccount`
`109`	`109`	`self.localAccountChain.append(remoteAccount)`
`110`	`110`	`if try await AIProxyStorage.updateLocalAccountChainInKeychain(self.localAccountChain) != noErr {`
`111`		`- if ll(.warning) { aiproxyLogger.warning("Could not update the local account chain") }`
	`111`	`+ logIf(.warning)?.warning("Could not update the local account chain")`
`112`	`112`	`}`
`113`	`113`	`try AIProxyStorage.updateUKVS(localAccount)`
`114`	`114`	`} else {`
`115`	`115`	`if try await AIProxyStorage.updateRemoteAccountInKeychain(localAccount) != noErr {`
`116`		`- if ll(.warning) { aiproxyLogger.warning("Could not update the remote account") }`
	`116`	`+ logIf(.warning)?.warning("Could not update the remote account")`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`} else {`
`121`		`- if ll(.warning) { aiproxyLogger.warning("Keychain cloud sync claims that there is a duplicate item, but we can't fetch it.") }`
	`121`	`+ logIf(.warning)?.warning("Keychain cloud sync claims that there is a duplicate item, but we can't fetch it.")`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`@@ -129,8 +129,8 @@ final class AnonymousAccountStorage {`
`129`	`129`	`name: NSUbiquitousKeyValueStore.didChangeExternallyNotification,`
`130`	`130`	`object: NSUbiquitousKeyValueStore.default)`
`131`	`131`
`132`		`- if ll(.debug) { aiproxyLogger.debug("Local account chain is \(localAccountChain)") }`
`133`		`- if ll(.debug) { aiproxyLogger.debug("Anonymous account identifier is \(self.resolvedAccount?.uuid ?? "unknown")") }`
	`132`	`+ logIf(.debug)?.debug("Local account chain is \(localAccountChain)")`
	`133`	`+ logIf(.debug)?.debug("Anonymous account identifier is \(self.resolvedAccount?.uuid ?? "unknown")")`
`134`	`134`
`135`	`135`	`return localAccount.uuid`
`136`	`136`	`}`
`@@ -154,10 +154,10 @@ final class AnonymousAccountStorage {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`switch changeReason.intValue {`
`157`		`- case NSUbiquitousKeyValueStoreServerChange: if ll(.info) { aiproxyLogger.info("AIProxy account changed due to remote server change") }`
`158`		`- case NSUbiquitousKeyValueStoreInitialSyncChange: if ll(.info) { aiproxyLogger.info("AIProxy account changed due to initial sync change") }`
`159`		`- case NSUbiquitousKeyValueStoreQuotaViolationChange: if ll(.info) { aiproxyLogger.info("AIProxy account changed due to quota violation") }`
`160`		`- case NSUbiquitousKeyValueStoreAccountChange: if ll(.info) { aiproxyLogger.info("AIProxy account changed due to icloud account change") }`
	`157`	`+ case NSUbiquitousKeyValueStoreServerChange: logIf(.info)?.info("AIProxy account changed due to remote server change")`
	`158`	`+ case NSUbiquitousKeyValueStoreInitialSyncChange: logIf(.info)?.info("AIProxy account changed due to initial sync change")`
	`159`	`+ case NSUbiquitousKeyValueStoreQuotaViolationChange: logIf(.info)?.info("AIProxy account changed due to quota violation")`
	`160`	`+ case NSUbiquitousKeyValueStoreAccountChange: logIf(.info)?.info("AIProxy account changed due to icloud account change")`
`161`	`161`	`default:`
`162`	`162`	`return`
`163`	`163`	`}`
`@@ -172,12 +172,12 @@ final class AnonymousAccountStorage {`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`guard ukvsAccount != resolvedAccount else {`
`175`		`- if ll(.info) { aiproxyLogger.info("UKVS remote sync is already up to date") }`
	`175`	`+ logIf(.info)?.info("UKVS remote sync is already up to date")`
`176`	`176`	`return`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`if ukvsAccount.timestamp <= resolvedAccount.timestamp {`
`180`		`- if ll(.info) { aiproxyLogger.info("UKVS account is older than our existing resolved account. Switching to the older account.") }`
	`180`	`+ logIf(.info)?.info("UKVS account is older than our existing resolved account. Switching to the older account.")`
`181`	`181`	`self.resolvedAccount = ukvsAccount`
`182`	`182`	`self.localAccountChain.append(ukvsAccount)`
`183`	`183`	`DispatchQueue.main.async {`
`@@ -187,16 +187,16 @@ final class AnonymousAccountStorage {`
`187`	`187`	`Task.detached {`
`188`	`188`	`let updateLocal = try? await AIProxyStorage.updateLocalAccountChainInKeychain(self.localAccountChain)`
`189`	`189`	`if updateLocal == nil \|\| updateLocal! != noErr {`
`190`		`- if ll(.warning) { aiproxyLogger.warning("Could not update the local account chain") }`
	`190`	`+ logIf(.warning)?.warning("Could not update the local account chain")`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`let updateRemote = try? await AIProxyStorage.updateRemoteAccountInKeychain(ukvsAccount)`
`194`	`194`	`if updateRemote == nil \|\| updateRemote! != noErr {`
`195`		`- if ll(.warning) { aiproxyLogger.warning("Could not update the remote account") }`
	`195`	`+ logIf(.warning)?.warning("Could not update the remote account")`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`	`} else {`
`199`		`- if ll(.info) { aiproxyLogger.info("UKVS account is newer than our existing resolved account. Updating UKVS to use the older account.") }`
	`199`	`+ logIf(.info)?.info("UKVS account is newer than our existing resolved account. Updating UKVS to use the older account.")`
`200`	`200`	`try? AIProxyStorage.updateUKVS(resolvedAccount)`
`201`	`201`	`}`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ internal struct AnthropicMessageStreamingContentBlockStart: Decodable {`
`17`	`17`	`guard let chunkJSON = line.dropFirst(6).data(using: .utf8),`
`18`	`18`	`let chunk = try? JSONDecoder().decode(Self.self, from: chunkJSON) else`
`19`	`19`	`{`
`20`		`- if ll(.warning) { aiproxyLogger.warning("Received unexpected JSON from Anthropic: \(line)") }`
	`20`	`+ logIf(.warning)?.warning("Received unexpected JSON from Anthropic: \(line)")`
`21`	`21`	`return nil`
`22`	`22`	`}`
`23`	`23`	`return chunk`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ internal struct AnthropicMessageStreamingDeltaBlock: Decodable {`
`19`	`19`	`guard let chunkJSON = line.dropFirst(6).data(using: .utf8),`
`20`	`20`	`let chunk = try? JSONDecoder().decode(Self.self, from: chunkJSON) else`
`21`	`21`	`{`
`22`		`- if ll(.warning) { aiproxyLogger.warning("Received unexpected JSON from Anthropic: \(line)") }`
	`22`	`+ logIf(.warning)?.warning("Received unexpected JSON from Anthropic: \(line)")`
`23`	`23`	`return nil`
`24`	`24`	`}`
`25`	`25`	`return chunk`
Original file line number	Diff line number	Diff line change
`@@ -81,13 +81,13 @@ open class AudioPCMPlayer {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`deinit {`
`84`		`- if ll(.debug) { aiproxyLogger.debug("AudioPCMPlayer is being freed") }`
	`84`	`+ logIf(.debug)?.debug("AudioPCMPlayer is being freed")`
`85`	`85`	`self.audioEngine.stop()`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`public func playPCM16Audio(from base64String: String) {`
`89`	`89`	`guard let audioData = Data(base64Encoded: base64String) else {`
`90`		`- if ll(.error) { aiproxyLogger.error("Could not decode base64 string for audio playback") }`
	`90`	`+ logIf(.error)?.error("Could not decode base64 string for audio playback")`
`91`	`91`	`return`
`92`	`92`	`}`
`93`	`93`
`@@ -106,35 +106,35 @@ open class AudioPCMPlayer {`
`106`	`106`	`pcmFormat: self.inputFormat,`
`107`	`107`	`bufferListNoCopy: &bufferList`
`108`	`108`	`) else {`
`109`		`- if ll(.error) { aiproxyLogger.error("Could not create input buffer for audio playback") }`
	`109`	`+ logIf(.error)?.error("Could not create input buffer for audio playback")`
`110`	`110`	`return`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`guard let outPCMBuf = AVAudioPCMBuffer(`
`114`	`114`	`pcmFormat: self.playableFormat,`
`115`	`115`	`frameCapacity: AVAudioFrameCount(self.playableFormat.sampleRate * 2.0)`
`116`	`116`	`) else {`
`117`		`- if ll(.error) { aiproxyLogger.error("Could not create output buffer for audio playback") }`
	`117`	`+ logIf(.error)?.error("Could not create output buffer for audio playback")`
`118`	`118`	`return`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`guard let converter = AVAudioConverter(from: self.inputFormat, to: self.playableFormat) else {`
`122`		`- if ll(.error) { aiproxyLogger.error("Could not create audio converter needed to map from pcm16int to pcm32float") }`
	`122`	`+ logIf(.error)?.error("Could not create audio converter needed to map from pcm16int to pcm32float")`
`123`	`123`	`return`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`do {`
`127`	`127`	`try converter.convert(to: outPCMBuf, from: inPCMBuf)`
`128`	`128`	`} catch {`
`129`		`- if ll(.error) { aiproxyLogger.error("Could not map from pcm16int to pcm32float: \(error.localizedDescription)") }`
	`129`	`+ logIf(.error)?.error("Could not map from pcm16int to pcm32float: \(error.localizedDescription)")`
`130`	`130`	`return`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`if !self.audioEngine.isRunning {`
`134`	`134`	`do {`
`135`	`135`	`try self.audioEngine.start()`
`136`	`136`	`} catch {`
`137`		`- if ll(.error) { aiproxyLogger.error("Could not start audio engine: \(error.localizedDescription)") }`
	`137`	`+ logIf(.error)?.error("Could not start audio engine: \(error.localizedDescription)")`
`138`	`138`	`return`
`139`	`139`	`}`
`140`	`140`	`}`
`@@ -150,7 +150,7 @@ open class AudioPCMPlayer {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`public func interruptPlayback() {`
`153`		`- if ll(.debug) { aiproxyLogger.debug("Interrupting playback") }`
	`153`	`+ logIf(.debug)?.debug("Interrupting playback")`
`154`	`154`	`self.playerNode.stop()`
`155`	`155`	`}`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,20 +24,20 @@ extension Decodable {`
`24`	`24`	`guard line.hasPrefix("data: ") else {`
`25`	`25`	`// Special case to ignore OpenRouter and DeepSeek SSE comments`
`26`	`26`	`if line != ": OPENROUTER PROCESSING" && line != ": keep-alive" {`
`27`		`- if ll(.warning) { aiproxyLogger.warning("Received unexpected line from aiproxy: \(line)") }`
	`27`	`+ logIf(.warning)?.warning("Received unexpected line from aiproxy: \(line)")`
`28`	`28`	`}`
`29`	`29`	`return nil`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`guard line != "data: [DONE]" else {`
`33`		`- if ll(.debug) { aiproxyLogger.debug("Streaming response has finished") }`
	`33`	`+ logIf(.debug)?.debug("Streaming response has finished")`
`34`	`34`	`return nil`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`guard let chunkJSON = line.dropFirst(6).data(using: .utf8),`
`38`	`38`	`let chunk = try? JSONDecoder().decode(Self.self, from: chunkJSON) else`
`39`	`39`	`{`
`40`		`- if ll(.warning) { aiproxyLogger.warning("Received unexpected JSON from aiproxy: \(line)") }`
	`40`	`+ logIf(.warning)?.warning("Received unexpected JSON from aiproxy: \(line)")`
`41`	`41`	`return nil`
`42`	`42`	`}`
`43`	`43`