From 8361841a4ad3897a98a14bb64bfb01057faa87fa Mon Sep 17 00:00:00 2001 From: Sheldon Hull Date: Tue, 13 Sep 2022 11:32:21 -0500 Subject: [PATCH] chore(taskfile): add missing model, fix env file commenting, and only run download if changed --- .env.example | 12 ++++++++---- Taskfile.yml | 36 ++++++++++++++++++++++++------------ 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/.env.example b/.env.example index b7275b2..86cff73 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,8 @@ -UI=hlky # The most popular fork, Repo -# UI=auto # Another great fork, many features with neat UI, Repo -# UI=auto # cpu: for users without a GPU. -# UI=lstein # One of the earliest forks, the UI is simple but has a lot of potential, Repo \ No newline at end of file +# The most popular fork, Repo +UI=hlky +# Another great fork, many features with neat UI, Repo +# UI=auto +# cpu: for users without a GPU. +# UI=auto +# One of the earliest forks, the UI is simple but has a lot of potential, Repo +# UI=lstein \ No newline at end of file diff --git a/Taskfile.yml b/Taskfile.yml index 8666ba5..835dc7b 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -1,6 +1,6 @@ version: '3' # silent: true -output: prefixed +output: group dotenv: [.env] # Default environment variables for projects @@ -16,23 +16,31 @@ tasks: - task: list list: desc: list tasks + prefix: ' ' cmds: - - task --list + - task --list --color=true --list-all vars: desc: variable output cmds: - | echo -e "{{.light_gray}}=== ℹ {{ .reversed }} Variable Info from Task {{ .nocolor }} === " echo -e "{{.light_gray}}ARTIFACT_DIRECTORY {{.nocolor}}: {{ .orange}}{{ .ARTIFACT_DIRECTORY }} {{ .nocolor }}" - build: + + ### Core Task ### + init: + desc: Download models, build initial docker-compose setup + cmds: + - task: download + - task: update + compose:build: desc: setup tooling for project and download dependencies cmds: - | docker compose --profile download up --build - up: - desc: docker compose --profile {{ .UI }} up + compose:up: + desc: 'compose up with the current profile of: {{ .UI }}' cmds: - - docker compose up + - docker compose --profile {{ .UI }} up update: desc: run updates interactive: true @@ -43,17 +51,21 @@ tasks: download: desc: get extras downloaded cmds: - # curl --progress-bar -C - https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media -o {{ .MODEL_DIRECTORY }}/models/model.ckpt - | + echo '👉 This might take a few minutes. However, it will resume downloading if interuppted and ran again' mkdir -p cache/models || true + curl --progress-bar -C - https://www.googleapis.com/storage/v1/b/aai-blog-files/o/sd-v1-4.ckpt?alt=media -o {{ .MODEL_DIRECTORY }}/model.ckpt curl --progress-bar -C - https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth -o {{ .MODEL_DIRECTORY }}/GFPGANv1.3.pth curl --progress-bar -C - https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth -o {{ .MODEL_DIRECTORY }}/RealESRGAN_x4plus.pth curl --progress-bar -C - https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth -o {{ .MODEL_DIRECTORY }}/RealESRGAN_x4plus_anime_6B.pth curl --progress-bar -C - https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.1/RealESRGAN_x2plus.pth -o {{ .MODEL_DIRECTORY }}/RealESRGAN_x2plus.pth curl --progress-bar -C - https://heibox.uni-heidelberg.de/f/578df07c8fc04ffbadf3/?dl=1 -o {{ .MODEL_DIRECTORY }}/LDSR.ckpt curl --progress-bar -C - https://heibox.uni-heidelberg.de/f/31a76b13ea27482981b4/?dl=1 -o {{ .MODEL_DIRECTORY }}/LDSR.yaml - init: - desc: Download models, build initial docker-compose setup - cmds: - - task: download - - task: update \ No newline at end of file + status: + - test -f {{ .MODEL_DIRECTORY }}/model.ckpt + - test -f {{ .MODEL_DIRECTORY }}/GFPGANv1.3.pth + - test -f {{ .MODEL_DIRECTORY }}/RealESRGAN_x4plus.pth + - test -f {{ .MODEL_DIRECTORY }}/RealESRGAN_x4plus_anime_6B.pth + - test -f {{ .MODEL_DIRECTORY }}/RealESRGAN_x2plus.pth + - test -f {{ .MODEL_DIRECTORY }}/LDSR.ckpt + - test -f {{ .MODEL_DIRECTORY }}/LDSR.yaml \ No newline at end of file