Refactor log (#268)

* update logger

* add dashscope log

* update user log

* add comment

---------

Co-authored-by: ly119399 <[email protected]>

apps/agentfabric/app.py

@@ -1,4 +1,3 @@
-import importlib
 import os
 import random
 import shutil
@@ -12,7 +11,7 @@
                                            gen_response_and_process,
                                            init_builder_chatbot_agent)
 from config_utils import (DEFAULT_AGENT_DIR, Config, get_avatar_image,
-                          get_ci_dir, get_user_cfg_file, get_user_dir,
+                          get_ci_dir, get_user_dir,
                           is_valid_plugin_configuration, parse_configuration,
                           save_avatar_image, save_builder_configuration,
                           save_plugin_configuration)
@@ -35,10 +34,10 @@ def init_user(uuid_str, state):
         state['user_agent'] = user_agent
         state['user_memory'] = user_memory
     except Exception as e:
-        logger.error(
+        logger.query_error(
             uuid=uuid_str,
             error=str(e),
-            content={'error_traceback': traceback.format_exc()})
+            details={'error_traceback': traceback.format_exc()})
     return state
 
 
@@ -48,10 +47,10 @@ def init_builder(uuid_str, state):
         state['builder_agent'] = builder_agent
         state['builder_memory'] = builder_memory
     except Exception as e:
-        logger.error(
+        logger.query_error(
             uuid=uuid_str,
             error=str(e),
-            content={'error_traceback': traceback.format_exc()})
+            details={'error_traceback': traceback.format_exc()})
     return state
 
 
@@ -61,10 +60,10 @@ def update_builder(uuid_str, state):
         builder_agent = init_builder_chatbot_agent(uuid_str)
         state['builder_agent'] = builder_agent
     except Exception as e:
-        logger.error(
+        logger.query_error(
             uuid=uuid_str,
             error=str(e),
-            content={'error_traceback': traceback.format_exc()})
+            details={'error_traceback': traceback.format_exc()})
 
     return state
 
@@ -293,10 +292,10 @@ def check_uuid(uuid_str):
 
     # 初始化表单
     def init_ui_config(uuid_str, _state, builder_cfg, model_cfg, tool_cfg):
-        logger.info(
+        logger.query_info(
             uuid=uuid_str,
             message='builder_cfg',
-            content={'builder_cfg': str(builder_cfg)})
+            details={'builder_cfg': str(builder_cfg)})
         # available models
         models = list(model_cfg.keys())
         capabilities = [(tool_cfg[tool_key]['name'], tool_key)
@@ -409,8 +408,8 @@ def create_send_message(chatbot, input, _state, uuid_str):
             llm_result = frame.get('llm_text', '')
             exec_result = frame.get('exec_result', '')
             step_result = frame.get('step', '')
-            logger.info(
-                uuid=uuid_str, message='frame', content={'frame': str(frame)})
+            logger.query_info(
+                uuid=uuid_str, message='frame', details={'frame': str(frame)})
             if len(exec_result) != 0:
                 if isinstance(exec_result, dict):
                     exec_result = exec_result['result']
@@ -507,10 +506,10 @@ def process_configuration(uuid_str, bot_avatar, name, description,
             if is_valid_plugin_configuration(openapi_plugin_cfg):
                 save_plugin_configuration(openapi_plugin_cfg, uuid_str)
         except Exception as e:
-            logger.error(
+            logger.query_error(
                 uuid=uuid_str,
                 error=str(e),
-                content={'error_traceback': traceback.format_exc()})
+                details={'error_traceback': traceback.format_exc()})
 
         save_builder_configuration(builder_cfg, uuid_str)
         update_builder(uuid_str, state)
@@ -586,7 +585,8 @@ def preview_send_message(chatbot, input, _state, uuid_str):
                     input.text,
                     history=history,
                     ref_doc=ref_doc,
-                    append_files=append_files):
+                    append_files=append_files,
+                    uuid_str=uuid_str):
                 # append_files=new_file_paths):
                 # important! do not change this
                 response += frame

apps/agentfabric/appBot.py

@@ -42,10 +42,10 @@ def init_user(state):
         state['user_agent'] = user_agent
         state['user_memory'] = user_memory
     except Exception as e:
-        logger.error(
+        logger.query_error(
             uuid=uuid_str,
             error=str(e),
-            content={'error_traceback': traceback.format_exc()})
+            details={'error_traceback': traceback.format_exc()})
         raise Exception(e)
     return state
 

apps/agentfabric/builder_core.py

@@ -1,6 +1,7 @@
 # flake8: noqa E501
 import os
 import re
+from http import HTTPStatus
 
 import json
 from config_utils import DEFAULT_UUID_HISTORY, parse_configuration
@@ -24,12 +25,12 @@ def init_builder_chatbot_agent(uuid_str: str, session='default'):
     builder_cfg, model_cfg, _, _, _, _ = parse_configuration(uuid_str)
 
     # init agent
-    logger.info(
+    logger.query_info(
         uuid=uuid_str, message=f'using builder model {builder_cfg.model}')
     llm_config = {'model': builder_cfg.model, 'model_server': 'dashscope'}
     # function_list = ['image_gen']  # use image_gen to draw logo?
 
-    agent = AgentBuilder(llm=llm_config)
+    agent = AgentBuilder(llm=llm_config, uuid_str=uuid_str)
 
     current_history_path = os.path.join(DEFAULT_UUID_HISTORY, uuid_str,
                                         session + '_builder.json')
@@ -51,7 +52,7 @@ def gen_response_and_process(agent,
     llm_result = ''
     llm_result_prefix = ''
     try:
-        response = agent.run(query, history=history)
+        response = agent.run(query, history=history, uuid_str=uuid_str)
         for s in response:
             llm_result += s
             answer, finish, llm_result_prefix = agent.parse_answer(
@@ -74,10 +75,10 @@ def gen_response_and_process(agent,
             Message(role='assistant', content=llm_result),
         ])
         if print_info:
-            logger.info(
+            logger.query_info(
                 uuid=uuid_str,
                 message=f'LLM output in round 0',
-                content={'llm_result': llm_result})
+                details={'llm_result': llm_result})
     except Exception as e:
         yield {'error': 'llm result is not valid'}
 
@@ -95,14 +96,14 @@ def gen_response_and_process(agent,
         try:
             answer = json.loads(rich_config)
         except Exception:
-            logger.error(uuid=uuid_str, error='parse RichConfig error')
+            logger.query_error(uuid=uuid_str, error='parse RichConfig error')
             return
         agent.last_assistant_structured_response['rich_config_dict'] = answer
         builder_cfg = config_conversion(answer, uuid_str=uuid_str)
         yield {'exec_result': {'result': builder_cfg}}
         yield {'step': CONFIG_UPDATED_STEP}
     except ValueError as e:
-        logger.error(uuid=uuid_str, error=str(e))
+        logger.query_error(uuid=uuid_str, error=str(e))
         yield {'error content=[{}]'.format(llm_result)}
         return
 

apps/agentfabric/config_utils.py

@@ -162,7 +162,7 @@ def parse_configuration(uuid_str=''):
             for name, config in config_dict.items():
                 available_plugin_list.append(name)
         except Exception as e:
-            logger.error(
+            logger.query_error(
                 uuid=uuid_str,
                 error=str(e),
                 content={

apps/agentfabric/help_tools.py

@@ -68,7 +68,7 @@ def call_wanx(prompt, save_path, uuid_str):
             with open(save_path, 'wb+') as f:
                 f.write(requests.get(result.url).content)
     else:
-        logger.error(
+        logger.query_error(
             uuid=uuid_str,
             error='wanx error',
             content={

apps/agentfabric/user_core.py

@@ -21,10 +21,10 @@ def init_user_chatbot_agent(uuid_str='', session='default'):
     model_cfg[builder_cfg.model]['generate_cfg']['stop'] = 'Observation'
 
     # build model
-    logger.info(
+    logger.query_info(
         uuid=uuid_str,
         message=f'using model {builder_cfg.model}',
-        content={'model_config': model_cfg[builder_cfg.model]})
+        details={'model_config': model_cfg[builder_cfg.model]})
 
     # update function_list
     function_list = parse_tool_cfg(tool_cfg)
@@ -38,7 +38,10 @@ def init_user_chatbot_agent(uuid_str='', session='default'):
         'instruction': builder_cfg.description
     }
     agent = RolePlay(
-        function_list=function_list, llm=llm_config, instruction=instruction)
+        function_list=function_list,
+        llm=llm_config,
+        instruction=instruction,
+        uuid_str=uuid_str)
 
     # build memory
     storage_path = get_user_dir(uuid_str)

modelscope_agent/agent.py

@@ -50,13 +50,16 @@ def __init__(self,
         self.name = name
         self.description = description
         self.instruction = instruction
+        self.uuid_str = kwargs.get('uuid_str', None)
 
     def run(self, *args, **kwargs) -> Union[str, Iterator[str]]:
         if 'lang' not in kwargs:
             if has_chinese_chars([args, kwargs]):
                 kwargs['lang'] = 'zh'
             else:
                 kwargs['lang'] = 'en'
+        if 'uuid_str' not in kwargs and self.uuid_str is not None:
+            kwargs['uuid_str'] = self.uuid_str
         return self._run(*args, **kwargs)
 
     @abstractmethod

modelscope_agent/agents/agent_builder.py

@@ -115,7 +115,7 @@ def _run(self,
         # concat the new messages
         messages.append({'role': 'user', 'content': user_request})
 
-        return self._call_llm(messages=messages)
+        return self._call_llm(messages=messages, **kwargs)
 
     def parse_answer(self, llm_result_prefix: str, llm_result: str):
         """

modelscope_agent/agents/function_calling.py

@@ -3,7 +3,7 @@
 from modelscope_agent import Agent
 from modelscope_agent.agents.react import ReAct
 from modelscope_agent.agents.react_chat import ReActChat
-from modelscope_agent.log import logger
+from modelscope_agent.utils.logger import agent_logger as logger
 
 
 class FunctionCalling(Agent):

modelscope_agent/agents/role_play.py

@@ -212,7 +212,7 @@ def _run(self,
                 prompt=planning_prompt,
                 stream=True,
                 stop=['Observation:', 'Observation:\n'],
-            )
+                **kwargs)
 
             llm_result = ''
             for s in output:

modelscope_agent/llm/dashscope.py

@@ -3,17 +3,25 @@
 from typing import Dict, Iterator, List, Optional
 
 import dashscope
+from modelscope_agent.utils.logger import agent_logger as logger
 
 from .base import BaseChatModel, register_llm
 
 
-def stream_output(response):
+def stream_output(response, **kwargs):
     last_len = 0
     delay_len = 5
     in_delay = False
     text = ''
     for trunk in response:
         if trunk.status_code == HTTPStatus.OK:
+            logger.query_info(
+                uuid=kwargs.get('uuid_str', ''),
+                details={
+                    'dashscope.request_id': trunk.request_id,
+                    'dashscope.output': trunk.output
+                },
+                message='call dashscope generation api success')
             text = trunk.output.choices[0].message.content
             if (len(text) - last_len) <= delay_len:
                 in_delay = True
@@ -25,6 +33,15 @@ def stream_output(response):
                 yield now_rsp
                 last_len = len(real_text)
         else:
+            logger.query_error(
+                uuid=kwargs.get('uuid_str', ''),
+                details={
+                    'dashscope.request_id': trunk.request_id,
+                    'dashscope.status_code': trunk.status_code,
+                    'dashscope.code': trunk.code,
+                    'dashscope.message': trunk.message
+                },
+                message='call dashscope generation api error')
             err = '\nError code: %s. Error message: %s' % (trunk.code,
                                                            trunk.message)
             if trunk.code == 'DataInspectionFailed':
@@ -55,20 +72,24 @@ def _chat_stream(self,
                      stop: Optional[List[str]] = None,
                      **kwargs) -> Iterator[str]:
         stop = stop or []
-        top_p = kwargs.get('top_p', 0.8)
-
-        response = dashscope.Generation.call(
-            self.model,
-            messages=messages,  # noqa
-            stop_words=[{
+        generation_input = {
+            'model': self.model,
+            'messages': messages,  # noqa
+            'stop_words': [{
                 'stop_str': word,
                 'mode': 'exclude'
             } for word in stop],
-            top_p=top_p,
-            result_format='message',
-            stream=True,
-        )
-        return stream_output(response)
+            'top_p': kwargs.get('top_p', 0.8),
+            'result_format': 'message',
+            'stream': True,
+        }
+
+        logger.query_info(
+            uuid=kwargs.get('uuid_str', ''),
+            details=generation_input,
+            message='call dashscope generation api')
+        response = dashscope.Generation.call(**generation_input)
+        return stream_output(response, **kwargs)
 
     def _chat_no_stream(self,
                         messages: List[Dict],

modelscope_agent/tools/doc_parser.py

@@ -7,11 +7,11 @@
 
 import json
 import json5
-from modelscope_agent.log import logger
 from modelscope_agent.schemas import Document
 from modelscope_agent.tools.base import BaseTool, register_tool
 from modelscope_agent.tools.similarity_search import (RefMaterialInput,
                                                       RefMaterialInputItem)
+from modelscope_agent.utils.logger import agent_logger as logger
 from modelscope_agent.utils.utils import print_traceback, save_text_to_file
 
 from .storage import BaseStorage, DocumentStorage

modelscope_agent/tools/storage/file_storage.py

@@ -1,7 +1,7 @@
 import hashlib
 import os
 
-from modelscope_agent.log import logger
+from modelscope_agent.utils.logger import agent_logger as logger
 from modelscope_agent.utils.utils import (print_traceback, read_text_from_file,
                                           save_text_to_file)