Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-20 01:31:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

ruff linting fixes

Browse Source
This commit is contained in:
Vladimir Mandic
2023-06-13 12:22:39 -04:00
parent cb307399dd
commit 1d9e490ef9
33 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/create-previews.py
+4 -4
View File
@@ -163,8 +163,8 @@ async def lora(params):
if not os.path.exists(folder):
log.error({ 'lora directory not found': folder })
return
models1 = [f for f in Path(folder).glob('*.safetensors')]
models2 = [f for f in Path(folder).glob('*.ckpt')]
models1 = list(Path(folder).glob('*.safetensors'))
models2 = list(Path(folder).glob('*.ckpt'))
models = [f.stem for f in models1 + models2]
log.info({ 'loras': len(models) })
for model in models:
@@ -204,8 +204,8 @@ async def lyco(params):
if not os.path.exists(folder):
log.error({ 'lyco directory not found': folder })
return
models1 = [f for f in Path(folder).glob('*.safetensors')]
models2 = [f for f in Path(folder).glob('*.ckpt')]
models1 = list(Path(folder).glob('*.safetensors'))
models2 = list(Path(folder).glob('*.ckpt'))
models = [f.stem for f in models1 + models2]
log.info({ 'lycos': len(models) })
for model in models:
cli/generate.py
+2 -2
View File
@@ -72,7 +72,7 @@ def exif(info, i = None, op = 'generate'):
template += ' | grid {num}'.format(num = sd.generate.batch_size * sd.generate.n_iter) # pylint: disable=consider-using-f-string
ifd = ImageFileDirectory_v2()
exif_stream = io.BytesIO()
_TAGS = dict(((v, k) for k, v in TAGS.items())) # enumerate possible exif tags
_TAGS = {v: k for k, v in TAGS.items()} # enumerate possible exif tags
ifd[_TAGS['ImageDescription']] = template
ifd.save(exif_stream)
val = b'Exif\x00\x00' + exif_stream.getvalue()
@@ -337,7 +337,7 @@ async def main():
scheduler = sampler(params, options)
t0 = time.perf_counter()
data = await generate() # generate returns list of images
if not 'image' in data:
if 'image' not in data:
break
stats.images += len(data.image)
t1 = time.perf_counter()
cli/image-exif.py
+3 -3
View File
@@ -16,8 +16,8 @@ class Exif: # pylint: disable=single-string-used-for-slots
def __init__(self, image = None):
super(Exif, self).__setattr__('exif', Image.Exif())
self.pnginfo = PngImagePlugin.PngInfo()
self.tags = {**dict(((k, v) for k, v in ExifTags.TAGS.items())), **dict(((k, v) for k, v in ExifTags.GPSTAGS.items()))}
self.ids = {**dict(((v, k) for k, v in ExifTags.TAGS.items())), **dict(((v, k) for k, v in ExifTags.GPSTAGS.items()))}
self.tags = {**dict(ExifTags.TAGS.items()), **dict(ExifTags.GPSTAGS.items())}
self.ids = {**{v: k for k, v in ExifTags.TAGS.items()}, **{v: k for k, v in ExifTags.GPSTAGS.items()}}
if image is not None:
self.load(image)
@@ -101,6 +101,6 @@ if __name__ == '__main__':
if os.path.isfile(fn):
read_exif(fn)
elif os.path.isdir(fn):
for root, dirs, files in os.walk(fn):
for root, _dirs, files in os.walk(fn):
for file in files:
read_exif(os.path.join(root, file))
cli/image-watermark.py
+1 -1
View File
@@ -39,7 +39,7 @@ def get_exif(image):
def set_exif(d: dict):
ifd = ImageFileDirectory_v2()
_TAGS = dict(((v, k) for k, v in TAGS.items())) # enumerate possible exif tags
_TAGS = {v: k for k, v in TAGS.items()} # enumerate possible exif tags
for k, v in d.items():
ifd[_TAGS[k]] = v
exif_stream = io.BytesIO()
cli/process.py
+3 -3
View File
@@ -21,7 +21,7 @@ all_images_by_type = {}
class Result(object):
def __init__(self, typ: str, fn: str, tag: str = None, requested: list = []):
def __init__(self, typ: str, fn: str, tag: str = None, requested: list = []): # noqa: B006
self.type = typ
self.input = fn
self.output = ''
@@ -139,7 +139,7 @@ def upscale_restore_image(res: Result, upscale: bool = False, restore: bool = Fa
res.ops.append('upscale')
if restore:
kwargs.codeformer_visibility = 1.0
kwargs.codeformer_weight: 0.2
kwargs.codeformer_weight = 0.2
res.ops.append('restore')
if upscale or restore:
result = sdapi.postsync('/sdapi/v1/extra-single-image', kwargs)
@@ -260,7 +260,7 @@ def save_image(res: Result, folder: str):
return res
def file(filename: str, folder: str, tag = None, requested = []):
def file(filename: str, folder: str, tag = None, requested = []): # noqa: B006
# initialize result dict
res = Result(fn = filename, typ='unknown', tag=tag, requested = requested)
# open image
cli/torch-compile.py
+5 -5
View File
@@ -59,9 +59,9 @@ if __name__ == '__main__':
results = {}
times = []
print('eager initial eval:', timed(lambda: evaluate(model, inp))[1])
for i in range(N_ITERS):
for _i in range(N_ITERS):
inp = generate_data(16)[0]
_res, time = timed(lambda: evaluate(model, inp))
_res, time = timed(lambda: evaluate(model, inp)) # noqa: B023
times.append(time)
results['default'] = np.median(times)
@@ -71,11 +71,11 @@ if __name__ == '__main__':
# required before changing backends
torch._dynamo.reset() # pylint: disable=protected-access
eval_dyn = dynamo.optimize(backend)(evaluate)
print('dynamo initial eval:', backend, timed(lambda: eval_dyn(model, inp))[1])
print('dynamo initial eval:', backend, timed(lambda: eval_dyn(model, inp))[1]) # noqa: B023
times = []
for i in range(N_ITERS):
for _i in range(N_ITERS):
inp = generate_data(16)[0]
_res, time = timed(lambda: eval_dyn(model, inp))
_res, time = timed(lambda: eval_dyn(model, inp)) # noqa: B023
times.append(time)
results[backend] = np.median(times)
except Exception as err:
cli/train.py
+1 -1
View File
@@ -399,7 +399,7 @@ if __name__ == '__main__':
train_embedding()
if args.type == 'lora' or args.type == 'lyco' or args.type == 'dreambooth':
train_lora()
except KeyboardInterrupt as e:
except KeyboardInterrupt:
log.error('interrupt requested')
sdapi.interrupt()
mem_stats()