Skip to content

Commit f31a762

Browse files
Assistant API v2 (#124)
* WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Fix compile Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Refactor Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Refactor Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * WIP Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Refactor Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Finish Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Compliance Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * PR fixes Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Upload fix multisession (#129) * fix Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> * fix Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> --------- Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> Co-authored-by: Marino Faggiana <marino@marinofaggiana.com> * Fix: Login poll without cached responses. Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> * Linter Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> --------- Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com> Signed-off-by: Marino Faggiana <marino@marinofaggiana.com> Co-authored-by: Marino Faggiana <marino.faggiana@nextcloud.com> Co-authored-by: Marino Faggiana <marino@marinofaggiana.com>
1 parent eedce45 commit f31a762

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

Sources/NextcloudKit/NextcloudKit+AssistantV2.swift

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public extension NextcloudKit {
1111
supportedTaskType: String = "Text",
1212
options: NKRequestOptions = NKRequestOptions(),
1313
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
14-
completion: @escaping (_ account: String, _ types: [TaskTypeData]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
14+
completion: @escaping (_ account: String, _ types: [TaskTypeData]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
1515
let endpoint = "ocs/v2.php/taskprocessing/tasktypes"
1616
guard let nkSession = nkCommonInstance.getSession(account: account),
1717
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
@@ -40,7 +40,6 @@ public extension NextcloudKit {
4040
var filteredResult = result?
4141
.filter({ $0.inputShape?.input?.type == supportedTaskType && $0.outputShape?.output?.type == supportedTaskType })
4242
.sorted(by: {$0.id! < $1.id!})
43-
4443
options.queue.async { completion(account, filteredResult, response, .success) }
4544
} else {
4645
options.queue.async { completion(account, nil, response, NKError(rootJson: json, fallbackStatusCode: response.response?.statusCode)) }
@@ -91,9 +90,9 @@ public extension NextcloudKit {
9190
}
9291

9392
func textProcessingGetTasksV2(taskType: String,
94-
account: String,
95-
options: NKRequestOptions = NKRequestOptions(),
96-
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
93+
account: String,
94+
options: NKRequestOptions = NKRequestOptions(),
95+
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
9796
completion: @escaping (_ account: String, _ tasks: TaskList?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
9897
let endpoint = "/ocs/v2.php/taskprocessing/tasks?taskType=\(taskType)"
9998
guard let nkSession = nkCommonInstance.getSession(account: account),
@@ -128,10 +127,10 @@ public extension NextcloudKit {
128127
}
129128

130129
func textProcessingDeleteTaskV2(taskId: Int64,
131-
account: String,
132-
options: NKRequestOptions = NKRequestOptions(),
133-
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
134-
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
130+
account: String,
131+
options: NKRequestOptions = NKRequestOptions(),
132+
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
133+
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
135134
let endpoint = "/ocs/v2.php/taskprocessing/task/\(taskId)"
136135
guard let nkSession = nkCommonInstance.getSession(account: account),
137136
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),

0 commit comments

Comments
 (0)