Remove input path

Author: billwuhao

Diff for: NotaGenNode.py

@@ -58,15 +58,6 @@ def INPUT_TYPES(s):
                 "top_k": ("INT", {"default": 50, "min": 0}),
                 "top_p": ("FLOAT", {"default": 0.95, "min": 0, "max": 1, "step": 0.01}),
                 "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-                "comfy_python_path": ("STRING", {
-                    "default": "", 
-                    "multiline": False, 
-                    "tooltip": "Absolute path of python.exe in ComfyUI environment"
-                }),
-                "musescore4_path": ("STRING", {
-                    "default": "", 
-                    "tooltip": r"Absolute path e.g. D:\APP\MuseScorePortable\App\MuseScore\bin\MuseScore4.exe"
-                }),
             },
         }
 
@@ -77,8 +68,6 @@ def INPUT_TYPES(s):
 
     def inference_patch(self, model, period, composer, instrumentation, 
                         custom_prompt,
-                        comfy_python_path, 
-                        musescore4_path,
                         unload_model,
                         temperature,
                         top_k,
@@ -256,10 +245,11 @@ def inference_patch(self, model, period, composer, instrumentation,
                     with open(unreduced_output_path, 'w') as file:
                         file.writelines(abc_lines)
                         print(f"Saved to {unreduced_output_path}",)
-                    unreduced_xml_path = self.abc2xml(unreduced_output_path, INTERLEAVED_OUTPUT_FOLDER, comfy_python_path)
+                    unreduced_xml_path = self.convert_abc2xml(unreduced_output_path, INTERLEAVED_OUTPUT_FOLDER)
                     if unreduced_xml_path:
                         save_xml_original = True
                     else:
+                        print("Conversion xml failed.")
                         num_gen += 1
                         save_xml_original = False
 
@@ -274,7 +264,7 @@ def inference_patch(self, model, period, composer, instrumentation,
                         print(f"Saved to {original_output_path}",)
 
                     if save_xml_original:
-                        original_xml_path = self.abc2xml(original_output_path, ORIGINAL_OUTPUT_FOLDER, comfy_python_path)
+                        original_xml_path = self.convert_abc2xml(original_output_path, ORIGINAL_OUTPUT_FOLDER)
                         if original_xml_path:
                             print(f"Conversion to {original_xml_path}",)
                         break
@@ -289,8 +279,8 @@ def inference_patch(self, model, period, composer, instrumentation,
                     raise Exception("All generation attempts failed after 6 tries. Try again.")
 
         if unreduced_xml_path:
-            mp3_path = self.xml2mp3(unreduced_xml_path, musescore4_path)
-            png_paths = self.xml2png(unreduced_xml_path, musescore4_path)
+            mp3_path = self.xml2mp3(unreduced_xml_path)
+            png_paths = self.xml2png(unreduced_xml_path)
 
             # 处理音频
             audio = None
@@ -499,7 +489,7 @@ def wait_for_png_sequence(self, base_path, timeout=15, check_interval=0.3):
 
         return None
 
-    def xml2mp3(self, xml_path, musescore4_path):
+    def xml2mp3(self, xml_path):
         import subprocess
         import sys
         import tempfile
@@ -532,7 +522,7 @@ def xml2mp3(self, xml_path, musescore4_path):
 
                 # 运行 mscore 命令
                 subprocess.run(
-                    [musescore4_path, '-o', mp3_path, xml_path],
+                    ['mscore', '-o', mp3_path, xml_path],
                     check=True,
                     capture_output=True,
                 )
@@ -553,8 +543,11 @@ def xml2mp3(self, xml_path, musescore4_path):
                 xvfb_process.wait()
         else:
             try:
+                import shutil
+                musescore_executable_path = shutil.which('MuseScore4')
+                print(musescore_executable_path)
                 subprocess.run(
-                    [musescore4_path, '-o', mp3_path, xml_path],
+                    [musescore_executable_path, '-o', mp3_path, xml_path],
                     check=True,
                     capture_output=True,
                 )
@@ -569,7 +562,7 @@ def xml2mp3(self, xml_path, musescore4_path):
                 print(f"Conversion failed: {e.stderr}" if e.stderr else "Unknown error")
                 return None
 
-    def xml2png(self, xml_path, musescore4_path):
+    def xml2png(self, xml_path):
         import subprocess
         import sys
         import tempfile
@@ -602,7 +595,7 @@ def xml2png(self, xml_path, musescore4_path):
 
                 # 运行 mscore 命令
                 subprocess.run(
-                    [musescore4_path, '-o', f"{base_png_path}.png", xml_path],
+                    ['mscore', '-o', f"{base_png_path}.png", xml_path],
                     check=True,
                     capture_output=True,
                 )
@@ -623,8 +616,11 @@ def xml2png(self, xml_path, musescore4_path):
                 xvfb_process.wait()
         else:
             try:
+                import shutil
+                musescore_executable_path = shutil.which('MuseScore4')
+                print(musescore_executable_path)
                 subprocess.run(
-                    [musescore4_path, '-o', f"{base_png_path}.png", xml_path],
+                    [musescore_executable_path, '-o', f"{base_png_path}.png", xml_path],
                     check=True,
                     capture_output=True,
                 )
@@ -640,19 +636,31 @@ def xml2png(self, xml_path, musescore4_path):
                 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
+    def convert_abc2xml(self, abc_path, output_dir):
+        import sys
+        import os
+        sys.path.append(self.node_dir)
+        from abc2xml import getXmlDocs, writefile, readfile, info
         xml_path = abc_path.rsplit(".", 1)[0] + ".xml"
         try:
-            subprocess.run(
-                [python_path, f"{self.node_dir}/abc2xml.py", '-o', output_dir, abc_path, ],
-                check=True,
-                capture_output=True,
-            )
+            fnm, ext = os.path.splitext(abc_path)
+            abctext = readfile(abc_path)
+            
+            # 设置参数，对应原命令行参数
+            skip, num = 0, 1  # 对应 -m 参数
+            show_whole_rests = False  # 对应 -r 参数
+            line_breaks = False  # 对应 -b 参数
+            force_string_fret = False  # 对应 -f 参数
+            
+            xml_docs = getXmlDocs(abctext, skip, num, show_whole_rests, line_breaks, force_string_fret)
+            
+            for itune, xmldoc in enumerate(xml_docs):
+                fnmNum = '%02d' % (itune + 1) if len(xml_docs) > 1 else ''
+                writefile(output_dir, fnm, fnmNum, xmldoc, '', False)  # '' 对应 -mxl 参数，False 对应 -t 参数
             print(f"Conversion to {xml_path}",)
             return xml_path
-        except subprocess.CalledProcessError as e:
-            print(f"Conversion failed: {e.stderr}" if e.stderr else "Unknown error")
+        except Exception as e:
+            print(f"Conversion failed: {str(e)}")
             return None
 
 

Diff for: README-CN.md

@@ -9,6 +9,8 @@ https://github.com/user-attachments/assets/0671657f-e66b-4000-a0aa-48520f15b782
 
 ## 📣 更新
 
+[2025-04-09]⚒️: 不再需要输入 MuseScore4 或 mscore 以及 python 路径, 只需要将 MuseScore4 或 mscore 安装目录例如 `C:\Program Files\MuseScore 4\bin` 添加到系统 path 环境变量即可.
+
 [2025-03-21]⚒️: 增加更多可调参数, 更自由畅玩. 可选是否卸载模型.
 
 [2025-03-15]⚒️: 支持 Linux Ubuntu/Debian 系列, 以及服务器, 其他未测试.
@@ -19,7 +21,6 @@ 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, 其他操作同上:
 ```
@@ -33,8 +34,6 @@ sudo apt install xvfb
 
 - 支持自定义 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`.
-
 ## 安装
 
 ```

Diff for: README.md

@@ -8,6 +8,8 @@ https://github.com/user-attachments/assets/0671657f-e66b-4000-a0aa-48520f15b782
 
 ## 📣 Updates
 
+[2025-04-09]⚒️: It is no longer necessary to input MuseScore4 or mscore and the Python path. You only need to add the MuseScore4 or mscore installation directory (e.g., `C:\Program Files\MuseScore 4\bin`) to the system path environment variable.
+
 [2025-03-21] ⚒️: Added more tunable parameters for more creative freedom. Optional model unloading.
 
 [2025-03-15]⚒️: Supports Linux Ubuntu/Debian series, as well as servers, others untested, as well as servers.
@@ -18,7 +20,6 @@ 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`.
 
 For servers, install the virtual display Xvfb, other operations are the same as above:
 ```
@@ -32,8 +33,6 @@ sudo apt install xvfb
 
 - 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
 
 ```

Diff for: pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "notagen-mw"
 description = "Symbolic Music Generation, NotaGen node for ComfyUI."
-version = "2.2.3"
+version = "2.2.4"
 license = {file = "LICENSE"}
 
 [project.urls]