v2.1.1

billwuhao · billwuhao · commit 553e201a99f5 · 2025-03-15T23:02:59.000+08:00
diff --git a/NotaGenNode.py b/NotaGenNode.py
@@ -292,15 +292,20 @@ def inference_patch(self, model, period, composer, instrumentation,
                 
                 for image_path in png_paths:
                     i = Image.open(image_path)
-                    i = ImageOps.exif_transpose(i)
+                    # 创建一个白色背景的图像
+                    image = Image.new("RGB", i.size, (255, 255, 255))
+
+                    # 将透明背景的图片粘贴到白色背景上
+                    image.paste(i, mask=i.split()[3])  # 使用 Alpha 通道作为掩码
+                    # i = ImageOps.exif_transpose(i) # 翻转图片
                     
                     # 调整宽度为1024，保持宽高比
-                    width, height = i.size
-                    new_width = 1024
-                    new_height = int(height * (new_width / width))
-                    i = i.resize((new_width, new_height), Image.Resampling.LANCZOS)
+                    # width, height = i.size
+                    # new_width = 1024
+                    # new_height = int(height * (new_width / width))
+                    # i = i.resize((new_width, new_height), Image.Resampling.LANCZOS)
                     
-                    image = i.convert("RGB")
+                    image = image.convert("RGB")
                     image = np.array(image).astype(np.float32) / 255.0
                     image = torch.from_numpy(image)[None,]
                     images.append(image)
@@ -467,45 +472,144 @@ def wait_for_png_sequence(self, base_path, timeout=15, check_interval=0.3):
 
     def xml2mp3(self, xml_path, musescore4_path):
         import subprocess
+        import sys
+        import tempfile
+
         mp3_path = xml_path.rsplit(".", 1)[0] + ".mp3"
-        try:
-            subprocess.run(
-                [musescore4_path, '-o', mp3_path, xml_path],
-                check=True,
-                capture_output=True,
-            )
-            # 等待MP3文件生成完成
-            if self.wait_for_file(mp3_path):
-                print(f"Conversion to {mp3_path} completed")
-                return mp3_path
-            else:
-                print("MP3 conversion timeout")
+        # 检测操作系统是否为 Linux
+        if sys.platform == "linux":
+            try:
+                # 使用不同的显示端口
+                display_number = 100
+                os.environ["DISPLAY"] = f":{display_number}"
+
+                # 检查并清理旧的 Xvfb 锁文件
+                tmp_dir = tempfile.mkdtemp()
+                xvfb_lock_file = os.path.join(tmp_dir, f".X{display_number}-lock")
+                if os.path.exists(xvfb_lock_file):
+                    print(f"清理旧的 Xvfb 锁文件: {xvfb_lock_file}")
+                    os.remove(xvfb_lock_file)
+
+                # 杀死所有残留的 Xvfb 进程
+                subprocess.run(["pkill", "Xvfb"], stderr=subprocess.DEVNULL)  # 忽略错误
+                time.sleep(1)  # 等待进程终止
+
+                # 启动 Xvfb
+                xvfb_process = subprocess.Popen(["Xvfb", f":{display_number}", "-screen", "0", "1024x768x24"])
+                time.sleep(2)  # 等待 Xvfb 启动
+
+                # 设置 Qt 插件环境变量
+                os.environ["QT_QPA_PLATFORM"] = "offscreen"
+                
+                # 运行 mscore 命令
+                subprocess.run(
+                    [musescore4_path, '-o', mp3_path, xml_path],
+                    check=True,
+                    capture_output=True,
+                )
+                
+                # 等待MP3文件生成完成
+                if self.wait_for_file(mp3_path):
+                    print(f"Conversion to {mp3_path} completed")
+                    return mp3_path
+                else:
+                    print("MP3 conversion timeout")
+                    return None
+            except subprocess.CalledProcessError as e:
+                print(f"Conversion failed: {e.stderr}" if e.stderr else "Unknown error")
+                return None
+            finally:
+                # 关闭 Xvfb
+                xvfb_process.terminate()
+                xvfb_process.wait()
+        else:
+            try:
+                subprocess.run(
+                    [musescore4_path, '-o', mp3_path, xml_path],
+                    check=True,
+                    capture_output=True,
+                )
+                # 等待MP3文件生成完成
+                if self.wait_for_file(mp3_path):
+                    print(f"Conversion to {mp3_path} completed")
+                    return mp3_path
+                else:
+                    print("MP3 conversion timeout")
+                    return None
+            except subprocess.CalledProcessError as e:
+                print(f"Conversion failed: {e.stderr}" if e.stderr else "Unknown error")
                 return None
-        except subprocess.CalledProcessError as e:
-            print(f"Conversion failed: {e.stderr}" if e.stderr else "Unknown error")
-            return None
 
     def xml2png(self, xml_path, musescore4_path):
         import subprocess
+        import sys
+        import tempfile
         
         base_png_path = xml_path.rsplit(".", 1)[0]
-        try:
-            subprocess.run(
-                [musescore4_path, '-o', f"{base_png_path}.png", xml_path],
-                check=True,
-                capture_output=True,
-            )
-            # 等待PNG序列生成完成
-            png_files = self.wait_for_png_sequence(base_png_path)
-            if png_files:
-                print(f"Converted to {len(png_files)} PNG files")
-                return png_files
-            else:
-                print("PNG conversion timeout")
+        # 检测操作系统是否为 Linux
+        if sys.platform == "linux":
+            try:
+                # 使用不同的显示端口
+                display_number = 100
+                os.environ["DISPLAY"] = f":{display_number}"
+
+                # 检查并清理旧的 Xvfb 锁文件
+                tmp_dir = tempfile.mkdtemp()
+                xvfb_lock_file = os.path.join(tmp_dir, f".X{display_number}-lock")
+                if os.path.exists(xvfb_lock_file):
+                    print(f"清理旧的 Xvfb 锁文件: {xvfb_lock_file}")
+                    os.remove(xvfb_lock_file)
+
+                # 杀死所有残留的 Xvfb 进程
+                subprocess.run(["pkill", "Xvfb"], stderr=subprocess.DEVNULL)  # 忽略错误
+                time.sleep(1)  # 等待进程终止
+
+                # 启动 Xvfb
+                xvfb_process = subprocess.Popen(["Xvfb", f":{display_number}", "-screen", "0", "1024x768x24"])
+                time.sleep(2)  # 等待 Xvfb 启动
+
+                # 设置 Qt 插件环境变量
+                os.environ["QT_QPA_PLATFORM"] = "offscreen"
+                
+                # 运行 mscore 命令
+                subprocess.run(
+                    [musescore4_path, '-o', f"{base_png_path}.png", xml_path],
+                    check=True,
+                    capture_output=True,
+                )
+                # 等待PNG序列生成完成
+                png_files = self.wait_for_png_sequence(base_png_path)
+                if png_files:
+                    print(f"Converted to {len(png_files)} PNG files")
+                    return png_files
+                else:
+                    print("PNG conversion timeout")
+                    return None
+            except subprocess.CalledProcessError as e:
+                print(f"Conversion failed: {e.stderr}" if e.stderr else "Unknown error")
+                return None
+            finally:
+                # 关闭 Xvfb
+                xvfb_process.terminate()
+                xvfb_process.wait()
+        else:
+            try:
+                subprocess.run(
+                    [musescore4_path, '-o', f"{base_png_path}.png", xml_path],
+                    check=True,
+                    capture_output=True,
+                )
+                # 等待PNG序列生成完成
+                png_files = self.wait_for_png_sequence(base_png_path)
+                if png_files:
+                    print(f"Converted to {len(png_files)} PNG files")
+                    return png_files
+                else:
+                    print("PNG conversion timeout")
+                    return None
+            except subprocess.CalledProcessError as e:
+                print(f"Conversion failed: {e.stderr}" if e.stderr else "Unknown error")
                 return None
-        except subprocess.CalledProcessError as e:
-            print(f"Conversion failed: {e.stderr}" if e.stderr else "Unknown error")
-            return None
 
     def abc2xml(self, abc_path, output_dir, python_path):
         import subprocess
diff --git a/README-CN.md b/README-CN.md
@@ -0,0 +1,60 @@
+[中文](README-CN.md) | [English](README.md)
+
+# 符号音乐生成. NotaGen 的 ComfyUI 节点.
+
+![image](https://github.com/billwuhao/ComfyUI_NotaGen/blob/master/images/2025-03-10_06-24-03.png)
+
+
+## 📣 更新
+
+[2025-03-15]⚒️: 支持 Linux Ubuntu/Debian 系列, 以及服务器, 其他未测试.
+ 
+本地 Linux 电脑, 安装 `musescore` 等:
+```
+sudo apt update
+sudo apt install musescore
+sudo apt install libxcb-xinerama0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0
+```
+然后将 `mscore` 路径输入节点即可, 如 `/bin/mscore`. 以及 comfyui 中 `python` 的绝对路径, 如 `/root/comfy/ComfyUI/bin/python`.
+
+服务器, 安装虚拟显示器 Xvfb, 其他操作同上:
+```
+sudo apt update
+sudo apt install xvfb
+```
+
+[2025-03-13]⚒️: 
+
+- 生成 `.abc` 自动转 `.xml`, `.mp3`, `.png` 格式, 可以听生成的音乐, 同时可以看曲谱啦🎵🎵🎵
+
+- 支持自定义 prompt, 格式必须保持 `<period>|<composer>|<instrumentation>` 的格式, `period`, `composer`, `instrumentation` 的顺序不能乱, 而且以 `|` 分割.
+
+- 为了避免配置环境变量的麻烦, 请安装 [MuseScore4](https://musescore.org/en/download), 并将 `MuseScore4.exe` 的绝对路径输入节点中, 如 `D:\APP\MuseScorePortable\App\MuseScore\bin\MuseScore4.exe`, 以及 comfyui 中 `python.exe` 的绝对路径, 如 `D:\AIGC\APP\ComfyUI_v1\python_embeded\python.exe`.
+
+## 安装
+
+```
+cd ComfyUI/custom_nodes
+git clone https://github.com/billwuhao/ComfyUI_NotaGen.git
+cd ComfyUI_NotaGen
+pip install -r requirements.txt
+
+# python_embeded
+./python_embeded/python.exe -m pip install -r requirements.txt
+```
+
+## 模型下载
+
+将模型下载放到 `ComfyUI\models\TTS\NotaGen` 下, 并按要求重命名:
+
+[NotaGen-X](https://huggingface.co/ElectricAlexis/NotaGen/blob/main/weights_notagenx_p_size_16_p_length_1024_p_layers_20_h_size_1280.pth) → `notagenx.pth`  
+[NotaGen-small](https://huggingface.co/ElectricAlexis/NotaGen/blob/main/weights_notagen_pretrain_p_size_16_p_length_2048_p_layers_12_c_layers_3_h_size_768_lr_0.0002_batch_8.pth) → `notagen_small.pth`   
+[NotaGen-medium](https://huggingface.co/ElectricAlexis/NotaGen/blob/main/weights_notagen_pretrain_p_size_16_p_length_2048_p_layers_16_c_layers_3_h_size_1024_lr_0.0001_batch_4.pth) → `notagen_medium.pth`  
+[NotaGen-large](https://huggingface.co/ElectricAlexis/NotaGen/blob/main/weights_notagen_pretrain_p_size_16_p_length_1024_p_layers_20_c_layers_6_h_size_1280_lr_0.0001_batch_4.pth) → `notagen_large.pth`  
+
+
+https://github.com/user-attachments/assets/229139bd-1065-4539-bcfa-b0c245259f6d
+
+## 鸣谢
+
+[NotaGen](https://github.com/ElectricAlexis/NotaGen)
diff --git a/README-en.md b/README-en.md
diff --git a/README.md b/README.md
@@ -1,23 +1,51 @@
-[中文](README.md) | [English](README-en.md)
+[中文](README-CN.md) | [English](README.md)
 
-# 符号音乐生成. NotaGen 的 ComfyUI 节点.
+# Symbolic Music Generation, NotaGen node for ComfyUI.
 
 ![image](https://github.com/billwuhao/ComfyUI_NotaGen/blob/master/images/2025-03-10_06-24-03.png)
 
 
-## 📣 更新
+## 📣 Updates
 
-[2025-03-13]⚒️: 
+[2025-03-15]⚒️: Supports Linux Ubuntu/Debian series, as well as servers, others untested, as well as servers.
 
-- 生成 `.abc` 自动转 `.xml`, `.mp3`, `.png` 格式, 可以听生成的音乐, 同时可以看曲谱啦🎵🎵🎵
+For local Linux computers, install `musescore` etc.:
+```
+sudo apt update
+sudo apt install musescore
+sudo apt install libxcb-xinerama0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0
+```
+Then input the `mscore` path into the node, such as `/bin/mscore`. And the absolute path of `python` in ComfyUI, such as `/root/comfy/ComfyUI/bin/python`.
 
-- 支持自定义 prompt, 格式必须保持 `<period>|<composer>|<instrumentation>` 的格式, `period`, `composer`, `instrumentation` 的顺序不能乱, 而且以 `|` 分割.
+For servers, install the virtual display Xvfb, other operations are the same as above:
+```
+sudo apt update
+sudo apt install xvfb
+```
 
-- 为了避免配置环境变量的麻烦, 请安装 [MuseScore4](https://musescore.org/en/download), 并将 `MuseScore4.exe` 的绝对路径输入节点中, 如 `D:\APP\MuseScorePortable\App\MuseScore\bin\MuseScore4.exe`, 以及 comfyui 中 `python.exe` 的绝对路径, 如 `D:\AIGC\APP\ComfyUI_v1\python_embeded\python.exe`.
+[2025-03-13]⚒️:
 
-## 模型下载
+- Automatically convert generated `.abc` to `.xml`, `.mp3`, and `.png` formats.  Now you can listen to the generated music and see the sheet music too! 🎵🎵🎵
 
-将模型下载放到 `ComfyUI\models\TTS\NotaGen` 下, 并按要求重命名:
+- Supports custom prompts. The format must be maintained as `<period>|<composer>|<instrumentation>`, with the order of `period`, `composer`, and `instrumentation` strictly enforced and separated by `|`.
+
+- To avoid the hassle of configuring environment variables, please install [MuseScore4](https://musescore.org/en/download) and enter the absolute path of `MuseScore4.exe` into the node, such as `D:\APP\MuseScorePortable\App\MuseScore\bin\MuseScore4.exe`, as well as the absolute path of `python.exe` in ComfyUI, such as `D:\AIGC\APP\ComfyUI_v1\python_embeded\python.exe`.
+
+## Installation
+
+```
+cd ComfyUI/custom_nodes
+git clone https://github.com/billwuhao/ComfyUI_NotaGen.git
+cd ComfyUI_NotaGen
+pip install -r requirements.txt
+
+# python_embeded
+./python_embeded/python.exe -m pip install -r requirements.txt
+```
+
+## Model Download
+
+Download the model to `ComfyUI\models\TTS\NotaGen` and rename it as required:
 
 [NotaGen-X](https://huggingface.co/ElectricAlexis/NotaGen/blob/main/weights_notagenx_p_size_16_p_length_1024_p_layers_20_h_size_1280.pth) → `notagenx.pth`  
 [NotaGen-small](https://huggingface.co/ElectricAlexis/NotaGen/blob/main/weights_notagen_pretrain_p_size_16_p_length_2048_p_layers_12_c_layers_3_h_size_768_lr_0.0002_batch_8.pth) → `notagen_small.pth`   
@@ -27,6 +55,7 @@
 
 https://github.com/user-attachments/assets/229139bd-1065-4539-bcfa-b0c245259f6d
 
-## 鸣谢
+
+## Acknowledgments
 
 [NotaGen](https://github.com/ElectricAlexis/NotaGen)
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "notagen-mw"
 description = "Symbolic Music Generation, NotaGen node for ComfyUI."
-version = "2.0.1"
+version = "2.1.1"
 license = {file = "LICENSE"}
 
 [project.urls]
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,3 @@
-# transformers==4.40.0
-# numpy==1.26.4
-# gradio==5.17.1
 wandb>=0.17.2
 abctoolkit>=0.0.6
 samplings>=0.1.7
