Dev (#37) - CLI improvements + docs, simpler install

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "vendor/GMA"]
+	path = vendor/GMA
+	url = https://github.com/pytti-tools/GMA
+[submodule "vendor/AdaBins"]
+	path = vendor/AdaBins
+	url = https://github.com/pytti-tools/AdaBins
+[submodule "vendor/CLIP"]
+	path = vendor/CLIP
+	url = https://github.com/openai/CLIP
+[submodule "pytti_taming"]
+	path = vendor/taming-transformers
+	url = https://github.com/pytti-tools/taming-transformers

setup.cfg

@@ -3,12 +3,12 @@ name = pyttitools-core
 version = 0.0.1
 
 [options]
-packages = find:
-package_dir =
-    = src
+#packages = find:
+#package_dir =
+#    = src
 install_requires =
     torch >= 1.10
 include_package_data=True
 
-[options.packages.find]
-where = src
+#[options.packages.find]
+#where = src

setup.py

@@ -0,0 +1,25 @@
+from setuptools import setup, find_packages, find_namespace_packages
+import logging
+
+p0 = find_packages(where='src')
+#print(p0)
+#logging.critical(p0)
+#p1 = find_namespace_packages(where='vendor.*')
+#print(p1)
+#logging.critical(p1)
+p2 = find_namespace_packages(
+    where='src',
+    include=['hydra_plugins.*'],
+    )
+#logging.critical(p2)
+
+setup(
+    #packages= p0 + p1,
+    packages=p0+p2,
+    package_dir={
+        "": "src",
+        #"pyttitools-adabins": "vendor",
+        #"pyttitools-gma": "vendor",
+        },
+    install_requires=['pyttitools-adabins', 'pyttitools-gma']
+)

src/hydra_plugins/pytti_local_config_searchpath_plugin/searchpath_append_cwd.py

@@ -0,0 +1,22 @@
+import os
+
+from loguru import logger
+
+from hydra.core.config_search_path import ConfigSearchPath
+from hydra.plugins.search_path_plugin import SearchPathPlugin
+
+
+# https://hydra.cc/docs/advanced/search_path/#
+# https://github.com/facebookresearch/hydra/issues/763
+
+class PyttiLocalConfigSearchPathPlugin(SearchPathPlugin):
+
+    def manipulate_search_path(self, search_path: ConfigSearchPath) -> None:
+
+        local_path = f"{os.getcwd()}/config/"
+        # If path doesn't exist, we should create it and copy configs to it
+        logger.debug(local_path)
+
+        search_path.append(
+            provider="pytti_hydra_pathplugin", path=f"file://{local_path}"
+        )

src/pytti/Image/VQGANImage.py

@@ -2,12 +2,12 @@
 import sys, subprocess
 from loguru import logger
 
-if not path_exists("./taming-transformers"):
-    raise FileNotFoundError("ERROR: taming-transformers is missing!")
-if "./taming-transformers" not in sys.path:
-    sys.path.append("./taming-transformers")
-else:
-    logger.debug("DEBUG: sys.path already contains ./taming transformers")
+#if not path_exists("./taming-transformers"):
+#    raise FileNotFoundError("ERROR: taming-transformers is missing!")
+#if "./taming-transformers" not in sys.path:
+#    sys.path.append("./taming-transformers")
+#else:
+#    logger.debug("DEBUG: sys.path already contains ./taming transformers")
 from taming.models import cond_transformer, vqgan
 
 from pytti import DEVICE, replace_grad, clamp_with_grad, vram_usage_mode

src/pytti/Perceptor/Prompt.py

@@ -14,7 +14,7 @@
 from torch.nn import functional as F
 from torchvision.transforms import functional as TF
 import re, math
-from CLIP import clip
+from clip import clip
 import pytti
 from PIL import Image
 from pytti.Image import RGBImage

src/pytti/Perceptor/__init__.py

@@ -1,5 +1,5 @@
 import torch
-from CLIP import clip
+from clip import clip
 from pytti import DEVICE, vram_usage_mode
 
 CLIP_PERCEPTORS = None

src/pytti/config/conf/demo.yaml

@@ -6,7 +6,11 @@ scene_prefix: 'astrophotography #pixelart | image credit nasa | space full of cy
 scene_suffix: '| satellite image:-1:-.95 | text:-1:-.95 | anime:-1:-.95 | watermark:-1:-.95
   | backyard telescope:-1:-.95 | map:-1:-.95'
 
-direct_image_prompts: https://i.imgur.com/frXoHJ6.jpg
+steps_per_scene: 30
+steps_per_frame: 3
+pre_animation_steps: 2
+save_every: ${steps_per_frame}
+display_every: ${steps_per_frame}
 
 image_model: Limited Palette
 ViTB32: true

vendor/README.md

@@ -0,0 +1 @@
+Vendored code goes here.