Merge pull request #1 from xhiroga/feat/order

feat: いい感じに整える

.github/workflows/publish.yaml

@@ -0,0 +1,23 @@
+name: Publish to Comfy registry
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - "pyproject.toml"
+
+jobs:
+  publish-node:
+    name: Publish Custom Node to registry
+    runs-on: ubuntu-latest
+    # if this is a forked repository. Skipping the workflow.
+    if: github.event.repository.fork == false 
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Publish Custom Node
+        uses: Comfy-Org/publish-node-action@main
+        with:
+          ## Add your own personal access token to your Github Repository secrets and reference it here.
+          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}

.gitignore

@@ -1,3 +1,5 @@
+extra_model_paths.yaml
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

Makefile

@@ -0,0 +1,100 @@
+# 動作確認のための Makefile
+# 1. .env を作成
+# 2. extra_model_paths.yaml を作成
+# 3. make init && make run
+
+include .env	# MODEL_PATH, TMP
+
+MODEL_PATH ?= ComfyUI/models
+TMP ?= /tmp
+
+.PHONY: run
+
+run:
+	ComfyUI/.venv/bin/python ComfyUI/main.py --listen --port 58188 --fast --extra-model-paths-config extra_model_paths.yaml
+
+ComfyUI:
+	git -C $@ pull || git clone https://github.com/comfyanonymous/ComfyUI.git
+
+ComfyUI/.venv: ComfyUI
+	test -d ComfyUI/.venv || (cd ComfyUI && python3 -m venv .venv)
+	ComfyUI/.venv/bin/pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu128
+	ComfyUI/.venv/bin/pip install -r ComfyUI/requirements.txt
+
+ComfyUI/custom_nodes/ComfyUI-FramePackWrapper_PlusOne: ComfyUI/.venv
+	git -C $@ pull || git clone . $@
+	ComfyUI/.venv/bin/pip install -r $@/requirements.txt
+
+custom_nodes = \
+	ComfyUI/custom_nodes/ComfyUI-FramePackWrapper_PlusOne \
+	ComfyUI/custom_nodes/comfyui-get-meta \
+	ComfyUI/custom_nodes/ComfyUI-KJNodes \
+	ComfyUI/custom_nodes/ComfyUI-LogicUtils \
+	ComfyUI/custom_nodes/ComfyUI-VideoHelperSuite \
+	ComfyUI/custom_nodes/ComfyUI_essentials
+
+ComfyUI/custom_nodes/ComfyUI-FramePackWrapper_PlusOne: REPO = .
+ComfyUI/custom_nodes/ComfyUI-FramePackWrapper_PlusOne: COMMIT = $(shell git rev-parse HEAD)
+ComfyUI/custom_nodes/comfyui-get-meta: REPO = https://github.com/shinich39/comfyui-get-meta
+ComfyUI/custom_nodes/comfyui-get-meta: COMMIT = b1af205fed09a3a4e2257f208fee2c53ad27a96e
+ComfyUI/custom_nodes/ComfyUI-KJNodes: REPO = https://github.com/kijai/ComfyUI-KJNodes
+ComfyUI/custom_nodes/ComfyUI-KJNodes: COMMIT = 5dcda71011870278c35d92ff77a677ed2e538f2d
+ComfyUI/custom_nodes/ComfyUI-LogicUtils: REPO = https://github.com/aria1th/ComfyUI-LogicUtils
+ComfyUI/custom_nodes/ComfyUI-LogicUtils: COMMIT = 60f8f1187c66ee544e09a85303e4140cf0bd0ff2
+ComfyUI/custom_nodes/ComfyUI-VideoHelperSuite: REPO = https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite
+ComfyUI/custom_nodes/ComfyUI-VideoHelperSuite: COMMIT = a7ce59e381934733bfae03b1be029756d6ce936d
+ComfyUI/custom_nodes/ComfyUI_essentials: REPO = https://github.com/cubiq/ComfyUI_essentials
+ComfyUI/custom_nodes/ComfyUI_essentials: COMMIT = 9d9f4bedfc9f0321c19faf71855e228c93bd0dc9
+
+$(custom_nodes): ComfyUI
+	git -C $@ rev-parse HEAD || git clone $(REPO) $@
+	git -C $@ checkout $(COMMIT)
+	test -f $@/requirements.txt && ComfyUI/.venv/bin/pip install -r $@/requirements.txt || true
+
+models = \
+	$(MODEL_PATH)/diffusion_models/FramePackI2V_HY_fp8_e4m3fn.safetensors \
+	$(MODEL_PATH)/diffusion_models/FramePackI2V_HY_bf16.safetensors \
+	$(MODEL_PATH)/clip_vision/sigclip_vision_patch14_384.safetensors \
+	$(MODEL_PATH)/text_encoders/clip_l.safetensors \
+	$(MODEL_PATH)/text_encoders/llava_llama3_fp16.safetensors \
+	$(MODEL_PATH)/text_encoders/llava_llama3_fp8_scaled.safetensors \
+	$(MODEL_PATH)/vae/hunyuan_video_vae_bf16.safetensors \
+	$(MODEL_PATH)/loras/framepack/body2img_V7_kisekaeichi_dim4_1e-3_512_768-000140.safetensors \
+	$(MODEL_PATH)/loras/framepack/Apose_V7_dim4.safetensors \
+	$(MODEL_PATH)/loras/framepack/fp-1f-chibi-1024.safetensors
+
+## diffusion_models
+$(MODEL_PATH)/diffusion_models/FramePackI2V_HY_fp8_e4m3fn.safetensors: REPO = Kijai/HunyuanVideo_comfy
+$(MODEL_PATH)/diffusion_models/FramePackI2V_HY_fp8_e4m3fn.safetensors: FILE = FramePackI2V_HY_fp8_e4m3fn.safetensors
+$(MODEL_PATH)/diffusion_models/FramePackI2V_HY_bf16.safetensors: REPO = Kijai/HunyuanVideo_comfy
+$(MODEL_PATH)/diffusion_models/FramePackI2V_HY_bf16.safetensors: FILE = FramePackI2V_HY_bf16.safetensors
+## clip_vision
+$(MODEL_PATH)/clip_vision/sigclip_vision_patch14_384.safetensors: REPO = Comfy-Org/sigclip_vision_384
+$(MODEL_PATH)/clip_vision/sigclip_vision_patch14_384.safetensors: FILE = sigclip_vision_patch14_384.safetensors
+
+## text_encoders
+$(MODEL_PATH)/text_encoders/clip_l.safetensors: REPO = Comfy-Org/HunyuanVideo_repackaged
+$(MODEL_PATH)/text_encoders/clip_l.safetensors: FILE = split_files/text_encoders/clip_l.safetensors
+$(MODEL_PATH)/text_encoders/llava_llama3_fp16.safetensors: REPO = Comfy-Org/HunyuanVideo_repackaged
+$(MODEL_PATH)/text_encoders/llava_llama3_fp16.safetensors: FILE = split_files/text_encoders/llava_llama3_fp16.safetensors
+$(MODEL_PATH)/text_encoders/llava_llama3_fp8_scaled.safetensors: REPO = Comfy-Org/HunyuanVideo_repackaged
+$(MODEL_PATH)/text_encoders/llava_llama3_fp8_scaled.safetensors: FILE = split_files/text_encoders/llava_llama3_fp8_scaled.safetensors
+
+## vae
+$(MODEL_PATH)/vae/hunyuan_video_vae_bf16.safetensors: REPO = Comfy-Org/HunyuanVideo_repackaged
+$(MODEL_PATH)/vae/hunyuan_video_vae_bf16.safetensors: FILE = split_files/vae/hunyuan_video_vae_bf16.safetensors
+
+## loras
+$(MODEL_PATH)/loras/framepack/body2img_V7_kisekaeichi_dim4_1e-3_512_768-000140.safetensors: REPO = tori29umai/FramePack_LoRA
+$(MODEL_PATH)/loras/framepack/body2img_V7_kisekaeichi_dim4_1e-3_512_768-000140.safetensors: FILE = body2img_V7_kisekaeichi_dim4_1e-3_512_768-000140.safetensors
+$(MODEL_PATH)/loras/framepack/Apose_V7_dim4.safetensors: REPO = tori29umai/FramePack_LoRA
+$(MODEL_PATH)/loras/framepack/Apose_V7_dim4.safetensors: FILE = Apose_V7_dim4.safetensors
+$(MODEL_PATH)/loras/framepack/fp-1f-chibi-1024.safetensors: REPO = kohya-ss/misc-models
+$(MODEL_PATH)/loras/framepack/fp-1f-chibi-1024.safetensors: FILE = fp-1f-chibi-1024.safetensors
+
+$(models):
+	uvx --from "huggingface_hub[cli]" huggingface-cli download $(REPO) $(FILE) --local-dir $(TMP)/$(REPO)
+	mkdir -p $(dir $@)
+	mv $(TMP)/$(REPO)/$(FILE) $@
+
+init: ComfyUI/.venv $(custom_nodes) $(models)

README.md

@@ -1,5 +1,13 @@
 # ComfyUI-FramePackWrapper_PlusOne
-This repository is derived from [ComfyUI-FramePackWrapper_Plus](https://github.com/ShmuelRonen/ComfyUI-FramePackWrapper_Plus/tree/main) and was created for my own use. I have little intention to maintain it. Please feel free to improve it, especially Framepack 1f-mc.
+
+[ComfyUI-FramePackWrapper_PlusOne](https://github.com/tori29umai0123/ComfyUI-FramePackWrapper_PlusOne) is a fork by @tori29umai0123 derived from [ComfyUI-FramePackWrapper](https://github.com/kijai/ComfyUI-FramePackWrapper) and [ComfyUI-FramePackWrapper_Plus](https://github.com/ShmuelRonen/ComfyUI-FramePackWrapper_Plus/tree/main), which includes a 1-frame inference node for FramePack (compatible with kisekaeichi). This repository was forked for public release at the request of @tori29umai0123.
+
+<details>
+<summary>日本語</summary>
+
+[ComfyUI-FramePackWrapper_PlusOne](https://github.com/tori29umai0123/ComfyUI-FramePackWrapper_PlusOne) は、[ComfyUI-FramePackWrapper](https://github.com/kijai/ComfyUI-FramePackWrapper)および[ComfyUI-FramePackWrapper_Plus](https://github.com/ShmuelRonen/ComfyUI-FramePackWrapper_Plus/tree/main)から派生した、 @tori29umai0123 氏によるFramePackの1フレーム推論ノード(kisekaeichi対応)を含むフォーク
+です。本リポジトリは、 @tori29umai0123 氏の依頼を受けて公開用にフォークしました。
+</details>
 
 An improved wrapper for the FramePack project that allows the creation of videos of any length based on reference images and LoRAs with F1 sampler.
 

pyproject.toml

@@ -0,0 +1,14 @@
+[project]
+name = "ComfyUI-FramePackWrapper_PlusOne"
+description = "An improved wrapper for the FramePack project that allows the creation of videos of any length based on reference images and LoRAs with F1 and One sampler."
+version = "1.0.0"
+license = {file = "LICENSE"}
+
+[project.urls]
+Repository = "https://github.com/xhiroga/ComfyUI-FramePackWrapper_PlusOne"
+#  Used by Comfy Registry https://comfyregistry.org
+
+[tool.comfy]
+PublisherId = "xhiroga"
+DisplayName = "ComfyUI-FramePackWrapper_PlusOne"
+Icon = ""