liblogging 0.1.2__tar.gz → 0.1.5__tar.gz

{liblogging-0.1.2 → liblogging-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: liblogging
-Version: 0.1.2
+Version: 0.1.5
 Summary: Utilities for logging and sending logs.
 Home-page: https://github.com/XoriieInpottn/liblogging
 Author: xi

{liblogging-0.1.2 → liblogging-0.1.5}/liblogging/logger.py

@@ -185,11 +185,19 @@ class Logger(logging.Logger):
             console_handler.setFormatter(formatter)
             self.addHandler(console_handler)
 
-    def track_start(self, message: Union[str, Mapping], message_type: str = "on_track_start"):
-        self._log(logging.INFO, {"message": message, "message_type": message_type}, (), stacklevel=2)
+    def track_start(
+        self, message: Union[str, Mapping], message_type: str = "on_track_start", stacklevel: int = 2, **kwargs
+    ):
+        self._log(
+            logging.INFO, {"message": message, "message_type": message_type, **kwargs}, (), stacklevel=stacklevel
+        )
 
-    def track_end(self, message: Union[str, Mapping], message_type: str = "on_track_end"):
-        self._log(logging.INFO, {"message": message, "message_type": message_type}, (), stacklevel=2)
+    def track_end(
+        self, message: Union[str, Mapping], message_type: str = "on_track_end", stacklevel: int = 2, **kwargs
+    ):
+        self._log(
+            logging.INFO, {"message": message, "message_type": message_type, **kwargs}, (), stacklevel=stacklevel
+        )
 
     def service_start(self):
         self._log(logging.INFO, {"message": "service_start", "message_type": "on_service_start"}, (), stacklevel=2)
@@ -197,22 +205,26 @@ class Logger(logging.Logger):
     def service_end(self):
         self._log(logging.INFO, {"message": "service_end", "message_type": "on_service_end"}, (), stacklevel=2)
 
-    def turn_start(self, request: Mapping):
-        self._log(logging.INFO, {"message": request, "message_type": "on_turn_start"}, (), stacklevel=2)
+    def turn_start(self, request: Mapping, **kwargs):
+        self.track_start(message=request, message_type="on_turn_start", stacklevel=3, **kwargs)
 
-    def turn_end(self, response: Mapping):
-        self._log(logging.INFO, {"message": response, "message_type": "on_turn_end"}, (), stacklevel=2)
+    def turn_end(self, response: Mapping, **kwargs):
+        self.track_end(message=response, message_type="on_turn_end", stacklevel=3, **kwargs)
 
-    def tool_start(self, tool_name: str, inputs: Mapping):
+    def tool_start(self, tool_name: str, inputs: Mapping, **kwargs):
         self.track_start(
-            message={"message": {"func_name": tool_name, "inputs": inputs}},
-            message_type="on_tool_start"
+            message={"func_name": tool_name, "inputs": inputs},
+            message_type="on_tool_start",
+            stacklevel=3,
+            **kwargs
         )
 
-    def tool_end(self, tool_name: str, output: Mapping, execute_time: float):
+    def tool_end(self, tool_name: str, output: Mapping, execute_time: float, **kwargs):
         self.track_end(
             message={"func_name": tool_name, "output": output, "duration": round(execute_time, 3)},
-            message_type="on_tool_end"
+            message_type="on_tool_end",
+            stacklevel=3,
+            **kwargs
         )
 
     def llm_start(
@@ -220,7 +232,8 @@ class Logger(logging.Logger):
         llm_chain_name: str,
         messages: Sequence[Mapping],
         template_info: Mapping,
-        model_kwargs: Mapping = None
+        model_kwargs: Mapping = None,
+        **kwargs
     ):
         log_info_dict = {
             "func_name": llm_chain_name,
@@ -230,7 +243,9 @@ class Logger(logging.Logger):
         }
         self.track_start(
             message=log_info_dict,
-            message_type="on_llm_start"
+            message_type="on_llm_start",
+            stacklevel=3,
+            **kwargs
         )
 
     def llm_end(
@@ -240,7 +255,8 @@ class Logger(logging.Logger):
         execute_time: float,
         completion_tokens: int = None,
         prompt_tokens: int = None,
-        role: str = "assistant"
+        role: str = "assistant",
+        **kwargs
     ):
         log_info_dict = {
             "func_name": llm_name,
@@ -249,10 +265,10 @@ class Logger(logging.Logger):
             "prompt_tokens": prompt_tokens,
             "duration": round(execute_time, 3)
         }
-        self.track_end(message=log_info_dict, message_type="on_llm_end")
+        self.track_end(message=log_info_dict, message_type="on_llm_end", stacklevel=3, **kwargs)
 
-    def agent(self, message: Union[str, Mapping]):
-        self._log(logging.INFO, {"message": message, "message_type": "agent"}, ())
+    def agent(self, message: Union[str, Mapping], **kwargs):
+        self._log(logging.INFO, {"message": message, "message_type": "agent", **kwargs}, ())
 
 
 logger = Logger("libentry.logger")

liblogging-0.1.5/liblogging/util.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+
+__author__ = "yubin"
+__all__ = [
+    "get_trace_id",
+    "split_trace_id",
+]
+
+import uuid
+from typing import Dict, Union, Tuple
+from datetime import datetime
+
+
+def get_trace_id(
+    request: Union[object, Dict], add_timestamp: bool = True, combine_symbol: str = "+"
+) -> str:
+    """
+    获取trace_id
+
+    参数:
+    request (Union[Dict, object]): 请求对象，可以是包含 'uid', 'session_id', 'turn' 属性的对象或包含这些键的字典
+    add_timestamp (bool): 是否添加时间戳
+    combine_symbol (str): 各个部分的连接符
+
+    返回:
+    str: 生成的trace_id
+    """
+    try:
+        if hasattr(request, "uid") and hasattr(request, "session_id") and hasattr(request, "turn"):
+            combine = [request.uid, request.session_id, str(request.turn)]
+        elif isinstance(request, Dict):
+            combine = [request.get("uid"), request.get("session_id"), str(request.get("turn"))]
+        else:
+            raise TypeError("Unsupported request type")
+        if add_timestamp:
+            timestamp = datetime.now().strftime("%H:%M:%S.%f")[:-3]
+            combine.append(timestamp)
+        result = combine_symbol.join(combine)
+    except (AttributeError, TypeError) as e:
+        print(f"Error occurred: {e}")
+        result = str(uuid.uuid4())
+    return result
+
+
+def split_trace_id(trace_id: str, combine_symbol: str = "+") -> Tuple:
+    """
+    拆分trace_id
+
+    参数:
+    trace_id (str): 需要拆分的trace_id
+    combine_symbol (str): 各个部分的连接符
+
+    返回:
+    tuple: 包含原始trace_id和一个字典，字典包含 'uid', 'session_id', 'turn' 键，如果无法正确拆分则返回空字典
+    """
+    parts = trace_id.split(combine_symbol)
+    if len(parts) == 3 or len(parts) == 4:  # 包含时间戳时长度为4
+        try:
+            uid, session_id, turn = parts[:3]
+            return trace_id, {"uid": uid, "session_id": session_id, "turn": turn}
+        except ValueError:
+            pass
+    return trace_id, {}

{liblogging-0.1.2 → liblogging-0.1.5}/liblogging.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: liblogging
-Version: 0.1.2
+Version: 0.1.5
 Summary: Utilities for logging and sending logs.
 Home-page: https://github.com/XoriieInpottn/liblogging
 Author: xi

{liblogging-0.1.2 → liblogging-0.1.5}/liblogging.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 setup.py
 liblogging/__init__.py
 liblogging/logger.py
+liblogging/util.py
 liblogging.egg-info/PKG-INFO
 liblogging.egg-info/SOURCES.txt
 liblogging.egg-info/dependency_links.txt

{liblogging-0.1.2 → liblogging-0.1.5}/setup.py

@@ -12,7 +12,7 @@ if __name__ == '__main__':
         packages=[
             'liblogging',
         ],
-        version='0.1.2',
+        version='0.1.5',
         description='Utilities for logging and sending logs.',
         long_description_content_type='text/markdown',
         long_description=long_description,