From 11d774bfab9c0af431af8584921d5ca32d4ebdfb Mon Sep 17 00:00:00 2001 From: zhaokexin Date: Thu, 25 Apr 2024 17:27:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87settings=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8F=92=E4=BB=B6=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/nlp.cpp | 7 +++++-- src/speech.cpp | 2 +- src/vision.cpp | 12 +++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/nlp.cpp b/src/nlp.cpp index 896788f..586b881 100644 --- a/src/nlp.cpp +++ b/src/nlp.cpp @@ -49,9 +49,12 @@ NlpResult nlp_init_session(NlpSession session) const auto& nlpSettings = aisdk::GlobalSettings::getInstance().getChildSettings(CAPABILITY_NLP); - const std::string model = "baidu"; + const std::string model = nlpSettings.getModel(PUBLIC_CLOUD); auto config = nlpSettings.getModelConfig(PUBLIC_CLOUD, model); - return nlpSession->init(model, config.get("apiKey", "").asString(), config.get("secretKey", "").asString(), config.get("appId", "").asString()); + return nlpSession->init(model, + config.get("apiKey", "").asString(), + config.get("secretKey", "").asString(), + config.get("appId", "").asString()); } diff --git a/src/speech.cpp b/src/speech.cpp index b3fd904..e9f53e8 100644 --- a/src/speech.cpp +++ b/src/speech.cpp @@ -38,7 +38,7 @@ SpeechResult speech_init_session(SpeechSession session) { } const auto& speechSettings = aisdk::GlobalSettings::getInstance().getChildSettings(CAPABILITY_SPEECH); - const std::string model = "baidu"; + const std::string model = speechSettings.getModel(PUBLIC_CLOUD); auto config = speechSettings.getModelConfig(PUBLIC_CLOUD, model); return speechSession->init(model, config.get("apiKey", "").asString(), config.get("secretKey", "").asString(), diff --git a/src/vision.cpp b/src/vision.cpp index bd4e47b..cd58c71 100644 --- a/src/vision.cpp +++ b/src/vision.cpp @@ -41,14 +41,12 @@ VisionResult vision_init_session(VisionSession session) { } const auto& visionSettings = aisdk::GlobalSettings::getInstance().getChildSettings(CAPABILITY_VISION); - const std::string model = "baidu"; + const std::string model = visionSettings.getModel(PUBLIC_CLOUD); auto config = visionSettings.getModelConfig(PUBLIC_CLOUD, model); - - visionSession->init(visionSettings.getModel(PUBLIC_CLOUD), - config.get("apiKey", "").asString(), - config.get("secretKey", "").asString(), - config.get("appId", "").asString()); - return VISION_SUCCESS; + return visionSession->init(model, + config.get("apiKey", "").asString(), + config.get("secretKey", "").asString(), + config.get("appId", "").asString()); } void vision_set_prompt2image_callback( -- Gitee