[update]

- update camera.
- StackFlow add get_config_file_paths.
- StackFlow output add \n.
- sys.hwinfo add eth info.

Author: dianjixz

ext_components/StackFlow/stackflow/StackFlow.h

@@ -133,6 +133,7 @@ class llm_channel_obj {
         } else
             out_body["error"] = error_msg;
         std::string out = out_body.dump();
+        out += "\n";
         if (outuart)
             return output_to_uart(out);
         else
@@ -155,6 +156,7 @@ class llm_channel_obj {
             out_body["error"] = error_msg;
 
         std::string out = out_body.dump();
+        out += "\n";
         send_raw_to_pub(out);
         if (enoutput_) return send_raw_to_usr(out);
         return 0;
@@ -176,6 +178,7 @@ class llm_channel_obj {
             out_body["error"] = error_msg;
 
         std::string out = out_body.dump();
+        out += "\n";
         send_raw_to_pub(out);
         if (enoutput_) return send_raw_to_usr(out);
         return 0;
@@ -342,10 +345,14 @@ class StackFlow {
             out_body["error"] = error_msg;
         if (zmq_url.empty()) {
             pzmq _zmq(out_zmq_url_, ZMQ_PUSH);
-            return _zmq.send_data(out_body.dump());
+            std::string out = out_body.dump();
+            out += "\n";
+            return _zmq.send_data(out);
         } else {
             pzmq _zmq(zmq_url, ZMQ_PUSH);
-            return _zmq.send_data(out_body.dump());
+            std::string out = out_body.dump();
+            out += "\n";
+            return _zmq.send_data(out);
         }
     }
 

ext_components/StackFlow/stackflow/StackFlowUtil.cpp

@@ -263,4 +263,19 @@ std::string StackFlows::unit_call(const std::string &unit_name, const std::strin
     pzmq _call(unit_name);
     _call.call_rpc_action(unit_action, data, [&value](pzmq *_pzmq, const std::string &raw) { value = raw; });
     return value;
+}
+
+std::list<std::string> StackFlows::get_config_file_paths(const std::string &base_model_path,
+                                                         const std::string &mode_name)
+{
+    std::shared_ptr<std::string> base_path((std::string *)(&base_model_path), [](std::string *Npt) {});
+    if (base_path->empty()) base_path = std::make_shared<std::string>("/opt/m5stack/data/");
+    std::list<std::string> config_file_paths;
+    config_file_paths.push_back(std::string("./") + mode_name + ".json");
+    config_file_paths.push_back(std::string("./asr_mode_") + mode_name + ".json");
+    config_file_paths.push_back((*base_path) + "../share/" + mode_name + ".json");
+    config_file_paths.push_back((*base_path) + "../share/asr_mode_" + mode_name + ".json");
+    config_file_paths.push_back((*base_path) + mode_name + ".json");
+    config_file_paths.push_back((*base_path) + "asr_mode_" + mode_name + ".json");
+    return config_file_paths;
 }

ext_components/StackFlow/stackflow/StackFlowUtil.h

@@ -7,6 +7,7 @@
 #include <string>
 #include <cstring>
 #include <unordered_map>
+#include <list>
 #define WORK_ID_NONE -100
 
 #define RPC_PUSH_PARAM(_obj, _data1, _data2)                                                     \
@@ -31,4 +32,5 @@ bool decode_stream(const std::string &in, std::string &out, std::unordered_map<i
 int decode_base64(const std::string &in, std::string &out);
 int encode_base64(const std::string &in, std::string &out);
 std::string unit_call(const std::string &unit_name, const std::string &unit_action, const std::string &data);
+std::list<std::string> get_config_file_paths(const std::string &base_model_path, const std::string &mode_name);
 };  // namespace StackFlows

projects/llm_framework/main_asr/src/main.cpp

@@ -92,9 +92,7 @@ class llm_task {
             return -1;
         }
         nlohmann::json file_body;
-        std::list<std::string> config_file_paths;
-        config_file_paths.push_back(std::string("./") + model_ + ".json");
-        config_file_paths.push_back(base_model_path_ + "../share/" + model_ + ".json");
+        std::list<std::string> config_file_paths = get_config_file_paths(base_model_path_, model_);
         try {
             for (auto file_name : config_file_paths) {
                 std::ifstream config_file(file_name);
@@ -644,7 +642,7 @@ class llm_asr : public StackFlow {
             req_body["model"]           = llm_task_obj->model_;
             req_body["response_format"] = llm_task_obj->response_format_;
             req_body["enoutput"]        = llm_task_obj->enoutput_;
-            req_body["inputs"]         = llm_task_obj->inputs_;
+            req_body["inputs"]          = llm_task_obj->inputs_;
             send("asr.taskinfo", req_body, LLM_NO_ERROR, work_id);
         }
     }

projects/llm_framework/main_audio/src/main.cpp

@@ -139,9 +139,7 @@ class llm_audio : public StackFlow {
         nlohmann::json config_body;
         nlohmann::json file_body;
         nlohmann::json error_body;
-        std::list<std::string> config_file_paths;
-        config_file_paths.push_back("./audio.json");
-        config_file_paths.push_back("/opt/m5stack/share/audio.json");
+        std::list<std::string> config_file_paths = get_config_file_paths("/opt/m5stack/data", "audio");
         try {
             config_body = nlohmann::json::parse(data);
             for (auto file_name : config_file_paths) {