@agentunion/kite 1.4.0 → 1.5.0

package/extensions/services/model_service/entry.py

@@ -485,7 +485,7 @@ async def _ws_connect(token: str, kernel_port: int, _t0: float):
     ws_url = f"ws://127.0.0.1:{kernel_port}/ws?token={token}&id=model_service"
     print(f"[model_service] Connecting to Kernel: {ws_url}")
 
-    async with websockets.connect(ws_url, open_timeout=5, ping_interval=20, ping_timeout=20, close_timeout=10) as ws:
+    async with websockets.connect(ws_url, open_timeout=5, ping_interval=None, close_timeout=10) as ws:
         _ws_global = ws
         print(f"[model_service] Connected to Kernel ({_fmt_elapsed(_t0)})")
 
@@ -518,12 +518,14 @@ async def _ws_connect(token: str, kernel_port: int, _t0: float):
 
         # Publish module.ready (every reconnect)
         if not _shutting_down:
+            startup_time = time.monotonic() - _t0
             await _rpc_call(ws, "event.publish", {
                 "event_id": str(uuid.uuid4()),
                 "event": "module.ready",
                 "data": {
                     "module_id": "model_service",
                     "graceful_shutdown": True,
+                    "startup_time": startup_time,
                 },
             })
             print(f"[model_service] module.ready published ({_fmt_elapsed(_t0)})")
@@ -575,12 +577,32 @@ async def _publish_event(ws, event: dict):
     })
 
 
+async def _handle_ping_event(data: dict):
+    """Handle system.ping event and reply with system.pong."""
+    t1 = data.get("ping_time")
+    t2 = time.time()
+
+    await _publish_event(_ws_global, {
+        "event": "system.pong",
+        "data": {
+            "module_id": MODULE_NAME,
+            "ping_time": t1,
+            "pong_time": t2,
+        },
+    })
+
+
 async def _handle_event_notification(msg: dict):
     """Handle an event notification (JSON-RPC 2.0 Notification with method='event')."""
     params = msg.get("params", {})
     event_type = params.get("event", "")
     data = params.get("data", {})
 
+    # Handle system.ping event
+    if event_type == "system.ping":
+        await _handle_ping_event(data)
+        return
+
     # Special handling for module.shutdown
     if event_type == "module.shutdown":
         target = data.get("module_id", "")

package/extensions/services/proxy/.claude/settings.local.json

@@ -0,0 +1,13 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(echo agentcp not found directly:*)",
+      "Bash(grep:*)",
+      "Bash(head:*)",
+      "Bash(find H:\\\\project\\\\evol_main\\\\evol-electron-app\\\\python_sample_backend:*)",
+      "Bash(python3:*)",
+      "Bash(python:*)",
+      "Bash(cd H:\\\\project\\\\evol_main\\\\evol-electron-app\\\\python_sample_backend:*)"
+    ]
+  }
+}

package/extensions/services/proxy/CHANGELOG_20260308.md

@@ -0,0 +1,258 @@
+# Evol Proxy 服务修改说明
+
+## 修改日期
+2026-03-08
+
+## 修改内容
+
+### 1. 端口改为系统自动分配
+
+**修改文件：**
+- `main.py`
+- `server.py`
+
+**改动说明：**
+
+原来使用固定端口 12655，容易导致端口冲突。现在改为：
+- 使用 `port=0` 让系统自动分配可用端口
+- 在启动前先获取一个可用端口
+- 启动后显示实际使用的端口号
+
+**实现方式：**
+
+```python
+# 获取系统分配的可用端口
+import socket
+sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+sock.bind(('', 0))
+actual_port = sock.getsockname()[1]
+sock.close()
+
+# 使用该端口启动服务器
+await run_server(port=actual_port)
+```
+
+### 2. 登录后自动拉取模型列表和用户信息
+
+**修改文件：**
+- `main.py`
+
+**新增功能：**
+
+在 AID 上线成功后，自动执行以下操作：
+
+1. **拉取模型列表**
+   - 调用 `get_models_list()` 获取可用模型
+   - 显示模型数量和前 5 个模型名称
+   - 示例输出：
+     ```
+     [Models] Found 15 available models:
+       - gpt-4
+       - gpt-3.5-turbo
+       - claude-3-opus
+       - claude-3-sonnet
+       - gemini-pro
+       ... and 10 more
+     ```
+
+2. **获取用户信息**
+   - 调用 `userPresenter.get_user_info()` 获取用户信息
+   - 显示手机号和用户 ID
+   - 示例输出：
+     ```
+     [User] Logged in as: 138****1234
+     [User] User ID: user_abc123
+     ```
+
+**代码位置：**
+
+在 `async_main()` 函数中，Step 3.6 部分：
+
+```python
+# Step 3.6: 拉取模型列表和用户信息
+print("\n[Info] Fetching models and user info...")
+try:
+    # 拉取模型列表
+    from evol.server.openclaw_proxy import get_models_list
+    models_data = get_models_list()
+    model_count = len(models_data.get("data", []))
+    print(f"[Models] Found {model_count} available models:")
+    for model in models_data.get("data", [])[:5]:
+        print(f"  - {model.get('id', 'unknown')}")
+    if model_count > 5:
+        print(f"  ... and {model_count - 5} more")
+
+    # 获取用户信息
+    from evol.presenter.userPresenter import userPresenter
+    user_info = userPresenter.get_user_info()
+    if user_info:
+        print(f"[User] Logged in as: {user_info.get('phone', 'unknown')}")
+        print(f"[User] User ID: {user_info.get('id', 'unknown')}")
+
+except Exception as e:
+    print(f"[Info] Warning: 获取信息失败: {e}")
+```
+
+## 启动流程变化
+
+### 修改前
+
+```
+1. 初始化配置目录
+2. 检查本地 token
+3. 若无有效 token → 控制台登录
+4. 同步用户信息 & AID 上线
+5. 获取 Evol 本地密钥
+6. 启动 FastAPI 服务器（固定端口 12655）
+```
+
+### 修改后
+
+```
+1. 初始化配置目录
+2. 检查本地 token
+3. 若无有效 token → 控制台登录
+4. 同步用户信息 & AID 上线
+5. 获取 Evol 本地密钥
+6. 拉取模型列表和用户信息 ← 新增
+7. 启动 FastAPI 服务器（系统自动分配端口）← 修改
+```
+
+## 输出示例
+
+### 修改前
+
+```
+============================================================
+  Evol Sample Backend
+  Port: 12655
+============================================================
+
+[Init] Config dir: C:\Users\xxx\.evol
+[Auth] Token valid, skip login
+[AID] Starting AID login...
+Evol: aid_xxx is online
+[Key] Evol API Key: evol-xxx
+
+[Server] Starting on port 12655...
+[Server] ANTHROPIC_BASE_URL = http://127.0.0.1:12655/claude-proxy
+[Server] OPENAI_BASE_URL    = http://127.0.0.1:12655/openclaw-proxy/v1
+[Server] Health check       = http://127.0.0.1:12655/health
+[Server] Evol API Key       = evol-xxx
+
+Press Ctrl+C to stop.
+```
+
+### 修改后
+
+```
+============================================================
+  Evol Sample Backend
+  Port: Auto-assigned by system
+============================================================
+
+[Init] Config dir: C:\Users\xxx\.evol
+[Auth] Token valid, skip login
+[AID] Starting AID login...
+Evol: aid_xxx is online
+[Key] Evol API Key: evol-xxx
+
+[Info] Fetching models and user info...
+[Models] Found 15 available models:
+  - gpt-4
+  - gpt-3.5-turbo
+  - claude-3-opus
+  - claude-3-sonnet
+  - gemini-pro
+  ... and 10 more
+[User] Logged in as: 138****1234
+[User] User ID: user_abc123
+
+[Server] Starting server...
+
+[Server] Server will start on port 54321
+[Server] ANTHROPIC_BASE_URL = http://127.0.0.1:54321/claude-proxy
+[Server] OPENAI_BASE_URL    = http://127.0.0.1:54321/openclaw-proxy/v1
+[Server] Health check       = http://127.0.0.1:54321/health
+[Server] Evol API Key       = evol-xxx
+
+Press Ctrl+C to stop.
+```
+
+## 优点
+
+### 1. 端口自动分配
+
+- **避免端口冲突** - 不会与其他服务冲突
+- **支持多实例** - 可以同时运行多个代理服务
+- **更灵活** - 适应不同的部署环境
+
+### 2. 自动拉取信息
+
+- **验证登录状态** - 确认模型列表可以正常获取
+- **显示可用模型** - 用户一目了然有哪些模型可用
+- **确认用户身份** - 显示当前登录的用户信息
+- **便于调试** - 启动时就能发现配置问题
+
+## 注意事项
+
+1. **端口号变化** - 每次启动端口可能不同，需要从启动日志中获取
+2. **防火墙规则** - 如果需要外部访问，需要动态配置防火墙
+3. **错误处理** - 如果拉取模型列表失败，只会显示警告，不会中断启动
+
+## 测试建议
+
+1. **基本功能测试**
+   ```bash
+   # 启动服务
+   python main.py
+
+   # 查看启动日志，获取实际端口（假设是 54321）
+   # 测试健康检查
+   curl http://127.0.0.1:54321/health
+
+   # 测试模型列表
+   curl http://127.0.0.1:54321/openclaw-proxy/v1/models \
+     -H "Authorization: Bearer evol-xxx"
+   ```
+
+2. **多实例测试**
+   ```bash
+   # 同时启动多个实例，验证端口不冲突
+   python main.py &
+   python main.py &
+   ```
+
+3. **端口冲突测试**
+   ```bash
+   # 验证不会出现端口占用错误
+   # 之前固定端口时可能出现的问题现在应该不会发生
+   ```
+
+## 回滚方案
+
+如果需要回滚到固定端口模式，修改 `main.py`：
+
+```python
+# 改回固定端口
+PORT = 12655  # 或其他固定端口
+
+# 恢复端口清理逻辑
+kill_port(PORT)
+
+# 直接使用固定端口启动
+await run_server(port=PORT)
+```
+
+## 相关文件
+
+- `main.py` - 主程序入口
+- `server.py` - FastAPI 服务器
+- `console_auth.py` - 控制台认证
+- `evol/server/openclaw_proxy.py` - OpenClaw 代理实现
+- `evol/presenter/userPresenter.py` - 用户信息管理
+
+---
+
+**修改者：** Claude (Kite Assistant)
+**审核者：** 待审核

package/extensions/services/proxy/_fix_prints.py

@@ -0,0 +1,133 @@
+"""
+Temporary script to replace print() with logger calls in openclaw_proxy.py and claude_proxy_async.py.
+Delete this file after running.
+"""
+import re
+import sys
+
+def classify_message(msg_text):
+    """Classify a print message into logger level based on content."""
+    error_keywords = ['❌', '失败', '异常', 'error', 'Error', '严重错误', '错误']
+    warning_keywords = ['⚠️', '警告']
+    info_keywords = ['成功', '已初始化', '已启动', '已停止', '已注册', '已禁用', '已清理',
+                     '刷新完成', '加载成功', '上线', '完成']
+
+    for kw in error_keywords:
+        if kw in msg_text:
+            return 'error'
+    for kw in warning_keywords:
+        if kw in msg_text:
+            return 'warning'
+    for kw in info_keywords:
+        if kw in msg_text:
+            return 'info'
+    return 'debug'
+
+
+def remove_emojis(text):
+    """Remove common emoji characters from text."""
+    emojis = ['🧹', '🚀', '🛑', '✅', '❌', '⚠️', '✓', '🔧']
+    for e in emojis:
+        text = text.replace(e, '')
+    # Clean up extra spaces left by emoji removal
+    text = re.sub(r'  +', ' ', text)
+    return text
+
+
+def process_file(filepath):
+    with open(filepath, 'r', encoding='utf-8') as f:
+        content = f.read()
+
+    lines = content.split('\n')
+    new_lines = []
+    i = 0
+    replacements = 0
+
+    while i < len(lines):
+        line = lines[i]
+        stripped = line.lstrip()
+        indent = line[:len(line) - len(stripped)]
+
+        # Handle traceback.print_exc()
+        if 'traceback.print_exc()' in stripped and stripped.strip() == 'traceback.print_exc()':
+            new_lines.append(f'{indent}logger.debug(traceback.format_exc())')
+            replacements += 1
+            i += 1
+            continue
+
+        # Skip non-print lines
+        if not stripped.startswith('print(') and not stripped.startswith('print ('):
+            new_lines.append(line)
+            i += 1
+            continue
+
+        # Gather the full print statement (may span multiple lines)
+        full_print = line
+        # Count open/close parens to handle multi-line prints
+        open_count = full_print.count('(') - full_print.count(')')
+        while open_count > 0 and i + 1 < len(lines):
+            i += 1
+            full_print += '\n' + lines[i]
+            open_count = full_print.count('(') - full_print.count(')')
+
+        # Extract the content inside print(...)
+        # Find the print( and matching )
+        full_stripped = full_print.lstrip()
+
+        # Match print(...) - extract inner content
+        # Simple approach: replace 'print(' with 'logger.X(' and keep everything else
+
+        # Determine the level based on content
+        level = classify_message(full_stripped)
+
+        # Clean emojis from the content
+        cleaned = remove_emojis(full_print)
+        cleaned_stripped = cleaned.lstrip()
+
+        # Handle special case: print("\n" + "=" * 80) and print("=" * 80 + "\n")
+        # These are separator lines - skip them entirely
+        if re.match(r'print\(\s*"\\n"\s*\+\s*"="\s*\*\s*\d+\s*\)', cleaned_stripped):
+            replacements += 1
+            i += 1
+            continue
+        if re.match(r'print\(\s*"="\s*\*\s*\d+\s*\+\s*"\\n"\s*\)', cleaned_stripped):
+            replacements += 1
+            i += 1
+            continue
+        if re.match(r'print\(\s*"="\s*\*\s*\d+\s*\)', cleaned_stripped):
+            replacements += 1
+            i += 1
+            continue
+
+        # Replace print( with logger.level(
+        # Handle the indentation properly for multi-line
+        cleaned_lines = cleaned.split('\n')
+        first_line = cleaned_lines[0]
+        first_stripped = first_line.lstrip()
+        first_indent = first_line[:len(first_line) - len(first_stripped)]
+
+        # Replace print( with logger.level(
+        new_first = re.sub(r'^print\s*\(', f'logger.{level}(', first_stripped)
+        cleaned_lines[0] = first_indent + new_first
+
+        for cl in cleaned_lines:
+            new_lines.append(cl)
+
+        replacements += 1
+        i += 1
+        continue
+
+    result = '\n'.join(new_lines)
+
+    with open(filepath, 'w', encoding='utf-8') as f:
+        f.write(result)
+
+    return replacements
+
+
+# Process both files
+r1 = process_file('evol/server/openclaw_proxy.py')
+print(f"openclaw_proxy.py: {r1} replacements made")
+
+r2 = process_file('evol/server/claude_proxy_async.py')
+print(f"claude_proxy_async.py: {r2} replacements made")

package/extensions/services/proxy/_fix_prints2.py

@@ -0,0 +1,87 @@
+"""
+Fix indentation issues caused by the previous script's emoji removal.
+The problem: removing multi-byte emoji chars from lines messes up indentation
+when the emoji is at the start of a string, not in the indentation itself.
+
+Actually, the real issue is simpler: the 'remove_emojis' function was applied to
+the ENTIRE line including indentation whitespace, and the `re.sub(r'  +', ' ', text)`
+collapsed double spaces in the indentation.
+
+This script fixes the indentation by re-reading the current (broken) files and
+fixing any lines where logger.X( has wrong indentation.
+"""
+import re
+
+def fix_indentation(filepath):
+    """
+    The previous script broke indentation because:
+    1. Emojis in Chinese text like '✅' '❌' were removed
+    2. The cleanup regex `re.sub(r'  +', ' ', text)` collapsed ALL multi-spaces,
+       including indentation whitespace
+
+    Strategy: We can't easily reverse this. Instead, let's look at each logger.X()
+    line and infer the correct indentation from its surrounding context.
+    """
+    with open(filepath, 'r', encoding='utf-8') as f:
+        lines = f.readlines()
+
+    fixed = 0
+    new_lines = []
+
+    for i, line in enumerate(lines):
+        stripped = line.lstrip()
+        current_indent = len(line) - len(line.lstrip())
+
+        # Check if this is a logger line with potentially wrong indentation
+        if stripped.startswith('logger.'):
+            # Look at the previous non-empty line to determine expected indentation
+            expected_indent = None
+            for j in range(i - 1, max(0, i - 5), -1):
+                prev = lines[j]
+                prev_stripped = prev.lstrip()
+                if not prev_stripped or prev_stripped.startswith('#'):
+                    continue
+                prev_indent = len(prev) - len(prev.lstrip())
+
+                # If previous line ends with ':', this line should be indented more
+                if prev_stripped.rstrip().endswith(':'):
+                    expected_indent = prev_indent + 4
+                # If previous line is at same block level
+                elif prev_stripped.startswith(('logger.', 'log_info', 'log_error',
+                    'return', 'if ', 'elif ', 'else:', 'try:', 'except', 'finally:',
+                    'for ', 'while ', 'async ', 'await ', 'with ', 'raise',
+                    'self.', 'del ', 'pass', 'break', 'continue',
+                    'result', 'response', 'session', 'error', 'cleanup',
+                    'old_', 'new_', 'first_', 'aid_', 'evol_', 'agentcp_',
+                    'remaining', 'time_since', 'current_', 'message', 'proxy_',
+                    'trace_id', 'model', 'request', 'body', 'api_', 'user_',
+                    'is_', 'async_session', 'openclaw', 'shared_', '_register',
+                    'full_rebuild', 'rebuild_thread', 'login_result',
+                    'fetch_result', 'balance', 'credits', 'users_count',
+                    'inner_data', 'data', 'api_key', 'cached_key', 'success',
+                    'stale_trace', 'age_', 'content', 'stream_url', 'openai_',
+                    'response_body', 'http_status', 'error_message',
+                    'global ', 'import ', '_rebuild', '_last_full', '_agentcp')):
+                    expected_indent = prev_indent
+                else:
+                    expected_indent = prev_indent
+                break
+
+            if expected_indent is not None and current_indent != expected_indent:
+                # Fix the indentation
+                line = ' ' * expected_indent + stripped
+                fixed += 1
+
+        new_lines.append(line)
+
+    with open(filepath, 'w', encoding='utf-8') as f:
+        f.writelines(new_lines)
+
+    return fixed
+
+
+f1 = fix_indentation('evol/server/openclaw_proxy.py')
+print(f"openclaw_proxy.py: {f1} lines fixed")
+
+f2 = fix_indentation('evol/server/claude_proxy_async.py')
+print(f"claude_proxy_async.py: {f2} lines fixed")