Skip to content

Commit 0ac1373

Browse files
nathanborrornathanborror
committed
missed some
1 parent 32a353f commit 0ac1373

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎Sources/GenKit/Sessions/ChatSession.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class ChatSession {
66
public func stream(_ request: ChatSessionRequest, runLoopLimit: Int = 10) -> AsyncThrowingStream<Message, Error> {
77
AsyncThrowingStream { continuation in
88
Task {
9-
let runID = String.id
9+
let runID = Run.ID.id
1010

1111
var messages = request.messages
1212

@@ -51,7 +51,7 @@ public class ChatSession {
5151
}
5252

5353
public func completion(_ request: ChatSessionRequest, runLoopLimit: Int = 10) async throws -> ChatSessionResponse {
54-
let runID = String.id
54+
let runID = Run.ID.id
5555

5656
var messages = request.messages
5757
var response = ChatSessionResponse(messages: [])
@@ -148,7 +148,7 @@ public class ChatSession {
148148
}
149149
}
150150

151-
func apply(runID: String?, message: Message) -> Message {
151+
func apply(runID: Run.ID?, message: Message) -> Message {
152152
var message = message
153153
message.runID = runID
154154
return message

‎Sources/GenKit/Sessions/VisionSession.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class VisionSession {
66
public func stream(_ request: VisionSessionRequest) -> AsyncThrowingStream<Message, Error> {
77
AsyncThrowingStream { continuation in
88
Task {
9-
let runID = String.id
9+
let runID = Run.ID.id
1010

1111
var messages = request.messages
1212

@@ -28,7 +28,7 @@ public class VisionSession {
2828
}
2929

3030
public func completion(_ request: VisionSessionRequest) async throws -> VisionSessionResponse {
31-
let runID = String.id
31+
let runID = Run.ID.id
3232

3333
var messages = request.messages
3434
var response = VisionSessionResponse(messages: [])

‎Sources/GenKit/Types/Message.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public struct Message: Codable, Identifiable, Sendable {
1010
public var attachments: [Attachment]
1111
public var toolCalls: [ToolCall]?
1212
public var toolCallID: String?
13-
public var runID: String?
13+
public var runID: Run.ID?
1414
public var name: String?
1515
public var finishReason: FinishReason?
1616
public var metadata: Metadata
@@ -56,7 +56,7 @@ public struct Message: Codable, Identifiable, Sendable {
5656

5757
public init(id: Message.ID = .id, parent: String? = nil, kind: Kind = .none, role: Role, content: String? = nil,
5858
attachments: [Attachment] = [], toolCalls: [ToolCall]? = nil, toolCallID: String? = nil,
59-
runID: String? = nil, name: String? = nil, finishReason: FinishReason? = .stop,
59+
runID: Run.ID? = nil, name: String? = nil, finishReason: FinishReason? = .stop,
6060
metadata: [String: String] = [:]) {
6161
self.id = id
6262
self.parent = parent
@@ -76,28 +76,28 @@ public struct Message: Codable, Identifiable, Sendable {
7676

7777

7878
public static func system(parent: String? = nil, kind: Kind = .none, content: String? = nil, attachments: [Attachment] = [],
79-
toolCalls: [ToolCall]? = nil, toolCallID: String? = nil, runID: String? = nil, name: String? = nil,
79+
toolCalls: [ToolCall]? = nil, toolCallID: String? = nil, runID: Run.ID? = nil, name: String? = nil,
8080
finishReason: FinishReason? = .stop, metadata: [String: String] = [:]) -> Self {
8181
self.init(parent: parent, kind: kind, role: .system, content: content, attachments: attachments, toolCalls: toolCalls,
8282
toolCallID: toolCallID, runID: runID, name: name, finishReason: finishReason, metadata: metadata)
8383
}
8484

8585
public static func assistant(parent: String? = nil, kind: Kind = .none, content: String? = nil, attachments: [Attachment] = [],
86-
toolCalls: [ToolCall]? = nil, toolCallID: String? = nil, runID: String? = nil, name: String? = nil,
86+
toolCalls: [ToolCall]? = nil, toolCallID: String? = nil, runID: Run.ID? = nil, name: String? = nil,
8787
finishReason: FinishReason? = .stop, metadata: [String: String] = [:]) -> Self {
8888
self.init(parent: parent, kind: kind, role: .assistant, content: content, attachments: attachments, toolCalls: toolCalls,
8989
toolCallID: toolCallID, runID: runID, name: name, finishReason: finishReason, metadata: metadata)
9090
}
9191

9292
public static func user(parent: String? = nil, kind: Kind = .none, content: String? = nil, attachments: [Attachment] = [],
93-
toolCalls: [ToolCall]? = nil, toolCallID: String? = nil, runID: String? = nil, name: String? = nil,
93+
toolCalls: [ToolCall]? = nil, toolCallID: String? = nil, runID: Run.ID? = nil, name: String? = nil,
9494
finishReason: FinishReason? = .stop, metadata: [String: String] = [:]) -> Self {
9595
self.init(parent: parent, kind: kind, role: .user, content: content, attachments: attachments, toolCalls: toolCalls,
9696
toolCallID: toolCallID, runID: runID, name: name, finishReason: finishReason, metadata: metadata)
9797
}
9898

9999
public static func tool(parent: String? = nil, kind: Kind = .none, content: String? = nil, attachments: [Attachment] = [],
100-
toolCalls: [ToolCall]? = nil, toolCallID: String? = nil, runID: String? = nil, name: String? = nil,
100+
toolCalls: [ToolCall]? = nil, toolCallID: String? = nil, runID: Run.ID? = nil, name: String? = nil,
101101
finishReason: FinishReason? = .stop, metadata: [String: String] = [:]) -> Self {
102102
self.init(parent: parent, kind: kind, role: .tool, content: content, attachments: attachments, toolCalls: toolCalls,
103103
toolCallID: toolCallID, runID: runID, name: name, finishReason: finishReason, metadata: metadata)

‎Sources/GenKit/Types/Service.swift‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ public struct Service: Codable, Identifiable, Sendable {
1111
public var models: [Model]
1212
public var status: Status
1313

14-
public var preferredChatModel: String?
15-
public var preferredImageModel: String?
16-
public var preferredEmbeddingModel: String?
17-
public var preferredTranscriptionModel: String?
18-
public var preferredToolModel: String?
19-
public var preferredVisionModel: String?
20-
public var preferredSpeechModel: String?
21-
public var preferredSummarizationModel: String?
14+
public var preferredChatModel: Model.ID?
15+
public var preferredImageModel: Model.ID?
16+
public var preferredEmbeddingModel: Model.ID?
17+
public var preferredTranscriptionModel: Model.ID?
18+
public var preferredToolModel: Model.ID?
19+
public var preferredVisionModel: Model.ID?
20+
public var preferredSpeechModel: Model.ID?
21+
public var preferredSummarizationModel: Model.ID?
2222

2323
public enum ServiceID: String, Codable, Sendable {
2424
case anthropic
@@ -40,10 +40,10 @@ public struct Service: Codable, Identifiable, Sendable {
4040
}
4141

4242
public init(id: ServiceID, name: String, host: String = "", token: String = "", models: [Model] = [],
43-
preferredChatModel: String? = nil, preferredImageModel: String? = nil,
44-
preferredEmbeddingModel: String? = nil, preferredTranscriptionModel: String? = nil,
45-
preferredToolModel: String? = nil, preferredVisionModel: String? = nil,
46-
preferredSpeechModel: String? = nil, preferredSummarizationModel: String? = nil) {
43+
preferredChatModel: Model.ID? = nil, preferredImageModel: Model.ID? = nil,
44+
preferredEmbeddingModel: Model.ID? = nil, preferredTranscriptionModel: Model.ID? = nil,
45+
preferredToolModel: Model.ID? = nil, preferredVisionModel: Model.ID? = nil,
46+
preferredSpeechModel: Model.ID? = nil, preferredSummarizationModel: Model.ID? = nil) {
4747
self.id = id
4848
self.name = name
4949
self.host = host

0 commit comments

Comments
 (0)