Merge pull request #674 from harry0703/dev

Author: harry0703

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,81 +1,88 @@
-name: 🐛 Bug
-description: 出现错误或未按预期工作
-title: "请在此处填写标题"
+name: 🐛 Bug | Bug Report
+description: 报告错误或异常问题 | Report an error or unexpected behavior
+title:
+  default: "[Bug] Something is not working"
 labels:
   - bug
 
 body:
   - type: markdown
     attributes:
       value: |
-        **在提交此问题之前，请确保您已阅读以下文档：[Getting Started (英文)](https://github.com/harry0703/MoneyPrinterTurbo/blob/main/README-en.md#system-requirements-) 或 [快速开始 (中文)](https://github.com/harry0703/MoneyPrinterTurbo/blob/main/README.md#%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B-)。**
-
-        **请填写以下信息：**
-  - type: checkboxes
-    attributes:
-      label: 是否已存在类似问题？
-      description: |
-        请务必检查此问题是否已有用户反馈。
+        **提交问题前，请确保您已阅读以下文档：[Getting Started (English)](https://github.com/harry0703/MoneyPrinterTurbo/blob/main/README-en.md#system-requirements-) 或 [快速开始 (中文)](https://github.com/harry0703/MoneyPrinterTurbo/blob/main/README.md#%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B-)。**
         
-        在提交新问题前，使用 GitHub 的问题搜索框（包括已关闭的问题）或通过 Google、StackOverflow 等工具搜索，确认该问题是否重复。
+        **Before submitting an issue, please make sure you've read the following documentation: [Getting Started (English)](https://github.com/harry0703/MoneyPrinterTurbo/blob/main/README-en.md#system-requirements-) or [快速开始 (Chinese)](https://github.com/harry0703/MoneyPrinterTurbo/blob/main/README.md#%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B-).**
         
-        您可能已经可以找到解决问题的方法！
-      options:
-        - label: 我已搜索现有问题
-          required: true
   - type: textarea
     attributes:
-      label: 当前行为
-      description: 描述您当前遇到的情况。
+      label: 问题描述 | Current Behavior
+      description: |
+        描述您遇到的问题
+        Describe the issue you're experiencing
       placeholder: |
-        MoneyPrinterTurbo 未按预期工作。当我执行某个操作时，视频未成功生成/程序报错了...
+        当我执行...操作时，程序出现了...问题
+        When I perform..., the program shows...
     validations:
       required: true
   - type: textarea
     attributes:
-      label: 预期行为
-      description: 描述您期望发生的情况。
+      label: 重现步骤 | Steps to Reproduce
+      description: |
+        详细描述如何重现此问题
+        Describe in detail how to reproduce this issue
       placeholder: |
-        当我执行某个操作时，程序应当...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 重现步骤
-      description: 描述重现问题的步骤。描述的越详细，越有助于定位和修复问题。
+        1. 打开...
+        2. 点击...
+        3. 出现错误...
+        
+        1. Open...
+        2. Click on...
+        3. Error occurs...
     validations:
       required: true
   - type: textarea
     attributes:
-      label: 堆栈追踪/日志
+      label: 错误日志 | Error Logs
       description: |
-        如果您有任何堆栈追踪或日志，请将它们粘贴在此处。（注意不要包含敏感信息）
+        请提供相关错误信息或日志（注意不要包含敏感信息）
+        Please provide any error messages or logs (be careful not to include sensitive information)
+      placeholder: |
+        错误信息、日志或截图...
+        Error messages, logs, or screenshots...
     validations:
       required: true
   - type: input
     attributes:
-      label: Python 版本
-      description: 您遇到此问题时使用的 Python 版本。
-      placeholder: v3.13.0, v3.10.0 等
+      label: Python 版本 | Python Version
+      description: |
+        您使用的 Python 版本
+        The Python version you're using
+      placeholder: v3.13.0, v3.10.0, etc.
     validations:
       required: true
   - type: input
     attributes:
-      label: 操作系统
-      description: 您使用 MoneyPrinterTurbo 遇到问题时的操作系统信息。
-      placeholder: macOS 14.1, Windows 11 等
+      label: 操作系统 | Operating System
+      description: |
+        您的操作系统信息
+        Your operating system information
+      placeholder: macOS 14.1, Windows 11, Ubuntu 22.04, etc.
     validations:
       required: true
   - type: input
     attributes:
-      label: MoneyPrinterTurbo 版本
-      description: 您在哪个版本的 MoneyPrinterTurbo 中遇到了此问题？
-      placeholder: v1.2.2 等
+      label: MoneyPrinterTurbo 版本 | Version
+      description: |
+        您使用的 MoneyPrinterTurbo 版本
+        The version of MoneyPrinterTurbo you're using
+      placeholder: v1.2.2, etc.
     validations:
       required: true
   - type: textarea
     attributes:
-      label: 其他信息
-      description: 您还有什么其他信息想补充吗？例如问题的截图或视频记录。
+      label: 补充信息 | Additional Information
+      description: |
+        其他对解决问题有帮助的信息（如截图、视频等）
+        Any other information that might help solve the issue (screenshots, videos, etc.)
     validations:
       required: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,38 +1,31 @@
-name: ✨ 增加功能
-description: 为此项目提出一个新想法
-title: "请在此处填写标题"
+name: ✨ 增加功能 | Feature Request
+description: 为此项目提出一个新想法或建议 | Suggest a new idea for this project
+title:
+  default: "[Feature] Idea for new feature"
+
 labels:
   - enhancement
 
 body:
-  - type: checkboxes
-    attributes:
-      label: 是否已存在类似的功能请求？
-      description: 请确保此功能请求是否重复。
-      options:
-        - label: 我已搜索现有的功能请求
-          required: true
-  - type: textarea
-    attributes:
-      label: 痛点
-      description: 请解释您的功能请求。
-      placeholder: 我希望可以实现这一点
-    validations:
-      required: true
   - type: textarea
     attributes:
-      label: 建议的解决方案
-      description: 请描述您能想到的解决方案。
-      placeholder: 您可以添加这个功能 / 更改这个流程 / 使用某种方法
+      label: 需求描述 | Problem Statement
+      description: |
+        请描述您希望解决的问题或需求 
+        Please describe the problem you want to solve
+      placeholder: |
+        我在使用过程中遇到了...
+        I encountered... when using this project
     validations:
       required: true
   - type: textarea
     attributes:
-      label: 有用的资源
-      description: 请提供一些有助于实现您建议的资源。
-  - type: textarea
-    attributes:
-      label: 其他信息
-      description: 您还有什么其他想补充的信息吗？例如问题的截图或视频记录。
+      label: 建议的解决方案 | Proposed Solution
+      description: |
+        请描述您认为可行的解决方案或实现方式
+        Please describe your suggested solution or implementation
+      placeholder: |
+        可以考虑添加...功能来解决这个问题
+        Consider adding... feature to address this issue
     validations:
-      required: false
+      required: true

.pdm-python

@@ -38,15 +38,15 @@ project. It allows for online use without deployment, which is very convenient.
 - Chinese version: https://reccloud.cn
 - English version: https://reccloud.com
 
-![](docs/reccloud.cn.jpg)
+![](docs/reccloud.com.jpg)
 
 ## Thanks for Sponsorship 🙏
 
-Thanks to Picwish https://picwish.cn for supporting and sponsoring this project, enabling continuous updates and maintenance.
+Thanks to Picwish https://picwish.com for supporting and sponsoring this project, enabling continuous updates and maintenance.
 
 Picwish focuses on the **image processing field**, providing a rich set of **image processing tools** that extremely simplify complex operations, truly making image processing easier.
 
-![picwish.jpg](docs/picwish.jpg)
+![picwish.jpg](docs/picwish.com.jpg)
 
 ## Features 🎯
 
@@ -65,11 +65,7 @@ Picwish focuses on the **image processing field**, providing a rich set of **ima
   supports `subtitle outlining`
 - [x] Supports **background music**, either random or specified music files, with adjustable `background music volume`
 - [x] Video material sources are **high-definition** and **royalty-free**, and you can also use your own **local materials**
-- [x] Supports integration with various models such as **OpenAI**, **Moonshot**, **Azure**, **gpt4free**, **one-api**,
-  **Qwen**, **Google Gemini**, **Ollama**, **DeepSeek**, **ERNIE** and more
-    - For users in China, it is recommended to use **DeepSeek** or **Moonshot** as the large model provider (directly accessible in China, no VPN needed. Free credits upon registration, generally sufficient for use)
-
-❓[How to Use the Free OpenAI GPT-3.5 Model?](https://github.com/harry0703/MoneyPrinterTurbo/blob/main/README-en.md#common-questions-)
+- [x] Supports integration with various models such as **OpenAI**, **Moonshot**, **Azure**, **gpt4free**, **one-api**, **Qwen**, **Google Gemini**, **Ollama**, **DeepSeek**, **ERNIE**, **Pollinations** and more
 
 ### Future Plans 📅
 
@@ -119,15 +115,20 @@ Picwish focuses on the **image processing field**, providing a rich set of **ima
 
 ## System Requirements 📦
 
-- Recommended minimum 4 CPU cores or more, 8G of memory or more, GPU is not required
+- Recommended minimum 4 CPU cores or more, 4G of memory or more, GPU is not required
 - Windows 10 or MacOS 11.0, and their later versions
 
 ## Quick Start 🚀
 
-Download the one-click startup package, extract and use directly (the path should not contain **Chinese characters**, **special characters**, or **spaces**)
+### Run in Google Colab 
+Want to try MoneyPrinterTurbo without setting up a local environment? Run it directly in Google Colab!
+
+[![Open in Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/harry0703/MoneyPrinterTurbo/blob/main/docs/MoneyPrinterTurbo.ipynb)
+
 
 ### Windows
-- Baidu Netdisk (1.2.1 latest version): https://pan.baidu.com/s/1pSNjxTYiVENulTLm6zieMQ?pwd=g36q Extraction code: g36q
+
+Google Drive (v1.2.6): https://drive.google.com/file/d/1HsbzfT7XunkrCrHw5ncUjFX8XX4zAuUh/view?usp=sharing
 
 After downloading, it is recommended to **double-click** `update.bat` first to update to the **latest code**, then double-click `start.bat` to launch
 
@@ -141,9 +142,6 @@ One-click startup packages have not been created yet. See the **Installation & D
 
 ### Prerequisites
 
-- Try to avoid using **Chinese paths** to prevent unpredictable issues
-- Ensure your **network** is stable, VPN needs to be in `global traffic` mode
-
 #### ① Clone the Project
 
 ```shell
@@ -183,19 +181,16 @@ Open your browser and visit http://0.0.0.0:8080/docs Or http://0.0.0.0:8080/redo
 
 ### Manual Deployment 📦
 
-> Video tutorials
->
-> - Complete usage demonstration: https://v.douyin.com/iFhnwsKY/
-> - How to deploy on Windows: https://v.douyin.com/iFyjoW3M
-
-#### ① Install Dependencies
+#### ① Create a Python Virtual Environment
 
-It is recommended to use [pdm](https://pdm-project.org/en/latest/#installation)
+It is recommended to create a Python virtual environment using [conda](https://conda.io/projects/conda/en/latest/user-guide/install/index.html)
 
 ```shell
 git clone https://github.com/harry0703/MoneyPrinterTurbo.git
 cd MoneyPrinterTurbo
-pdm sync
+conda create -n MoneyPrinterTurbo python=3.11
+conda activate MoneyPrinterTurbo
+pip install -r requirements.txt
 ```
 
 #### ② Install ImageMagick
@@ -310,34 +305,6 @@ own fonts.
 
 ## Common Questions 🤔
 
-### ❓How to Use the Free OpenAI GPT-3.5 Model?
-
-[OpenAI has announced that ChatGPT with 3.5 is now free](https://openai.com/blog/start-using-chatgpt-instantly), and
-developers have wrapped it into an API for direct usage.
-
-**Ensure you have Docker installed and running**. Execute the following command to start the Docker service:
-
-```shell
-docker run -p 3040:3040 missuo/freegpt35
-```
-
-Once successfully started, modify the `config.toml` configuration as follows:
-
-- Set `llm_provider` to `openai`
-- Fill in `openai_api_key` with any value, for example, '123456'
-- Change `openai_base_url` to `http://localhost:3040/v1/`
-- Set `openai_model_name` to `gpt-3.5-turbo`
-
-> Note: This method may be unstable
-
-### ❓AttributeError: 'str' object has no attribute 'choices'
-
-This issue is caused by the large language model not returning a correct response.
-
-It's likely a network issue. Use a **VPN**, or set `openai_base_url` to your proxy, which should solve the problem.
-
-At the same time, it is recommended to use **Moonshot** or **DeepSeek** as the large model provider, as these service providers have faster access and are more stable in China.
-
 ### ❓RuntimeError: No ffmpeg exe could be found
 
 Normally, ffmpeg will be automatically downloaded and detected.
@@ -357,24 +324,6 @@ actual installation path.
 ffmpeg_path = "C:\\Users\\harry\\Downloads\\ffmpeg.exe"
 ```
 
-### ❓Error generating audio or downloading videos
-
-[issue 56](https://github.com/harry0703/MoneyPrinterTurbo/issues/56)
-
-```
-failed to generate audio, maybe the network is not available.
-if you are in China, please use a VPN.
-```
-
-[issue 44](https://github.com/harry0703/MoneyPrinterTurbo/issues/44)
-
-```
-failed to download videos, maybe the network is not available.
-if you are in China, please use a VPN.
-```
-
-This is likely due to network issues preventing access to foreign services. Please use a VPN to resolve this.
-
 ### ❓ImageMagick is not installed on your computer
 
 [issue 33](https://github.com/harry0703/MoneyPrinterTurbo/issues/33)
@@ -431,11 +380,6 @@ Solution: [Click to see how to manually download the model from netdisk](#subtit
 - You can submit an [issue](https://github.com/harry0703/MoneyPrinterTurbo/issues) or
   a [pull request](https://github.com/harry0703/MoneyPrinterTurbo/pulls).
 
-## Reference Projects 📚
-
-This project is based on https://github.com/FujiwaraChoki/MoneyPrinter and has been refactored with a lot of
-optimizations and added functionalities. Thanks to the original author for their spirit of open source.
-
 ## License 📝
 
 Click to view the [`LICENSE`](LICENSE) file