@rookiestar/eng-lang-tutor 1.0.2 → 1.0.4

package/scripts/tts/manager.py

@@ -27,9 +27,14 @@ from pathlib import Path
 from typing import Dict, Any, Optional, Type, ClassVar
 from datetime import date, datetime
 import os
+import sys
+
+# 添加 scripts 目录到路径以导入 state_manager
+sys.path.insert(0, str(Path(__file__).parent.parent))
 
 from .base import TTSProvider, TTSConfig, TTSResult
 from .providers.xunfei import XunFeiProvider
+from state_manager import get_default_state_dir
 
 
 # Provider 注册表
@@ -57,7 +62,7 @@ class TTSManager:
     def __init__(
         self,
         provider: str = "xunfei",
-        data_dir: str = "data",
+        data_dir: str = None,
         config: Optional[TTSConfig] = None,
         **credentials
     ):
@@ -66,12 +71,12 @@ class TTSManager:
 
         Args:
             provider: Provider 名称（目前仅支持 "xunfei"）
-            data_dir: 数据目录
+            data_dir: 数据目录（默认使用 OPENCLAW_STATE_DIR 或 ~/.openclaw/state/eng-lang-tutor/）
             config: TTS 配置
             **credentials: Provider 认证信息
 
         示例:
-            # 讯飞（从环境变量读取）
+            # 讯飞（使用默认数据目录）
             manager = TTSManager(provider="xunfei")
 
             # 讯飞（直接传入密钥）
@@ -88,7 +93,12 @@ class TTSManager:
                 f"Available: {list(PROVIDERS.keys())}"
             )
 
-        self.data_dir = Path(data_dir)
+        # 使用与 StateManager 相同的默认目录逻辑
+        if data_dir is None:
+            self.data_dir = get_default_state_dir()
+        else:
+            self.data_dir = Path(data_dir)
+
         self.audio_dir = self.data_dir / "audio"
         self.audio_dir.mkdir(parents=True, exist_ok=True)
 

package/scripts/tts/providers/xunfei.py

@@ -16,6 +16,8 @@ import base64
 import hmac
 import json
 import os
+import ssl
+import certifi
 from pathlib import Path
 from typing import Optional, ClassVar, Dict
 from urllib.parse import urlencode
@@ -132,8 +134,12 @@ class XunFeiProvider(TTSProvider):
                 data = json.loads(message)
                 if data.get("code") == 0:
                     audio = data.get("data", {}).get("audio", "")
+                    status = data.get("data", {}).get("status", 0)
                     if audio:
                         audio_data.extend(base64.b64decode(audio))
+                    # status=2 表示合成完成，关闭连接
+                    if status == 2:
+                        ws.close()
                 else:
                     error_msg = f"XunFei API error: code={data.get('code')}, message={data.get('message')}"
             except json.JSONDecodeError as e:
@@ -170,7 +176,10 @@ class XunFeiProvider(TTSProvider):
                 on_error=on_error,
             )
             ws.on_open = on_open
-            ws.run_forever()
+            # 使用 certifi 提供的 SSL 证书
+            ws.run_forever(
+                sslopt={"cert_reqs": ssl.CERT_REQUIRED, "ca_certs": certifi.where()}
+            )
 
             if error_msg:
                 return TTSResult(success=False, error_message=error_msg)

package/scripts/utils.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+"""
+Utility functions for eng-lang-tutor.
+
+Common utilities used across multiple modules.
+"""
+
+from typing import Dict, Any
+
+
+def safe_divide(numerator: float, denominator: float, default: float = 0.0) -> float:
+    """
+    Safe division that returns default if denominator is zero.
+
+    Args:
+        numerator: The number to divide
+        denominator: The number to divide by
+        default: Value to return if denominator is zero
+
+    Returns:
+        Result of division, or default if denominator is zero
+
+    Examples:
+        >>> safe_divide(10, 2)
+        5.0
+        >>> safe_divide(10, 0)
+        0.0
+        >>> safe_divide(10, 0, default=100)
+        100.0
+    """
+    return numerator / denominator if denominator != 0 else default
+
+
+def deep_merge(base: Dict[str, Any], override: Dict[str, Any]) -> Dict[str, Any]:
+    """
+    Recursively merge override dictionary into base dictionary.
+
+    Creates a new dictionary with values from base, updated with values from override.
+    Nested dictionaries are merged recursively; other values are overwritten.
+
+    Args:
+        base: Base dictionary (not modified)
+        override: Dictionary with values to override/add
+
+    Returns:
+        New merged dictionary
+
+    Examples:
+        >>> base = {'a': 1, 'b': {'c': 2, 'd': 3}}
+        >>> override = {'b': {'c': 10}}
+        >>> deep_merge(base, override)
+        {'a': 1, 'b': {'c': 10, 'd': 3}}
+    """
+    import copy
+    result = copy.deepcopy(base)
+
+    for key, value in override.items():
+        if key in result and isinstance(result[key], dict) and isinstance(value, dict):
+            result[key] = deep_merge(result[key], value)
+        else:
+            result[key] = copy.deepcopy(value)
+
+    return result
+
+
+def clamp(value: float, min_val: float, max_val: float) -> float:
+    """
+    Clamp a value to a range.
+
+    Args:
+        value: Value to clamp
+        min_val: Minimum allowed value
+        max_val: Maximum allowed value
+
+    Returns:
+        Value clamped to [min_val, max_val]
+    """
+    return max(min_val, min(max_val, value))