chunzhi/comfyui-deploy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit c36b0ec0b374dd8ccbee3a6044ee7e3f1fefe368
Author: Nicholas Koben Kao <[email protected]>
Date:   Thu Jan 25 17:54:54 2024 -0800

    nits on wording and removing link to broken storage/:id page

commit 0777fdcf7b0002244bc713199d3d64eea6b6061e
Author: Nicholas Koben Kao <[email protected]>
Date:   Thu Jan 25 17:23:55 2024 -0800

    builder update config and such

commit 958b795bb2b6ac27ce33c5729ef265b068420e1a
Author: Nicholas Koben Kao <[email protected]>
Date:   Thu Jan 25 17:23:43 2024 -0800

    rename all from checkponit to model

commit 7a9c5636e73bd005499b141a4dd382db5672c962
Author: Nicholas Koben Kao <[email protected]>
Date:   Thu Jan 25 16:51:59 2024 -0800

    rename for consistency

commit 48bebbafab9a95388817df97c15f8ea97e0fea75
Author: Nicholas Koben Kao <[email protected]>
Date:   Thu Jan 25 16:18:36 2024 -0800

    bulider

commit 81dacd9af457886f2f027994d225a7748c738abb
Author: Nicholas Koben Kao <[email protected]>
Date:   Thu Jan 25 16:17:56 2024 -0800

    different types of models
This commit is contained in:
bennykok
2024-01-26 10:08:37 +08:00
parent 62a69dba06
commit 85477aba9d
22 changed files with 2919 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/modal-builder/.env.example
+2 -1
View File
@@ -3,4 +3,5 @@ MODAL_TOKEN_SECRET=
CIVITAI_API_KEY=
# On production set to False
DEPLOY_TEST_FLAG=True
DEPLOY_TEST_FLAG=True
CIVITAI_API_KEY=
builder/modal-builder/src/main.py
+16 -48
View File
@@ -177,7 +177,7 @@ class Item(BaseModel):
snapshot: Snapshot
models: List[Model]
callback_url: str
checkpoint_volume_name: str
model_volume_name: str
gpu: GPUType = Field(default=GPUType.T4)
@field_validator('gpu')
@@ -227,24 +227,31 @@ async def websocket_endpoint(websocket: WebSocket, machine_id: str):
# return {"Hello": "World"}
# definition based on web schema
class UploadType(str, Enum):
checkpoint = "checkpoint"
lora = "lora"
embedding = "embedding"
class UploadBody(BaseModel):
download_url: str
volume_name: str
volume_id: str
checkpoint_id: str
model_id: str
upload_type: UploadType
callback_url: str
# based on ComfyUI's model dir, and our mappings in ./src/template/data/extra_model_paths.yaml
UPLOAD_TYPE_DIR_MAP = {
UploadType.checkpoint: "checkpoints"
UploadType.checkpoint: "checkpoints",
UploadType.lora: "loras",
UploadType.embedding: "embeddings",
}
@app.post("/upload-volume")
async def upload_checkpoint(body: UploadBody):
async def upload_model(body: UploadBody):
global last_activity_time
last_activity_time = time.time()
logger.info(f"Extended inactivity time to {global_timeout}")
@@ -254,6 +261,7 @@ async def upload_checkpoint(body: UploadBody):
# check that this
return JSONResponse(status_code=200, content={"message": "Volume uploading", "build_machine_instance_id": fly_instance_id})
async def upload_logic(body: UploadBody):
folder_path = f"/app/builds/{body.volume_id}"
@@ -270,7 +278,7 @@ async def upload_logic(body: UploadBody):
},
"callback_url": body.callback_url,
"callback_body": {
"checkpoint_id": body.checkpoint_id,
"model_id": body.model_id,
"volume_id": body.volume_id,
"folder_path": upload_path,
},
@@ -279,51 +287,11 @@ async def upload_logic(body: UploadBody):
with open(f"{folder_path}/config.py", "w") as f:
f.write("config = " + json.dumps(config))
process = await asyncio.subprocess.create_subprocess_shell(
await asyncio.subprocess.create_subprocess_shell(
f"modal run app.py",
# stdout=asyncio.subprocess.PIPE,
# stderr=asyncio.subprocess.PIPE,
cwd=folder_path,
env={**os.environ, "COLUMNS": "10000"}
)
# error_logs = []
# async def read_stream(stream):
# while True:
# line = await stream.readline()
# if line:
# l = line.decode('utf-8').strip()
# error_logs.append(l)
# logger.error(l)
# error_logs.append({
# "logs": l,
# "timestamp": time.time()
# })
# else:
# break
# stderr_read_task = asyncio.create_task(read_stream(process.stderr))
#
# await asyncio.wait([stderr_read_task])
# await process.wait()
# if process.returncode != 0:
# error_logs.append({"logs": "Unable to upload volume.", "timestamp": time.time()})
# # Error handling: send POST request to callback URL with error details
# requests.post(body.callback_url, json={
# "volume_id": body.volume_id,
# "checkpoint_id": body.checkpoint_id,
# "folder_path": upload_path,
# "error_logs": json.dumps(error_logs),
# "status": "failed"
# })
#
# requests.post(body.callback_url, json={
# "checkpoint_id": body.checkpoint_id,
# "volume_id": body.volume_id,
# "folder_path": upload_path,
# "status": "success"
# })
@app.post("/create")
async def create_machine(item: Item):
@@ -414,8 +382,8 @@ async def build_logic(item: Item):
"name": item.name,
"deploy_test": os.environ.get("DEPLOY_TEST_FLAG", "False"),
"gpu": item.gpu,
"public_checkpoint_volume": "model-store",
"private_checkpoint_volume": item.checkpoint_volume_name
"public_model_volume": "model-store",
"private_model_volume": item.model_volume_name
}
with open(f"{folder_path}/config.py", "w") as f:
f.write("config = " + json.dumps(config))
builder/modal-builder/src/template/config.py
+2 -2
View File
@@ -2,6 +2,6 @@ config = {
"name": "my-app",
"deploy_test": "True",
"gpu": "T4",
"public_checkpoint_volume": "model-store",
"private_checkpoint_volume": "private-model-store"
"public_model_volume": "model-store",
"private_model_volume": "private-model-store"
}
builder/modal-builder/src/template/data/extra_model_paths.yaml
+8
View File
@@ -13,3 +13,11 @@ public:
private:
base_path: /private_models/
checkpoints: checkpoints
clip: clip
clip_vision: clip_vision
configs: configs
controlnet: controlnet
embeddings: embeddings
loras: loras
upscale_models: upscale_models
vae: vae
builder/modal-builder/src/template/volume_setup.py
+2 -2
View File
@@ -1,8 +1,8 @@
import modal
from config import config
public_model_volume = modal.Volume.persisted(config["public_checkpoint_volume"])
private_volume = modal.Volume.persisted(config["private_checkpoint_volume"])
public_model_volume = modal.Volume.persisted(config["public_model_volume"])
private_volume = modal.Volume.persisted(config["private_model_volume"])
PUBLIC_BASEMODEL_DIR = "/public_models"
PRIVATE_BASEMODEL_DIR = "/private_models"
builder/modal-builder/src/volume-builder/config.py
+6 -6
View File
@@ -1,18 +1,18 @@
config = {
"volume_names": {
"test": {
"download_url": "https://pub-6230db03dc3a4861a9c3e55145ceda44.r2.dev/openpose-pose (1).png",
"folder_path": "images"
"user4": {
"download_url": "https://civitai.com/api/download/models/11745",
"folder_path": "checkpoints"
}
},
"volume_paths": {
"test": "/volumes/something"
"user4": "/volumes/something",
},
"callback_url": "",
"callback_body": {
"checkpoint_id": "",
"model_id": "",
"volume_id": "",
"folder_path": "images",
"folder_path": "checkpoints",
},
"civitai_api_key": "",
}