v0.25.1

README.md

@@ -116,6 +116,16 @@ Model download,move to :```models/llamafile/```
 
 ```
 
+> [Mac](https://llama-cpp-python.readthedocs.io/en/latest/install/macos/) 
+```
+pip uninstall llama-cpp-python -y
+CMAKE_ARGS="-DLLAMA_METAL=on" pip install -U llama-cpp-python --no-cache-dir
+pip install 'llama-cpp-python[server]'
+```
+```
+pip install llama-cpp-python \
+  --extra-index-url https://abetlen.github.io/llama-cpp-python/whl/metal
+```
 
 ## Prompt
 > PromptSlide

__init__.py

@@ -11,10 +11,23 @@ import logging
 from comfy.cli_args import args
 python = sys.executable
 
+#修复 sys.stdout.isatty()  object has no attribute 'isatty'
+try:
+    sys.stdout.isatty()
+except:
+    print('#fix sys.stdout.isatty')
+    sys.stdout.isatty = lambda: False
+
 llama_port=None
 llama_model=""
 
-from .nodes.ChatGPT import get_llama_models,get_llama_model_path
+try:
+    from .nodes.ChatGPT import get_llama_models,get_llama_model_path,llama_cpp_client
+    llama_cpp_client("")
+
+except:
+    print("##nodes.ChatGPT ImportError")
+
 
 from server import PromptServer
 
@@ -677,8 +690,13 @@ async def start_local_llm(data):
 
     app = create_app(
                 server_settings=server_settings,
-                model_settings=[ModelSettings(model=model,n_gpu_layers=9999,n_ctx=4098)],
-            )
+                model_settings=[
+                    ModelSettings(
+                    model=model,
+                    n_gpu_layers=-1,
+                    n_ctx=4098,
+                    chat_format="chatml"
+                    )])
 
     def run_uvicorn():
         uvicorn.run(
@@ -705,7 +723,13 @@ async def start_local_llm(data):
 async def my_hander_method(request):
     data =await request.json()
     # print(data)
-    result=await start_local_llm(data)
+    try:
+        result=await start_local_llm(data)
+    except:
+        result={
+            {"port":None,"model":"","llama_cpp_error":True}
+        }
+        print('start_local_llm error')
 
     return web.json_response(result)
 
@@ -927,4 +951,4 @@ try:
 except Exception as e:
     logging.info('RembgNode_.available False' )
 
-logging.info('\033[93m -------------- \033[0m')
+logging.info('\033[93m -------------- \033[0m')

install.bat

@@ -11,9 +11,9 @@ if exist "%python_exec%" (
         %python_exec% -s -m pip install "%%i" -i https://pypi.tuna.tsinghua.edu.cn/simple
     )
 
-    %python_exec% -s -m pip install llama-cpp-python --extra-index-url https://abetlen.github.io/llama-cpp-python/whl/cu121
+    %python_exec% -s -m pip install --upgrade --force llama-cpp-python --extra-index-url https://abetlen.github.io/llama-cpp-python/whl/cu121
 
-    %python_exec% -s -m pip install llama-cpp-python[server]
+    %python_exec% -s -m pip install --upgrade --force llama-cpp-python[server]
     
 
 ) else (

nodes/ClipInterrogator.py

@@ -70,14 +70,20 @@ def load_caption_model(model_path,config,t='blip-base'):
     return (caption_model,caption_processor)
     
 
+def get_clip_interrogator_path():
+    try:
+        return folder_paths.get_folder_paths('clip_interrogator')[0]
+    except:
+        return os.path.join(folder_paths.models_dir, "clip_interrogator")
 
-caption_model_path=os.path.join(folder_paths.models_dir, "clip_interrogator/Salesforce/blip-image-captioning-base")
+
+cache_path=get_clip_interrogator_path()
+
+caption_model_path=os.path.join(cache_path, "Salesforce/blip-image-captioning-base")
 if not os.path.exists(caption_model_path):
     print(f"## clip_interrogator_model not found: {caption_model_path}, pls download from https://huggingface.co/Salesforce/blip-image-captioning-base")
     caption_model_path='Salesforce/blip-image-captioning-base'
 
-cache_path=os.path.join(folder_paths.models_dir, "clip_interrogator")
-
 
 # Tensor to PIL
 def tensor2pil(image):

nodes/Lama.py

@@ -42,8 +42,13 @@ else:
     _available=True
 
 
- 
-llma_model_path=os.path.join(folder_paths.models_dir, "lama/big-lama.pt")
+def get_lama_path():
+    try:
+        return folder_paths.get_folder_paths('lama')[0]
+    except:
+        return os.path.join(folder_paths.models_dir, "lama")
+
+llma_model_path=os.path.join(get_lama_path(), "big-lama.pt")
 if not os.path.exists(llma_model_path):
     os.environ['LAMA_MODEL']=''
     print(f"## lama torchscript model not found: {llma_model_path},pls download from https://github.com/enesmsahin/simple-lama-inpainting/releases/download/v0.1.0/big-lama.pt")

nodes/TextGenerateNode.py

@@ -18,19 +18,25 @@ from lark import Lark, Transformer, v_args
 global _available
 _available=True
 
+def get_text_generator_path():
+    try:
+        return folder_paths.get_folder_paths('prompt_generator')[0]
+    except:
+        return os.path.join(folder_paths.models_dir, "prompt_generator")
 
-text_generator_model_path=os.path.join(folder_paths.models_dir, "prompt_generator/text2image-prompt-generator")
+prompt_generator=get_text_generator_path()
+
+text_generator_model_path=os.path.join(prompt_generator, "text2image-prompt-generator")
 if not os.path.exists(text_generator_model_path):
     print(f"## text_generator_model not found: {text_generator_model_path}, pls download from https://huggingface.co/succinctly/text2image-prompt-generator/tree/main")
     text_generator_model_path='succinctly/text2image-prompt-generator'
 
-zh_en_model_path=os.path.join(folder_paths.models_dir, "prompt_generator/opus-mt-zh-en")
+zh_en_model_path=os.path.join(prompt_generator, "opus-mt-zh-en")
 if not os.path.exists(zh_en_model_path):
     print(f"## zh_en_model not found: {zh_en_model_path}, pls download from https://huggingface.co/Helsinki-NLP/opus-mt-zh-en/tree/main")
     zh_en_model_path='Helsinki-NLP/opus-mt-zh-en'
 
 
-
 def is_installed(package):
     try:
         spec = importlib.util.find_spec(package)

web/index.html

@@ -247,10 +247,10 @@
 
         .card textarea {
             width: 100%;
-            /* height: 200px; */
+            height:'fit-content';
             /* min-width: 300px; */
             margin-top: 12px;
-            resize: vertical;
+            resize: none;
             overflow: hidden;
         }
 
@@ -434,7 +434,7 @@
             /* 角落颜色 */
         }
 
-
+/* 
         .dynamic_prompt::after {
             content: attr(title);
             position: absolute;
@@ -442,7 +442,7 @@
             padding: 4px;
             padding-left: 25px;
             border-radius: 4px;
-        }
+        } */
 
         summary {
             user-select: none;

web/javascript/checkVersion_mixlab.js

@@ -3,7 +3,7 @@ import { app } from '../../../scripts/app.js'
 const repoOwner = 'shadowcz007' // 替换为仓库的所有者
 const repoName = 'comfyui-mixlab-nodes' // 替换为仓库的名称
 
-const version = 'v0.25.0'
+const version = 'v0.25.1'
 
 fetch(`https://api.github.com/repos/${repoOwner}/${repoName}/releases/latest`)
   .then(response => response.json())

web/javascript/ui_mixlab.js

@@ -51,8 +51,13 @@ async function start_llama (model = 'Phi-3-mini-4k-instruct-Q5_K_S.gguf') {
       })
     })
 
-    const data = await response.json()
+    const data = await response.json();
+    if(data.llama_cpp_error){
+      return 
+    }
+    
     return { url: `http://127.0.0.1:${data.port}`, model: data.model }
+    
   } catch (error) {
     console.error(error)
   }