@rookiestar/eng-lang-tutor 1.0.4 → 1.0.6

package/npm-scripts/install.js

@@ -5,23 +5,99 @@
  *
  * This script runs automatically after npm install and:
  * 1. Installs the skill to ~/.openclaw/skills/eng-lang-tutor/
- * 2. Migrates data from old data/ directory if needed (handled by Python code)
+ * 2. Creates Python venv and installs dependencies
+ * 3. Checks for system dependencies (ffmpeg)
+ * 4. Migrates data from old data/ directory if needed (handled by Python code)
  */
 
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
+const { execSync, spawn } = require('child_process');
 
 const SKILL_NAME = 'eng-lang-tutor';
 const SKILLS_DIR = path.join(os.homedir(), '.openclaw', 'skills');
 const SKILL_TARGET = path.join(SKILLS_DIR, SKILL_NAME);
+const VENV_DIR = path.join(os.homedir(), '.venvs', SKILL_NAME);
 
 // Get the package root directory
 const PACKAGE_ROOT = path.resolve(__dirname, '..');
 
+function checkFfmpeg() {
+  try {
+    execSync('ffmpeg -version', { stdio: 'ignore' });
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+function setupPythonVenv() {
+  const requirementsPath = path.join(SKILL_TARGET, 'requirements.txt');
+
+  // Check if requirements.txt exists
+  if (!fs.existsSync(requirementsPath)) {
+    console.log('⚠️  requirements.txt not found, skipping Python setup\n');
+    return false;
+  }
+
+  // Check if venv already exists and has dependencies
+  const venvPython = path.join(VENV_DIR, 'bin', 'python');
+  const venvPip = path.join(VENV_DIR, 'bin', 'pip');
+
+  if (fs.existsSync(venvPython) && fs.existsSync(venvPip)) {
+    // Check if websocket-client is installed (key dependency)
+    try {
+      execSync(`${venvPython} -c "import websocket"`, { stdio: 'ignore' });
+      console.log('✓ Python venv already set up with dependencies\n');
+      return true;
+    } catch (e) {
+      console.log('→ Updating Python dependencies...');
+    }
+  } else {
+    console.log('→ Creating Python virtual environment...');
+    try {
+      execSync(`python3 -m venv ${VENV_DIR}`, { stdio: 'inherit' });
+      console.log('✓ Created venv at ' + VENV_DIR);
+    } catch (e) {
+      console.log('⚠️  Failed to create venv: ' + e.message);
+      return false;
+    }
+  }
+
+  // Install dependencies
+  console.log('→ Installing Python dependencies...');
+  try {
+    execSync(`${venvPip} install -q -r ${requirementsPath}`, { stdio: 'inherit' });
+    console.log('✓ Python dependencies installed\n');
+    return true;
+  } catch (e) {
+    console.log('⚠️  Failed to install Python dependencies: ' + e.message);
+    console.log('   You may need to run manually:');
+    console.log(`   ${venvPip} install -r ${requirementsPath}\n`);
+    return false;
+  }
+}
+
 function install() {
   console.log(`\n📦 Setting up ${SKILL_NAME} skill...\n`);
 
+  // Check for ffmpeg
+  const hasFfmpeg = checkFfmpeg();
+  if (!hasFfmpeg) {
+    console.log('⚠️  WARNING: ffmpeg is not installed. Audio generation will not work.');
+    console.log('   Install it with:');
+    if (process.platform === 'darwin') {
+      console.log('     brew install ffmpeg');
+    } else if (process.platform === 'linux') {
+      console.log('     sudo apt-get install ffmpeg   # Debian/Ubuntu');
+      console.log('     sudo yum install ffmpeg       # RHEL/CentOS');
+    }
+    console.log('');
+  } else {
+    console.log('✓ ffmpeg is installed\n');
+  }
+
   // Create skills directory if it doesn't exist
   if (!fs.existsSync(SKILLS_DIR)) {
     fs.mkdirSync(SKILLS_DIR, { recursive: true });
@@ -75,6 +151,9 @@ function install() {
 
   console.log(`✓ Copied ${copiedCount} items to ${SKILL_TARGET}`);
 
+  // Setup Python venv and install dependencies
+  setupPythonVenv();
+
   // Show post-install message
   console.log(`
 ╔═══════════════════════════════════════════════════════════════╗
@@ -84,21 +163,20 @@ function install() {
 ║  ${SKILL_NAME} has been installed to:                          ║
 ║  ${SKILL_TARGET}
 ║                                                               ║
-║  Next steps:                                                  ║
-║  1. Install Python dependencies:                              ║
-║     pip install -r ${SKILL_TARGET}/requirements.txt           ║
+║  Python venv:                                                 ║
+║     ${VENV_DIR}                                               ║
 ║                                                               ║
-║  2. Restart your OpenClaw agent                               ║
+║  Usage:                                                       ║
+║     ${VENV_DIR}/bin/python ${SKILL_TARGET}/scripts/cli.py     ║
 ║                                                               ║
-║  3. Configure through onboarding (first time only)            ║
+║  Or use the wrapper script:                                   ║
+║     ${SKILL_TARGET}/scripts/eng-lang-tutor                    ║
 ║                                                               ║
 ║  Data location:                                               ║
 ║     ~/.openclaw/state/eng-lang-tutor/                         ║
-║     (or set OPENCLAW_STATE_DIR env var)                       ║
 ║                                                               ║
-║  Commands:                                                    ║
-║     npx eng-lang-tutor install    - Reinstall skill           ║
-║     npx eng-lang-tutor uninstall  - Remove skill              ║
+║  Environment variables (required for TTS):                    ║
+║     XUNFEI_APPID, XUNFEI_API_KEY, XUNFEI_API_SECRET           ║
 ║                                                               ║
 ╚═══════════════════════════════════════════════════════════════╝
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rookiestar/eng-lang-tutor",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "English language tutor skill for OpenClaw - Learn authentic American English expressions with gamification",
   "keywords": [
     "english",

package/requirements.txt

@@ -9,3 +9,8 @@ aiohttp>=3.8.0           # Async HTTP client for Feishu API
 # Development dependencies
 pytest>=7.0.0
 pytest-asyncio>=0.21.0
+
+# System dependencies (must be installed separately):
+# - ffmpeg: Required for audio composition
+#   macOS: brew install ffmpeg
+#   Ubuntu/Debian: sudo apt-get install ffmpeg

package/scripts/audio_composer.py

@@ -71,7 +71,7 @@ class AudioComposer:
 
     def __del__(self):
         """清理临时目录"""
-        if self.temp_dir.exists():
+        if hasattr(self, 'temp_dir') and self.temp_dir.exists():
             shutil.rmtree(self.temp_dir, ignore_errors=True)
 
     def compose_keypoint_audio(

package/scripts/eng-lang-tutor

@@ -0,0 +1,16 @@
+#!/bin/bash
+# eng-lang-tutor wrapper script
+# Automatically uses venv Python if available, falls back to system Python
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+VENV_PYTHON="$HOME/.venvs/eng-lang-tutor/bin/python"
+
+# Prefer venv Python if it exists
+if [ -x "$VENV_PYTHON" ]; then
+    PYTHON="$VENV_PYTHON"
+else
+    PYTHON="python3"
+fi
+
+# Run the CLI with all arguments
+exec "$PYTHON" "$SCRIPT_DIR/cli.py" "$@"

package/scripts/state_manager.py

@@ -317,13 +317,26 @@ class StateManager:
             try:
                 audio_result = self.generate_keypoint_audio(target_date)
                 if audio_result.get('success'):
+                    audio_path = audio_result.get('audio_path')
                     # Update keypoint with audio metadata
                     content['audio'] = {
-                        'composed': audio_result.get('audio_path'),
+                        'composed': audio_path,
                         'duration_seconds': audio_result.get('duration_seconds'),
                         'generated_at': datetime.now().isoformat()
                     }
-                    # Re-save with audio info
+                    # Inject [AUDIO:...] tag for Gateway to send voice message
+                    audio_tag = f"[AUDIO:{audio_path}]"
+                    if 'display' in content:
+                        if isinstance(content['display'], dict):
+                            # Add audio tag to footer if display is an object
+                            footer = content['display'].get('footer', '')
+                            if audio_tag not in footer:
+                                content['display']['footer'] = f"{audio_tag}\n{footer}" if footer else audio_tag
+                        elif isinstance(content['display'], str):
+                            # Append to display if it's a string
+                            if audio_tag not in content['display']:
+                                content['display'] = f"{audio_tag}\n\n{content['display']}"
+                    # Re-save with audio info and display update
                     with open(file_path, 'w', encoding='utf-8') as f:
                         json.dump(content, f, ensure_ascii=False, indent=2)
             except Exception as e:
@@ -385,9 +398,37 @@ class StateManager:
             result = composer.compose_keypoint_audio(keypoint, output_path)
 
             if result.success:
+                audio_path = f"audio/{date_str}/keypoint_full.mp3"
+
+                # Update keypoint with audio metadata
+                keypoint['audio'] = {
+                    'composed': audio_path,
+                    'duration_seconds': result.duration_seconds,
+                    'generated_at': datetime.now().isoformat()
+                }
+
+                # Inject [AUDIO:...] tag for Gateway to send voice message
+                audio_tag = f"[AUDIO:{audio_path}]"
+                if 'display' in keypoint:
+                    if isinstance(keypoint['display'], dict):
+                        # Add audio tag to footer if display is an object
+                        footer = keypoint['display'].get('footer', '')
+                        if audio_tag not in footer:
+                            keypoint['display']['footer'] = f"{audio_tag}\n{footer}" if footer else audio_tag
+                    elif isinstance(keypoint['display'], str):
+                        # Append to display if it's a string
+                        if audio_tag not in keypoint['display']:
+                            keypoint['display'] = f"{audio_tag}\n\n{keypoint['display']}"
+
+                # Save updated keypoint
+                daily_path = self.get_daily_dir(target_date)
+                file_path = daily_path / "keypoint.json"
+                with open(file_path, 'w', encoding='utf-8') as f:
+                    json.dump(keypoint, f, ensure_ascii=False, indent=2)
+
                 return {
                     'success': True,
-                    'audio_path': f"audio/{date_str}/keypoint_full.mp3",
+                    'audio_path': audio_path,
                     'duration_seconds': result.duration_seconds
                 }
             else: