diff --git a/en/.doctrees/environment.pickle b/en/.doctrees/environment.pickle index 963b2d54d..529b0123a 100644 Binary files a/en/.doctrees/environment.pickle and b/en/.doctrees/environment.pickle differ diff --git a/en/.doctrees/index.doctree b/en/.doctrees/index.doctree index 70f6cad49..9347e6de0 100644 Binary files a/en/.doctrees/index.doctree and b/en/.doctrees/index.doctree differ diff --git a/en/_modules/agentscope/utils/logging_utils.html b/en/_modules/agentscope/utils/logging_utils.html index 2add2b48f..d5d43fe8d 100644 --- a/en/_modules/agentscope/utils/logging_utils.html +++ b/en/_modules/agentscope/utils/logging_utils.html @@ -124,17 +124,19 @@

Source code for agentscope.utils.logging_utils

"CRITICAL", ] -LEVEL_CHAT_LOG = "CHAT_LOG" -LEVEL_CHAT_SAVE = "CHAT_SAVE" +LEVEL_SAVE_LOG = "SAVE_LOG" +LEVEL_SAVE_MSG = "SAVE_MSG" +LEVEL_DISPLAY_MSG = "DISPLAY_MSG" _SPEAKER_COLORS = [ - ("<blue>", "</blue>"), - ("<cyan>", "</cyan>"), - ("<green>", "</green>"), - ("<magenta>", "</magenta>"), - ("<red>", "</red>"), - ("<white>", "</white>"), - ("<yellow>", "</yellow>"), + ("\033[90m", "\033[0m"), + ("\033[91m", "\033[0m"), + ("\033[92m", "\033[0m"), + ("\033[93m", "\033[0m"), + ("\033[94m", "\033[0m"), + ("\033[95m", "\033[0m"), + ("\033[96m", "\033[0m"), + ("\033[97m", "\033[0m"), ] _SPEAKER_TO_COLORS = {} @@ -182,9 +184,10 @@

Source code for agentscope.utils.logging_utils

"content" keys, and the message will be logged as "<name/role>: <content>". """ - # Save message into file, add default to ignore not serializable objects + # Save message into chat file, add default to ignore not serializable + # objects logger.log( - LEVEL_CHAT_SAVE, + LEVEL_SAVE_MSG, json.dumps(message, ensure_ascii=False, default=lambda _: None), *args, **kwargs, @@ -202,26 +205,43 @@

Source code for agentscope.utils.logging_utils

(m1, m2) = _get_speaker_color(speaker) print_str = [] + print_str_without_markers = [] if contain_content: print_str.append( - f"{m1}<b>{speaker}</b>{m2}: {message['content']}", + f"{m1}\033[1m{speaker}\033[0m{m2}: {message['content']}", + ) + print_str_without_markers.append( + f"{speaker}: {message['content']}", ) if contain_url: - print_str.append(f"{m1}<b>{speaker}</b>{m2}: {message['url']}") + print_str.append( + f"{m1}\033[1m{speaker}\033[0m{m2}: {message['url']}", + ) + print_str_without_markers.append( + f"{speaker}: {message['url']}", + ) if len(print_str) > 0: - print_str = ( - "\n".join(print_str).replace("{", "{{").replace("}", "}}") + print_str = "\n".join(print_str) + print_str_without_markers = "\n".join( + print_str_without_markers, + ) + + logger.log(LEVEL_DISPLAY_MSG, print_str, *args, **kwargs) + logger.log( + LEVEL_SAVE_LOG, + print_str_without_markers, + *args, + **kwargs, ) - logger.log(LEVEL_CHAT_LOG, print_str, *args, **kwargs) if hasattr(thread_local_data, "uid") and not disable_studio: log_studio(message, thread_local_data.uid, **kwargs) return - message = str(message).replace("{", "{{").replace("}", "}}") - logger.log(LEVEL_CHAT_LOG, message, *args, **kwargs) + logger.log(LEVEL_DISPLAY_MSG, message, *args, **kwargs) + logger.log(LEVEL_SAVE_LOG, message, *args, **kwargs)

@@ -285,8 +305,9 @@

Source code for agentscope.utils.logging_utils

def _level_format(record: dict) -> str: """Format the log record.""" - if record["level"].name == LEVEL_CHAT_LOG: - return record["message"] + "\n" + # Display the chat message + if record["level"].name in [LEVEL_DISPLAY_MSG, LEVEL_SAVE_LOG]: + return "{message}\n" else: return ( "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{" @@ -315,8 +336,11 @@

Source code for agentscope.utils.logging_utils

# avoid reinit in subprocess if not hasattr(logger, "chat"): # add chat function for logger - logger.level(LEVEL_CHAT_LOG, no=21) - logger.level(LEVEL_CHAT_SAVE, no=0) + logger.level(LEVEL_SAVE_LOG, no=51) + logger.level(LEVEL_DISPLAY_MSG, no=52) + + # save chat message into file + logger.level(LEVEL_SAVE_MSG, no=53) logger.chat = _chat # set logging level @@ -324,7 +348,8 @@

Source code for agentscope.utils.logging_utils

# standard output for all logging except chat logger.add( sys.stdout, - filter=lambda record: record["level"].name != LEVEL_CHAT_SAVE, + filter=lambda record: record["level"].name + not in [LEVEL_SAVE_LOG, LEVEL_SAVE_MSG], format=_level_format, enqueue=True, level=level, @@ -341,7 +366,8 @@

Source code for agentscope.utils.logging_utils

# save all logging into file logger.add( path_log_file, - filter=lambda record: record["level"].name != LEVEL_CHAT_SAVE, + filter=lambda record: record["level"].name + not in [LEVEL_SAVE_MSG, LEVEL_DISPLAY_MSG], format=_level_format, enqueue=True, level=level, @@ -349,10 +375,9 @@

Source code for agentscope.utils.logging_utils

logger.add( path_chat_file, - filter=lambda record: record["level"].name == LEVEL_CHAT_SAVE, format="{message}", enqueue=True, - level=LEVEL_CHAT_SAVE, + level=LEVEL_SAVE_MSG, )

diff --git a/zh_CN/.doctrees/environment.pickle b/zh_CN/.doctrees/environment.pickle index a3341b620..12ae25124 100644 Binary files a/zh_CN/.doctrees/environment.pickle and b/zh_CN/.doctrees/environment.pickle differ diff --git a/zh_CN/.doctrees/index.doctree b/zh_CN/.doctrees/index.doctree index 2732a8bb6..c8339afe0 100644 Binary files a/zh_CN/.doctrees/index.doctree and b/zh_CN/.doctrees/index.doctree differ diff --git a/zh_CN/_modules/agentscope/utils/logging_utils.html b/zh_CN/_modules/agentscope/utils/logging_utils.html index 584d14101..62d9b666c 100644 --- a/zh_CN/_modules/agentscope/utils/logging_utils.html +++ b/zh_CN/_modules/agentscope/utils/logging_utils.html @@ -125,17 +125,19 @@

agentscope.utils.logging_utils 源代码

     "CRITICAL",
 ]
 
-LEVEL_CHAT_LOG = "CHAT_LOG"
-LEVEL_CHAT_SAVE = "CHAT_SAVE"
+LEVEL_SAVE_LOG = "SAVE_LOG"
+LEVEL_SAVE_MSG = "SAVE_MSG"
+LEVEL_DISPLAY_MSG = "DISPLAY_MSG"
 
 _SPEAKER_COLORS = [
-    ("<blue>", "</blue>"),
-    ("<cyan>", "</cyan>"),
-    ("<green>", "</green>"),
-    ("<magenta>", "</magenta>"),
-    ("<red>", "</red>"),
-    ("<white>", "</white>"),
-    ("<yellow>", "</yellow>"),
+    ("\033[90m", "\033[0m"),
+    ("\033[91m", "\033[0m"),
+    ("\033[92m", "\033[0m"),
+    ("\033[93m", "\033[0m"),
+    ("\033[94m", "\033[0m"),
+    ("\033[95m", "\033[0m"),
+    ("\033[96m", "\033[0m"),
+    ("\033[97m", "\033[0m"),
 ]
 
 _SPEAKER_TO_COLORS = {}
@@ -183,9 +185,10 @@ 
agentscope.utils.logging_utils 源代码
             "content" keys, and the message will be logged as "<name/role>:
             <content>".
     """
-    # Save message into file, add default to ignore not serializable objects
+    # Save message into chat file, add default to ignore not serializable
+    # objects
     logger.log(
-        LEVEL_CHAT_SAVE,
+        LEVEL_SAVE_MSG,
         json.dumps(message, ensure_ascii=False, default=lambda _: None),
         *args,
         **kwargs,
@@ -203,26 +206,43 @@ 
agentscope.utils.logging_utils 源代码
             (m1, m2) = _get_speaker_color(speaker)
 
             print_str = []
+            print_str_without_markers = []
             if contain_content:
                 print_str.append(
-                    f"{m1}<b>{speaker}</b>{m2}: {message['content']}",
+                    f"{m1}\033[1m{speaker}\033[0m{m2}: {message['content']}",
+                )
+                print_str_without_markers.append(
+                    f"{speaker}: {message['content']}",
                 )
 
             if contain_url:
-                print_str.append(f"{m1}<b>{speaker}</b>{m2}: {message['url']}")
+                print_str.append(
+                    f"{m1}\033[1m{speaker}\033[0m{m2}: {message['url']}",
+                )
+                print_str_without_markers.append(
+                    f"{speaker}: {message['url']}",
+                )
 
             if len(print_str) > 0:
-                print_str = (
-                    "\n".join(print_str).replace("{", "{{").replace("}", "}}")
+                print_str = "\n".join(print_str)
+                print_str_without_markers = "\n".join(
+                    print_str_without_markers,
+                )
+
+                logger.log(LEVEL_DISPLAY_MSG, print_str, *args, **kwargs)
+                logger.log(
+                    LEVEL_SAVE_LOG,
+                    print_str_without_markers,
+                    *args,
+                    **kwargs,
                 )
-                logger.log(LEVEL_CHAT_LOG, print_str, *args, **kwargs)
 
                 if hasattr(thread_local_data, "uid") and not disable_studio:
                     log_studio(message, thread_local_data.uid, **kwargs)
                 return
 
-    message = str(message).replace("{", "{{").replace("}", "}}")
-    logger.log(LEVEL_CHAT_LOG, message, *args, **kwargs)
+    logger.log(LEVEL_DISPLAY_MSG, message, *args, **kwargs)
+    logger.log(LEVEL_SAVE_LOG, message, *args, **kwargs)
 
 
 

@@ -286,8 +306,9 @@ 
agentscope.utils.logging_utils 源代码
 
 def _level_format(record: dict) -> str:
     """Format the log record."""
-    if record["level"].name == LEVEL_CHAT_LOG:
-        return record["message"] + "\n"
+    # Display the chat message
+    if record["level"].name in [LEVEL_DISPLAY_MSG, LEVEL_SAVE_LOG]:
+        return "{message}\n"
     else:
         return (
             "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{"
@@ -316,8 +337,11 @@ 
agentscope.utils.logging_utils 源代码
     # avoid reinit in subprocess
     if not hasattr(logger, "chat"):
         # add chat function for logger
-        logger.level(LEVEL_CHAT_LOG, no=21)
-        logger.level(LEVEL_CHAT_SAVE, no=0)
+        logger.level(LEVEL_SAVE_LOG, no=51)
+        logger.level(LEVEL_DISPLAY_MSG, no=52)
+
+        # save chat message into file
+        logger.level(LEVEL_SAVE_MSG, no=53)
         logger.chat = _chat
 
         # set logging level
@@ -325,7 +349,8 @@ 
agentscope.utils.logging_utils 源代码
         # standard output for all logging except chat
         logger.add(
             sys.stdout,
-            filter=lambda record: record["level"].name != LEVEL_CHAT_SAVE,
+            filter=lambda record: record["level"].name
+            not in [LEVEL_SAVE_LOG, LEVEL_SAVE_MSG],
             format=_level_format,
             enqueue=True,
             level=level,
@@ -342,7 +367,8 @@ 
agentscope.utils.logging_utils 源代码
         # save all logging into file
         logger.add(
             path_log_file,
-            filter=lambda record: record["level"].name != LEVEL_CHAT_SAVE,
+            filter=lambda record: record["level"].name
+            not in [LEVEL_SAVE_MSG, LEVEL_DISPLAY_MSG],
             format=_level_format,
             enqueue=True,
             level=level,
@@ -350,10 +376,9 @@ 
agentscope.utils.logging_utils 源代码
 
         logger.add(
             path_chat_file,
-            filter=lambda record: record["level"].name == LEVEL_CHAT_SAVE,
             format="{message}",
             enqueue=True,
-            level=LEVEL_CHAT_SAVE,
+            level=LEVEL_SAVE_MSG,
         )