merge dev to master

.eslintrc.json

@@ -18,6 +18,7 @@
     "max-len": [1, 275, 3],
     "camelcase":"off",
     "default-case":"off",
+    "no-await-in-loop":"off",
     "no-bitwise":"off",
     "no-confusing-arrow":"off",
     "no-console":"off",
@@ -71,6 +72,8 @@
     "restartReload": "readonly",
     "updateInput": "readonly",
     "toggleCompact": "readonly",
+    "setFontSize": "readonly",
+    "setTheme": "readonly",
     // settings.js
     "registerDragDrop": "readonly",
     //extraNetworks.js

.github/workflows/build_readme.yaml

@@ -10,14 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout-code
-        uses: actions/checkout@v3
+        uses: actions/checkout@main
       - name: update-readme
-        uses: JamesIves/github-sponsors-readme-action@v1
+        uses: JamesIves/github-sponsors-readme-action@v1.3.1
         with:
           token: ${{ secrets.PAT }}
           file: 'README.md'
       - name: deploy-readme
-        uses: JamesIves/github-pages-deploy-action@v4
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           branch: master
           folder: '.'

.github/workflows/on_pull_request.yaml

@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout-code
-        uses: actions/checkout@v3
+        uses: actions/checkout@main
       - name: setup-python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@main
         with:
           python-version: 3.10.6
           cache: pip

.gitignore

@@ -59,6 +59,8 @@ cache
 .idea/
 /localizations
 
+.*/
+
 # force included
 !/models/VAE-approx
 !/models/VAE-approx/model.pt

TODO.md

@@ -1,3 +1,16 @@
 # TODO
 
-ToDo list has moved to [GitHub projects](https://github.com/users/vladmandic/projects)
+Main ToDo list can be found at [GitHub projects](https://github.com/users/vladmandic/projects)
+
+## Candidates for next release
+
+- multi-ipadapter: <https://github.com/huggingface/diffusers/pull/6573>
+- control second pass: <https://github.com/vladmandic/automatic/issues/2783>  
+- diffusers public callbacks  
+- image2video: pia and vgen pipelines  
+- video2video
+- control api  
+- masking api  
+- preprocess api  
+- remove kohya from submodules  
+- bind panZoom to control input

cli/image-exif.py

@@ -4,12 +4,9 @@
 import io
 import re
 import sys
-import json
 from PIL import Image, ExifTags, TiffImagePlugin, PngImagePlugin
 from rich import print # pylint: disable=redefined-builtin
 
-# warnings.filterwarnings("ignore", category=UserWarning)
-
 
 class Exif: # pylint: disable=single-string-used-for-slots
     __slots__ = ('__dict__') # pylint: disable=superfluous-parens
@@ -69,6 +66,36 @@ def decode(self, s: bytes):
                 pass
         return None
 
+    def parse(self):
+        re_param_code = r'\s*([\w ]+):\s*("(?:\\"[^,]|\\"|\\|[^\"])+"|[^,]*)(?:,|$)'
+        re_param = re.compile(re_param_code)
+        x = self.exif.pop('parameters', None) or self.exif.pop('UserComment', None)
+        res = {}
+        if x is None:
+            return res
+        remaining = x.replace('\n', ' ').strip()
+        if len(remaining) == 0:
+            return res
+        remaining = x[7:] if x.startswith('Prompt: ') else x
+        remaining = x[11:] if x.startswith('parameters: ') else x
+        if 'Steps: ' in remaining and 'Negative prompt: ' not in remaining:
+            remaining = remaining.replace('Steps: ', 'Negative prompt: Steps: ')
+        prompt, remaining = remaining.strip().split('Negative prompt: ', maxsplit=1) if 'Negative prompt: ' in remaining else (remaining, '')
+        res["Prompt"] = prompt.strip()
+        negative, remaining = remaining.strip().split('Steps: ', maxsplit=1) if 'Steps: ' in remaining else (remaining, None)
+        res["Negative prompt"] = negative.strip()
+        if remaining is None:
+            return res
+        remaining = f'Steps: {remaining}'
+        for k, v in re_param.findall(remaining.strip()):
+            if v.isdigit():
+                res[k] = float(v) if '.' in v else int(v)
+            else:
+                res[k] = v
+        from types import SimpleNamespace
+        ns = SimpleNamespace(**res)
+        return ns
+
     def get_bytes(self):
         ifd = TiffImagePlugin.ImageFileDirectory_v2()
         exif_stream = io.BytesIO()
@@ -87,13 +114,13 @@ def read_exif(filename: str):
         from pi_heif import register_heif_opener
         register_heif_opener()
     try:
-        img = Image.open(filename)
-        exif = Exif(img)
-        print('image:', filename, 'format:', img.format, 'metadata:', json.dumps(vars(exif.exif)['_data'], indent=2))
+        image = Image.open(filename)
+        exif = Exif(image)
+        print('image:', filename, 'format:', image)
+        print('exif:', vars(exif.exif)['_data'])
+        print('info:', exif.parse())
     except Exception as e:
         print('metadata error reading:', filename, e)
-    # exif.exif['Software'] = 'This is a Test'
-    # img.save('input-scored.jpg', exif=exif.bytes())
 
 
 if __name__ == '__main__':

cli/install-sf.py

@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+import os
+import re
+import sys
+
+torch_supported = ['211', '212']
+cuda_supported = ['cu118', 'cu121']
+python_supported = ['39', '310', '311']
+repo_url = 'https://github.com/chengzeyi/stable-fast'
+api_url = 'https://api.github.com/repos/chengzeyi/stable-fast/releases/tags/nightly'
+path_url = '/releases/download/nightly'
+
+
+def install_pip(arg: str):
+    import subprocess
+    cmd = f'"{sys.executable}" -m pip install -U {arg}'
+    print(f'Running: {cmd}')
+    result = subprocess.run(cmd, shell=True, check=False, env=os.environ)
+    return result.returncode == 0
+
+
+def get_nightly():
+    import requests
+    r = requests.get(api_url, timeout=10)
+    if r.status_code != 200:
+        print('Failed to get nightly version')
+        return None
+    json = r.json()
+    assets = json.get('assets', [])
+    if len(assets) == 0:
+        print('Failed to get nightly version')
+        return None
+    asset = assets[0].get('name', '')
+    pattern = r"-(.+?)\+"
+    match = re.search(pattern, asset)
+    if match:
+        ver = match.group(1)
+        print(f'Nightly version: {ver}')
+        return ver
+    else:
+        print('Failed to get nightly version')
+        return None
+
+
+def install_stable_fast():
+    import torch
+
+    python_ver = f'{sys.version_info.major}{sys.version_info.minor}'
+    if python_ver not in python_supported:
+        raise ValueError(f'StableFast unsupported python: {python_ver} required {python_supported}')
+    if sys.platform == 'linux':
+        bin_url = 'manylinux2014_x86_64.whl'
+    elif sys.platform == 'win32':
+        bin_url = 'win_amd64.whl'
+    else:
+        raise ValueError(f'StableFast unsupported platform: {sys.platform}')
+
+    torch_ver, cuda_ver = torch.__version__.split('+')
+    torch_ver = torch_ver.replace('.', '')
+    sf_ver = get_nightly()
+
+    if torch_ver not in torch_supported:
+        print(f'StableFast unsupported torch: {torch_ver} required {torch_supported}')
+        print('Installing from source...')
+        url = 'git+https://github.com/chengzeyi/stable-fast.git@main#egg=stable-fast'
+    elif cuda_ver not in cuda_supported:
+        print(f'StableFast unsupported CUDA: {cuda_ver} required {cuda_supported}')
+        print('Installing from source...')
+        url = 'git+https://github.com/chengzeyi/stable-fast.git@main#egg=stable-fast'
+    elif sf_ver is None:
+        print('StableFast cannot determine version')
+        print('Installing from source...')
+        url = 'git+https://github.com/chengzeyi/stable-fast.git@main#egg=stable-fast'
+    else:
+        print('Installing wheel...')
+        file_url = f'stable_fast-{sf_ver}+torch{torch_ver}{cuda_ver}-cp{python_ver}-cp{python_ver}-{bin_url}'
+        url = f'{repo_url}/{path_url}/{file_url}'
+
+    ok = install_pip(url)
+    if ok:
+        import sfast
+        print(f'StableFast installed: {sfast.__version__}')
+    else:
+        print('StableFast install failed')
+
+if __name__ == '__main__':
+    install_stable_fast()

cli/run-benchmark.py

@@ -2,34 +2,21 @@
 """
 sd api txt2img benchmark
 """
+import os
 import asyncio
 import base64
 import io
 import json
 import time
+import argparse
 from PIL import Image
 import sdapi
 from util import Map, log
 
 
-options = Map({
-    'restore_faces': False,
-    'prompt': 'photo of two dice on a table',
-    'negative_prompt': 'foggy, blurry',
-    'steps': 50,
-    'batch_size': 1,
-    'n_iter': 1,
-    'seed': -1,
-    'sampler_name': 'Euler a',
-    'cfg_scale': 0,
-    'width': 512,
-    'height': 512
-})
-
-
-# batch = [1, 1, 2, 4, 8, 12, 16, 24, 32, 48, 64, 96, 128]
-batch = [1, 1, 2, 4, 8, 12, 16]
 oom = 0
+args = None
+options = None
 
 
 async def txt2img():
@@ -46,9 +33,15 @@ async def txt2img():
     else:
         return 0
     log.debug({ 'info': info })
+    if options['batch_size'] != len(data['images']):
+        log.error({ 'requested': options['batch_size'], 'received': len(data['images']) })
     for i in range(len(data['images'])):
         data['images'][i] = Image.open(io.BytesIO(base64.b64decode(data['images'][i].split(',',1)[0])))
-        log.debug({ 'image': data['images'][i].size })
+        if args.save:
+            fn = os.path.join(args.save, f'benchmark-{i}-{len(data["images"])}.png')
+            data["images"][i].save(fn)
+            log.debug({ 'save': fn })
+    log.debug({ "images": data["images"] })
     t1 = time.perf_counter()
     return t1 - t0
 
@@ -75,28 +68,30 @@ def gb(val: float):
 
 
 async def main():
-    log.info({ 'benchmark': { 'batch-sizes': batch } })
     sdapi.quiet = True
     await sdapi.session()
     await sdapi.interrupt()
+    ver = await sdapi.get("/sdapi/v1/version")
+    log.info({ 'version': ver})
+    platform = await sdapi.get("/sdapi/v1/platform")
+    log.info({ 'platform': platform })
     opts = await sdapi.get('/sdapi/v1/options')
     opts = Map(opts)
-    log.info({ 'options': {
-        'resolution': [options.width, options.height],
-        'model': opts.sd_model_checkpoint,
-        'vae': opts.sd_vae,
-        'hypernetwork': opts.sd_hypernetwork,
-        'sampler': options.sampler_name,
-        'preview': opts.show_progress_every_n_steps
-    } })
+    log.info({ 'model': opts.sd_model_checkpoint })
     cpu, gpu = memstats()
     log.info({ 'system': { 'cpu': cpu, 'gpu': gpu }})
+    batch = [1, 1, 2, 4, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192, 256]
+    batch = [b for b in batch if b <= args.maxbatch]
+    log.info({"batch-sizes": batch})
     for i in range(len(batch)):
         if oom > 0:
             continue
         options['batch_size'] = batch[i]
+        warmup = await txt2img()
         ts = await txt2img()
-        if ts > 0:
+        if i == 0:
+            ts += warmup
+        if ts > 0.01: # cannot be faster than 10ms per run
             await asyncio.sleep(0)
             cpu, gpu = memstats()
             if i == 0:
@@ -115,6 +110,37 @@ async def main():
 
 
 if __name__ == '__main__':
+    log.info({ 'run-benchmark' })
+    parser = argparse.ArgumentParser(description = 'run-benchmark')
+    parser.add_argument("--steps", type=int, default=50, required=False, help="steps")
+    parser.add_argument("--sampler", type=str, default='Euler a', required=False, help="max batch size")
+    parser.add_argument("--prompt", type=str, default='photo of two dice on a table', required=False, help="prompt")
+    parser.add_argument("--negative", type=str, default='foggy, blurry', required=False, help="prompt")
+    parser.add_argument("--maxbatch", type=int, default=16, required=False, help="max batch size")
+    parser.add_argument("--width", type=int, default=512, required=False, help="width")
+    parser.add_argument("--height", type=int, default=512, required=False, help="height")
+    parser.add_argument('--debug', default = False, action='store_true', help = 'debug logging')
+    parser.add_argument('--taesd', default = False, action='store_true', help = 'use taesd as vae')
+    parser.add_argument("--save", type=str, default='', required=False, help="save images to folder")
+    args = parser.parse_args()
+    if args.debug:
+        log.setLevel('DEBUG')
+    options = Map(
+        {
+            "prompt": args.prompt,
+            "negative_prompt": args.negative,
+            "steps": args.steps,
+            "sampler_name": args.sampler,
+            "width": args.width,
+            "height": args.height,
+            "full_quality": not args.taesd,
+            "cfg_scale": 0,
+            "batch_size": 1,
+            "n_iter": 1,
+            "seed": -1,
+        }
+    )
+    log.info({"options": options})
     try:
         asyncio.run(main())
     except KeyboardInterrupt: