Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vvm-async-api] Add: ユーザー辞書APIを追加 #538

Merged
merged 161 commits into from
Jul 22, 2023
Merged
Show file tree
Hide file tree
Changes from 153 commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
d2bf8a0
Add: ユーザー辞書を追加
sevenc-nanashi Jul 8, 2023
046ed4b
Add: テストを追加
sevenc-nanashi Jul 8, 2023
b21e3c9
Merge: project-vvm-async-api -> add/user-dict
sevenc-nanashi Jul 8, 2023
41c5196
Add: C APIの定義を追加
sevenc-nanashi Jul 8, 2023
c3264dc
Add: OpenJtalkのロード関数を定義
sevenc-nanashi Jul 8, 2023
95bd63c
Fix: 引数を修正
sevenc-nanashi Jul 8, 2023
b77d5f5
Fix: store_fileをmutに
sevenc-nanashi Jul 8, 2023
e480d71
Fix: 書き込みを削除
sevenc-nanashi Jul 8, 2023
ca4c42c
Change: export_json -> get_words_json
sevenc-nanashi Jul 8, 2023
a89e01c
Change: 不明な単語はエラーにするように
sevenc-nanashi Jul 8, 2023
a288309
Add: voicevox_dict_mergeを追加
sevenc-nanashi Jul 8, 2023
357d69f
Change: エラーを細分化
sevenc-nanashi Jul 8, 2023
e564439
Add: コメントを追加
sevenc-nanashi Jul 8, 2023
2a6da7a
Add: C APIがわにもコメントを追加
sevenc-nanashi Jul 8, 2023
9887c9f
Change: serdeのケース変換を使うように
sevenc-nanashi Jul 8, 2023
ff54649
Add: C APIの一部を実装
sevenc-nanashi Jul 8, 2023
7ece260
Add: alter_wordを実装
sevenc-nanashi Jul 8, 2023
3f192ca
Add: remove_wordを実装
sevenc-nanashi Jul 8, 2023
1b2b1ee
Add: get_words_jsonを実装
sevenc-nanashi Jul 8, 2023
5ec5273
Add: mergeを実装
sevenc-nanashi Jul 8, 2023
3f08b8d
WIP: テストを実装
sevenc-nanashi Jul 9, 2023
fc874d3
Change: alter_word -> update_word
sevenc-nanashi Jul 9, 2023
cba57cb
Add: e2eテストを追加
sevenc-nanashi Jul 9, 2023
9383b87
Update: ヘッダを更新
sevenc-nanashi Jul 9, 2023
74db61f
Code: フォーマット
sevenc-nanashi Jul 9, 2023
2766df1
Code: 未使用のenumを削除
sevenc-nanashi Jul 9, 2023
3152592
WIP: OpenJTalkへの読み込みを追加
sevenc-nanashi Jul 9, 2023
dd756cd
Change: 整数型を変更
sevenc-nanashi Jul 9, 2023
1922b40
Add: 読み込み機構を実装
sevenc-nanashi Jul 9, 2023
1ea2082
Add: --quietを追加
sevenc-nanashi Jul 9, 2023
95de7c2
Add: C APIを実装
sevenc-nanashi Jul 9, 2023
96f1036
Change: user_dict.rs -> user_dict_manipulate.rs
sevenc-nanashi Jul 9, 2023
fe99908
WIP: テストを追加
sevenc-nanashi Jul 9, 2023
caeef6f
Change: 書き方を変更
sevenc-nanashi Jul 9, 2023
abca0c5
Change: tempfileのバージョン指定を変更
sevenc-nanashi Jul 9, 2023
b4e3081
Update: C APIのヘッダーを更新
sevenc-nanashi Jul 9, 2023
22d2d65
Add: dropする関数を追加
sevenc-nanashi Jul 9, 2023
48d4237
Code: コードフォーマット
sevenc-nanashi Jul 9, 2023
ee6a62c
Fix: スナップショットを修正
sevenc-nanashi Jul 9, 2023
9090625
Fix: スナップショットの指定を修正
sevenc-nanashi Jul 9, 2023
cf57332
Add: ユーザー辞書APIのPython APIを実装
sevenc-nanashi Jul 9, 2023
5ea8699
Fix: user_dict_manipulateのsnapshotを追加
sevenc-nanashi Jul 9, 2023
333fa86
Add: テストを追加
sevenc-nanashi Jul 9, 2023
0da6a19
Fix: deseriarize処理を変更
sevenc-nanashi Jul 9, 2023
3b69a31
Code: useの順番を変更
sevenc-nanashi Jul 9, 2023
907846c
Fix: stderrは出ないのを修正
sevenc-nanashi Jul 9, 2023
3ca293d
Fix: Windowsでのテストを修正
sevenc-nanashi Jul 9, 2023
34c1acb
Add: エラーメッセージに元のエラーを入れるように
sevenc-nanashi Jul 9, 2023
0ec3b2e
(確認用)
sevenc-nanashi Jul 9, 2023
fc0cc1e
Code: cargo fmt
sevenc-nanashi Jul 9, 2023
fb343c4
Fix: 消し忘れ
sevenc-nanashi Jul 9, 2023
3aeb46a
Change: MaybeUninitを使うように
sevenc-nanashi Jul 9, 2023
b096ee6
Change: CStringを使うように
sevenc-nanashi Jul 9, 2023
9c550dd
Fix: 一時ファイルが残らないように
sevenc-nanashi Jul 9, 2023
3cbbbad
Add: コメントを追加
sevenc-nanashi Jul 9, 2023
da7fad0
Update crates/voicevox_core/src/engine/open_jtalk.rs
sevenc-nanashi Jul 9, 2023
a5fc43c
Update crates/voicevox_core/src/engine/open_jtalk.rs
sevenc-nanashi Jul 9, 2023
bed56f8
Change: ユーザー辞書と分かるように
sevenc-nanashi Jul 10, 2023
7aea158
Change: C APIのstructをunsignedに
sevenc-nanashi Jul 10, 2023
31e8e25
Change: 削除から廃棄に
sevenc-nanashi Jul 10, 2023
fd99385
Add: コメントを追加
sevenc-nanashi Jul 10, 2023
a671d45
Change: user_dict -> user_dict_load
sevenc-nanashi Jul 10, 2023
a6dbf57
Update: symbols.rsを更新
sevenc-nanashi Jul 10, 2023
70fd49d
Change: merge -> import
sevenc-nanashi Jul 10, 2023
e483cc1
Change: saveとloadを追加
sevenc-nanashi Jul 10, 2023
2d93628
Update: Python APIを更新
sevenc-nanashi Jul 10, 2023
f44a8c6
Code: cargo fmt
sevenc-nanashi Jul 10, 2023
5934ea0
Change: &'static strを使うように
sevenc-nanashi Jul 10, 2023
434618c
Add: 辞書の変更周りのコメントを追加
sevenc-nanashi Jul 10, 2023
19d6a5b
Add: 元実装のURLを追加
sevenc-nanashi Jul 10, 2023
da1584a
Add: 関数のドキュメントを追加
sevenc-nanashi Jul 10, 2023
3e77c56
Add: to_mecab_formatのテストを追加
sevenc-nanashi Jul 10, 2023
d7651f7
Update: open_jtalk-rsを更新
sevenc-nanashi Jul 10, 2023
1fa792e
Update: C APIのヘッダーを更新
sevenc-nanashi Jul 10, 2023
0cd4cb7
Change: 何を表してるか分かりやすく
sevenc-nanashi Jul 10, 2023
79baf97
Update crates/voicevox_core_python_api/python/test/test_user_dict_loa…
sevenc-nanashi Jul 10, 2023
40597e3
Add: 全角スペースの変換を追加
sevenc-nanashi Jul 10, 2023
30292ec
Change: エラーの名前を変更
sevenc-nanashi Jul 10, 2023
3681aa1
Merge: 変更をマージ
sevenc-nanashi Jul 10, 2023
692e832
Code: cargo fmt
sevenc-nanashi Jul 10, 2023
e653c62
Change: derive(Default)を使う用に
sevenc-nanashi Jul 11, 2023
f313007
Change: 文字列メモリの解放周りを修正
sevenc-nanashi Jul 11, 2023
1296adf
Fix: e2eテスト内のメモリリークを修正
sevenc-nanashi Jul 11, 2023
5bbfa6d
Update: C APIのヘッダーを更新
sevenc-nanashi Jul 11, 2023
58d4d8c
(printデバッグ)
sevenc-nanashi Jul 11, 2023
760ab88
Revert: printデバッグ
sevenc-nanashi Jul 11, 2023
41b967f
Change: to_owned -> to_string
sevenc-nanashi Jul 11, 2023
d07385e
(検証:freeしないと?)
sevenc-nanashi Jul 12, 2023
54cf888
(検証:cloneすると?)
sevenc-nanashi Jul 12, 2023
0cda9b4
Fix: ;忘れ
sevenc-nanashi Jul 12, 2023
8cb69fc
Fix: freeの引数を修正
sevenc-nanashi Jul 12, 2023
429c89a
Revert: cloneはだめっぽい
sevenc-nanashi Jul 12, 2023
c75b58e
Change: MaybeUninitを使う用に
sevenc-nanashi Jul 12, 2023
a6a5045
Add: jsonパースか農家の確認を追加
sevenc-nanashi Jul 12, 2023
93588ad
Fix: 文字列渡しを修正
sevenc-nanashi Jul 12, 2023
814694e
Code: cargo fmt
sevenc-nanashi Jul 12, 2023
dd05a77
Update crates/voicevox_core_c_api/src/lib.rs
sevenc-nanashi Jul 12, 2023
a14498e
Update crates/voicevox_core_c_api/tests/e2e/testcases/user_dict_manip…
sevenc-nanashi Jul 12, 2023
69b0e5c
Update crates/voicevox_core_c_api/src/lib.rs
sevenc-nanashi Jul 12, 2023
80dcbe6
Update crates/voicevox_core_c_api/tests/e2e/testcases/user_dict_manip…
sevenc-nanashi Jul 12, 2023
f06bbfd
Revert: 69b0e5cd34c8aaa98c548815598b83aaf0e73a1f
sevenc-nanashi Jul 13, 2023
b6505fe
Change: voicevox_user_dict_word_makeに変更
sevenc-nanashi Jul 13, 2023
6c8d210
Update: voicevox/open_jtalk-rs#15のマージに追従
sevenc-nanashi Jul 13, 2023
ecf556e
Change: add_wordの型を変更
sevenc-nanashi Jul 13, 2023
337e1a6
Update crates/voicevox_core_c_api/src/lib.rs
sevenc-nanashi Jul 13, 2023
e51fcc4
Change: UUIDをそれぞれの専用の型に
sevenc-nanashi Jul 14, 2023
b9c624e
Change: uuidの変換をfeature提供のものに
sevenc-nanashi Jul 14, 2023
b8d51b1
Update: cargo xtask update-header
sevenc-nanashi Jul 14, 2023
ba402ce
Code: cargo fmt
sevenc-nanashi Jul 14, 2023
4ddb6d7
Update: 型定義を更新
sevenc-nanashi Jul 14, 2023
c95f1bf
Fix: ignoreされなかったのを修正
sevenc-nanashi Jul 14, 2023
73d7599
Update crates/voicevox_core/src/user_dict/dict.rs
sevenc-nanashi Jul 14, 2023
d1cab57
Update crates/voicevox_core/src/user_dict/part_of_speech_data.rs
sevenc-nanashi Jul 14, 2023
131fe0c
Merge: リモートの変更をマージ
sevenc-nanashi Jul 14, 2023
a2c142e
Change: fs_errを使うように
sevenc-nanashi Jul 14, 2023
22fcef2
Change: to_owned -> *
sevenc-nanashi Jul 14, 2023
7ca12cf
Change: itertoolsを使う用に*
sevenc-nanashi Jul 14, 2023
736e9e1
Change: mora_countの正規表現をonce_cell::Lazyで囲むように
sevenc-nanashi Jul 14, 2023
5881260
Refactor: to_zenkakuの処理をリファクタ
sevenc-nanashi Jul 14, 2023
c925fb5
Fix: Python APIが動かなかったのを修正
sevenc-nanashi Jul 14, 2023
db55f98
Add: user_dict_manipulateのPython版を追加
sevenc-nanashi Jul 14, 2023
3d31e2f
Change: Uuid::parse_strからstr#parseに
sevenc-nanashi Jul 14, 2023
67b7327
Update crates/voicevox_core/src/user_dict/word.rs
sevenc-nanashi Jul 15, 2023
1bd15ca
Change: voicevox_user_dict_newは辞書をそのまま返すように
sevenc-nanashi Jul 15, 2023
7aa19d8
Merge: リモートの変更をマージ
sevenc-nanashi Jul 15, 2023
1eec70d
Change: deriveするように
sevenc-nanashi Jul 15, 2023
bf8a9ad
Change: dataclassベースに
sevenc-nanashi Jul 15, 2023
74c0fd0
Update crates/voicevox_core_c_api/tests/e2e/testcases/user_dict_load.rs
sevenc-nanashi Jul 15, 2023
4f1a94e
Update crates/voicevox_core_python_api/src/lib.rs
sevenc-nanashi Jul 15, 2023
cca4d21
Change: wordsの実装を変更
sevenc-nanashi Jul 15, 2023
c7d5469
Fix: use忘れ
sevenc-nanashi Jul 15, 2023
39594e8
Add: Defaultをderive
sevenc-nanashi Jul 15, 2023
aeee234
Change: IndexMapに
sevenc-nanashi Jul 15, 2023
8d1a962
Change: OpenJTalkの辞書ロードをsetに
sevenc-nanashi Jul 15, 2023
a282e63
Update crates/voicevox_core/src/user_dict/dict.rs
sevenc-nanashi Jul 15, 2023
2fbefe2
Change: OpenJTalkの辞書ロードをuseに
sevenc-nanashi Jul 15, 2023
08b89b6
Merge: リモートの変更をマージ
sevenc-nanashi Jul 15, 2023
1acd2bd
Change: WordNotFound -> UnknownWord
sevenc-nanashi Jul 15, 2023
aa0f604
Change: HashMapからIndexMapに
sevenc-nanashi Jul 16, 2023
6c04326
Fix: エラー周りを修正
sevenc-nanashi Jul 17, 2023
a40c804
Fix: 開放 -> 解放
sevenc-nanashi Jul 17, 2023
53d50af
Update crates/voicevox_core/src/user_dict/part_of_speech_data.rs
sevenc-nanashi Jul 18, 2023
570dda2
Change: serde_jsonで変換するように
sevenc-nanashi Jul 18, 2023
ffd1b42
Change: get_json -> to_json
sevenc-nanashi Jul 18, 2023
7b90c5a
Change: PyResultを返すように
sevenc-nanashi Jul 18, 2023
ca05589
Update: cargo xtask update-c-header
sevenc-nanashi Jul 18, 2023
1ff291d
Change: TODOの内容を変更
sevenc-nanashi Jul 18, 2023
1186436
Change: Deseriarizeの処理を変更
sevenc-nanashi Jul 19, 2023
0ed9220
Add: バリデーションのテストを追加
sevenc-nanashi Jul 19, 2023
7f09298
Fix: C APIがビルドできないのを修正
sevenc-nanashi Jul 19, 2023
244e31b
Change: UserDictWord::newでエラーを返すように
sevenc-nanashi Jul 19, 2023
2d9e33a
RUST_BACKTRACE=fullを追加
Hiroshiba Jul 19, 2023
404f7be
Update crates/voicevox_core_c_api/tests/e2e/testcases/user_dict_load.rs
sevenc-nanashi Jul 19, 2023
ecbbb07
Update crates/voicevox_core/src/user_dict/dict.rs
sevenc-nanashi Jul 20, 2023
5bbaf56
Change: unwrap() -> ?
sevenc-nanashi Jul 20, 2023
916b643
Change: .get(i).unwrap() -> [i]
sevenc-nanashi Jul 20, 2023
e004239
Change: &String[..] -> &String (&str)
sevenc-nanashi Jul 20, 2023
d13f2a5
Change: 一部の関数をimplの外に移動
sevenc-nanashi Jul 20, 2023
e720055
Change: Vecのクローンからstaticなi32のスライスに
sevenc-nanashi Jul 20, 2023
0578d4a
Change: UserDictWord::newのsurfaceを&strに
sevenc-nanashi Jul 20, 2023
9271be1
Update crates/voicevox_core/src/user_dict/dict.rs
sevenc-nanashi Jul 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
# cargoのキャッシュが原因でテストが失敗する場合はバージョン部分をカウントアップすること
key: "v2-cargo-test-cache-${{ matrix.features }}-${{ matrix.os }}"
- name: Run cargo test
run: cargo test -vv --features ,${{ matrix.features }} -- --include-ignored
run: RUST_BACKTRACE=full cargo test -vv --features ,${{ matrix.features }} -- --include-ignored

c-header:
runs-on: ubuntu-latest
Expand Down
142 changes: 115 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,18 @@ clap = { version = "4.0.10", features = ["derive"] }
const-default = { version = "1.0.0", features = ["derive"] }
easy-ext = "1.0.1"
fs-err = { version = "2.9.0", features = ["tokio"] }
itertools = "0.10.5"
once_cell = "1.15.0"
regex = "1.6.0"
serde = { version = "1.0.145", features = ["derive"] }
serde_json = { version = "1.0.85", features = ["preserve_order"] }
strum = { version = "0.24.1", features = ["derive"] }
tempfile = "3.6.0"
test_util = { path = "crates/test_util" }
thiserror = "1.0.37"
tracing = { version = "0.1.37", features = ["log"] }
tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
uuid = { version = "1.4.0", features = ["v4", "serde"] }
voicevox_core = { path = "crates/voicevox_core" }
tokio = { version = "1.25.0", features = ["rt", "rt-multi-thread", "macros", "sync"] }
derive-getters = "0.2.0"
Expand Down
Loading