fix: Kiwi v0.23.0 지원 및 Functional Options 패턴 적용 (Resolves #41)

.github/workflows/ci.yaml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - '1.23'
+          - '1.26'
         os:
           - ubuntu-latest
           - macos-latest

Makefile

@@ -1,4 +1,4 @@
-KIWI_VERSION := v0.21.0
+KIWI_VERSION := v0.23.0
 
 .PHONY: test
 test: base/default.dict
@@ -7,7 +7,8 @@ test: base/default.dict
 base/default.dict:
 	curl -L https://github.com/bab2min/Kiwi/releases/download/$(KIWI_VERSION)/kiwi_model_$(KIWI_VERSION)_base.tgz --output model.tgz
 	tar --no-same-owner -xzvf model.tgz
-	rm -f model.tgz
+	mv models/cong/base ./base
+	rm -rf models model.tgz
 
 
 .PHONY: install-kiwi

go.mod

@@ -1,6 +1,6 @@
 module github.com/codingpot/kiwigo
 
-go 1.23
+go 1.26
 
 require (
 	github.com/google/go-cmp v0.6.0
@@ -12,4 +12,3 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )
-

kiwi.go

@@ -33,19 +33,127 @@ const (
 	KIWI_BUILD_DEFAULT             BuildOption = C.KIWI_BUILD_DEFAULT
 )
 
-// AnalyzeOption is a bitwise OR of the KiwiAnalyzeOption values.
-type AnalyzeOption int
+// MatchOption is a bitwise OR of the KiwiMatchOption values.
+type MatchOption int
 
 const (
-	KIWI_MATCH_URL                  AnalyzeOption = C.KIWI_MATCH_URL
-	KIWI_MATCH_EMAIL                AnalyzeOption = C.KIWI_MATCH_EMAIL
-	KIWI_MATCH_HASHTAG              AnalyzeOption = C.KIWI_MATCH_HASHTAG
-	KIWI_MATCH_MENTION              AnalyzeOption = C.KIWI_MATCH_MENTION
-	KIWI_MATCH_ALL                  AnalyzeOption = C.KIWI_MATCH_ALL
-	KIWI_MATCH_NORMALIZE_CODA       AnalyzeOption = C.KIWI_MATCH_NORMALIZE_CODA
-	KIWI_MATCH_ALL_WITH_NORMALIZING AnalyzeOption = C.KIWI_MATCH_ALL_WITH_NORMALIZING
+	KIWI_MATCH_URL                  MatchOption = C.KIWI_MATCH_URL
+	KIWI_MATCH_EMAIL                MatchOption = C.KIWI_MATCH_EMAIL
+	KIWI_MATCH_HASHTAG              MatchOption = C.KIWI_MATCH_HASHTAG
+	KIWI_MATCH_MENTION              MatchOption = C.KIWI_MATCH_MENTION
+	KIWI_MATCH_ALL                  MatchOption = C.KIWI_MATCH_ALL
+	KIWI_MATCH_NORMALIZE_CODA       MatchOption = C.KIWI_MATCH_NORMALIZE_CODA
+	KIWI_MATCH_ALL_WITH_NORMALIZING MatchOption = C.KIWI_MATCH_ALL_WITH_NORMALIZING
 )
 
+// Dialect represents a dialect in the Kiwi API.
+type Dialect int
+
+const (
+	DialectStandard    Dialect = 0 // KIWI_DIALECT_STANDARD
+	DialectGyeonggi    Dialect = 1 << 0
+	DialectChungcheong Dialect = 1 << 1
+	DialectGangwon     Dialect = 1 << 2
+	DialectGyeongsang  Dialect = 1 << 3
+	DialectJeolla      Dialect = 1 << 4
+	DialectJeju        Dialect = 1 << 5
+	DialectHwanghae    Dialect = 1 << 6
+	DialectHamgyeong   Dialect = 1 << 7
+	DialectPyeongan    Dialect = 1 << 8
+	DialectArchaic     Dialect = 1 << 9
+	DialectAll         Dialect = (1<<9)*2 - 1
+)
+
+const (
+	// Default values derived from Kiwi C-API defaults (include/kiwi/capi.h).
+	// For detailed information on these parameters, refer to:
+	// https://github.com/bab2min/Kiwi/blob/main/include/kiwi/capi.h
+	DefaultDialectCost   float32 = 3.0 // Default penalty for dialect words (dialect_cost)
+	DefaultTypoThreshold float32 = 2.5 // Default cost threshold for typo correction (typo_threshold)
+	DefaultNumThread     int     = 0   // Default number of threads (0 means auto-detect based on CPU cores)
+	DefaultTopN          int     = 1   // Default number of results to return from Analyze
+)
+
+// Option represents a configuration function for Kiwi initialization.
+type Option func(*kiwiOptions)
+
+type kiwiOptions struct {
+	buildOptions BuildOption
+	dialects     Dialect
+	numThread    int
+}
+
+// WithBuildOption sets the BuildOption for initialization.
+func WithBuildOption(options BuildOption) Option {
+	return func(opts *kiwiOptions) {
+		opts.buildOptions = options
+	}
+}
+
+// WithDialect sets the allowed dialects for initialization.
+func WithDialect(dialects Dialect) Option {
+	return func(opts *kiwiOptions) {
+		opts.dialects = dialects
+	}
+}
+
+// WithNumThread sets the number of threads for initialization.
+// A value of 0 tells Kiwi to automatically use all available CPU cores.
+func WithNumThread(threads int) Option {
+	return func(opts *kiwiOptions) {
+		opts.numThread = threads
+	}
+}
+
+// AnalyzeOptionFunc represents a configuration function for Analyze.
+type AnalyzeOptionFunc func(*AnalyzeOptions)
+
+// WithMatchOption sets the MatchOption for Analyze.
+func WithMatchOption(options MatchOption) AnalyzeOptionFunc {
+	return func(opts *AnalyzeOptions) {
+		opts.MatchOptions = options
+	}
+}
+
+// WithDialectCost sets the dialect cost for Analyze.
+func WithDialectCost(cost float32) AnalyzeOptionFunc {
+	return func(opts *AnalyzeOptions) {
+		opts.DialectCost = cost
+	}
+}
+
+// WithTypoThreshold sets the typo threshold for Analyze.
+func WithTypoThreshold(threshold float32) AnalyzeOptionFunc {
+	return func(opts *AnalyzeOptions) {
+		opts.TypoThreshold = threshold
+	}
+}
+
+// WithTopN sets the maximum number of results to return from Analyze.
+func WithTopN(n int) AnalyzeOptionFunc {
+	return func(opts *AnalyzeOptions) {
+		opts.TopN = n
+	}
+}
+
+// AnalyzeOptions provides configuration for the Analyze function.
+type AnalyzeOptions struct {
+	MatchOptions  MatchOption
+	DialectCost   float32
+	TypoThreshold float32
+	TopN          int
+}
+
+// DefaultAnalyzeOptions returns the default AnalyzeOptions recommended by Kiwi.
+func DefaultAnalyzeOptions() AnalyzeOptions {
+	return AnalyzeOptions{
+		MatchOptions:  KIWI_MATCH_ALL,
+		DialectCost:   DefaultDialectCost,
+		TypoThreshold: DefaultTypoThreshold,
+		TopN:          DefaultTopN,
+	}
+}
+
 // KiwiVersion returns the version of the kiwi library.
 func KiwiVersion() string {
 	return C.GoString(C.kiwi_version())
@@ -68,9 +176,18 @@ type Kiwi struct {
 
 // New returns a new Kiwi instance.
 // Don't forget to call Close after this.
-func New(modelPath string, numThread int, options BuildOption) *Kiwi {
+func New(modelPath string, opts ...Option) *Kiwi {
+	options := kiwiOptions{
+		buildOptions: KIWI_BUILD_DEFAULT,
+		dialects:     DialectStandard,
+		numThread:    DefaultNumThread,
+	}
+	for _, opt := range opts {
+		opt(&options)
+	}
+
 	return &Kiwi{
-		handler: C.kiwi_init(C.CString(modelPath), C.int(numThread), C.int(options)),
+		handler: C.kiwi_init(C.CString(modelPath), C.int(options.numThread), C.int(options.buildOptions), C.int(options.dialects)),
 	}
 }
 
@@ -93,16 +210,26 @@ type TokenResult struct {
 }
 
 // Analyze returns the result of the analysis.
-func (k *Kiwi) Analyze(text string, topN int, options AnalyzeOption) ([]TokenResult, error) {
+func (k *Kiwi) Analyze(text string, opts ...AnalyzeOptionFunc) ([]TokenResult, error) {
 	var (
-		blocklist    C.kiwi_morphset_h
 		pretokenized C.kiwi_pretokenized_h
 		cText        = C.CString(text)
 	)
 
+	options := DefaultAnalyzeOptions()
+	for _, opt := range opts {
+		opt(&options)
+	}
+
 	defer C.free(unsafe.Pointer(cText))
 
-	kiwiResH := C.kiwi_analyze(k.handler, cText, C.int(topN), C.int(options), blocklist, pretokenized)
+	cOptions := C.kiwi_analyze_option_t{
+		match_options:  C.int(options.MatchOptions),
+		dialect_cost:   C.float(options.DialectCost),
+		typo_threshold: C.float(options.TypoThreshold),
+	}
+
+	kiwiResH := C.kiwi_analyze(k.handler, cText, C.int(options.TopN), cOptions, pretokenized)
 	if kiwiResH == nil {
 		return nil, fmt.Errorf("failed to analyze text")
 	}
@@ -152,7 +279,7 @@ type SplitResult struct {
 }
 
 // SplitSentence returns the line of sentences.
-func (k *Kiwi) SplitSentence(text string, options AnalyzeOption) ([]SplitResult, error) {
+func (k *Kiwi) SplitSentence(text string, options MatchOption) ([]SplitResult, error) {
 	cText := C.CString(text)
 	defer C.free(unsafe.Pointer(cText))
 
@@ -207,9 +334,18 @@ type KiwiBuilder struct {
 
 // NewBuilder returns a new KiwiBuilder instance.
 // Don't forget to call Close after this.
-func NewBuilder(modelPath string, numThread int, options BuildOption) *KiwiBuilder {
+func NewBuilder(modelPath string, opts ...Option) *KiwiBuilder {
+	options := kiwiOptions{
+		buildOptions: KIWI_BUILD_DEFAULT,
+		dialects:     DialectStandard,
+		numThread:    DefaultNumThread,
+	}
+	for _, opt := range opts {
+		opt(&options)
+	}
+
 	return &KiwiBuilder{
-		handler: C.kiwi_builder_init(C.CString(modelPath), C.int(numThread), C.int(options)),
+		handler: C.kiwi_builder_init(C.CString(modelPath), C.int(options.numThread), C.int(options.buildOptions), C.int(options.dialects)),
 	}
 }
 
@@ -292,7 +428,8 @@ func (kb *KiwiBuilder) ExtractWords(readSeeker io.ReadSeeker, minCnt int, maxWor
 		kb.handler,
 		C.kiwi_reader_t(C.KiwiReaderBridge),
 		unsafe.Pointer(h),
-		C.int(minCnt), C.int(maxWordLen), C.float(minScore), C.float(posThreshold))
+		C.int(minCnt), C.int(maxWordLen), C.float(minScore), C.float(posThreshold),
+	)
 	defer C.kiwi_ws_close(kiwiWsH)
 
 	resSize := int(C.kiwi_ws_size(kiwiWsH))

kiwi_example_test.go

@@ -7,13 +7,13 @@ import (
 )
 
 func Example() {
-	kb := kiwi.NewBuilder("./base", 1 /*=numThread*/, kiwi.KIWI_BUILD_INTEGRATE_ALLOMORPH /*=options*/)
+	kb := kiwi.NewBuilder("./base", kiwi.WithNumThread(1), kiwi.WithBuildOption(kiwi.KIWI_BUILD_INTEGRATE_ALLOMORPH))
 	kb.AddWord("코딩냄비", "NNP", 0)
 
 	k := kb.Build()
 	defer k.Close() // don't forget to Close()!
 
-	results, _ := k.Analyze("안녕하세요 코딩냄비입니다. 부글부글.", 1 /*=topN*/, kiwi.KIWI_MATCH_ALL)
+	results, _ := k.Analyze("안녕하세요 코딩냄비입니다. 부글부글.")
 
 	// Print tokens without the score to avoid floating-point output issues
 	if len(results) > 0 {