mirror of
https://github.com/mii443/AzooKeyKanaKanjiConverter.git
synced 2025-12-03 11:08:33 +00:00
feat: sessionコマンドにdump/replayの機能を追加
This commit is contained in:
ensan-hcl
@@ -35,6 +35,8 @@ extension Subcommands {
|
||||
var zenzV1 = false
|
||||
@Flag(name: [.customLong("zenz_v2")], help: "Use zenz_v2 model.")
|
||||
var zenzV2 = false
|
||||
@Flag(name: [.customLong("zenz_v3")], help: "Use zenz_v3 model.")
|
||||
var zenzV3 = false
|
||||
@Option(name: [.customLong("config_zenzai_base_lm")], help: "Marisa files for Base LM.")
|
||||
var configZenzaiBaseLM: String?
|
||||
@Option(name: [.customLong("config_zenzai_personal_lm")], help: "Marisa files for Personal LM.")
|
||||
@@ -42,6 +44,9 @@ extension Subcommands {
|
||||
@Option(name: [.customLong("config_zenzai_personalization_alpha")], help: "Strength of personalization (0.5 by default)")
|
||||
var configZenzaiPersonalizationAlpha: Float = 0.5
|
||||
|
||||
@Option(name: [.customLong("replay")], help: "history.txt for replay.")
|
||||
var replayHistory: String?
|
||||
|
||||
static let configuration = CommandConfiguration(commandName: "session", abstract: "Start session for incremental input.")
|
||||
|
||||
private func getTemporaryDirectory() -> URL? {
|
||||
@@ -59,8 +64,14 @@ extension Subcommands {
|
||||
}
|
||||
|
||||
@MainActor mutating func run() async {
|
||||
if self.zenzV1 {
|
||||
print("\(bold: "We strongly recommend to use zenz-v2 models")")
|
||||
if self.zenzV1 || self.zenzV2 {
|
||||
print("\(bold: "We strongly recommend to use zenz-v3 models")")
|
||||
}
|
||||
if (self.zenzV1 || self.zenzV2 || self.zenzV3) && self.zenzWeightPath.isEmpty {
|
||||
preconditionFailure("\(bold: "zenz version is specified but --zenz weight is not specified")")
|
||||
}
|
||||
if !self.zenzWeightPath.isEmpty && (!self.zenzV1 && !self.zenzV2 && !self.zenzV3) {
|
||||
print("zenz version is not specified. By default, zenz-v3 will be used.")
|
||||
}
|
||||
let memoryDirectory = if self.enableLearning {
|
||||
if let dir = self.getTemporaryDirectory() {
|
||||
@@ -78,32 +89,45 @@ extension Subcommands {
|
||||
var lastCandidates: [Candidate] = []
|
||||
var leftSideContext: String = ""
|
||||
var page = 0
|
||||
|
||||
var histories = [String]()
|
||||
|
||||
var inputs = self.replayHistory.map {
|
||||
try! String(contentsOfFile: $0, encoding: .utf8)
|
||||
}?.split(by: "\n")
|
||||
inputs?.append(":q")
|
||||
|
||||
while true {
|
||||
print()
|
||||
print("\(bold: "== Type :q to end session, type :d to delete character, type :c to stop composition. For other commands, type :h ==")")
|
||||
if !leftSideContext.isEmpty {
|
||||
print("\(bold: "Current Left-Side Context"): \(leftSideContext)")
|
||||
}
|
||||
var input = readLine(strippingNewline: true) ?? ""
|
||||
var input = if inputs != nil {
|
||||
inputs!.removeFirst()
|
||||
} else {
|
||||
readLine(strippingNewline: true) ?? ""
|
||||
}
|
||||
histories.append(input)
|
||||
switch input {
|
||||
case ":q":
|
||||
case ":q", ":quit":
|
||||
// 終了
|
||||
return
|
||||
case ":d":
|
||||
case ":d", ":del":
|
||||
if !composingText.isEmpty {
|
||||
composingText.deleteBackwardFromCursorPosition(count: 1)
|
||||
} else {
|
||||
_ = leftSideContext.popLast()
|
||||
continue
|
||||
}
|
||||
case ":c":
|
||||
case ":c", ":clear":
|
||||
// クリア
|
||||
composingText.stopComposition()
|
||||
converter.stopComposition()
|
||||
leftSideContext = ""
|
||||
print("composition is stopped")
|
||||
continue
|
||||
case ":n":
|
||||
case ":n", ":next":
|
||||
// ページ送り
|
||||
page += 1
|
||||
for (i, candidate) in lastCandidates[self.displayTopN * page ..< self.displayTopN * (page + 1)].indexed() {
|
||||
@@ -114,13 +138,13 @@ extension Subcommands {
|
||||
}
|
||||
}
|
||||
continue
|
||||
case ":s":
|
||||
case ":s", ":save":
|
||||
composingText.stopComposition()
|
||||
converter.stopComposition()
|
||||
converter.sendToDicdataStore(.closeKeyboard)
|
||||
print("saved")
|
||||
continue
|
||||
case ":p":
|
||||
case ":p", ":pred":
|
||||
// 次の文字の予測を取得する
|
||||
let results = converter.predictNextCharacter(
|
||||
leftSideContext: leftSideContext,
|
||||
@@ -131,20 +155,36 @@ extension Subcommands {
|
||||
leftSideContext.append(firstCandidate.character)
|
||||
}
|
||||
continue
|
||||
case ":h":
|
||||
case ":h", ":help":
|
||||
// ヘルプ
|
||||
print("""
|
||||
\(bold: "== anco session commands ==")
|
||||
\(bold: ":q") - quit session
|
||||
\(bold: ":c") - clear composition
|
||||
\(bold: ":d") - delete one character
|
||||
\(bold: ":n") - see more candidates
|
||||
\(bold: ":s") - save memory to temporary directory
|
||||
\(bold: ":p") - predict next one character
|
||||
\(bold: ":q, :quit") - quit session
|
||||
\(bold: ":c, :clear") - clear composition
|
||||
\(bold: ":d, :del") - delete one character
|
||||
\(bold: ":n, :next") - see more candidates
|
||||
\(bold: ":s, :save") - save memory to temporary directory
|
||||
\(bold: ":p, :pred") - predict next one character
|
||||
\(bold: ":%d") - select candidate at that index (like :3 to select 3rd candidate)
|
||||
\(bold: ":ctx %s") - set the string as context
|
||||
\(bold: ":dump %s") - dump command history to specified file name (default: history.txt).
|
||||
""")
|
||||
default:
|
||||
if input.hasPrefix(":"), let index = Int(input.dropFirst()) {
|
||||
if input.hasPrefix(":ctx") {
|
||||
let ctx = String(input.split(by: ":ctx ").last ?? "")
|
||||
leftSideContext.append(ctx)
|
||||
continue
|
||||
} else if input.hasPrefix(":dump") {
|
||||
let fileName = if ":dump " < input {
|
||||
String(input.dropFirst(6))
|
||||
} else {
|
||||
"history.txt"
|
||||
}
|
||||
histories.removeAll(where: {$0.hasPrefix(":dump")})
|
||||
let content = histories.joined(separator: "\n")
|
||||
try! content.write(to: URL(fileURLWithPath: fileName), atomically: true, encoding: .utf8)
|
||||
continue
|
||||
} else if input.hasPrefix(":"), let index = Int(input.dropFirst()) {
|
||||
if !lastCandidates.indices.contains(index) {
|
||||
print("\(bold: "Error"): Index \(index) is not available for current context.")
|
||||
continue
|
||||
@@ -252,3 +292,4 @@ extension Subcommands {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user