Upload folder using huggingface_hub
Browse files- utils/app_utils.py +8 -4
- yaml/constants.yaml +1 -1
utils/app_utils.py
CHANGED
|
@@ -105,6 +105,14 @@ def sanitize_prompt(prompt: str) -> str:
|
|
| 105 |
def sanitize_id(input_id: str) -> str:
|
| 106 |
if not isinstance(input_id, str):
|
| 107 |
return ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 108 |
return re.sub(r'[^0-9]', '', input_id)
|
| 109 |
|
| 110 |
def sanitize_url(url: str) -> str:
|
|
@@ -356,7 +364,6 @@ def get_vae_path(source: str, id_or_url: str, civitai_key: str, progress) -> tup
|
|
| 356 |
except Exception as e:
|
| 357 |
return None, f"Hugging Face download failed: {e}"
|
| 358 |
|
| 359 |
-
|
| 360 |
def _ensure_model_downloaded(display_name: str, progress=gr.Progress()):
|
| 361 |
if display_name not in ALL_MODEL_MAP:
|
| 362 |
raise ValueError(f"Model '{display_name}' not found in configuration.")
|
|
@@ -549,7 +556,6 @@ def ensure_ipadapter_models_downloaded(preset_name: str, progress):
|
|
| 549 |
except Exception as e:
|
| 550 |
print(f"❌ Error ensuring download for IPAdapter asset '{filename}': {e}")
|
| 551 |
|
| 552 |
-
|
| 553 |
def ensure_sd3_ipadapter_models_downloaded(progress):
|
| 554 |
_PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
| 555 |
yaml_path = os.path.join(_PROJECT_ROOT, 'yaml', 'ipadapter_sd3_models.yaml')
|
|
@@ -564,8 +570,6 @@ def ensure_sd3_ipadapter_models_downloaded(progress):
|
|
| 564 |
except Exception as e:
|
| 565 |
print(f"Warning: Failed to load or download sd3 ipadapter models: {e}")
|
| 566 |
|
| 567 |
-
|
| 568 |
-
|
| 569 |
def get_model_generation_defaults(model_display_name: str, model_type: str, defaults_config: dict):
|
| 570 |
final_defaults = {
|
| 571 |
'steps': 25, 'cfg': 7.0, 'sampler_name': 'euler', 'scheduler': 'simple',
|
|
|
|
| 105 |
def sanitize_id(input_id: str) -> str:
|
| 106 |
if not isinstance(input_id, str):
|
| 107 |
return ""
|
| 108 |
+
input_id = input_id.strip()
|
| 109 |
+
if "civitai" in input_id.lower():
|
| 110 |
+
version_match = re.search(r'modelVersionId=(\d+)', input_id)
|
| 111 |
+
if version_match:
|
| 112 |
+
return version_match.group(1)
|
| 113 |
+
model_match = re.search(r'/models/(\d+)', input_id)
|
| 114 |
+
if model_match:
|
| 115 |
+
return model_match.group(1)
|
| 116 |
return re.sub(r'[^0-9]', '', input_id)
|
| 117 |
|
| 118 |
def sanitize_url(url: str) -> str:
|
|
|
|
| 364 |
except Exception as e:
|
| 365 |
return None, f"Hugging Face download failed: {e}"
|
| 366 |
|
|
|
|
| 367 |
def _ensure_model_downloaded(display_name: str, progress=gr.Progress()):
|
| 368 |
if display_name not in ALL_MODEL_MAP:
|
| 369 |
raise ValueError(f"Model '{display_name}' not found in configuration.")
|
|
|
|
| 556 |
except Exception as e:
|
| 557 |
print(f"❌ Error ensuring download for IPAdapter asset '{filename}': {e}")
|
| 558 |
|
|
|
|
| 559 |
def ensure_sd3_ipadapter_models_downloaded(progress):
|
| 560 |
_PROJECT_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
| 561 |
yaml_path = os.path.join(_PROJECT_ROOT, 'yaml', 'ipadapter_sd3_models.yaml')
|
|
|
|
| 570 |
except Exception as e:
|
| 571 |
print(f"Warning: Failed to load or download sd3 ipadapter models: {e}")
|
| 572 |
|
|
|
|
|
|
|
| 573 |
def get_model_generation_defaults(model_display_name: str, model_type: str, defaults_config: dict):
|
| 574 |
final_defaults = {
|
| 575 |
'steps': 25, 'cfg': 7.0, 'sampler_name': 'euler', 'scheduler': 'simple',
|
yaml/constants.yaml
CHANGED
|
@@ -247,7 +247,7 @@ MULTIPLIERS_MAP:
|
|
| 247 |
omnigen2: 1
|
| 248 |
lumina: 1
|
| 249 |
hidream-o1: 32
|
| 250 |
-
hidream-i1:
|
| 251 |
flux1: 1
|
| 252 |
sd35: 1
|
| 253 |
sdxl: 1
|
|
|
|
| 247 |
omnigen2: 1
|
| 248 |
lumina: 1
|
| 249 |
hidream-o1: 32
|
| 250 |
+
hidream-i1: 1
|
| 251 |
flux1: 1
|
| 252 |
sd35: 1
|
| 253 |
sdxl: 1
|