From 593ac904946a90b961f0ee67c278077551b6fab0 Mon Sep 17 00:00:00 2001 From: Alejandro Gil Date: Sun, 18 Jun 2023 08:36:59 -0700 Subject: [PATCH 1/5] ... --- .gitmodules | 18 ------------------ backend/clip-as-service | 1 - backend/clipseg | 1 - backend/dalle_flow | 1 - backend/glid-3-xl | 1 - backend/latent-diffusion | 1 - backend/stable-diffusion | 1 - 7 files changed, 24 deletions(-) delete mode 160000 backend/clip-as-service delete mode 160000 backend/clipseg delete mode 160000 backend/dalle_flow delete mode 160000 backend/glid-3-xl delete mode 160000 backend/latent-diffusion delete mode 160000 backend/stable-diffusion diff --git a/.gitmodules b/.gitmodules index f7de798..b4b644f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,21 +1,3 @@ [submodule "backend"] path = backend url = ../../Sygil-Dev/dalle-flow.git -[submodule "backend/clip-as-service"] - path = backend/clip-as-service - url = ../../jina-ai/clip-as-service.git -[submodule "backend/clipseg"] - path = backend/clipseg - url = ../../timojl/clipseg.git -[submodule "backend/dalle_flow"] - path = backend/dalle_flow - url = ../../Sygil-Dev/dalle-flow.git -[submodule "backend/glid-3-xl"] - path = backend/glid-3-xl - url = ../../jina-ai/glid-3-xl.git -[submodule "backend/latent-diffusion"] - path = backend/latent-diffusion - url = ../../CompVis/latent-diffusion.git -[submodule "backend/stable-diffusion"] - path = backend/stable-diffusion - url = ../../AmericanPresidentJimmyCarter/stable-diffusion.git diff --git a/backend/clip-as-service b/backend/clip-as-service deleted file mode 160000 index 9bb7d1f..0000000 --- a/backend/clip-as-service +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9bb7d1f47d19e15e844108dec5f84cabcce7975d diff --git a/backend/clipseg b/backend/clipseg deleted file mode 160000 index 656e0c6..0000000 --- a/backend/clipseg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 656e0c662bd1c9a5ae511011642da5b7d8503312 diff --git a/backend/dalle_flow b/backend/dalle_flow deleted file mode 160000 index 491c52a..0000000 --- a/backend/dalle_flow +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 491c52af85f6d75d30094974c97a5a0ed53ba6db diff --git a/backend/glid-3-xl b/backend/glid-3-xl deleted file mode 160000 index b21a3ac..0000000 --- a/backend/glid-3-xl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b21a3acdd478a4fa41c529b55199c8ac3b1b807a diff --git a/backend/latent-diffusion b/backend/latent-diffusion deleted file mode 160000 index a506df5..0000000 --- a/backend/latent-diffusion +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a506df5756472e2ebaf9078affdde2c4f1502cd4 diff --git a/backend/stable-diffusion b/backend/stable-diffusion deleted file mode 160000 index 2de63ea..0000000 --- a/backend/stable-diffusion +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2de63ea62862106de27706cd280e692f34c12d9f From c1b91ac8330d7b36752f6721ca9042c650385d6a Mon Sep 17 00:00:00 2001 From: Alejandro Gil Date: Sun, 18 Jun 2023 08:38:45 -0700 Subject: [PATCH 2/5] ... --- .pre-commit-config.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..5174c96 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,27 @@ +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +ci: + autofix_prs: true + autoupdate_branch: 'dev' + autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate' + autoupdate_schedule: weekly + +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.4.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files + + - repo: https://github.com/charliermarsh/ruff-pre-commit + rev: "v0.0.272" + hooks: + - id: ruff + args: [--fix, --exit-non-zero-on-fix] + + - repo: https://github.com/psf/black + rev: 23.3.0 + hooks: + - id: black From 47c39c200abf8c12dc44f3b146637a6ab1af3c52 Mon Sep 17 00:00:00 2001 From: Alejandro Gil Date: Thu, 22 Jun 2023 12:30:18 -0700 Subject: [PATCH 3/5] Update FUNDING.yml --- .github/FUNDING.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 2b7c680..56df8f3 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,5 @@ github: [ZeroCool940711] +patreon: zerocool94 +ko_fi: zerocool94 +open_collective: sygil_dev +custom: ["https://paypal.me/zerocool94"] From 5e69b1f688ef2f5513280b056669b17b76bc7a63 Mon Sep 17 00:00:00 2001 From: Alejandro Gil Date: Thu, 22 Jun 2023 12:32:00 -0700 Subject: [PATCH 4/5] Removed extra submodules that are no longer used. --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index b4b644f..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "backend"] - path = backend - url = ../../Sygil-Dev/dalle-flow.git From f10bf826f0d97e367cb2283f5f4134663f3b6d1a Mon Sep 17 00:00:00 2001 From: Alejandro Gil Date: Thu, 22 Jun 2023 19:53:18 -0700 Subject: [PATCH 5/5] Added `altair<5` to the requirements.txt to fix an issue with streamlit not being compatible with altair 5 and higher. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 285f6bf..ed33d32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,6 +44,7 @@ matplotlib==3.6. resize-right==0.0.2 torchdiffeq==0.2.3 barfi==0.7.0 +altair<5 # Environment Dependencies for WebUI (flet)