fix merge bugs

This commit is contained in:
Liu Zhicong
2023-09-18 12:51:52 -07:00
parent 2301babd4d
commit 0d8ee2a7af
4 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -40,7 +40,7 @@ class OpenAI_ComputeNode(ComputeNode):
if os.getenv("OPENAI_API_KEY") is not None:
self.openai_api_key = os.getenv("OPENAI_API_KEY")
else:
self.openai_api_key = AIStorage.get_instance().get_user_config().get_user_config("openai_api_key")
self.openai_api_key = AIStorage.get_instance().get_user_config().get_user_config("openai_api_key").value
if self.openai_api_key is None:
logger.error("openai_api_key is None!")
+1 -1
View File
@@ -84,7 +84,7 @@ class UserConfig:
if config_item.value is None:
return config_item.default_value
return config_item.value,config_item
return config_item
def set_user_config(self,key:str,value:Any) -> None:
config_item = self.config_table.get(key)
+1
View File
@@ -49,6 +49,7 @@ class TelegramTunnel(AgentTunnel):
logger.warning(f"tunnel {self.tunnel_id} is already started")
return False
self.is_start = True
logger.warning(f"tunnel {self.tunnel_id} is starting...")
self.app:Application = Application.builder().token(self.tg_token).build()
self.app.add_handler(MessageHandler(filters.TEXT, self.on_message))
+2 -1
View File
@@ -146,7 +146,8 @@ class AIOS_Shell:
show_text = FormattedText([("class:title", f"set config failed!")])
if len(args) == 1:
key = args[0]
old_value,config_item = AIStorage.get_instance().get_user_config().get_user_config(key)
config_item = AIStorage.get_instance().get_user_config().get_user_config(key)
old_value = config_item.value
if config_item is not None:
value = await session.prompt_async(f"{key} : {config_item.desc} \nCurrent : {old_value}\nPlease input new value:",style=shell_style)
AIStorage.get_instance().get_user_config().set_user_config(key,value)