refactor: 配置文件均改为json

pkg/provider/requester/apis/chatcmpl.py

@@ -22,8 +22,8 @@ class OpenAIChatCompletion(api.LLMAPIRequester):
     async def initialize(self):
         self.client = openai.AsyncClient(
             api_key="",
-            base_url=self.ap.cfg_mgr.data["openai_config"]["reverse_proxy"],
-            timeout=self.ap.cfg_mgr.data["process_message_timeout"],
+            base_url=self.ap.provider_cfg.data['openai-config']['base_url'],
+            timeout=self.ap.provider_cfg.data['openai-config']['request-timeout'],
         )
 
     async def _req(
@@ -51,7 +51,7 @@ class OpenAIChatCompletion(api.LLMAPIRequester):
     ) -> llm_entities.Message:
         self.client.api_key = use_model.token_mgr.get_token()
 
-        args = self.ap.cfg_mgr.data["completion_api_params"].copy()
+        args = self.ap.provider_cfg.data['openai-config']['chat-completions-params'].copy()
         args["model"] = use_model.name if use_model.model_name is None else use_model.model_name
 
         if use_model.tool_call_supported:

pkg/provider/requester/modelmgr.py

@@ -29,7 +29,7 @@ class ModelManager:
     async def initialize(self):
         openai_chat_completion = chatcmpl.OpenAIChatCompletion(self.ap)
         await openai_chat_completion.initialize()
-        openai_token_mgr = token.TokenManager(self.ap, list(self.ap.cfg_mgr.data['openai_config']['api_key'].values()))
+        openai_token_mgr = token.TokenManager(self.ap, list(self.ap.provider_cfg.data['openai-config']['api-keys']))
 
         tiktoken_tokenizer = tiktoken.Tiktoken(self.ap)
 

pkg/provider/session/sessionmgr.py

@@ -25,10 +25,15 @@ class SessionManager:
             if query.launcher_type == session.launcher_type and query.launcher_id == session.launcher_id:
                 return session
 
+        session_concurrency = self.ap.system_cfg.data['session-concurrency']['default']
+
+        if f'{query.launcher_type.value}_{query.launcher_id}' in self.ap.system_cfg.data['session-concurrency']:
+            session_concurrency = self.ap.system_cfg.data['session-concurrency'][f'{query.launcher_type.value}_{query.launcher_id}']
+
         session = core_entities.Session(
             launcher_type=query.launcher_type,
             launcher_id=query.launcher_id,
-            semaphore=asyncio.Semaphore(1) if self.ap.cfg_mgr.data['wait_last_done'] else asyncio.Semaphore(10000),
+            semaphore=asyncio.Semaphore(session_concurrency),
         )
         self.session_list.append(session)
         return session
@@ -41,7 +46,7 @@ class SessionManager:
             conversation = core_entities.Conversation(
                 prompt=await self.ap.prompt_mgr.get_prompt(session.use_prompt_name),
                 messages=[],
-                use_model=await self.ap.model_mgr.get_model_by_name(self.ap.cfg_mgr.data['completion_api_params']['model']),
+                use_model=await self.ap.model_mgr.get_model_by_name(self.ap.provider_cfg.data['openai-config']['chat-completions-params']['model']),
                 use_funcs=await self.ap.tool_mgr.get_all_functions(),
             )
             session.conversations.append(conversation)

pkg/provider/sysprompt/loaders/scenario.py

@@ -14,8 +14,8 @@ class ScenarioPromptLoader(loader.PromptLoader):
     async def load(self):
         """加载Prompt
         """
-        for file in os.listdir("scenarios"):
-            with open("scenarios/{}".format(file), "r", encoding="utf-8") as f:
+        for file in os.listdir("data/scenarios"):
+            with open("data/scenarios/{}".format(file), "r", encoding="utf-8") as f:
                 file_str = f.read()
                 file_name = file.split(".")[0]
                 file_json = json.loads(file_str)

pkg/provider/sysprompt/loaders/single.py

@@ -14,7 +14,7 @@ class SingleSystemPromptLoader(loader.PromptLoader):
         """加载Prompt
         """
         
-        for name, cnt in self.ap.cfg_mgr.data['default_prompt'].items():
+        for name, cnt in self.ap.provider_cfg.data['prompt'].items():
             prompt = entities.Prompt(
                 name=name,
                 messages=[
@@ -26,8 +26,8 @@ class SingleSystemPromptLoader(loader.PromptLoader):
             )
             self.prompts.append(prompt)
 
-        for file in os.listdir("prompts"):
-            with open("prompts/{}".format(file), "r", encoding="utf-8") as f:
+        for file in os.listdir("data/prompts"):
+            with open("data/prompts/{}".format(file), "r", encoding="utf-8") as f:
                 file_str = f.read()
                 file_name = file.split(".")[0]
                 prompt = entities.Prompt(

pkg/provider/sysprompt/sysprompt.py

@@ -23,7 +23,7 @@ class PromptManager:
             "full_scenario": scenario.ScenarioPromptLoader
         }
 
-        loader_cls = loader_map[self.ap.cfg_mgr.data['preset_mode']]
+        loader_cls = loader_map[self.ap.provider_cfg.data['prompt-mode']]
 
         self.loader_inst: loader.PromptLoader = loader_cls(self.ap)