myagent-ai 1.15.84 → 1.15.85

package/memory/manager.py

@@ -231,7 +231,15 @@ class MemoryManager:
         params.append(timestamp())
 
         where = " AND ".join(conditions) if conditions else "1=1"
-        sql = f"SELECT * FROM memories WHERE {where} ORDER BY {order_by} LIMIT ?"
+        # 安全白名单：仅允许预定义的排序字段
+        _allowed_orders = {
+            "created_at ASC", "created_at DESC",
+            "importance ASC", "importance DESC",
+            "access_count ASC", "access_count DESC",
+            "updated_at ASC", "updated_at DESC",
+        }
+        _safe_order = order_by if order_by in _allowed_orders else "created_at ASC"
+        sql = f"SELECT * FROM memories WHERE {where} ORDER BY {_safe_order} LIMIT ?"
         params.append(limit)
 
         rows = conn.execute(sql, params).fetchall()
@@ -512,8 +520,8 @@ class MemoryManager:
             return None  # 空内容不查重
 
         conn = self._get_conn()
-        conditions = [f"category = '{category}'"]
-        params: list = []
+        conditions = ["category = ?"]
+        params: list = [category]
 
         if session_id:
             conditions.append("session_id = ?")
@@ -868,10 +876,13 @@ class MemoryManager:
                                          time_decay=time_decay, half_life_days=half_life_days)
         else:
             # 混合模式：取两种搜索结果的加权和 + 时间衰减
+            # 注意：传入 update_access=False 避免子搜索重复更新 access_count
             keyword_results = self._search_keyword(conn, query, where, params, limit * 2,
-                                                   time_decay=False, half_life_days=half_life_days)
+                                                   time_decay=False, half_life_days=half_life_days,
+                                                   update_access=False)
             semantic_results = self._search_semantic(conn, query, where, params, limit * 2,
-                                                     time_decay=False, half_life_days=half_life_days)
+                                                     time_decay=False, half_life_days=half_life_days,
+                                                     update_access=False)
 
             # 合并评分（相关性 + 时间衰减）
             combined: Dict[str, Tuple[MemoryEntry, float]] = {}
@@ -920,6 +931,7 @@ class MemoryManager:
         limit: int,
         time_decay: bool = False,
         half_life_days: float = 30.0,
+        update_access: bool = True,
     ) -> List[MemoryEntry]:
         """关键词 LIKE 搜索（支持时间衰减重排序）"""
         like_pattern = f"%{query}%"
@@ -949,12 +961,13 @@ class MemoryManager:
             entries = [e for e, _ in scored[:limit]]
 
         # 更新访问计数
-        for entry in entries:
-            conn.execute(
-                "UPDATE memories SET access_count = access_count + 1 WHERE id = ?",
-                (entry.id,),
-            )
-        conn.commit()
+        if update_access:
+            for entry in entries:
+                conn.execute(
+                    "UPDATE memories SET access_count = access_count + 1 WHERE id = ?",
+                    (entry.id,),
+                )
+            conn.commit()
 
         return entries
 
@@ -967,6 +980,7 @@ class MemoryManager:
         limit: int,
         time_decay: bool = False,
         half_life_days: float = 30.0,
+        update_access: bool = True,
     ) -> List[MemoryEntry]:
         """TF-IDF 语义搜索（支持时间衰减重排序）"""
         # 先取一批候选文档
@@ -1001,12 +1015,13 @@ class MemoryManager:
         result = [MemoryEntry.from_row(row_map[doc_id]) for doc_id in top_ids if doc_id in row_map]
 
         # 更新访问计数
-        for entry in result:
-            conn.execute(
-                "UPDATE memories SET access_count = access_count + 1 WHERE id = ?",
-                (entry.id,),
-            )
-        conn.commit()
+        if update_access:
+            for entry in result:
+                conn.execute(
+                    "UPDATE memories SET access_count = access_count + 1 WHERE id = ?",
+                    (entry.id,),
+                )
+            conn.commit()
 
         return result
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.15.84",
+  "version": "1.15.85",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/skills/search_skill.py

@@ -127,10 +127,21 @@ class WebSearchSkill(Skill):
                     r.raise_for_status()
                 except requests.exceptions.SSLError:
                     logger.warning("DuckDuckGo SSL 验证失败，跳过证书验证重试")
-                    r = requests.get("https://html.duckduckgo.com/html/", params={"q": query}, headers=_HEADERS, timeout=15, verify=False)
-                    r.raise_for_status()
+                    try:
+                        r = requests.get("https://html.duckduckgo.com/html/", params={"q": query}, headers=_HEADERS, timeout=15, verify=False)
+                        r.raise_for_status()
+                    except Exception as ssl_retry_err:
+                        logger.error(f"DuckDuckGo SSL 重试也失败: {ssl_retry_err}")
+                        return ""
+                except Exception as req_err:
+                    logger.error(f"DuckDuckGo 请求失败: {req_err}")
+                    return ""
                 if r is not None:
-                    return r.text or ""
+                    try:
+                        return r.text or ""
+                    except Exception as read_err:
+                        logger.error(f"DuckDuckGo 读取响应失败: {read_err}")
+                        return ""
                 return ""
 
             html = await asyncio.wait_for(loop.run_in_executor(None, _fetch), timeout=30)
@@ -181,10 +192,21 @@ class WebSearchSkill(Skill):
                     r.raise_for_status()
                 except requests.exceptions.SSLError:
                     logger.warning("Bing SSL 验证失败，跳过证书验证重试")
-                    r = requests.get("https://www.bing.com/search", params={"q": query, "count": num}, headers=_HEADERS, timeout=15, verify=False)
-                    r.raise_for_status()
+                    try:
+                        r = requests.get("https://www.bing.com/search", params={"q": query, "count": num}, headers=_HEADERS, timeout=15, verify=False)
+                        r.raise_for_status()
+                    except Exception as ssl_retry_err:
+                        logger.error(f"Bing SSL 重试也失败: {ssl_retry_err}")
+                        return ""
+                except Exception as req_err:
+                    logger.error(f"Bing 请求失败: {req_err}")
+                    return ""
                 if r is not None:
-                    return r.text or ""
+                    try:
+                        return r.text or ""
+                    except Exception as read_err:
+                        logger.error(f"Bing 读取响应失败: {read_err}")
+                        return ""
                 return ""
 
             html = await asyncio.wait_for(loop.run_in_executor(None, _fetch), timeout=30)
@@ -266,12 +288,23 @@ class WebReadSkill(Skill):
                     r.raise_for_status()
                 except requests.exceptions.SSLError:
                     logger.warning(f"web_read SSL 验证失败 ({url})，跳过证书验证重试")
-                    r = requests.get(url, headers=_HEADERS, timeout=30, verify=False)
-                    r.raise_for_status()
+                    try:
+                        r = requests.get(url, headers=_HEADERS, timeout=30, verify=False)
+                        r.raise_for_status()
+                    except Exception as ssl_retry_err:
+                        logger.error(f"web_read SSL 重试也失败 ({url}): {ssl_retry_err}")
+                        return None
+                except Exception as req_err:
+                    logger.error(f"web_read 请求失败 ({url}): {req_err}")
+                    return None
                 if r is not None:
-                    r.encoding = r.apparent_encoding
-                    return r.text or ""
-                return ""
+                    try:
+                        r.encoding = r.apparent_encoding
+                        return r.text or ""
+                    except Exception as read_err:
+                        logger.error(f"web_read 读取响应内容失败 ({url}): {read_err}")
+                        return None
+                return None
 
             html = await asyncio.wait_for(
                 loop.run_in_executor(None, _fetch), timeout=60
@@ -323,6 +356,7 @@ class WebReadSkill(Skill):
         except asyncio.TimeoutError:
             return SkillResult(success=False, error=f"网页读取超时 (60s): {url}")
         except Exception as e:
+            logger.error(f"web_read 异常 ({url}): {e}", exc_info=True)
             return SkillResult(success=False, error=f"网页读取失败: {e}")
 
 
@@ -369,23 +403,33 @@ class URLReadSkill(Skill):
                     )
                 except requests.exceptions.SSLError:
                     logger.warning(f"url_read SSL 验证失败 ({url})，跳过证书验证重试")
-                    r = requests.request(
-                        method=method,
-                        url=url,
-                        headers=headers,
-                        data=body,
-                        timeout=30,
-                        verify=False,
-                    )
+                    try:
+                        r = requests.request(
+                            method=method,
+                            url=url,
+                            headers=headers,
+                            data=body,
+                            timeout=30,
+                            verify=False,
+                        )
+                    except Exception as ssl_retry_err:
+                        logger.error(f"url_read SSL 重试也失败 ({url}): {ssl_retry_err}")
+                        return None
+                except Exception as req_err:
+                    logger.error(f"url_read 请求失败 ({url}): {req_err}")
+                    return None
                 if r is not None:
                     return r
-                raise requests.exceptions.ConnectionError(f"请求失败: {url}")
+                return None
 
             response = await asyncio.wait_for(loop.run_in_executor(None, _request), timeout=60)
 
+            if response is None:
+                return SkillResult(success=False, error=f"请求失败: 无法连接到 {url}")
+
             try:
                 content = response.json()
-            except ValueError:
+            except (ValueError, AttributeError):
                 content = response.text[:20000]
 
             return SkillResult(
@@ -398,4 +442,5 @@ class URLReadSkill(Skill):
                 message=f"HTTP {response.status_code}",
             )
         except Exception as e:
+            logger.error(f"url_read 异常 ({url}): {e}", exc_info=True)
             return SkillResult(success=False, error=f"请求失败: {e}")