Merge branch 'main' into stepfun-demo

bestony · web-flow · commit e2e402a4e56f · 2025-06-14T11:31:56.000+08:00
diff --git a/core/src/ten_runtime/binding/go/native/ten_env/ten_env_create_instance_done.c b/core/src/ten_runtime/binding/go/native/ten_env/ten_env_create_instance_done.c
@@ -4,13 +4,52 @@
 // Licensed under the Apache License, Version 2.0, with certain conditions.
 // Refer to the "LICENSE" file in the root directory for more information.
 //
+#include "include_internal/ten_runtime/addon/addon_host.h"
+#include "include_internal/ten_runtime/app/app.h"
 #include "include_internal/ten_runtime/binding/go/extension/extension.h"
 #include "include_internal/ten_runtime/binding/go/ten_env/ten_env.h"
 #include "include_internal/ten_runtime/binding/go/ten_env/ten_env_internal.h"
 #include "ten_runtime/binding/go/interface/ten_runtime/ten_env.h"
 #include "ten_runtime/extension/extension.h"
 #include "ten_runtime/ten.h"
 #include "ten_utils/macro/check.h"
+#include "ten_utils/macro/memory.h"
+
+typedef struct ten_go_ten_env_on_create_instance_done_ctx_t {
+  ten_addon_host_t *addon_host;
+  void *instance;
+  void *context;
+} ten_go_ten_env_on_create_instance_done_ctx_t;
+
+static void ten_app_addon_host_on_create_instance_done(void *from, void *args) {
+  ten_app_t *app = (ten_app_t *)from;
+  TEN_ASSERT(app, "Should not happen.");
+  TEN_ASSERT(ten_app_check_integrity(app, true), "Should not happen.");
+
+  ten_go_ten_env_on_create_instance_done_ctx_t *ctx =
+      (ten_go_ten_env_on_create_instance_done_ctx_t *)args;
+  TEN_ASSERT(ctx, "Should not happen.");
+
+  ten_addon_host_t *addon_host = ctx->addon_host;
+  TEN_ASSERT(addon_host, "Should not happen.");
+  TEN_ASSERT(ten_addon_host_check_integrity(addon_host, true),
+             "Should not happen.");
+
+  ten_error_t err;
+  TEN_ERROR_INIT(err);
+
+  bool rc = ten_env_on_create_instance_done(addon_host->ten_env, ctx->instance,
+                                            ctx->context, &err);
+  if (!rc) {
+    TEN_LOGE("ten_env.on_create_instance_done() in go binding failed: %s",
+             ten_error_message(&err));
+    TEN_ASSERT(0, "Should not happen.");
+  }
+
+  ten_error_deinit(&err);
+
+  TEN_FREE(ctx);
+}
 
 void ten_go_ten_env_on_create_instance_done(uintptr_t bridge_addr,
                                             uintptr_t instance_bridge_addr,
@@ -19,28 +58,45 @@ void ten_go_ten_env_on_create_instance_done(uintptr_t bridge_addr,
   TEN_ASSERT(self && ten_go_ten_env_check_integrity(self), "Invalid argument.");
   TEN_ASSERT(context_addr, "Invalid argument.");
 
-  ten_extension_t *c_extension_or_extension_group = NULL;
+  ten_extension_t *c_extension = NULL;
   if (instance_bridge_addr) {
     ten_go_extension_t *extension_bridge =
         ten_go_extension_reinterpret(instance_bridge_addr);
     TEN_ASSERT(ten_go_extension_check_integrity(extension_bridge),
                "Should not happen.");
-    c_extension_or_extension_group =
-        ten_go_extension_c_extension(extension_bridge);
+    c_extension = ten_go_extension_c_extension(extension_bridge);
   }
 
   TEN_GO_TEN_ENV_IS_ALIVE_REGION_BEGIN(self, {});
 
-  ten_error_t err;
-  TEN_ERROR_INIT(err);
+  ten_env_t *c_ten_env = self->c_ten_env;
+  TEN_ASSERT(c_ten_env, "Should not happen.");
+  TEN_ASSERT(ten_env_check_integrity(c_ten_env, false), "Should not happen.");
 
-  // TODO(xilin): Switch to the addon_host thread.
-  bool rc = ten_env_on_create_instance_done(self->c_ten_env,
-                                            c_extension_or_extension_group,
-                                            (void *)context_addr, &err);
-  TEN_ASSERT(rc, "Should not happen.");
+  TEN_ASSERT(c_ten_env->attach_to == TEN_ENV_ATTACH_TO_ADDON,
+             "Should not happen.");
 
-  ten_error_deinit(&err);
+  ten_addon_host_t *addon_host = ten_env_get_attached_addon(c_ten_env);
+  TEN_ASSERT(addon_host, "Should not happen.");
+  TEN_ASSERT(ten_addon_host_check_integrity(addon_host, false),
+             "Should not happen.");
+
+  ten_app_t *app = addon_host->attached_app;
+  TEN_ASSERT(app, "Should not happen.");
+  TEN_ASSERT(ten_app_check_integrity(app, false), "Should not happen.");
+
+  ten_go_ten_env_on_create_instance_done_ctx_t *ctx =
+      TEN_MALLOC(sizeof(ten_go_ten_env_on_create_instance_done_ctx_t));
+  TEN_ASSERT(ctx, "Failed to allocate memory.");
+
+  ctx->addon_host = addon_host;
+  ctx->instance = c_extension;
+  ctx->context = (void *)context_addr;
+
+  int post_task_rc = ten_runloop_post_task_tail(
+      ten_app_get_attached_runloop(app),
+      ten_app_addon_host_on_create_instance_done, app, ctx);
+  TEN_ASSERT(post_task_rc == 0, "Failed to post task.");
 
   TEN_GO_TEN_ENV_IS_ALIVE_REGION_END(self);
 
diff --git a/core/src/ten_runtime/binding/python/native/ten_env/ten_env_on_create_instance_done.c b/core/src/ten_runtime/binding/python/native/ten_env/ten_env_on_create_instance_done.c
@@ -4,22 +4,59 @@
 // Licensed under the Apache License, Version 2.0, with certain conditions.
 // Refer to the "LICENSE" file in the root directory for more information.
 //
+#include "include_internal/ten_runtime/addon/addon_host.h"
+#include "include_internal/ten_runtime/app/app.h"
 #include "include_internal/ten_runtime/binding/python/common/error.h"
 #include "include_internal/ten_runtime/binding/python/extension/extension.h"
 #include "include_internal/ten_runtime/binding/python/ten_env/ten_env.h"
 #include "object.h"
+#include "ten_runtime/app/app.h"
 #include "ten_runtime/ten_env/internal/on_xxx_done.h"
 #include "ten_utils/macro/mark.h"
+#include "ten_utils/macro/memory.h"
+
+typedef struct ten_py_ten_env_on_create_instance_done_ctx_t {
+  ten_addon_host_t *addon_host;
+  void *instance;
+  void *context;
+} ten_py_ten_env_on_create_instance_done_ctx_t;
+
+static void ten_app_addon_host_on_create_instance_done(void *from, void *args) {
+  ten_app_t *app = (ten_app_t *)from;
+  TEN_ASSERT(app, "Should not happen.");
+  TEN_ASSERT(ten_app_check_integrity(app, true), "Should not happen.");
+
+  ten_py_ten_env_on_create_instance_done_ctx_t *ctx =
+      (ten_py_ten_env_on_create_instance_done_ctx_t *)args;
+  TEN_ASSERT(ctx, "Should not happen.");
+
+  ten_addon_host_t *addon_host = ctx->addon_host;
+  TEN_ASSERT(addon_host, "Should not happen.");
+  TEN_ASSERT(ten_addon_host_check_integrity(addon_host, true),
+             "Should not happen.");
+
+  ten_error_t err;
+  TEN_ERROR_INIT(err);
+
+  bool rc = ten_env_on_create_instance_done(addon_host->ten_env, ctx->instance,
+                                            ctx->context, &err);
+  if (!rc) {
+    TEN_LOGE("ten_env.on_create_instance_done() in python binding failed: %s",
+             ten_error_message(&err));
+    TEN_ASSERT(0, "Should not happen.");
+  }
+
+  ten_error_deinit(&err);
+
+  TEN_FREE(ctx);
+}
 
 PyObject *ten_py_ten_env_on_create_instance_done(PyObject *self,
                                                  TEN_UNUSED PyObject *args) {
   ten_py_ten_env_t *py_ten_env = (ten_py_ten_env_t *)self;
   TEN_ASSERT(py_ten_env && ten_py_ten_env_check_integrity(py_ten_env),
              "Invalid argument.");
 
-  ten_error_t err;
-  TEN_ERROR_INIT(err);
-
   ten_py_extension_t *extension = NULL;
   void *context = NULL;
 
@@ -29,17 +66,39 @@ PyObject *ten_py_ten_env_on_create_instance_done(PyObject *self,
         "Invalid argument count when ten_env.on_create_instance_done.");
   }
 
-  // TODO(xilin): Switch to the addon_host thread.
-  bool rc = ten_env_on_create_instance_done(
-      py_ten_env->c_ten_env, extension->c_extension, context, &err);
-  TEN_ASSERT(rc, "Should not happen.");
+  ten_env_t *c_ten_env = py_ten_env->c_ten_env;
+  TEN_ASSERT(c_ten_env, "Should not happen.");
+  TEN_ASSERT(ten_env_check_integrity(c_ten_env, false), "Should not happen.");
+
+  TEN_ASSERT(c_ten_env->attach_to == TEN_ENV_ATTACH_TO_ADDON,
+             "Should not happen.");
+
+  ten_addon_host_t *addon_host = ten_env_get_attached_addon(c_ten_env);
+  TEN_ASSERT(addon_host, "Should not happen.");
+  TEN_ASSERT(ten_addon_host_check_integrity(addon_host, false),
+             "Should not happen.");
+
+  ten_app_t *app = addon_host->attached_app;
+  TEN_ASSERT(app, "Should not happen.");
+  TEN_ASSERT(ten_app_check_integrity(app, false), "Should not happen.");
+
+  ten_py_ten_env_on_create_instance_done_ctx_t *ctx =
+      TEN_MALLOC(sizeof(ten_py_ten_env_on_create_instance_done_ctx_t));
+  TEN_ASSERT(ctx, "Failed to allocate memory.");
+
+  ctx->addon_host = addon_host;
+  ctx->instance = extension->c_extension;
+  ctx->context = context;
+
+  int post_task_rc = ten_runloop_post_task_tail(
+      ten_app_get_attached_runloop(app),
+      ten_app_addon_host_on_create_instance_done, app, ctx);
+  TEN_ASSERT(post_task_rc == 0, "Failed to post task.");
 
   // It's necessary to keep the reference of the extension object to
   // prevent the python object from being destroyed when GC is triggered util
   // the addon's 'on_destroy_instance' function is called.
   Py_INCREF(extension);
 
-  ten_error_deinit(&err);
-
   Py_RETURN_NONE;
 }
diff --git a/core/src/ten_rust/src/graph/graph_info.rs b/core/src/ten_rust/src/graph/graph_info.rs
@@ -33,7 +33,16 @@ pub fn load_graph_from_uri(
     base_dir: Option<&str>,
     new_base_dir: &mut Option<String>,
 ) -> Result<Graph> {
-    // Try to parse as URL first
+    // First check if it's an absolute path - these are not supported
+    if Path::new(uri).is_absolute() {
+        return Err(anyhow!(
+            "Absolute paths are not supported in import_uri: {}. Use file:// \
+             URI or relative path instead",
+            uri
+        ));
+    }
+
+    // Try to parse as URL
     if let Ok(url) = Url::parse(uri) {
         match url.scheme() {
             "http" | "https" => {
@@ -52,15 +61,6 @@ pub fn load_graph_from_uri(
         }
     }
 
-    // Handle relative paths only - absolute paths are not supported
-    if Path::new(uri).is_absolute() {
-        return Err(anyhow!(
-            "Absolute paths are not supported in import_uri: {}. Use file:// \
-             URI or relative path instead",
-            uri
-        ));
-    }
-
     // For relative paths, base_dir must not be None
     let base_dir = base_dir.ok_or_else(|| {
         anyhow!("base_dir cannot be None when uri is a relative path")
diff --git a/tests/ten_runtime/integration/python/call_api_after_closing_python/call_api_after_closing_python_app/ten_packages/extension/default_extension_python/addon.py b/tests/ten_runtime/integration/python/call_api_after_closing_python/call_api_after_closing_python_app/ten_packages/extension/default_extension_python/addon.py
@@ -4,6 +4,8 @@
 # Licensed under the Apache License, Version 2.0, with certain conditions.
 # Refer to the "LICENSE" file in the root directory for more information.
 #
+import time
+import threading
 from ten_runtime import (
     Addon,
     register_addon_as_extension,
@@ -14,12 +16,25 @@
 
 @register_addon_as_extension("default_extension_python")
 class DefaultExtensionAddon(Addon):
-    def on_create_instance(self, ten_env: TenEnv, name: str, context) -> None:
-        ten_env.log_info("on_create_instance" + name)
+
+    def thread_on_create_instance_done(
+        self, ten_env: TenEnv, name: str, context
+    ) -> None:
+        # sleep 1 second to mock the time-consuming operation.
+        time.sleep(1)
 
         if name == "server":
             ten_env.on_create_instance_done(ServerExtension(name), context)
         elif name == "client":
             ten_env.on_create_instance_done(ClientExtension(name), context)
         else:
             assert False
+
+    def on_create_instance(self, ten_env: TenEnv, name: str, context) -> None:
+        ten_env.log_info("on_create_instance" + name)
+
+        # Create a new thread to call the on_create_instance_done function.
+        threading.Thread(
+            target=self.thread_on_create_instance_done,
+            args=(ten_env, name, context),
+        ).start()
