f"rpc server [{agent_class.__name__}] at port [{port}] started "
"successfully",
)
- pipe.send(port)
- start_event.set()
- stop_event.wait()
+ if start_event is not None:
+ pipe.send(port)
+ start_event.set()
+ stop_event.wait()
+ else:
+ server.wait_for_termination()
logger.info(
f"Stopping rpc server [{agent_class.__name__}] at port [{port}]",
)
@@ -450,15 +453,35 @@ Source code for agentscope.agents.rpc_agent
self.port = check_port(port)
self.max_pool_size = max_pool_size
self.max_timeout_seconds = max_timeout_seconds
- self.local_model = local_mode
+ self.local_mode = local_mode
self.server = None
self.stop_event = None
self.parent_con = None
-
-[docs]
- def launch(self) -> None:
- """launch a local rpc agent server."""
+ def _launch_in_main(self) -> None:
+ """Launch gRPC server in main-process"""
+ server_thread = threading.Thread(
+ target=setup_rcp_agent_server,
+ kwargs={
+ "agent_class": self.agent_class,
+ "agent_args": self.agent_args,
+ "agent_kwargs": self.agent_kwargs,
+ "host": self.host,
+ "port": self.port,
+ "max_pool_size": self.max_pool_size,
+ "max_timeout_seconds": self.max_timeout_seconds,
+ "local_mode": self.local_mode,
+ },
+ )
+ server_thread.start()
+ logger.info(
+ f"Launch [{self.agent_class.__name__}] server at "
+ f"[{self.host}:{self.port}] success",
+ )
+ server_thread.join()
+
+ def _launch_in_sub(self) -> None:
+ """Launch gRPC server in sub-process."""
self.stop_event = Event()
self.parent_con, child_con = Pipe()
start_event = Event()
@@ -476,7 +499,7 @@ Source code for agentscope.agents.rpc_agent
"pipe": child_con,
"max_pool_size": self.max_pool_size,
"max_timeout_seconds": self.max_timeout_seconds,
- "local_mode": self.local_model,
+ "local_mode": self.local_mode,
},
)
server_process.start()
@@ -486,7 +509,16 @@ Source code for agentscope.agents.rpc_agent
logger.info(
f"Launch [{self.agent_class.__name__}] server at "
f"[{self.host}:{self.port}] success",
- )
+ )
+
+
+[docs]
+ def launch(self, in_subprocess: bool = True) -> None:
+ """launch a local rpc agent server."""
+ if in_subprocess:
+ self._launch_in_sub()
+ else:
+ self._launch_in_main()
@@ -505,8 +537,8 @@ Source code for agentscope.agents.rpc_agent
if self.stop_event is not None:
self.stop_event.set()
self.stop_event = None
- self.server.terminate()
self.server.join(timeout=5)
+ self.server.terminate()
if self.server.is_alive():
self.server.kill()
logger.info(
diff --git a/_modules/agentscope/models/model.html b/_modules/agentscope/models/model.html
index 74e476931..f796a447e 100644
--- a/_modules/agentscope/models/model.html
+++ b/_modules/agentscope/models/model.html
@@ -317,10 +317,8 @@ Source code for agentscope.models.model
from the config file.
"""
self.config_name = config_name
- logger.info(
- f"Initialize model [{config_name}] with config:\n"
- f"{json.dumps(kwargs, indent=2)}",
- )
+ logger.info(f"Initialize model [{config_name}]")
+ logger.debug(f"[{config_name}]:\n {json.dumps(kwargs, indent=2)}")
def __call__(self, *args: Any, **kwargs: Any) -> ModelResponse:
"""Processing input with the model."""
diff --git a/agentscope.agents.html b/agentscope.agents.html
index 599c0493e..0b77d368c 100644
--- a/agentscope.agents.html
+++ b/agentscope.agents.html
@@ -361,7 +361,7 @@ Agents package
-launch() None[source]
+launch(in_subprocess: bool = True) None[source]
launch a local rpc agent server.