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.

Sign up for GitHub

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

update supports stackflow. #2

Closed
wants to merge 1 commit into from
Closed

update supports stackflow. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion examples/KWS_ASR/KWS_ASR.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ void setup()

/* 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);

M5.Display.printf(">> Setup ok\n>> Say \"%s\" to wakeup\n", wake_up_keyword.c_str());
}
Expand Down
8 changes: 8 additions & 0 deletions src/M5ModuleLLM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#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"

Expand Down Expand Up @@ -63,6 +64,12 @@ class M5ModuleLLM {
*/
m5_module_llm::ApiTts tts;

/**
* @brief MELOTTS module api set
*
*/
m5_module_llm::ApiMelotts melotts;

/**
* @brief KWS module api set
*
Expand Down Expand Up @@ -163,6 +170,7 @@ class M5ModuleLLM_VoiceAssistant {
String asr;
String llm;
String tts;
String melotts;
};

WorkId_t _work_id;
Expand Down
7 changes: 5 additions & 2 deletions src/api/api_asr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ 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;
JsonArray inputArray = doc["data"]["input"].to<JsonArray>();
for (const String& str : config.input)
{
inputArray.add(str);
}
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;
Expand Down
15 changes: 7 additions & 8 deletions src/api/api_asr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@
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;
float rule1 = 2.4;
float rule2 = 1.2;
float rule3 = 30.0;
};

class ApiAsr {
Expand Down
6 changes: 5 additions & 1 deletion src/api/api_kws.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ 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;
JsonArray inputArray = doc["data"]["input"].to<JsonArray>();
for (const String& str : config.input)
{
inputArray.add(str);
}
doc["data"]["enoutput"] = config.enoutput;
doc["data"]["kws"] = config.kws;
serializeJson(doc, cmd);
Expand Down
10 changes: 5 additions & 5 deletions src/api/api_kws.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 5 additions & 2 deletions src/api/api_llm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@ 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;
JsonArray inputArray = doc["data"]["input"].to<JsonArray>();
for (const String& str : config.input)
{
inputArray.add(str);
}
doc["data"]["enoutput"] = config.enoutput;
doc["data"]["enkws"] = config.enkws;
doc["data"]["max_token_len"] = config.max_token_len;
doc["data"]["prompt"] = config.prompt;
serializeJson(doc, cmd);
Expand Down
12 changes: 6 additions & 6 deletions src/api/api_llm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ 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;
int max_token_len = 127;
// int max_token_len = 512;
};

class ApiLlm {
Expand Down
10 changes: 7 additions & 3 deletions src/api/api_tts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@ 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;
JsonArray inputArray = doc["data"]["input"].to<JsonArray>();
for (const String& str : config.input)
{
inputArray.add(str);
}
doc["data"]["enoutput"] = config.enoutput;
doc["data"]["enkws"] = config.enkws;
doc["data"]["enaudio"] = config.enaudio;
serializeJson(doc, cmd);
}

Expand All @@ -50,7 +54,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);
}
Expand Down
10 changes: 5 additions & 5 deletions src/api/api_tts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
namespace m5_module_llm {

struct ApiTtsSetupConfig_t {
String model = "single_speaker_english_fast";
String response_format = "tts.base64.wav";
String input = "tts.utf-8.stream";
bool enoutput = true;
bool enkws = true;
String model = "single_speaker_english_fast";
String response_format = "sys.pcm";
std::vector<String> input = {"sys.pcm"};
bool enoutput = false;
bool enaudio = true;
};

class ApiTts {
Expand Down
10 changes: 7 additions & 3 deletions src/presets/voice_assistant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,19 @@ int M5ModuleLLM_VoiceAssistant::begin(String wakeUpKeyword, String prompt)
}

_debug("setup module asr..");
_work_id.asr = _m5_module_llm->asr.setup();
{
ApiAsrSetupConfig_t config;
config.input = {"sys.pcm", _work_id.kws};
_work_id.asr = _m5_module_llm->asr.setup(config);
}
if (_work_id.asr.isEmpty()) {
return MODULE_LLM_ERROR_NONE;
}

_debug("setup module llm..");
{
ApiLlmSetupConfig_t config;
config.input = _work_id.asr;
config.input = {_work_id.asr, _work_id.kws};
config.prompt = prompt;
_work_id.llm = _m5_module_llm->llm.setup(config);
}
Expand All @@ -56,7 +60,7 @@ int M5ModuleLLM_VoiceAssistant::begin(String wakeUpKeyword, String prompt)
_debug("setup module tts..");
{
ApiTtsSetupConfig_t config;
config.input = _work_id.llm;
config.input = {_work_id.llm, _work_id.kws};
_work_id.tts = _m5_module_llm->tts.setup(config);
}
if (_work_id.tts.isEmpty()) {
Expand Down
Loading