mirror of https://github.com/vladmandic/automatic
parent
a298173cf0
commit
e8bec2823a
|
|
@ -1 +1 @@
|
||||||
Subproject commit a9300638a86f77be92d80a7f18dae40ecd5c4a81
|
Subproject commit c1c7dfda4a2bd75f8f1924046135b11a73eec459
|
||||||
Binary file not shown.
|
|
@ -242,7 +242,7 @@ def parse_comfy_metadata(data: dict):
|
||||||
version = dct.get('extra', {}).get('frontendVersion', 'unknown')
|
version = dct.get('extra', {}).get('frontendVersion', 'unknown')
|
||||||
if version is not None:
|
if version is not None:
|
||||||
res = f" | Version: {version} | Nodes: {nodes}"
|
res = f" | Version: {version} | Nodes: {nodes}"
|
||||||
except:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
@ -257,7 +257,7 @@ def parse_comfy_metadata(data: dict):
|
||||||
model = inp.get('model', None)
|
model = inp.get('model', None)
|
||||||
if isinstance(model, str) and len(model) > 0:
|
if isinstance(model, str) and len(model) > 0:
|
||||||
res += f" | Model: {model} | Class: {val.get('class_type', '')}"
|
res += f" | Model: {model} | Class: {val.get('class_type', '')}"
|
||||||
except:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
@ -280,7 +280,7 @@ def parse_invoke_metadata(data: dict):
|
||||||
version = dct['app_version']
|
version = dct['app_version']
|
||||||
if isinstance(version, str) and len(version) > 0:
|
if isinstance(version, str) and len(version) > 0:
|
||||||
res += f" | Version: {version}"
|
res += f" | Version: {version}"
|
||||||
except:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
@ -299,7 +299,7 @@ def parse_novelai_metadata(data: dict):
|
||||||
dct = json.loads(data["Comment"])
|
dct = json.loads(data["Comment"])
|
||||||
sampler = sd_samplers.samplers_map.get(dct["sampler"], "Euler a")
|
sampler = sd_samplers.samplers_map.get(dct["sampler"], "Euler a")
|
||||||
geninfo = f'{data["Description"]} Negative prompt: {dct["uc"]} Steps: {dct["steps"]}, Sampler: {sampler}, CFG scale: {dct["scale"]}, Seed: {dct["seed"]}, Clip skip: 2, ENSD: 31337'
|
geninfo = f'{data["Description"]} Negative prompt: {dct["uc"]} Steps: {dct["steps"]}, Sampler: {sampler}, CFG scale: {dct["scale"]}, Seed: {dct["seed"]}, Clip skip: 2, ENSD: 31337'
|
||||||
except Exception as e:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
return geninfo
|
return geninfo
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ from collections import OrderedDict
|
||||||
import torch
|
import torch
|
||||||
from compel.embeddings_provider import BaseTextualInversionManager, EmbeddingsProvider
|
from compel.embeddings_provider import BaseTextualInversionManager, EmbeddingsProvider
|
||||||
from transformers import PreTrainedTokenizer
|
from transformers import PreTrainedTokenizer
|
||||||
from modules import shared, prompt_parser, devices, sd_models, errors
|
from modules import shared, prompt_parser, devices, sd_models
|
||||||
from modules.prompt_parser_xhinker import get_weighted_text_embeddings_sd15, get_weighted_text_embeddings_sdxl_2p, get_weighted_text_embeddings_sd3, get_weighted_text_embeddings_flux1, get_weighted_text_embeddings_chroma
|
from modules.prompt_parser_xhinker import get_weighted_text_embeddings_sd15, get_weighted_text_embeddings_sdxl_2p, get_weighted_text_embeddings_sd3, get_weighted_text_embeddings_flux1, get_weighted_text_embeddings_chroma
|
||||||
|
|
||||||
debug_enabled = os.environ.get('SD_PROMPT_DEBUG', None)
|
debug_enabled = os.environ.get('SD_PROMPT_DEBUG', None)
|
||||||
|
|
@ -253,7 +253,6 @@ class PromptEmbedder:
|
||||||
return torch.cat(res)
|
return torch.cat(res)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
shared.log.error(f"Prompt encode: {e}")
|
shared.log.error(f"Prompt encode: {e}")
|
||||||
# errors.display(e, 'encode')
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
2
wiki
2
wiki
|
|
@ -1 +1 @@
|
||||||
Subproject commit 9b30cf154e3f715da69a8317511465fe8b7bf13f
|
Subproject commit 8df9dbd32e89d51698b73fc00ca6f649be35b39d
|
||||||
Loading…
Reference in New Issue