-
Notifications
You must be signed in to change notification settings - Fork 39
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
Feature/set asr properties #263
Open
Yamakuprina
wants to merge
8
commits into
master
Choose a base branch
from
feature/set-asr-properties
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
19d82a2
feature: add set asr properties telephony reaction
Yamakuprina e1043b8
feature: add asr properties in asr provider config
Yamakuprina 2d80c1c
feature: support asr properties for tinkoff asr
Yamakuprina 0e2aa38
fix: added token data to asr config
Yamakuprina f672603
bump version
Yamakuprina c379103
docs: update asr config doc params
Yamakuprina 5e84b20
add: set asr properties handler
Yamakuprina e7864b9
refactor: SetAsrPropertiesHandler config handling
Yamakuprina File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
164 changes: 164 additions & 0 deletions
164
.../main/kotlin/com/justai/jaicf/channel/jaicp/reactions/handlers/SetAsrPropertiesHandler.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| package com.justai.jaicf.channel.jaicp.reactions.handlers | ||
|
|
||
| import com.justai.jaicf.channel.jaicp.dto.config.* | ||
| import kotlinx.serialization.json.JsonObject | ||
| import kotlinx.serialization.json.JsonPrimitive | ||
|
|
||
| class SetAsrPropertiesHandler { | ||
|
|
||
| private val setAsrPropertiesHandlerSber = SetAsrPropertiesHandlerSber() | ||
| private val setAsrPropertiesHandlerYandex = SetAsrPropertiesHandlerYandex() | ||
| private val setAsrPropertiesHandlerGoogle = SetAsrPropertiesHandlerGoogle() | ||
| private val setAsrPropertiesHandlerMts = SetAsrPropertiesHandlerMts() | ||
| private val setAsrPropertiesHandlerZitech = SetAsrPropertiesHandlerZitech() | ||
| private val setAsrPropertiesHandlerAimyvoice = SetAsrPropertiesHandlerAimyvoice() | ||
| private val setAsrPropertiesHandlerAzure = SetAsrPropertiesHandlerAzure() | ||
| private val setAsrPropertiesHandlerAsm = SetAsrPropertiesHandlerAsm() | ||
| private val setAsrPropertiesHandlerKaldi = SetAsrPropertiesHandlerKaldi() | ||
| private val setAsrPropertiesHandlerTinkoff = SetAsrPropertiesHandlerTinkoff() | ||
|
|
||
| fun handle(properties: Map<String, String>, asrConfig: AsrConfig): AsrConfig { | ||
| val propertiesJson = JsonObject(properties.toMutableMap().mapValues { entry -> JsonPrimitive(entry.value) }) | ||
| return when (checkNotNull(asrConfig.type)) { | ||
| AsrConfig.AsrProviderType.SBER -> { | ||
| setAsrPropertiesHandlerSber.handle(asrConfig, propertiesJson) | ||
| } | ||
|
|
||
| AsrConfig.AsrProviderType.YANDEX -> { | ||
| setAsrPropertiesHandlerYandex.handle(asrConfig, propertiesJson) | ||
| } | ||
|
|
||
| AsrConfig.AsrProviderType.GOOGLE -> { | ||
| setAsrPropertiesHandlerGoogle.handle(asrConfig, propertiesJson) | ||
| } | ||
|
|
||
| AsrConfig.AsrProviderType.MTS -> { | ||
| setAsrPropertiesHandlerMts.handle(asrConfig, propertiesJson) | ||
| } | ||
|
|
||
| AsrConfig.AsrProviderType.ZITECH -> { | ||
| setAsrPropertiesHandlerZitech.handle(asrConfig, propertiesJson) | ||
| } | ||
|
|
||
| AsrConfig.AsrProviderType.AIMYVOICE -> { | ||
| setAsrPropertiesHandlerAimyvoice.handle(asrConfig, propertiesJson) | ||
| } | ||
|
|
||
| AsrConfig.AsrProviderType.AZURE -> { | ||
| setAsrPropertiesHandlerAzure.handle(asrConfig, propertiesJson) | ||
| } | ||
|
|
||
| AsrConfig.AsrProviderType.ASM -> { | ||
| setAsrPropertiesHandlerAsm.handle(asrConfig, propertiesJson) | ||
| } | ||
|
|
||
| AsrConfig.AsrProviderType.TINKOFF -> { | ||
| setAsrPropertiesHandlerTinkoff.handle(asrConfig, propertiesJson) | ||
| } | ||
|
|
||
| AsrConfig.AsrProviderType.KALDI -> { | ||
| setAsrPropertiesHandlerKaldi.handle(asrConfig, propertiesJson) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| abstract class SetAsrPropertiesHandlerAbstract { | ||
| abstract fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig | ||
| } | ||
|
|
||
| class SetAsrPropertiesHandlerSber() : SetAsrPropertiesHandlerAbstract() { | ||
| override fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig { | ||
| val asrProviderConfig: AsrSberConfig = checkNotNull(asrConfig.sber) | ||
| return asrConfig.copy( | ||
| asrProperties = propertiesJson, | ||
| sber = asrProviderConfig.copy(asrProperties = propertiesJson) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| class SetAsrPropertiesHandlerYandex() : SetAsrPropertiesHandlerAbstract() { | ||
| override fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig { | ||
| val asrProviderConfig: AsrYandexConfig = checkNotNull(asrConfig.yandex) | ||
| return asrConfig.copy( | ||
| asrProperties = propertiesJson, | ||
| yandex = asrProviderConfig.copy(asrProperties = propertiesJson) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| class SetAsrPropertiesHandlerGoogle() : SetAsrPropertiesHandlerAbstract() { | ||
| override fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig { | ||
| val asrProviderConfig: AsrGoogleConfig = checkNotNull(asrConfig.google) | ||
| return asrConfig.copy( | ||
| asrProperties = propertiesJson, | ||
| google = asrProviderConfig.copy(asrProperties = propertiesJson) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| class SetAsrPropertiesHandlerMts() : SetAsrPropertiesHandlerAbstract() { | ||
| override fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig { | ||
| val asrProviderConfig: AsrMtsConfig = checkNotNull(asrConfig.mts) | ||
| return asrConfig.copy( | ||
| asrProperties = propertiesJson, | ||
| mts = asrProviderConfig.copy(asrProperties = propertiesJson) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| class SetAsrPropertiesHandlerZitech() : SetAsrPropertiesHandlerAbstract() { | ||
| override fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig { | ||
| val asrProviderConfig: AsrZitechConfig = checkNotNull(asrConfig.zitech) | ||
| return asrConfig.copy( | ||
| asrProperties = propertiesJson, | ||
| zitech = asrProviderConfig.copy(asrProperties = propertiesJson) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| class SetAsrPropertiesHandlerAimyvoice() : SetAsrPropertiesHandlerAbstract() { | ||
| override fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig { | ||
| val asrProviderConfig: AsrAimyvoiceConfig = checkNotNull(asrConfig.aimyvoice) | ||
| return asrConfig.copy( | ||
| asrProperties = propertiesJson, | ||
| aimyvoice = asrProviderConfig.copy(asrProperties = propertiesJson) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| class SetAsrPropertiesHandlerAzure() : SetAsrPropertiesHandlerAbstract() { | ||
| override fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig { | ||
| val asrProviderConfig: AsrAzureConfig = checkNotNull(asrConfig.azure) | ||
| return asrConfig.copy( | ||
| asrProperties = propertiesJson, | ||
| azure = asrProviderConfig.copy(asrProperties = propertiesJson) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| class SetAsrPropertiesHandlerAsm() : SetAsrPropertiesHandlerAbstract() { | ||
| override fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig { | ||
| val asrProviderConfig: AsrAsmConfig = checkNotNull(asrConfig.asm) | ||
| return asrConfig.copy( | ||
| asrProperties = propertiesJson, | ||
| asm = asrProviderConfig.copy(asrProperties = propertiesJson) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| class SetAsrPropertiesHandlerKaldi() : SetAsrPropertiesHandlerAbstract() { | ||
| override fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig { | ||
| return asrConfig.copy( | ||
| asrProperties = propertiesJson | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| class SetAsrPropertiesHandlerTinkoff() : SetAsrPropertiesHandlerAbstract() { | ||
| override fun handle(asrConfig: AsrConfig, propertiesJson: JsonObject): AsrConfig { | ||
| return asrConfig.copy( | ||
| asrProperties = propertiesJson | ||
| ) | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Главная идея - избавиться от этого when.
Условно нужно несколько моментов:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Реализовал как описано выше