Skip to content

Commit 4281a6a

Browse files
intitniintitni
committed
Merge branch 'feature/adjust-symbol-detection-from-conversation' into develop
2 parents 0e8cad3 + ec796af commit 4281a6a

9 files changed

Lines changed: 186 additions & 62 deletions

File tree

‎Core/Sources/ChatContextCollectors/SystemInfoChatContextCollector/SystemInfoChatContextCollector.swift‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ public final class SystemInfoChatContextCollector: ChatContextCollector {
1919
) -> ChatContext {
2020
return .init(
2121
systemPrompt: """
22-
Current Time: \(
23-
Self.dateFormatter.string(from: Date())
24-
) (You can use it to calculate time in another time zone)
25-
""",
22+
## System Info
23+
24+
Current Time: \(
25+
Self.dateFormatter.string(from: Date())
26+
) (You can use it to calculate time in another time zone)
27+
""",
2628
retrievedContent: [],
2729
functions: []
2830
)

‎Core/Sources/ChatService/DynamicContextController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ final class DynamicContextController {
6969
let extraSystemPrompt = contexts
7070
.map(\.systemPrompt)
7171
.filter { !$0.isEmpty }
72-
.joined(separator: "\n")
72+
.joined(separator: "\n\n")
7373

7474
let contextPrompts = contexts
7575
.flatMap(\.retrievedContent)

‎Pro‎

Submodule Pro updated from ef0377c to 6199237

‎Tool/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,8 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
101101
: "When you don't known what I am asking, I am probably referring to the code."
102102
)
103103
104-
Editing Document Context: ###
104+
### Editing Document Context
105105
"""
106-
let end = "###"
107106
let relativePath = "Document Relative Path: \(context.relativePath)"
108107
let language = "Language: \(context.language.rawValue)"
109108

@@ -160,7 +159,6 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
160159
code,
161160
codeAnnotations,
162161
fileAnnotations,
163-
end,
164162
]
165163
.filter { !$0.isEmpty }
166164
.joined(separator: "\n\n")
@@ -180,10 +178,9 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
180178
language,
181179
lineAnnotations,
182180
selectionRange,
183-
end,
184181
]
185182
.filter { !$0.isEmpty }
186-
.joined(separator: "\n")
183+
.joined(separator: "\n\n")
187184
}
188185
}
189186

‎Tool/Sources/FocusedCodeFinder/SwiftFocusedCodeFinder.swift‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@ public struct SwiftFocusedCodeFinder: FocusedCodeFinder {
6161
}
6262
}
6363
guard let focusedNode else {
64-
var result =
65-
UnknownLanguageFocusedCodeFinder(
66-
proposedSearchRange: maxFocusedCodeLineCount / 2
67-
)
64+
var result = UnknownLanguageFocusedCodeFinder(proposedSearchRange: 8)
6865
.findFocusedCode(
6966
containingRange: range,
7067
activeDocumentContext: activeDocumentContext

‎Tool/Sources/OpenAIService/ChatGPTService.swift‎

Lines changed: 77 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -98,41 +98,59 @@ public class ChatGPTService: ChatGPTServiceType {
9898
await memory.appendMessage(newMessage)
9999
}
100100

101-
return AsyncThrowingStream<String, Error> { continuation in
102-
Task(priority: .userInitiated) {
103-
do {
104-
var functionCall: ChatMessage.FunctionCall?
105-
var functionCallMessageID = ""
106-
var isInitialCall = true
107-
loop: while functionCall != nil || isInitialCall {
108-
isInitialCall = false
109-
if let call = functionCall {
110-
if !configuration.runFunctionsAutomatically {
111-
break loop
101+
return Debugger.$id.withValue(.init()) {
102+
AsyncThrowingStream<String, Error> { continuation in
103+
Task(priority: .userInitiated) {
104+
do {
105+
var functionCall: ChatMessage.FunctionCall?
106+
var functionCallMessageID = ""
107+
var isInitialCall = true
108+
loop: while functionCall != nil || isInitialCall {
109+
isInitialCall = false
110+
if let call = functionCall {
111+
if !configuration.runFunctionsAutomatically {
112+
break loop
113+
}
114+
functionCall = nil
115+
await runFunctionCall(call, messageId: functionCallMessageID)
112116
}
113-
functionCall = nil
114-
await runFunctionCall(call, messageId: functionCallMessageID)
115-
}
116-
let stream = try await sendMemory()
117-
for try await content in stream {
118-
switch content {
119-
case let .text(text):
120-
continuation.yield(text)
121-
case let .functionCall(call):
122-
if functionCall == nil {
123-
functionCallMessageID = uuidGenerator()
124-
functionCall = call
125-
} else {
126-
functionCall?.name.append(call.name)
127-
functionCall?.arguments.append(call.arguments)
117+
let stream = try await sendMemory()
118+
119+
#if DEBUG
120+
var reply = ""
121+
#endif
122+
123+
for try await content in stream {
124+
switch content {
125+
case let .text(text):
126+
continuation.yield(text)
127+
#if DEBUG
128+
reply.append(text)
129+
#endif
130+
case let .functionCall(call):
131+
if functionCall == nil {
132+
functionCallMessageID = uuidGenerator()
133+
functionCall = call
134+
} else {
135+
functionCall?.name.append(call.name)
136+
functionCall?.arguments.append(call.arguments)
137+
}
138+
await prepareFunctionCall(
139+
call,
140+
messageId: functionCallMessageID
141+
)
128142
}
129-
await prepareFunctionCall(call, messageId: functionCallMessageID)
130143
}
144+
#if DEBUG
145+
Debugger.didReceiveResponse(content: reply)
146+
#endif
131147
}
148+
149+
Debugger.didFinish()
150+
continuation.finish()
151+
} catch {
152+
continuation.finish(throwing: error)
132153
}
133-
continuation.finish()
134-
} catch {
135-
continuation.finish(throwing: error)
136154
}
137155
}
138156
}
@@ -152,22 +170,26 @@ public class ChatGPTService: ChatGPTServiceType {
152170
)
153171
await memory.appendMessage(newMessage)
154172
}
155-
156-
let message = try await sendMemoryAndWait()
157-
var finalResult = message?.content
158-
var functionCall = message?.functionCall
159-
while let call = functionCall {
160-
if !configuration.runFunctionsAutomatically {
161-
break
173+
return try await Debugger.$id.withValue(.init()) {
174+
let message = try await sendMemoryAndWait()
175+
var finalResult = message?.content
176+
var functionCall = message?.functionCall
177+
while let call = functionCall {
178+
if !configuration.runFunctionsAutomatically {
179+
break
180+
}
181+
functionCall = nil
182+
await runFunctionCall(call)
183+
guard let nextMessage = try await sendMemoryAndWait() else { break }
184+
finalResult = nextMessage.content
185+
functionCall = nextMessage.functionCall
162186
}
163-
functionCall = nil
164-
await runFunctionCall(call)
165-
guard let nextMessage = try await sendMemoryAndWait() else { break }
166-
finalResult = nextMessage.content
167-
functionCall = nextMessage.functionCall
168-
}
169187

170-
return finalResult
188+
Debugger.didReceiveResponse(content: finalResult ?? "N/A")
189+
Debugger.didFinish()
190+
191+
return finalResult
192+
}
171193
}
172194

173195
public func stopReceivingMessage() {
@@ -239,6 +261,8 @@ extension ChatGPTService {
239261
requestBody
240262
)
241263

264+
Debugger.didSendRequestBody(body: requestBody)
265+
242266
return AsyncThrowingStream<StreamContent, Error> { continuation in
243267
Task {
244268
do {
@@ -348,6 +372,8 @@ extension ChatGPTService {
348372
requestBody
349373
)
350374

375+
Debugger.didSendRequestBody(body: requestBody)
376+
351377
let response = try await api()
352378

353379
guard let choice = response.choices.first else { return nil }
@@ -388,6 +414,8 @@ extension ChatGPTService {
388414
_ call: ChatMessage.FunctionCall,
389415
messageId: String? = nil
390416
) async -> String {
417+
Debugger.didReceiveFunction(name: call.name, arguments: call.arguments)
418+
391419
let messageId = messageId ?? uuidGenerator()
392420

393421
guard let function = functionProvider.function(named: call.name) else {
@@ -413,6 +441,8 @@ extension ChatGPTService {
413441
}
414442
}
415443

444+
Debugger.didReceiveFunctionResult(result: result.botReadableContent)
445+
416446
await memory.updateMessage(id: messageId) { message in
417447
message.content = result.botReadableContent
418448
}
@@ -421,6 +451,9 @@ extension ChatGPTService {
421451
} catch {
422452
// For errors, use the error message as the result.
423453
let content = "Error: \(error.localizedDescription)"
454+
455+
Debugger.didReceiveFunctionResult(result: content)
456+
424457
await memory.updateMessage(id: messageId) { message in
425458
message.content = content
426459
}

‎Tool/Sources/OpenAIService/CompletionStreamAPI.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ protocol CompletionStreamAPI {
1313
)
1414
}
1515

16-
public enum FunctionCallStrategy: Encodable, Equatable {
16+
public enum FunctionCallStrategy: Codable, Equatable {
1717
/// Forbid the bot to call any function.
1818
case none
1919
/// Let the bot choose what function to call.
@@ -39,7 +39,7 @@ public enum FunctionCallStrategy: Encodable, Equatable {
3939
}
4040

4141
/// https://platform.openai.com/docs/api-reference/chat/create
42-
struct CompletionRequestBody: Encodable, Equatable {
42+
struct CompletionRequestBody: Codable, Equatable {
4343
struct Message: Codable, Equatable {
4444
/// The role of the message.
4545
var role: ChatMessage.Role

‎Tool/Sources/OpenAIService/Debug/Debug.swift‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
import AppKit
2+
import Foundation
3+
4+
enum Debugger {
5+
#if DEBUG
6+
@TaskLocal
7+
static var id: UUID?
8+
#endif
9+
10+
static func didSendRequestBody(body: CompletionRequestBody) {
11+
#if DEBUG
12+
13+
do {
14+
let json = try JSONEncoder().encode(body)
15+
let center = NSWorkspace.shared.notificationCenter
16+
center.post(
17+
name: .init("ServiceDebugger.ChatRequestDebug.requestSent"),
18+
object: nil,
19+
userInfo: [
20+
"id": id ?? UUID(),
21+
"data": json,
22+
]
23+
)
24+
} catch {
25+
print("Failed to encode request body: \(error)")
26+
}
27+
28+
#endif
29+
}
30+
31+
static func didReceiveFunction(name: String, arguments: String) {
32+
#if DEBUG
33+
34+
let center = NSWorkspace.shared.notificationCenter
35+
center.post(
36+
name: .init("ServiceDebugger.ChatRequestDebug.receivedFunctionCall"),
37+
object: nil,
38+
userInfo: [
39+
"id": id ?? UUID(),
40+
"name": name,
41+
"arguments": arguments,
42+
]
43+
)
44+
45+
#endif
46+
}
47+
48+
static func didReceiveFunctionResult(result: String) {
49+
#if DEBUG
50+
51+
let center = NSWorkspace.shared.notificationCenter
52+
center.post(
53+
name: .init("ServiceDebugger.ChatRequestDebug.receivedFunctionResult"),
54+
object: nil,
55+
userInfo: [
56+
"id": id ?? UUID(),
57+
"result": result,
58+
]
59+
)
60+
61+
#endif
62+
}
63+
64+
static func didReceiveResponse(content: String) {
65+
#if DEBUG
66+
67+
let center = NSWorkspace.shared.notificationCenter
68+
center.post(
69+
name: .init("ServiceDebugger.ChatRequestDebug.responseReceived"),
70+
object: nil,
71+
userInfo: [
72+
"id": id ?? UUID(),
73+
"response": content,
74+
]
75+
)
76+
77+
#endif
78+
}
79+
80+
static func didFinish() {
81+
let center = NSWorkspace.shared.notificationCenter
82+
center.post(
83+
name: .init("ServiceDebugger.ChatRequestDebug.finished"),
84+
object: nil,
85+
userInfo: [
86+
"id": id ?? UUID(),
87+
]
88+
)
89+
}
90+
}
91+

‎Tool/Sources/OpenAIService/Memory/AutoManagedChatGPTMemory.swift‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,13 @@ public actor AutoManagedChatGPTMemory: ChatGPTMemory {
135135
for (index, content) in retrievedContent.filter({ !$0.isEmpty }).enumerated() {
136136
if index == 0 {
137137
if !appendToSystemPrompt("""
138-
138+
139+
140+
## Relevant Content
141+
139142
Below are information related to the conversation, separated by \(separator)
140143
144+
141145
""") { break }
142146
} else {
143147
if !appendToSystemPrompt("\n\(separator)\n") { break }

0 commit comments

Comments
 (0)