liblogging 0.2.3__tar.gz → 0.2.4__tar.gz

{liblogging-0.2.3 → liblogging-0.2.4}/PKG-INFO

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

{liblogging-0.2.3 → liblogging-0.2.4}/liblogging/sending/log_collector.py

@@ -10,7 +10,6 @@ import json
 from datetime import datetime
 import time
 
-from .kafka_service import KafkaServiceFactory
 from ..util import split_trace_id, thread_pool_manager
 
 
@@ -26,11 +25,13 @@ def process_message(line):
     trace_id = message.get("trace_id", "")
     if trace_id:
         _, chat_dict = split_trace_id(trace_id)
-        message.update({
-            "uid": chat_dict.get("uid", ""),
-            "session_id": chat_dict.get("session_id", ""),
-            "turn": chat_dict.get("turn", 0)
-        })
+        # 新日志直接携带 uid/session_id/turn；旧日志仍可从复合 trace_id
+        # 中解析。显式传入的非空字段始终优先，避免被兼容逻辑覆盖。
+        for field in ("uid", "session_id", "turn"):
+            if message.get(field) in (None, ""):
+                legacy_value = chat_dict.get(field)
+                if legacy_value is not None and legacy_value != "":
+                    message[field] = legacy_value
     create_time = message.get("create_time")
     message.update({"create_date": get_date_from_time(create_time)})
     return trace_id, message
@@ -39,6 +40,8 @@ def process_message(line):
 class LogCollector:
 
     def __init__(self, args):
+        from .kafka_service import KafkaServiceFactory
+
         start_time = time.time()
         self.kafka_service = KafkaServiceFactory.create_kafka_service(
                 config_path=args.config_path,
@@ -110,4 +113,4 @@ def main():
 
 
 if __name__ == "__main__":
-    raise SystemExit(main())
+    raise SystemExit(main())

{liblogging-0.2.3 → liblogging-0.2.4}/liblogging.egg-info/PKG-INFO

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

{liblogging-0.2.3 → liblogging-0.2.4}/setup.py

@@ -20,7 +20,7 @@ if __name__ == '__main__':
                 "liblogging_mongo_collector = liblogging.collector.mongo:main"
             ]
         },
-        version='0.2.3',
+        version='0.2.4',
         description='Utilities for logging and sending logs.',
         long_description_content_type='text/markdown',
         long_description=long_description,