Refactor

Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com>

Author: mpivchev

Sources/NextcloudKit/Models/Assistant/v2/Chat.swift

@@ -6,7 +6,7 @@ import Foundation
 
 // MARK: - ChatMessage
 
-public struct ChatMessage: Codable, Identifiable, Equatable {
+public struct AssistantChatMessage: Codable, Identifiable, Equatable {
     public let id: Int
     public let sessionId: Int
     public let role: String
@@ -36,7 +36,7 @@ public struct ChatMessage: Codable, Identifiable, Equatable {
 
 // MARK: - ChatMessageRequest
 
-public struct ChatMessageRequest: Encodable {
+public struct AssistantChatMessageRequest: Encodable {
     public let sessionId: Int
     public let role: String
     public let content: String
@@ -69,20 +69,6 @@ public struct ChatMessageRequest: Encodable {
     }
 }
 
-// MARK: - Conversation
-
-public struct Conversation: Codable, Identifiable, Equatable {
-    public let id: Int
-    public let title: String?
-    public let timestamp: Int
-
-    enum CodingKeys: String, CodingKey {
-        case id
-        case title
-        case timestamp
-    }
-}
-
 // MARK: - Session
 
 public struct AssistantConversation: Codable, Equatable, Hashable {
@@ -114,7 +100,7 @@ public struct AssistantConversation: Codable, Equatable, Hashable {
 
 // MARK: - CreateConversation
 
-public struct CreateConversation: Codable, Equatable {
+public struct AssistantCreatedConversation: Codable, Equatable {
     public let conversation: AssistantConversation
 
     enum CodingKeys: String, CodingKey {
@@ -142,7 +128,7 @@ public struct AssistantSession: Codable, Equatable {
 
 // MARK: - SessionTask
 
-public struct SessionTask: Codable, Equatable {
+public struct AssistantSessionTask: Codable, Equatable {
     public let taskId: Int
 
     enum CodingKeys: String, CodingKey {

Sources/NextcloudKit/NextcloudKit+AssistantV2.swift

@@ -282,7 +282,7 @@ public extension NextcloudKit {
                                   taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in }
     ) async -> (
         account: String,
-        chatMessages: [ChatMessage]?,
+        chatMessages: [AssistantChatMessage]?,
         responseData: AFDataResponse<Data>?,
         error: NKError
     ) {
@@ -308,7 +308,7 @@ public extension NextcloudKit {
                     }
                 case .success(let data):
                     let decoder = JSONDecoder()
-                    let result = try? decoder.decode([ChatMessage].self, from: data)
+                    let result = try? decoder.decode([AssistantChatMessage].self, from: data)
                     options.queue.async {
                         continuation.resume(returning: (account: account, chatMessages: result, responseData: response, error: .success))
                     }
@@ -325,13 +325,13 @@ public extension NextcloudKit {
     ///   - options: Optional HTTP request configuration.
     ///   - taskHandler: Optional closure to access the underlying URLSessionTask.
     /// - Returns: A tuple with named values for account, created message, response, and error.
-    func createAssistantChatMessage(messageRequest: ChatMessageRequest,
+    func createAssistantChatMessage(messageRequest: AssistantChatMessageRequest,
                                     account: String,
                                     options: NKRequestOptions = NKRequestOptions(),
                                     taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in }
     ) async -> (
         account: String,
-        chatMessage: ChatMessage?,
+        chatMessage: AssistantChatMessage?,
         responseData: AFDataResponse<Data>?,
         error: NKError
     ) {
@@ -357,7 +357,7 @@ public extension NextcloudKit {
                     }
                 case .success(let data):
                     let decoder = JSONDecoder()
-                    let result = try? decoder.decode(ChatMessage.self, from: data)
+                    let result = try? decoder.decode(AssistantChatMessage.self, from: data)
                     options.queue.async {
                         continuation.resume(returning: (account: account, chatMessage: result, responseData: response, error: .success))
                     }
@@ -382,7 +382,7 @@ public extension NextcloudKit {
                                          taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in }
     ) async -> (
         account: String,
-        conversation: CreateConversation?,
+        conversation: AssistantCreatedConversation?,
         responseData: AFDataResponse<Data>?,
         error: NKError
     ) {
@@ -413,7 +413,7 @@ public extension NextcloudKit {
                     }
                 case .success(let data):
                     let decoder = JSONDecoder()
-                    let result = try? decoder.decode(CreateConversation.self, from: data)
+                    let result = try? decoder.decode(AssistantCreatedConversation.self, from: data)
                     options.queue.async {
                         continuation.resume(returning: (account: account, conversation: result, responseData: response, error: .success))
                     }
@@ -438,7 +438,7 @@ public extension NextcloudKit {
                                       taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in }
     ) async -> (
         account: String,
-        chatMessage: ChatMessage?,
+        chatMessage: AssistantChatMessage?,
         responseData: AFDataResponse<Data>?,
         error: NKError
     ) {
@@ -466,7 +466,7 @@ public extension NextcloudKit {
                     }
                 case .success(let data):
                     let decoder = JSONDecoder()
-                    let result = try? decoder.decode(ChatMessage.self, from: data)
+                    let result = try? decoder.decode(AssistantChatMessage.self, from: data)
                     options.queue.async {
                         continuation.resume(returning: (account: account, chatMessage: result, responseData: response, error: .success))
                     }
@@ -489,7 +489,7 @@ public extension NextcloudKit {
                                       taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in }
     ) async -> (
         account: String,
-        sessionTask: SessionTask?,
+        sessionTask: AssistantSessionTask?,
         responseData: AFDataResponse<Data>?,
         error: NKError
     ) {
@@ -517,7 +517,7 @@ public extension NextcloudKit {
                     }
                 case .success(let data):
                     let decoder = JSONDecoder()
-                    let result = try? decoder.decode(SessionTask.self, from: data)
+                    let result = try? decoder.decode(AssistantSessionTask.self, from: data)
                     options.queue.async {
                         continuation.resume(returning: (account: account, sessionTask: result, responseData: response, error: .success))
                     }