Upload 2 files

DEPLOYMENT.md

@@ -0,0 +1,153 @@
+# MoneyPrinterTurbo Huggingface Spaces 部署指南
+
+## 🎉 最新部署状态
+
+✅ **部署成功！** 应用已在Huggingface Spaces上线  
+🔗 **访问地址**: [MoneyPrinterTurbo on HF Spaces](https://huggingface.co/spaces/your-username/MoneyPrinterTurbo)
+
+### 📋 部署完成清单
+- [x] 创建Huggingface Space
+- [x] 上传所有项目文件  
+- [x] 配置启动文件 (app.py)
+- [x] 设置依赖文件 (requirements.txt)
+- [x] 优化FREE层级配置
+- [x] 解决启动问题
+
+---
+
+## 🚀 快速部署步骤
+
+### 1. 准备文件
+确保以下文件已准备好：
+- `app.py` - 简化的Streamlit启动文件
+- `README.md` - 项目说明（从README_HF.md重命名）
+- `requirements.txt` - 精简的依赖列表（从requirements_hf.txt重命名）
+- `config.toml` - 预配置的设置文件
+
+### 2. 创建Huggingface Space
+1. 访问 https://huggingface.co/spaces
+2. 点击 "Create new Space"
+3. 选择 "Streamlit" 作为SDK
+4. 设置Space名称和描述
+
+### 3. 上传文件
+将所有项目文件上传到新创建的Space，确保：
+- `app.py` 作为主入口文件
+- 所有必要的项目文件和目录结构完整
+
+### 4. 配置环境变量（重要！）
+
+在Space的Settings页面添加以下环境变量：
+
+#### LLM服务商API密钥
+```bash
+DEEPSEEK_API_KEY=sk-xxxxxx          # DeepSeek API密钥
+MOONSHOT_API_KEY=sk-xxxxxx          # Moonshot API密钥  
+OPENAI_API_KEY=sk-xxxxxx            # OpenAI API密钥
+```
+
+#### 视频素材API密钥
+```bash
+PEXELS_API_KEY=xxxxxx               # Pexels视频素材
+PIXABAY_API_KEY=xxxxxx              # Pixabay视频素材
+```
+
+#### 语音合成API密钥
+```bash
+AZURE_SPEECH_KEY=xxxxxx             # Azure语音服务密钥
+AZURE_SPEECH_REGION=eastus          # Azure服务区域
+```
+
+#### 其他服务
+```bash
+SILICONFLOW_API_KEY=sk-xxxxxx       # SiliconFlow API密钥
+MONEYPRINTER_API_KEY=xxxxxx         # MoneyPrinter官方API（可选）
+```
+
+---
+
+## 🔧 问题解决方案
+
+### ✅ 已解决的问题
+
+1. **启动卡在"Starting"状态**
+   - 原因：复杂的启动逻辑和subprocess调用
+   - 解决：简化为直接Streamlit应用，移除subprocess启动
+
+2. **依赖包安装失败**
+   - 原因：包含不兼容的系统级依赖
+   - 解决：使用精简的requirements_hf.txt
+
+3. **资源超限问题**
+   - 原因：FREE层级资源限制
+   - 解决：优化配置，限制并发任务数
+
+### 🛠️ 当前功能状态
+
+- ✅ **基础界面**: 应用启动和配置检查
+- ✅ **环境变量加载**: 自动读取HF Spaces环境变量
+- ✅ **API密钥验证**: 显示已配置的服务状态
+- 🔄 **视频生成**: 核心功能适配中
+- 🔄 **完整界面**: 原Main.py功能迁移中
+
+---
+
+## 📊 API密钥获取指南
+
+### DeepSeek API (推荐)
+1. 访问 https://platform.deepseek.com/
+2. 注册账户并获取API密钥
+3. 新用户通常有免费额度
+
+### Moonshot API  
+1. 访问 https://platform.moonshot.cn/
+2. 注册并获取API密钥
+3. 性价比较高的国产LLM
+
+### Pexels API (视频素材)
+1. 访问 https://www.pexels.com/api/
+2. 免费注册获取API密钥
+3. 每月有免费请求限额
+
+### Azure Speech (语音合成)
+1. 访问 https://azure.microsoft.com/services/cognitive-services/speech-services/
+2. 创建Azure账户和Speech资源
+3. 获取API密钥和区域信息
+
+---
+
+## 🎯 使用建议
+
+### FREE层级最佳实践
+1. **视频时长**: 建议30-60秒
+2. **并发限制**: 同时只生成1个视频
+3. **素材选择**: 优先使用缓存的素材
+4. **API调用**: 合理控制频率
+
+### 性能优化
+- 使用简化界面减少资源占用
+- 启用素材缓存机制
+- 限制同时处理的任务数量
+
+---
+
+## 📞 技术支持
+
+如遇到问题，请检查：
+1. **Space日志**: 查看启动和运行日志
+2. **环境变量**: 确认API密钥配置正确
+3. **网络连接**: 确保API服务可访问
+4. **资源限制**: 监控内存和CPU使用
+
+---
+
+## 🔄 后续计划
+
+1. **完整功能迁移**: 逐步适配所有视频生成功能
+2. **性能优化**: 进一步优化FREE层级体验
+3. **用户界面**: 改进交互体验
+4. **文档完善**: 添加更多使用教程
+
+---
+
+*最后更新: 2024年*

app.py

@@ -1,214 +1,180 @@
 #!/usr/bin/env python3
 """
-Huggingface Spaces entry point for MoneyPrinterTurbo
-Optimized for FREE tier (2 vCPU + 16GB RAM)
+MoneyPrinterTurbo - Huggingface Spaces Edition
+Optimized for FREE tier deployment
 """
 
 import os
 import sys
-import subprocess
+import streamlit as st
 import toml
 from pathlib import Path
 
-# Add the root directory to Python path
-root_dir = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, root_dir)
-
-def setup_environment():
-    """Setup environment optimized for HF Spaces FREE tier"""
-    print("📁 Creating storage directories...")
-    # Create necessary directories
-    os.makedirs("storage/tasks", exist_ok=True)
-    os.makedirs("storage/temp", exist_ok=True)
-    os.makedirs("storage/cache_videos", exist_ok=True)
-    os.makedirs(".streamlit", exist_ok=True)
-    
-    # Create .streamlit/config.toml for proper configuration
-    streamlit_config = """
-[server]
-port = 7860
-address = "0.0.0.0"
-enableCORS = true
-enableXsrfProtection = false
-enableWebsocketCompression = false
-
-[browser]
-gatherUsageStats = false
-"""
-    
-    with open(".streamlit/config.toml", "w") as f:
-        f.write(streamlit_config)
-    
-    print("✅ Directories and Streamlit config created")
+# Add project root to Python path
+project_root = Path(__file__).parent
+sys.path.insert(0, str(project_root))
+
+# Create necessary directories
+os.makedirs("storage/tasks", exist_ok=True)
+os.makedirs("storage/temp", exist_ok=True)
+os.makedirs("storage/cache_videos", exist_ok=True)
 
-def load_env_variables():
-    """Load environment variables into config.toml"""
+def load_config():
+    """Load configuration from environment variables"""
     config_path = "config.toml"
     
-    # Load existing config or create default
-    try:
-        if os.path.exists(config_path):
-            config = toml.load(config_path)
-        else:
-            config = {
-                "app": {"max_concurrent_tasks": 1, "api_enabled": True},
-                "ui": {"hide_log": False},
-                "azure": {},
-                "siliconflow": {}
-            }
-    except Exception:
-        config = {
-            "app": {"max_concurrent_tasks": 1, "api_enabled": True},
-            "ui": {"hide_log": False},
-            "azure": {},
-            "siliconflow": {}
-        }
+    # Default configuration
+    config = {
+        "app": {
+            "max_concurrent_tasks": 1,
+            "api_enabled": True,
+            "log_level": "INFO"
+        },
+        "ui": {"hide_log": False, "language": "zh"},
+        "azure": {},
+        "siliconflow": {}
+    }
     
     # Load environment variables
-    env_mappings = {
-        # MoneyPrinter API
-        "MONEYPRINTER_API_KEY": ("app", "api_key"),
-        
-        # LLM providers
+    env_vars = {
         "DEEPSEEK_API_KEY": ("app", "deepseek_api_key"),
-        "MOONSHOT_API_KEY": ("app", "moonshot_api_key"),
+        "MOONSHOT_API_KEY": ("app", "moonshot_api_key"), 
         "OPENAI_API_KEY": ("app", "openai_api_key"),
-        
-        # Video sources
         "PEXELS_API_KEY": ("app", "pexels_api_keys"),
         "PIXABAY_API_KEY": ("app", "pixabay_api_keys"),
-        
-        # Azure Speech
         "AZURE_SPEECH_KEY": ("azure", "speech_key"),
         "AZURE_SPEECH_REGION": ("azure", "speech_region"),
-        
-        # SiliconFlow
         "SILICONFLOW_API_KEY": ("siliconflow", "api_key"),
+        "MONEYPRINTER_API_KEY": ("app", "api_key")
     }
     
-    env_vars_loaded = []
-    for env_var, (section, key) in env_mappings.items():
-        value = os.getenv(env_var)
+    loaded_keys = []
+    for env_key, (section, config_key) in env_vars.items():
+        value = os.getenv(env_key)
         if value:
             if section not in config:
                 config[section] = {}
-            
-            # Handle API keys that should be lists
-            if key in ["pexels_api_keys", "pixabay_api_keys"]:
-                config[section][key] = [value] if isinstance(value, str) else value
+            if config_key.endswith("_keys"):
+                config[section][config_key] = [value]
             else:
-                config[section][key] = value
-            
-            env_vars_loaded.append(env_var)
+                config[section][config_key] = value
+            loaded_keys.append(env_key)
     
-    # Save updated config
-    try:
-        with open(config_path, "w") as f:
-            toml.dump(config, f)
-        
-        if env_vars_loaded:
-            print(f"✅ Loaded environment variables: {', '.join(env_vars_loaded)}")
-        else:
-            print("ℹ️ No environment variables found, using WebUI configuration")
-    except Exception as e:
-        print(f"⚠️ Could not save config: {e}")
-
-def optimize_for_free_tier():
-    """Apply FREE tier optimizations"""
-    print("🔧 Applying FREE tier optimizations...")
+    # Save configuration
+    with open(config_path, 'w', encoding='utf-8') as f:
+        toml.dump(config, f)
     
-    # Set environment variables for optimization
-    os.environ["STREAMLIT_SERVER_MAX_UPLOAD_SIZE"] = "10"  # 10MB limit
-    os.environ["STREAMLIT_SERVER_MAX_MESSAGE_SIZE"] = "10"  # 10MB limit
+    return config, loaded_keys
+
+# Load configuration
+config, loaded_env_vars = load_config()
+
+# Set Streamlit page config
+st.set_page_config(
+    page_title="MoneyPrinterTurbo - HF Spaces",
+    page_icon="🎬",
+    layout="wide",
+    initial_sidebar_state="expanded"
+)
+
+# Custom CSS
+st.markdown("""
+<style>
+.main > div {
+    padding-top: 2rem;
+}
+.stAlert {
+    margin-top: 1rem;
+}
+</style>
+""", unsafe_allow_html=True)
+
+# Main UI
+st.title("🎬 MoneyPrinterTurbo")
+st.markdown("### AI视频生成工具 - Huggingface Spaces版")
+
+# Status display
+with st.container():
+    col1, col2 = st.columns(2)
     
-    print("✅ FREE tier optimizations applied")
+    with col1:
+        st.success("✅ 应用已成功启动")
+        st.info(f"📊 环境变量加载: {len(loaded_env_vars)} 个")
+        
+    with col2:
+        st.warning("⚠️ 这是简化版界面")
+        st.info("🔧 为FREE层级优化")
+
+# Configuration status
+st.subheader("📋 配置状态")
+config_status = st.container()
 
-def start_streamlit():
-    """Start Streamlit application"""
-    print("🚀 Starting Streamlit application...")
+with config_status:
+    # Check API keys
+    api_keys_status = []
     
-    # Check if we should use SimpleMain (FREE tier) or full Main
-    use_simple = os.getenv("USE_SIMPLE_UI", "true").lower() == "true"
+    if config.get("app", {}).get("deepseek_api_key"):
+        api_keys_status.append("✅ DeepSeek API")
+    if config.get("app", {}).get("moonshot_api_key"):
+        api_keys_status.append("✅ Moonshot API")
+    if config.get("app", {}).get("openai_api_key"):
+        api_keys_status.append("✅ OpenAI API")
+    if config.get("app", {}).get("pexels_api_keys"):
+        api_keys_status.append("✅ Pexels API")
+    if config.get("azure", {}).get("speech_key"):
+        api_keys_status.append("✅ Azure Speech")
     
-    if use_simple:
-        streamlit_file = "webui/SimpleMain.py"
-        print("📱 Using SimpleMain.py (FREE tier optimized)")
+    if api_keys_status:
+        st.success("🔑 已配置的API密钥:")
+        for status in api_keys_status:
+            st.write(f"   {status}")
     else:
-        streamlit_file = "webui/Main.py"
-        print("🖥️ Using Main.py (full features)")
+        st.error("❌ 未检测到API密钥配置")
+        st.info("💡 请在Huggingface Spaces设置中添加环境变量")
+
+# Instructions
+st.subheader("🚀 使用说明")
+st.markdown("""
+1. **配置API密钥**: 在Huggingface Spaces的Settings中添加环境变量
+2. **选择功能**: 使用下方的功能模块开始创建视频
+3. **注意限制**: FREE层级有资源限制，建议生成较短的视频
+""")
+
+# Quick actions
+st.subheader("⚡ 快速操作")
+
+# Simple video generation form
+with st.form("quick_video"):
+    video_topic = st.text_input("视频主题", placeholder="例如: 介绍人工智能的发展历史")
+    video_duration = st.slider("视频时长 (秒)", 30, 120, 60)
     
-    # Start Streamlit
-    try:
-        subprocess.run([
-            sys.executable, "-m", "streamlit", "run", streamlit_file,
-            "--server.port", "7860",
-            "--server.address", "0.0.0.0",
-            "--server.enableCORS", "true",
-            "--server.enableXsrfProtection", "false",
-            "--browser.gatherUsageStats", "false"
-        ], check=True)
-    except subprocess.CalledProcessError as e:
-        print(f"❌ Failed to start Streamlit: {e}")
-        # Fallback to simple HTTP server
-        print("🔄 Falling back to simple HTTP server...")
-        
-        # Create a simple status page
-        html_content = """<!DOCTYPE html>
-<html>
-<head>
-    <title>MoneyPrinterTurbo - Starting</title>
-    <meta charset="utf-8">
-    <style>
-        body { font-family: Arial, sans-serif; text-align: center; padding: 50px; }
-        .container { max-width: 600px; margin: 0 auto; }
-        h1 { color: #4CAF50; }
-        .status { padding: 20px; background: #f0f8ff; border-radius: 10px; margin: 20px 0; }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <h1>🎬 MoneyPrinterTurbo</h1>
-        <div class="status">
-            <h2>🔄 应用启动中...</h2>
-            <p>Streamlit 启动失败，正在尝试备用方案。</p>
-            <p>请稍后刷新页面或检查日志获取更多信息。</p>
-        </div>
-    </div>
-</body>
-</html>"""
-        
-        with open("index.html", "w", encoding="utf-8") as f:
-            f.write(html_content)
-        
-        subprocess.run([
-            sys.executable, "-m", "http.server", "7860",
-            "--bind", "0.0.0.0"
-        ])
-
-if __name__ == "__main__":
-    print("🎬 MoneyPrinterTurbo - Huggingface Spaces Edition")
-    print("=" * 50)
+    col1, col2 = st.columns(2)
+    with col1:
+        video_style = st.selectbox("视频风格", ["科技", "生活", "教育", "娱乐"])
+    with col2:
+        video_language = st.selectbox("语言", ["中文", "英文"])
     
-    try:
-        # Setup environment
-        setup_environment()
-        
-        # Load environment variables
-        load_env_variables()
-        
-        # Apply FREE tier optimizations
-        optimize_for_free_tier()
-        
-        # Start application
-        start_streamlit()
-        
-    except Exception as e:
-        print(f"❌ Fatal error: {e}")
-        import traceback
-        traceback.print_exc()
-        
-        # Keep the process alive for debugging
-        import time
-        print("⏰ Keeping process alive for debugging...")
-        while True:
-            time.sleep(60)
+    submitted = st.form_submit_button("🎬 生成视频")
+    
+    if submitted:
+        if not video_topic:
+            st.error("请输入视频主题")
+        elif not api_keys_status:
+            st.error("请先配置API密钥")
+        else:
+            with st.spinner("正在生成视频..."):
+                st.info("🔄 视频生成功能正在开发中")
+                st.success("✅ 配置已保存，等待完整功能上线")
+
+# Footer
+st.markdown("---")
+st.markdown("💡 **提示**: 完整版功能正在适配中，敬请期待！")
+
+# Debug info (for development)
+if st.checkbox("显示调试信息"):
+    st.subheader("🔍 调试信息")
+    st.json({
+        "loaded_env_vars": loaded_env_vars,
+        "config_sections": list(config.keys()),
+        "storage_dirs": ["storage/tasks", "storage/temp", "storage/cache_videos"]
+    })