feat(xiaozhi): 支持在 python 端监听 event 和 runShell

examples/xiaozhi/src/lib.rs

@@ -1,6 +1,8 @@
 use open_xiaoai::services::connect::message::MessageManager;
+use open_xiaoai::services::connect::rpc::RPC;
 use pyo3::prelude::*;
 use pyo3::types::PyBytes;
+use serde_json::json;
 use server::AppServer;
 
 pub mod macros;
@@ -26,10 +28,29 @@ fn start_server(py: Python) -> PyResult<Bound<PyAny>> {
     })
 }
 
+#[pyfunction]
+fn run_shell(py: Python, script: String, timeout_millis: f64) -> PyResult<Bound<PyAny>> {
+    pyo3_async_runtimes::tokio::future_into_py(py, async move {
+        let res = RPC::instance()
+            .call_remote(
+                "run_shell",
+                Some(json!(script)),
+                Some(timeout_millis as u64),
+            )
+            .await;
+        let result = match res {
+            Err(e) => format!("run_shell error: {}", e),
+            Ok(res) => serde_json::to_string(&res.data.unwrap()).unwrap(),
+        };
+        Ok(result)
+    })
+}
+
 #[pymodule]
 fn open_xiaoai_server(_py: Python, m: Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(start_server, &m)?)?;
     m.add_function(wrap_pyfunction!(on_output_data, &m)?)?;
+    m.add_function(wrap_pyfunction!(run_shell, &m)?)?;
     crate::python::init_module(&m)?;
     Ok(())
 }

examples/xiaozhi/src/server.rs

@@ -1,3 +1,4 @@
+use crate::python::PythonManager;
 use open_xiaoai::base::{AppError, VERSION};
 use open_xiaoai::services::audio::config::AudioConfig;
 use open_xiaoai::services::connect::data::{Event, Request, Response, Stream};
@@ -7,13 +8,12 @@ use open_xiaoai::services::connect::rpc::RPC;
 use open_xiaoai::services::speaker::SpeakerManager;
 use open_xiaoai::utils::task::TaskManager;
 use pyo3::types::PyBytes;
+use pyo3::types::PyString;
 use pyo3::Python;
 use serde_json::json;
 use tokio::net::{TcpListener, TcpStream};
 use tokio_tungstenite::accept_async;
 
-use crate::python::PythonManager;
-
 pub struct AppServer;
 
 async fn test() -> Result<(), AppError> {
@@ -127,6 +127,8 @@ async fn on_stream(stream: Stream) -> Result<(), AppError> {
 }
 
 async fn on_event(event: Event) -> Result<(), AppError> {
-    crate::pylog!("🔥 收到 Event: {:?}", event);
+    let event_json = serde_json::to_string(&event)?;
+    let data = Python::with_gil(|py| PyString::new(py, &event_json).into());
+    PythonManager::instance().call_fn("on_event", Some(data))?;
     Ok(())
 }