m5/M5Module-LLM
0
0
Fork 0
mirror of https://github.com/m5stack/M5Module-LLM.git synced 2026-05-20 11:31:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from m5stack/dev

Browse Source 
Dev
This commit is contained in:
海底撩
2024-12-26 11:13:56 +08:00
committed by GitHub
parent 027aa79daa bcd23212e5
commit 6fe434b044
29 changed files with 675 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/KWS_ASR/KWS_ASR.ino
+10 -3
View File
@@ -12,15 +12,20 @@ M5ModuleLLM module_llm;
/* Must be capitalized */
String wake_up_keyword = "HELLO";
// String wake_up_keyword = "你好你好";
String kws_work_id;
String asr_work_id;
String language;
void setup()
{
M5.begin();
M5.Display.setTextSize(2);
M5.Display.setTextScroll(true);
// M5.Display.setFont(&fonts::efontCN_12); // Support Chinese display
language = "en_US";
// language = "zh_CN";
/* Init module serial port */
Serial2.begin(115200, SERIAL_8N1, 16, 17); // Basic
@@ -50,11 +55,13 @@ void setup()
M5.Display.printf(">> Setup kws..\n");
m5_module_llm::ApiKwsSetupConfig_t kws_config;
kws_config.kws = wake_up_keyword;
kws_work_id = module_llm.kws.setup(kws_config);
kws_work_id = module_llm.kws.setup(kws_config, "kws_setup", language);
/* Setup ASR module and save returned work id */
M5.Display.printf(">> Setup asr..\n");
asr_work_id = module_llm.asr.setup();
m5_module_llm::ApiAsrSetupConfig_t asr_config;
asr_config.input = {"sys.pcm", kws_work_id};
asr_work_id = module_llm.asr.setup(asr_config, "asr_setup", language);
M5.Display.printf(">> Setup ok\n>> Say \"%s\" to wakeup\n", wake_up_keyword.c_str());
}
examples/SerialTextAssistant/SerialTextAssistant.ino
+4 -1
View File
@@ -19,6 +19,7 @@ void setup()
M5.begin();
M5.Display.setTextSize(2);
M5.Display.setTextScroll(true);
// M5.Display.setFont(&fonts::efontCN_12); // Support Chinese display
/* Init usb serial */
CommSerialPort.begin(115200);
@@ -45,7 +46,9 @@ void setup()
/* Setup LLM module and save returned work id */
M5.Display.printf(">> Setup llm..\n");
llm_work_id = module_llm.llm.setup();
m5_module_llm::ApiLlmSetupConfig_t llm_config;
llm_config.max_token_len = 1023;
llm_work_id = module_llm.llm.setup(llm_config);
M5.Display.printf(">> Setup finish\n");
M5.Display.printf(">> Try send your question via usb serial port\n");
examples/TTS/TTS.ino
+8 -1
View File
@@ -9,12 +9,17 @@
M5ModuleLLM module_llm;
String tts_work_id;
String language;
void setup()
{
M5.begin();
M5.Display.setTextSize(2);
M5.Display.setTextScroll(true);
// M5.Display.setFont(&fonts::efontCN_12); // Support Chinese display
language = "en_US";
// language = "zh_CN";
/* Init module serial port */
Serial2.begin(115200, SERIAL_8N1, 16, 17); // Basic
@@ -42,7 +47,8 @@ void setup()
/* Setup TTS module and save returned work id */
M5.Display.printf(">> Setup tts..\n\n");
tts_work_id = module_llm.tts.setup();
m5_module_llm::ApiTtsSetupConfig_t tts_config;
tts_work_id = module_llm.tts.setup(tts_config, "tts_setup", language);
}
void loop()
@@ -51,6 +57,7 @@ void loop()
static int i = 0;
i++;
std::string text = std::to_string(i) + " plus " + std::to_string(i) + " equals " + std::to_string(i + i) + ".";
// std::string text = std::to_string(i) + " 加 " + std::to_string(i) + " 等于 " + std::to_string(i + i) + ".";
M5.Display.setTextColor(TFT_GREEN);
M5.Display.printf("<< %s\n\n", text.c_str());
examples/VoiceAssistant/VoiceAssistant.ino
+2
View File
@@ -14,6 +14,7 @@ M5ModuleLLM_VoiceAssistant voice_assistant(&module_llm);
void on_asr_data_input(String data, bool isFinish, int index)
{
M5.Display.setTextColor(TFT_GREEN, TFT_BLACK);
// M5.Display.setFont(&fonts::efontCN_12); // Support Chinese display
M5.Display.printf(">> %s\n", data.c_str());
/* If ASR data is finish */
@@ -59,6 +60,7 @@ void setup()
/* Begin voice assistant preset */
M5.Display.printf(">> Begin voice assistant..\n");
int ret = voice_assistant.begin("HELLO");
// int ret = voice_assistant.begin("你好你好", "", "zh_CN"); // Chinese kws and asr
if (ret != MODULE_LLM_OK) {
while (1) {
M5.Display.setTextColor(TFT_RED);
examples/YOLO/YOLO.ino
+107
View File
@@ -0,0 +1,107 @@
/*
* SPDX-FileCopyrightText: 2024 M5Stack Technology CO LTD
*
* SPDX-License-Identifier: MIT
*/
#include <Arduino.h>
#include <M5Unified.h>
#include <M5ModuleLLM.h>
#include <ArduinoJson.h>
M5ModuleLLM module_llm;
String camera_work_id;
String yolo_work_id;
void setup()
{
M5.begin();
M5.Display.setTextSize(2);
M5.Display.setTextScroll(true);
/* Init module serial port */
Serial2.begin(115200, SERIAL_8N1, 16, 17); // Basic
// Serial2.begin(115200, SERIAL_8N1, 13, 14); // Core2
// Serial2.begin(115200, SERIAL_8N1, 18, 17); // CoreS3
/* Init module */
module_llm.begin(&Serial2);
/* Make sure module is connected */
M5.Display.printf(">> Check ModuleLLM connection..\n");
while (1) {
if (module_llm.checkConnection()) {
break;
}
}
/* Reset ModuleLLM */
M5.Display.printf(">> Reset ModuleLLM..\n");
module_llm.sys.reset();
/* Setup Camera module */
M5.Display.printf(">> Setup camera..\n");
camera_work_id = module_llm.camera.setup();
/* Setup YOLO module and save returned work id */
M5.Display.printf(">> Setup yolo..\n");
m5_module_llm::ApiYoloSetupConfig_t yolo_config;
yolo_config.input = {camera_work_id};
yolo_work_id = module_llm.yolo.setup(yolo_config, "yolo_setup");
// M5.Display.printf(">> Yolo ready\n");
M5.Display.drawString("class", 10, 80);
M5.Display.drawString("confidence", 180, 80);
M5.Display.drawString("x1", 10, 110);
M5.Display.drawString("y1", 10, 140);
M5.Display.drawString("x2", 10, 170);
M5.Display.drawString("y2", 10, 200);
}
void loop()
{
/* Update ModuleLLM */
module_llm.update();
/* Handle module response messages */
for (auto& msg : module_llm.msg.responseMsgList) {
/* If YOLO module message */
if (msg.work_id == yolo_work_id) {
/* Check message object type */
if (msg.object == "yolo.box.stream") {
/* Parse message json and get YOLO result */
JsonDocument doc;
deserializeJson(doc, msg.raw_msg);
JsonArray delta = doc["data"]["delta"].as<JsonArray>();
if (delta.size() > 0) {
JsonObject result = delta[0].as<JsonObject>();
String class_name = result["class"].as<String>();
float confidence = result["confidence"].as<float>();
JsonArray bboxArray = result["bbox"].as<JsonArray>();
if (bboxArray.size() == 4) {
int x1 = bboxArray[0].as<int>();
int y1 = bboxArray[1].as<int>();
int x2 = bboxArray[2].as<int>();
int y2 = bboxArray[3].as<int>();
M5.Display.drawString(class_name, 80, 80);
M5.Display.drawFloat(confidence, 2, 200, 110);
M5.Display.drawNumber(x1, 40, 110);
M5.Display.drawNumber(y1, 40, 140);
M5.Display.drawNumber(x2, 40, 170);
M5.Display.drawNumber(y2, 40, 200);
}
} else {
M5.Display.drawString("None", 80, 80);
M5.Display.drawFloat(0, 2, 200, 110);
M5.Display.drawNumber(0, 40, 110);
M5.Display.drawNumber(0, 40, 140);
M5.Display.drawNumber(0, 40, 170);
M5.Display.drawNumber(0, 40, 200);
}
}
}
}
/* Clear handled messages */
module_llm.msg.responseMsgList.clear();
}
src/M5ModuleLLM.cpp
+6 -1
View File
@@ -14,14 +14,19 @@ bool M5ModuleLLM::begin(Stream* serialPort)
llm.init(&msg);
audio.init(&msg);
tts.init(&msg);
melotts.init(&msg);
kws.init(&msg);
asr.init(&msg);
yolo.init(&msg);
camera.init(&msg);
return true;
}
bool M5ModuleLLM::checkConnection()
{
return sys.ping() == MODULE_LLM_OK;
const bool result = (sys.ping() == MODULE_LLM_OK);
llm_version = (sys.version() == MODULE_LLM_OK);
return result;
}
void M5ModuleLLM::update()
src/M5ModuleLLM.h
+26 -1
View File
@@ -11,8 +11,12 @@
#include "api/api_llm.h"
#include "api/api_audio.h"
#include "api/api_tts.h"
#include "api/api_melotts.h"
#include "api/api_kws.h"
#include "api/api_asr.h"
#include "api/api_yolo.h"
#include "api/api_camera.h"
#include "api/api_version.h"
class M5ModuleLLM {
public:
@@ -57,12 +61,24 @@ public:
*/
m5_module_llm::ApiAudio audio;
/**
* @brief Camera module api set
*
*/
m5_module_llm::ApiCamera camera;
/**
* @brief TTS module api set
*
*/
m5_module_llm::ApiTts tts;
/**
* @brief MELOTTS module api set
*
*/
m5_module_llm::ApiMelotts melotts;
/**
* @brief KWS module api set
*
@@ -75,6 +91,12 @@ public:
*/
m5_module_llm::ApiAsr asr;
/**
* @brief YOLO module api set
*
*/
m5_module_llm::ApiYolo yolo;
/**
* @brief MSG module to handle module response message
*
@@ -93,8 +115,10 @@ private:
typedef std::function<void(void)> OnKeywordDetectedCallback_t;
typedef std::function<void(String data, bool isFinish, int index)> OnAsrDataInputCallback_t;
typedef std::function<void(String data, bool isFinish, int index)> OnLlmDataInputCallback_t;
typedef std::function<void(String data, bool isFinish, int index)> OnYoloDataInputCallback_t;
typedef std::function<void(String rawData)> OnAsrDataInputRawCallback_t;
typedef std::function<void(String rawData)> OnLlmDataInputRawCallback_t;
typedef std::function<void(String rawData)> OnYoloDataInputRawCallback_t;
/**
* @brief Voice assistant preset base on class M5ModuleLLM
@@ -113,7 +137,7 @@ public:
* @param prompt
* @return int
*/
int begin(String wakeUpKeyword = "HELLO", String prompt = "");
int begin(String wakeUpKeyword = "HELLO", String prompt = "", String language = "en_US");
/**
* @brief Update voice assistant preset, trigger callbacks
@@ -163,6 +187,7 @@ private:
String asr;
String llm;
String tts;
String melotts;
};
WorkId_t _work_id;
src/api/api_asr.cpp
+11 -2
View File
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include "api_asr.h"
#include "api_version.h"
using namespace m5_module_llm;
@@ -12,7 +13,7 @@ void ApiAsr::init(ModuleMsg* moduleMsg)
_module_msg = moduleMsg;
}
String ApiAsr::setup(ApiAsrSetupConfig_t config, String request_id)
String ApiAsr::setup(ApiAsrSetupConfig_t config, String request_id, String language)
{
String cmd;
{
@@ -23,12 +24,20 @@ String ApiAsr::setup(ApiAsrSetupConfig_t config, String request_id)
doc["object"] = "asr.setup";
doc["data"]["model"] = config.model;
doc["data"]["response_format"] = config.response_format;
doc["data"]["input"] = config.input;
doc["data"]["enoutput"] = config.enoutput;
doc["data"]["enkws"] = config.enkws;
doc["data"]["rule1"] = config.rule1;
doc["data"]["rule2"] = config.rule2;
doc["data"]["rule3"] = config.rule3;
if (!llm_version) {
doc["data"]["input"] = config.input[0];
} else {
JsonArray inputArray = doc["data"]["input"].to<JsonArray>();
for (const String& str : config.input) {
inputArray.add(str);
}
}
if (language == "zh_CN") doc["data"]["model"] = "sherpa-ncnn-streaming-zipformer-zh-14M-2023-02-23";
serializeJson(doc, cmd);
}
src/api/api_asr.h
+10 -9
View File
@@ -10,14 +10,14 @@
namespace m5_module_llm {
struct ApiAsrSetupConfig_t {
String model = "sherpa-ncnn-streaming-zipformer-20M-2023-02-17";
String response_format = "asr.utf-8.stream";
String input = "sys.pcm";
bool enoutput = true;
bool enkws = true;
float rule1 = 2.4;
float rule2 = 1.2;
float rule3 = 30.0;
String model = "sherpa-ncnn-streaming-zipformer-20M-2023-02-17";
String response_format = "asr.utf-8.stream";
std::vector<String> input = {"sys.pcm"};
bool enoutput = true;
bool enkws = true;
float rule1 = 2.4;
float rule2 = 1.2;
float rule3 = 30.0;
};
class ApiAsr {
@@ -31,7 +31,8 @@ public:
* @param request_id
* @return String
*/
String setup(ApiAsrSetupConfig_t config = ApiAsrSetupConfig_t(), String request_id = "asr_setup");
String setup(ApiAsrSetupConfig_t config = ApiAsrSetupConfig_t(), String request_id = "asr_setup",
String language = "en_US");
private:
ModuleMsg* _module_msg = nullptr;
src/api/api_camera.cpp
+41
View File
@@ -0,0 +1,41 @@
/*
* SPDX-FileCopyrightText: 2024 M5Stack Technology CO LTD
*
* SPDX-License-Identifier: MIT
*/
#include "api_camera.h"
using namespace m5_module_llm;
void ApiCamera::init(ModuleMsg* moduleMsg)
{
_module_msg = moduleMsg;
}
String ApiCamera::setup(ApiCameraSetupConfig_t config, String request_id)
{
String cmd;
{
JsonDocument doc;
doc["request_id"] = request_id;
doc["work_id"] = "camera";
doc["action"] = "setup";
doc["object"] = "camera.setup";
doc["data"]["response_format"] = config.response_format;
doc["data"]["input"] = config.input;
doc["data"]["enoutput"] = config.enoutput;
doc["data"]["frame_width"] = config.frame_width;
doc["data"]["frame_height"] = config.frame_height;
serializeJson(doc, cmd);
}
String work_id;
_module_msg->sendCmdAndWaitToTakeMsg(
cmd.c_str(), request_id,
[&work_id](ResponseMsg_t& msg) {
// Copy work id
work_id = msg.work_id;
},
5000);
return work_id;
}
src/api/api_camera.h
+37
View File
@@ -0,0 +1,37 @@
/*
* SPDX-FileCopyrightText: 2024 M5Stack Technology CO LTD
*
* SPDX-License-Identifier: MIT
*/
#pragma once
#include "../utils/msg.h"
#include <Arduino.h>
namespace m5_module_llm {
struct ApiCameraSetupConfig_t {
String response_format = "camera.raw";
String input = "/dev/video0";
bool enoutput = false;
int frame_width = 320;
int frame_height = 320;
};
class ApiCamera {
public:
void init(ModuleMsg* moduleMsg);
/**
* @brief Setup module camera, return work_id
*
* @param config
* @param request_id
* @return String
*/
String setup(ApiCameraSetupConfig_t config = ApiCameraSetupConfig_t(), String request_id = "camera_setup");
private:
ModuleMsg* _module_msg = nullptr;
};
} // namespace m5_module_llm
src/api/api_kws.cpp
+11 -2
View File
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include "api_kws.h"
#include "api_version.h"
using namespace m5_module_llm;
@@ -12,7 +13,7 @@ void ApiKws::init(ModuleMsg* moduleMsg)
_module_msg = moduleMsg;
}
String ApiKws::setup(ApiKwsSetupConfig_t config, String request_id)
String ApiKws::setup(ApiKwsSetupConfig_t config, String request_id, String language)
{
String cmd;
{
@@ -23,9 +24,17 @@ String ApiKws::setup(ApiKwsSetupConfig_t config, String request_id)
doc["object"] = "kws.setup";
doc["data"]["model"] = config.model;
doc["data"]["response_format"] = config.response_format;
doc["data"]["input"] = config.input;
doc["data"]["enoutput"] = config.enoutput;
doc["data"]["kws"] = config.kws;
if (!llm_version) {
doc["data"]["input"] = config.input[0];
} else {
JsonArray inputArray = doc["data"]["input"].to<JsonArray>();
for (const String& str : config.input) {
inputArray.add(str);
}
}
if (language == "zh_CN") doc["data"]["model"] = "sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01";
serializeJson(doc, cmd);
}
src/api/api_kws.h
+7 -6
View File
@@ -10,11 +10,11 @@
namespace m5_module_llm {
struct ApiKwsSetupConfig_t {
String kws = "HELLO";
String model = "sherpa-onnx-kws-zipformer-gigaspeech-3.3M-2024-01-01";
String response_format = "kws.bool";
String input = "sys.pcm";
bool enoutput = true;
String kws = "HELLO";
String model = "sherpa-onnx-kws-zipformer-gigaspeech-3.3M-2024-01-01";
String response_format = "kws.bool";
std::vector<String> input = {"sys.pcm"};
bool enoutput = true;
};
class ApiKws {
@@ -28,7 +28,8 @@ public:
* @param request_id
* @return String
*/
String setup(ApiKwsSetupConfig_t config = ApiKwsSetupConfig_t(), String request_id = "kws_setup");
String setup(ApiKwsSetupConfig_t config = ApiKwsSetupConfig_t(), String request_id = "kws_setup",
String language = "en_US");
private:
ModuleMsg* _module_msg = nullptr;
src/api/api_llm.cpp
+10 -1
View File
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include "api_llm.h"
#include "api_version.h"
using namespace m5_module_llm;
@@ -23,11 +24,19 @@ String ApiLlm::setup(ApiLlmSetupConfig_t config, String request_id)
doc["object"] = "llm.setup";
doc["data"]["model"] = config.model;
doc["data"]["response_format"] = config.response_format;
doc["data"]["input"] = config.input;
doc["data"]["enoutput"] = config.enoutput;
doc["data"]["enkws"] = config.enkws;
doc["data"]["max_token_len"] = config.max_token_len;
doc["data"]["prompt"] = config.prompt;
if (!llm_version) {
doc["data"]["model"] = "qwen2.5-0.5b";
doc["data"]["input"] = config.input[0];
} else {
JsonArray inputArray = doc["data"]["input"].to<JsonArray>();
for (const String& str : config.input) {
inputArray.add(str);
}
}
serializeJson(doc, cmd);
}
src/api/api_llm.h
+7 -6
View File
@@ -11,12 +11,13 @@ namespace m5_module_llm {
struct ApiLlmSetupConfig_t {
String prompt;
String model = "qwen2.5-0.5b";
String response_format = "llm.utf-8.stream";
String input = "llm.utf-8.stream";
bool enoutput = true;
bool enkws = true;
int max_token_len = 127;
String model = "qwen2.5-0.5B-prefill-20e";
String response_format = "llm.utf-8.stream";
std::vector<String> input = {"llm.utf-8.stream"};
bool enoutput = true;
bool enkws = true;
int max_token_len = 127;
// int max_token_len = 512;
};
class ApiLlm {
src/api/api_melotts.cpp
+76
View File
@@ -0,0 +1,76 @@
/*
* SPDX-FileCopyrightText: 2024 M5Stack Technology CO LTD
*
* SPDX-License-Identifier: MIT
*/
#include "api_melotts.h"
using namespace m5_module_llm;
void ApiMelotts::init(ModuleMsg* moduleMsg)
{
_module_msg = moduleMsg;
}
String ApiMelotts::setup(ApiMelottsSetupConfig_t config, String request_id, String language)
{
String cmd;
{
JsonDocument doc;
doc["request_id"] = request_id;
doc["work_id"] = "melotts";
doc["action"] = "setup";
doc["object"] = "melotts.setup";
doc["data"]["model"] = config.model;
doc["data"]["response_format"] = config.response_format;
JsonArray inputArray = doc["data"]["input"].to<JsonArray>();
for (const String& str : config.input) {
inputArray.add(str);
}
if (language == "zh_CN") doc["data"]["model"] = "melotts_zh-cn";
doc["data"]["enoutput"] = config.enoutput;
doc["data"]["enaudio"] = config.enaudio;
serializeJson(doc, cmd);
}
String work_id;
_module_msg->sendCmdAndWaitToTakeMsg(
cmd.c_str(), request_id,
[&work_id](ResponseMsg_t& msg) {
// Copy work id
work_id = msg.work_id;
},
15000);
return work_id;
}
int ApiMelotts::inference(String work_id, String input, uint32_t timeout, String request_id)
{
String cmd;
{
JsonDocument doc;
doc["request_id"] = request_id;
doc["work_id"] = work_id;
doc["action"] = "inference";
doc["object"] = "tts.utf-8.stream";
doc["data"]["delta"] = input;
doc["data"]["index"] = 0;
doc["data"]["finish"] = true;
serializeJson(doc, cmd);
}
if (timeout == 0) {
_module_msg->sendCmd(cmd.c_str());
return MODULE_LLM_OK;
}
int ret = MODULE_LLM_WAIT_RESPONSE_TIMEOUT;
_module_msg->sendCmdAndWaitToTakeMsg(
cmd.c_str(), request_id,
[&ret](ResponseMsg_t& msg) {
// Copy error code
ret = msg.error.code;
},
timeout);
return ret;
}
src/api/api_melotts.h
+49
View File
@@ -0,0 +1,49 @@
/*
* SPDX-FileCopyrightText: 2024 M5Stack Technology CO LTD
*
* SPDX-License-Identifier: MIT
*/
#pragma once
#include "../utils/msg.h"
#include <Arduino.h>
namespace m5_module_llm {
struct ApiMelottsSetupConfig_t {
String model = "melotts_zh-cn";
String response_format = "sys.pcm";
std::vector<String> input = {"tts.utf-8.stream"};
bool enoutput = false;
bool enaudio = true;
};
class ApiMelotts {
public:
void init(ModuleMsg* moduleMsg);
/**
* @brief Setup module TTS, return TTS work_id
*
* @param config
* @param request_id
* @return String
*/
String setup(ApiMelottsSetupConfig_t config = ApiMelottsSetupConfig_t(), String request_id = "melotts_setup",
String language = "en_US");
/**
* @brief Inference input data by TTS module
*
* @param work_id
* @param input
* @param timeout wait response timeout, default 0 (do not wait response)
* @param request_id
* @return int
*/
int inference(String work_id, String input, uint32_t timeout = 0, String request_id = "tts_inference");
private:
ModuleMsg* _module_msg = nullptr;
};
} // namespace m5_module_llm
src/api/api_sys.cpp
+10 -2
View File
@@ -13,8 +13,8 @@ static const char* _cmd_reset =
"{\"request_id\":\"sys_reset\",\"work_id\":\"sys\",\"action\":\"reset\",\"object\":\"None\",\"data\":\"None\"}";
static const char* _cmd_reboot =
"{\"request_id\":\"sys_reboot\",\"work_id\":\"sys\",\"action\":\"reboot\",\"object\":\"None\",\"data\":\"None\"}";
// static const char* _cmd_ls_mode =
// "{\"request_id\":\"sys_lsmode\",\"work_id\":\"sys\",\"action\":\"lsmode\",\"object\":\"None\",\"data\":\"None\"}";
static const char* _cmd_version =
"{\"request_id\":\"sys_version\",\"work_id\":\"sys\",\"action\":\"version\",\"object\":\"None\",\"data\":\"None\"}";
void ApiSys::init(ModuleMsg* moduleMsg)
{
@@ -29,6 +29,14 @@ int ApiSys::ping()
return ret;
}
int ApiSys::version()
{
int ret = MODULE_LLM_WAIT_RESPONSE_TIMEOUT;
_module_msg->sendCmdAndWaitToTakeMsg(
_cmd_version, "sys_version", [&ret](ResponseMsg_t& msg) { ret = msg.error.code; }, 2000);
return ret;
}
int ApiSys::reset(bool waitResetFinish)
{
int ret = MODULE_LLM_WAIT_RESPONSE_TIMEOUT;
src/api/api_sys.h
+10
View File
@@ -26,6 +26,16 @@ public:
* @param waitResetFinish
* @return int
*/
int version();
/**
* @brief Check version
*
* @param waitCheckFinish
* @return int
*/
int reset(bool waitResetFinish = true);
/**
src/api/api_tts.cpp
+15 -3
View File
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include "api_tts.h"
#include "api_version.h"
using namespace m5_module_llm;
@@ -12,7 +13,7 @@ void ApiTts::init(ModuleMsg* moduleMsg)
_module_msg = moduleMsg;
}
String ApiTts::setup(ApiTtsSetupConfig_t config, String request_id)
String ApiTts::setup(ApiTtsSetupConfig_t config, String request_id, String language)
{
String cmd;
{
@@ -23,9 +24,20 @@ String ApiTts::setup(ApiTtsSetupConfig_t config, String request_id)
doc["object"] = "tts.setup";
doc["data"]["model"] = config.model;
doc["data"]["response_format"] = config.response_format;
doc["data"]["input"] = config.input;
doc["data"]["enoutput"] = config.enoutput;
doc["data"]["enkws"] = config.enkws;
doc["data"]["enaudio"] = config.enaudio;
if (!llm_version) {
doc["data"]["response_format"] = "tts.base64.wav";
doc["data"]["input"] = config.input[0];
doc["data"]["enoutput"] = true;
} else {
JsonArray inputArray = doc["data"]["input"].to<JsonArray>();
for (const String& str : config.input) {
inputArray.add(str);
}
}
if (language == "zh_CN") doc["data"]["model"] = "single_speaker_fast";
serializeJson(doc, cmd);
}
@@ -50,7 +62,7 @@ int ApiTts::inference(String work_id, String input, uint32_t timeout, String req
doc["action"] = "inference";
doc["object"] = "tts.utf-8.stream";
doc["data"]["delta"] = input;
doc["data"]["index"] = 1;
doc["data"]["index"] = 0;
doc["data"]["finish"] = true;
serializeJson(doc, cmd);
}

Some files were not shown because too many files have changed in this diff Show More