feat: add on_configure

TEN-framework · Sep 17, 2024 · 97fd86c · 97fd86c
1 parent d8de77b
commit 97fd86c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/core/src/ten_runtime/binding/python/interface/ten/app.py b/core/src/ten_runtime/binding/python/interface/ten/app.py
@@ -21,5 +21,8 @@ def wait(self) -> None:
     def close(self) -> None:
         _App.close(self)
 
+    def on_configure(self, ten_env: TenEnv) -> None:
+        ten_env.on_configure_done()
+
     def on_init(self, ten_env: TenEnv) -> None:
         ten_env.on_init_done()
diff --git a/core/src/ten_runtime/binding/python/native/app/app.c b/core/src/ten_runtime/binding/python/native/app/app.c
@@ -30,12 +30,12 @@ static bool ten_py_app_check_integrity(ten_py_app_t *self, bool check_thread) {
   return ten_app_check_integrity(self->c_app, check_thread);
 }
 
-static void proxy_on_init(ten_app_t *app, ten_env_t *ten_env) {
+static void proxy_on_configure(ten_app_t *app, ten_env_t *ten_env) {
   TEN_ASSERT(app && ten_app_check_integrity(app, true), "Invalid argument.");
   TEN_ASSERT(ten_env && ten_env_check_integrity(ten_env, true),
              "Invalid argument.");
 
-  TEN_LOGI("proxy_on_init");
+  TEN_LOGI("proxy_on_configure");
 
   // The current state may be PyGILState_LOCKED or PyGILState_UNLOCKED which
   // depends on whether the app is running in the Python thread or native
@@ -50,8 +50,8 @@ static void proxy_on_init(ten_app_t *app, ten_env_t *ten_env) {
   ten_py_ten_env_t *py_ten_env = ten_py_ten_wrap(ten_env);
   py_ten_env->c_ten_env_proxy = ten_env_proxy_create(ten_env, 1, NULL);
 
-  PyObject *py_res = PyObject_CallMethod((PyObject *)py_app, "on_init", "O",
-                                         py_ten_env->actual_py_ten_env);
+  PyObject *py_res = PyObject_CallMethod((PyObject *)py_app, "on_configure",
+                                         "O", py_ten_env->actual_py_ten_env);
   Py_XDECREF(py_res);
 
   bool err_occurred = ten_py_check_and_clear_py_error();
@@ -66,6 +66,37 @@ static void proxy_on_init(ten_app_t *app, ten_env_t *ten_env) {
 
   py_ten_env->need_to_release_gil_state = true;
 
+  TEN_LOGI("proxy_on_configure done");
+}
+
+static void proxy_on_init(ten_app_t *app, ten_env_t *ten_env) {
+  TEN_ASSERT(app && ten_app_check_integrity(app, true), "Invalid argument.");
+  TEN_ASSERT(ten_env && ten_env_check_integrity(ten_env, true),
+             "Invalid argument.");
+
+  TEN_LOGI("proxy_on_init");
+
+  // The current state may be PyGILState_LOCKED or PyGILState_UNLOCKED which
+  // depends on whether the app is running in the Python thread or native
+  // thread.
+  PyGILState_STATE prev_state = ten_py_gil_state_ensure();
+
+  ten_py_app_t *py_app =
+      ten_binding_handle_get_me_in_target_lang((ten_binding_handle_t *)app);
+  TEN_ASSERT(py_app && ten_py_app_check_integrity(py_app, true),
+             "Should not happen.");
+
+  ten_py_ten_env_t *py_ten_env = ten_py_ten_wrap(ten_env);
+
+  PyObject *py_res = PyObject_CallMethod((PyObject *)py_app, "on_init", "O",
+                                         py_ten_env->actual_py_ten_env);
+  Py_XDECREF(py_res);
+
+  bool err_occurred = ten_py_check_and_clear_py_error();
+  TEN_ASSERT(!err_occurred, "Should not happen.");
+
+  ten_py_gil_state_release(prev_state);
+
   TEN_LOGI("proxy_on_init done");
 }
 
@@ -118,7 +149,8 @@ static PyObject *ten_py_app_create(PyTypeObject *type, PyObject *args,
     return ten_py_raise_py_type_error_exception("Expect 0 argument.");
   }
 
-  py_app->c_app = ten_app_create(NULL, proxy_on_init, proxy_on_deinit, NULL);
+  py_app->c_app =
+      ten_app_create(proxy_on_configure, proxy_on_init, proxy_on_deinit, NULL);
   if (!py_app->c_app) {
     TEN_ASSERT(0, "Failed to create TEN app.");