mirror of
https://github.com/FBukovina/Atoll.git
synced 2026-10-27 15:14:33 +00:00
Modify stuff to work, fuck copilot PR
This commit is contained in:
parent
9396a5a8ff
commit
bf4939c326
2 changed files with 23 additions and 9 deletions
|
|
@ -6607,6 +6607,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"Clear conversation and attachments" : {
|
||||||
|
"comment" : "A help text for the \"Reset Context\" button in the chat messages view.",
|
||||||
|
"isCommentAutoGenerated" : true
|
||||||
|
},
|
||||||
"Clear Data" : {
|
"Clear Data" : {
|
||||||
"localizations" : {
|
"localizations" : {
|
||||||
"fr" : {
|
"fr" : {
|
||||||
|
|
@ -20138,6 +20142,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"Reset Context" : {
|
||||||
|
"comment" : "A button label that resets the conversation context.",
|
||||||
|
"isCommentAutoGenerated" : true
|
||||||
|
},
|
||||||
"Reset Live Activities" : {
|
"Reset Live Activities" : {
|
||||||
"comment" : "A menu item that resets live activities for a particular app.",
|
"comment" : "A menu item that resets live activities for a particular app.",
|
||||||
"isCommentAutoGenerated" : true,
|
"isCommentAutoGenerated" : true,
|
||||||
|
|
|
||||||
|
|
@ -662,12 +662,14 @@ class ScreenAssistantManager: NSObject, ObservableObject {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
let task = URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
|
var task: URLSessionDataTask?
|
||||||
|
task = URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
guard let self = self else { return }
|
guard let self = self else { return }
|
||||||
|
guard let currentTask = task else { return }
|
||||||
|
|
||||||
// Ensure this callback belongs to the current in-flight request
|
// Ensure this callback belongs to the current in-flight request
|
||||||
guard self.activeRequest === task else { return }
|
guard self.activeRequest === currentTask else { return }
|
||||||
|
|
||||||
self.isLoading = false
|
self.isLoading = false
|
||||||
self.activeRequest = nil
|
self.activeRequest = nil
|
||||||
|
|
@ -677,7 +679,7 @@ class ScreenAssistantManager: NSObject, ObservableObject {
|
||||||
}
|
}
|
||||||
|
|
||||||
activeRequest = task
|
activeRequest = task
|
||||||
task.resume()
|
task?.resume()
|
||||||
}
|
}
|
||||||
|
|
||||||
private func performOpenAIRequest(url: URL, requestBody: [String: Any], apiKey: String) {
|
private func performOpenAIRequest(url: URL, requestBody: [String: Any], apiKey: String) {
|
||||||
|
|
@ -696,12 +698,14 @@ class ScreenAssistantManager: NSObject, ObservableObject {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
let task = URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
|
var task: URLSessionDataTask?
|
||||||
|
task = URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
guard let self = self else { return }
|
guard let self = self else { return }
|
||||||
|
guard let currentTask = task else { return }
|
||||||
|
|
||||||
// Ensure this callback belongs to the current in-flight request
|
// Ensure this callback belongs to the current in-flight request
|
||||||
guard self.activeRequest === task else { return }
|
guard self.activeRequest === currentTask else { return }
|
||||||
|
|
||||||
self.isLoading = false
|
self.isLoading = false
|
||||||
self.activeRequest = nil
|
self.activeRequest = nil
|
||||||
|
|
@ -711,7 +715,7 @@ class ScreenAssistantManager: NSObject, ObservableObject {
|
||||||
}
|
}
|
||||||
|
|
||||||
activeRequest = task
|
activeRequest = task
|
||||||
task.resume()
|
task?.resume()
|
||||||
}
|
}
|
||||||
|
|
||||||
private func performClaudeRequest(url: URL, requestBody: [String: Any], apiKey: String) {
|
private func performClaudeRequest(url: URL, requestBody: [String: Any], apiKey: String) {
|
||||||
|
|
@ -731,12 +735,14 @@ class ScreenAssistantManager: NSObject, ObservableObject {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
let task = URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
|
var task: URLSessionDataTask?
|
||||||
|
task = URLSession.shared.dataTask(with: request) { [weak self] data, response, error in
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
guard let self = self else { return }
|
guard let self = self else { return }
|
||||||
|
guard let currentTask = task else { return }
|
||||||
|
|
||||||
// Ensure this callback belongs to the current in-flight request
|
// Ensure this callback belongs to the current in-flight request
|
||||||
guard self.activeRequest === task else { return }
|
guard self.activeRequest === currentTask else { return }
|
||||||
|
|
||||||
self.isLoading = false
|
self.isLoading = false
|
||||||
self.activeRequest = nil
|
self.activeRequest = nil
|
||||||
|
|
@ -746,7 +752,7 @@ class ScreenAssistantManager: NSObject, ObservableObject {
|
||||||
}
|
}
|
||||||
|
|
||||||
activeRequest = task
|
activeRequest = task
|
||||||
task.resume()
|
task?.resume()
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Response Handlers
|
// MARK: - Response Handlers
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue