Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: avoid crash on long lora names #232

Merged
merged 1 commit into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions hordelib/model_manager/hyper.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,7 @@ def init_model_managers(
self.active_model_managers.append(
resolve_manager_to_load_type(
multiprocessing_lock=multiprocessing_lock,
civitai_api_token=(
os.environ["CIVIT_API_TOKEN"] if "CIVIT_API_TOKEN" in os.environ.keys() else None
),
civitai_api_token=os.getenv("CIVIT_API_TOKEN", None),
),
)

Expand Down
2 changes: 1 addition & 1 deletion hordelib/model_manager/lora.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ def _parse_civitai_lora_data(self, item, adhoc=False):
for file in version.get("files", {}):
if file.get("primary", False) and file.get("name", "").endswith(".safetensors"):
sanitized_name = Sanitizer.sanitise_model_name(lora_name)
lora_filename = f'{Sanitizer.sanitise_filename(lora_name)}_{version.get("id", 0)}'
lora_filename = f'{Sanitizer.sanitise_filename(lora_name)[0:128]}_{version.get("id", 0)}'
lora_key = sanitized_name.lower().strip()
lora["name"] = lora_key
lora["orig_name"] = lora_name
Expand Down
16 changes: 16 additions & 0 deletions tests/model_managers/test_mm_lora.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,22 @@ def test_fetch_specific_lora_version(self):
assert lora_model_manager.get_lora_filename("22591") == "GAG-RPGPotionsLoRaXL_197256.safetensors"
lora_model_manager.stop_all()

def test_lora_long_filename(self):
lora_model_manager = LoraModelManager(
download_wait=False,
allowed_adhoc_lora_storage=1024,
civitai_api_token=os.getenv("CIVIT_API_TOKEN", None),
)
lora_model_manager.download_default_loras()
lora_model_manager.wait_for_downloads(600)
lora_model_manager.wait_for_adhoc_reset(15)

lora_model_manager.ensure_lora_deleted(189973)
lora_model_manager.fetch_adhoc_lora("372094", is_version=True)
lora_dict = lora_model_manager.get_model_reference_info("189973")
assert lora_model_manager.find_latest_version(lora_dict) == "372094"
lora_model_manager.stop_all()

def test_reject_adhoc_nsfw_lora(self):
lora_model_manager = LoraModelManager(
download_wait=False,
Expand Down
Loading