Merge remote-tracking branch 'refs/remotes/origin/dev' into dev_zdy_1221_01_user_names

Author: wustzdy

src/memos/mem_reader/read_multi_modal/utils.py

@@ -4,7 +4,7 @@
 import os
 import re
 
-from datetime import datetime, timezone
+from datetime import datetime
 from typing import Any, TypeAlias
 from urllib.parse import urlparse
 
@@ -245,8 +245,8 @@ def coerce_scene_data(scene_data: SceneDataInput, scene_type: str) -> list[Messa
 
             # Default timestamp
             if chat_time_value is None:
-                session_date = datetime.now(timezone.utc)
-                date_format = "%I:%M %p on %d %B, %Y UTC"
+                session_date = datetime.now()
+                date_format = "%I:%M %p on %d %B, %Y"
                 chat_time_value = session_date.strftime(date_format)
 
             # Inject chat_time

src/memos/mem_scheduler/task_schedule_modules/redis_queue.py

@@ -699,27 +699,23 @@ def _batch_claim_pending_messages(
         results = []
         try:
             results = pipe.execute()
-        except Exception as e:
-            err_msg = str(e).lower()
-            if "nogroup" in err_msg or "no such key" in err_msg:
-                # Fallback: attempt sequential xautoclaim for robustness
-                for stream_key, need_count, label in claims_spec:
-                    try:
-                        self._ensure_consumer_group(stream_key=stream_key)
-                        res = self._redis_conn.xautoclaim(
-                            name=stream_key,
-                            groupname=self.consumer_group,
-                            consumername=self.consumer_name,
-                            min_idle_time=self.orchestrator.get_task_idle_min(task_label=label),
-                            start_id="0-0",
-                            count=need_count,
-                            justid=False,
-                        )
-                        results.append(res)
-                    except Exception:
-                        continue
-            else:
-                logger.error(f"Pipeline xautoclaim failed: {e}")
+        except Exception:
+            # Fallback: attempt sequential xautoclaim for robustness
+            for stream_key, need_count, label in claims_spec:
+                try:
+                    self._ensure_consumer_group(stream_key=stream_key)
+                    res = self._redis_conn.xautoclaim(
+                        name=stream_key,
+                        groupname=self.consumer_group,
+                        consumername=self.consumer_name,
+                        min_idle_time=self.orchestrator.get_task_idle_min(task_label=label),
+                        start_id="0-0",
+                        count=need_count,
+                        justid=False,
+                    )
+                    results.append(res)
+                except Exception:
+                    continue
 
         claimed_pairs: list[tuple[str, list[tuple[str, dict]]]] = []
         for (stream_key, _need_count, _label), claimed_result in zip(

src/memos/utils.py

@@ -6,9 +6,6 @@
 
 logger = get_logger(__name__)
 
-# Global threshold (seconds) for timing logs
-DEFAULT_TIME_BAR = 10.0
-
 
 def timed_with_status(
     func=None,
@@ -97,7 +94,7 @@ def wrapper(*args, **kwargs):
     return decorator(func)
 
 
-def timed(func=None, *, log=False, log_prefix=""):
+def timed(func=None, *, log=True, log_prefix=""):
     def decorator(fn):
         def wrapper(*args, **kwargs):
             start = time.perf_counter()
@@ -107,7 +104,8 @@ def wrapper(*args, **kwargs):
             if log is not True:
                 return result
 
-            if elapsed_ms >= (DEFAULT_TIME_BAR * 1000.0):
+            # 100ms threshold
+            if elapsed_ms >= 100.0:
                 logger.info(f"[TIMER] {log_prefix or fn.__name__} took {elapsed_ms:.0f} ms")
 
             return result