Skip to content

Commit 4af88a2

Browse files
committed
Fix prompt
1 parent 525d697 commit 4af88a2

20 files changed

Lines changed: 48 additions & 43 deletions

src/main/kotlin/ai/devchat/cli/DevChatResponse.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package ai.devchat.cli
22

3-
class DevChatResponse(line: String) {
3+
class DevChatResponse {
44
var user: String? = null
55
var date: String? = null
66
var message: String? = null
77
var promptHash: String? = null
88

9-
init {
9+
fun update(line: String) : DevChatResponse {
1010
when {
1111
line.startsWith("User: ") -> user = user ?: line.substring("User: ".length)
1212
line.startsWith("Date: ") -> date = date ?: line.substring("Date: ".length)
@@ -17,6 +17,7 @@ class DevChatResponse(line: String) {
1717
}
1818
line.isNotEmpty() -> message = message?.let { "$it\n$line" } ?: line
1919
}
20+
return this
2021
}
2122

2223
override fun toString(): String {

src/main/kotlin/ai/devchat/devchat/BaseActionHandler.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package ai.devchat.devchat
22

33
import ai.devchat.cli.DevChatWrapper
4-
import ai.devchat.common.DevChatPathUtil
54
import ai.devchat.common.Log
65
import com.alibaba.fastjson.JSONObject
76

@@ -17,18 +16,18 @@ abstract class BaseActionHandler(
1716

1817
abstract val actionName: String
1918

20-
open fun action() { response() }
19+
open fun action() { send() }
2120

2221
open fun except(exception: Exception) {
23-
response(
22+
send(
2423
metadata = mapOf(
2524
"status" to "error",
2625
"error" to exception
2726
)
2827
)
2928
}
3029

31-
fun response(metadata: Map<String, Any?>? = null, payload: Map<String, Any?>? = null) {
30+
fun send(metadata: Map<String, Any?>? = null, payload: Map<String, Any?>? = null) {
3231
handler?.sendResponse(
3332
actionName,
3433
jsCallback,

src/main/kotlin/ai/devchat/devchat/handler/AddContextNotifyHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject
77
class AddContextNotifyHandler(metadata: JSONObject?, payload: JSONObject?) : BaseActionHandler(metadata, payload) {
88
override val actionName: String = DevChatActions.ADD_CONTEXT_NOTIFY
99
override fun action() {
10-
response(payload=mapOf(
10+
send(payload=mapOf(
1111
"path" to payload?.getString("path"),
1212
"content" to payload?.getString("content"),
1313
"languageId" to payload?.getString("languageId"),

src/main/kotlin/ai/devchat/devchat/handler/AddContextRequestHandler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ class AddContextRequestHandler(metadata: JSONObject?, payload: JSONObject?) : Ba
2020
if (exitCode != 0) {
2121
throw RuntimeException("Failed to execute command: $command, Exit Code: $exitCode Error: $errors")
2222
}
23-
response(payload=mapOf("command" to command, "content" to result))
23+
send(payload=mapOf("command" to command, "content" to result))
2424
}
2525

2626
override fun except(exception: Exception) {
27-
response(
27+
send(
2828
metadata=mapOf("status" to "error", "error" to exception.message),
2929
payload=mapOf("command" to command, "content" to "")
3030
)

src/main/kotlin/ai/devchat/devchat/handler/DeleteLastConversationRequestHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ class DeleteLastConversationRequestHandler(metadata: JSONObject?, payload: JSONO
99
override fun action() {
1010
val promptHash = payload!!.getString("promptHash")
1111
wrapper.log(mutableListOf("delete" to promptHash), null)
12-
response(payload = mapOf("promptHash" to promptHash))
12+
send(payload = mapOf("promptHash" to promptHash))
1313
}
1414
}

src/main/kotlin/ai/devchat/devchat/handler/DeleteTopicRequestHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ class DeleteTopicRequestHandler(metadata: JSONObject?, payload: JSONObject?) : B
1313
if (!state.deletedTopicHashes.contains(topicHash)) {
1414
state.deletedTopicHashes += topicHash
1515
}
16-
response(payload = mapOf("topicHash" to topicHash))
16+
send(payload = mapOf("topicHash" to topicHash))
1717
}
1818
}

src/main/kotlin/ai/devchat/devchat/handler/GetKeyRequestHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ class GetKeyRequestHandler(metadata: JSONObject?, payload: JSONObject?) : BaseAc
1212
if (key.isNullOrEmpty()) {
1313
throw RuntimeException("key is empty")
1414
}
15-
response(payload = mapOf("key" to key))
15+
send(payload = mapOf("key" to key))
1616
}
1717
}

src/main/kotlin/ai/devchat/devchat/handler/GetSettingRequestHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class GetSettingRequestHandler(metadata: JSONObject?, payload: JSONObject?) : Ba
1111
override val actionName: String = DevChatActions.GET_SETTING_RESPONSE
1212
override fun action() {
1313
val (apiKey, apiBase, defaultModel) = Settings.getAPISettings()
14-
response(payload= mapOf("setting" to mapOf(
14+
send(payload= mapOf("setting" to mapOf(
1515
"apiKey" to apiKey,
1616
"apiBase" to apiBase,
1717
"currentModel" to defaultModel,

src/main/kotlin/ai/devchat/devchat/handler/InsertCodeRequestHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class InsertCodeRequestHandler(metadata: JSONObject?, payload: JSONObject?) : Ba
2121
document.insertString(offset, contentText)
2222
}
2323
}, "InsertText", null)
24-
response()
24+
send()
2525
}
2626
}
2727

src/main/kotlin/ai/devchat/devchat/handler/ListCommandsRequestHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ import com.alibaba.fastjson.JSONObject
88
class ListCommandsRequestHandler(metadata: JSONObject?, payload: JSONObject?) : BaseActionHandler(metadata, payload) {
99
override val actionName: String = DevChatActions.LIST_COMMANDS_RESPONSE
1010
override fun action() {
11-
response(payload= mapOf("commands" to wrapper.commandList))
11+
send(payload= mapOf("commands" to wrapper.commandList))
1212
}
1313
}

0 commit comments

Comments
 (0)