diff --git a/Core/Package.swift b/Core/Package.swift index 6443c4f..604e805 100644 --- a/Core/Package.swift +++ b/Core/Package.swift @@ -21,7 +21,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/azooKey/AzooKeyKanaKanjiConverter", revision: "e57b2c82cdecdeb8dc9058a8d04264e79bea1ab3", traits: kanaKanjiConverterTraits), + .package(url: "https://github.com/azooKey/AzooKeyKanaKanjiConverter", revision: "fc16d94b7caac13cde86977c5547a1167a824f81", traits: kanaKanjiConverterTraits), .package(url: "https://github.com/apple/swift-crypto.git", from: "3.0.0"), .package(url: "https://github.com/weichsel/ZIPFoundation.git", from: "0.9.0") ], diff --git a/Core/Sources/Core/InputUtils/SegmentsManager.swift b/Core/Sources/Core/InputUtils/SegmentsManager.swift index a51a0a0..098d09d 100644 --- a/Core/Sources/Core/InputUtils/SegmentsManager.swift +++ b/Core/Sources/Core/InputUtils/SegmentsManager.swift @@ -190,10 +190,7 @@ public final class SegmentsManager { specialCandidateProviders: KanaKanjiConverter.defaultSpecialCandidateProviders, zenzaiMode: self.zenzaiMode(leftSideContext: leftSideContext, requestRichCandidates: requestRichCandidates), experimentalZenzaiPredictiveInput: true, - typoCorrectionConfig: .init( - mode: canUseDebugTypoCorrection ? .noisyChannel : .auto, - languageModel: .ngram(.init(prefix: self.downloadedInputN5LMDir.path + "/lm_", n: 5, d: 0.75)) - ), + typoCorrectionMode: .automatic, metadata: self.metadata ) } @@ -910,7 +907,7 @@ public final class SegmentsManager { } let leftSideContext = self.getCleanLeftSideContext(maxCount: 30) ?? "" - let typoCandidates = self.kanaKanjiConverter.experimentalRequestTypoCorrectionOnly( + let typoCandidates = self.kanaKanjiConverter.experimentalRequestTypoCorrection( leftSideContext: leftSideContext, composingText: targetComposingText, options: options( @@ -920,7 +917,8 @@ public final class SegmentsManager { requireEnglishPrediction: .disabled ), inputStyle: inputStyle, - searchConfig: .init( + config: .init( + languageModel: .ngram(.init(prefix: self.downloadedInputN5LMDir.path + "/lm_", n: 5, d: 0.75)), beamSize: 16, topK: 32, nBest: 3