1580158
/
sd-civitai-browser-plus
mirror of https://github.com/BlafKing/sd-civitai-browser-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hotfix for (#197) and (#198)

pull/201/head
BlafKing 2024-02-10 08:58:43 +01:00
parent 47d5118fa9
commit 665f960fda
No known key found for this signature in database
GPG Key ID: BFD6B0BCA6280F8B
4 changed files with 84 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
javascript/civitai-html.js
View File

@ -1,14 +1,21 @@
"use strict";
// Selects a model by pressing on card
function select_model(model_name, event, bool = false, content_type = null) {
function select_model(model_name, event, bool = false, content_type = null, modelPath = null) {
if (event) {
var className = event.target.className;
if (className.includes('custom-checkbox') || className.includes('model-checkbox')) {
return;
}
}
if (!modelPath) {
modelPath = "Not Found";
}
const pathInput = gradioApp().querySelector('#model_path_input textarea');
pathInput.value = modelPath;
updateInput(pathInput);
const output = bool ? gradioApp().querySelector('#model_sent textarea') : gradioApp().querySelector('#model_select textarea');
if (output && model_name) {
@ -426,13 +433,19 @@ function createCardButtons(event) {
return;
}
const metaDataButton = buttonRow.querySelector('.metadata-button.card-button')
const metaDataButton = buttonRow.querySelector('.metadata-button.card-button');
const copyPathButton = buttonRow.querySelector('.copy-path-button.card-button');
let modelPath = "";
if (copyPathButton) {
modelPath = copyPathButton.getAttribute('data-clipboard-text');
}
const newDiv = document.createElement('div');
newDiv.classList.add('goto-civitbrowser', 'card-button');
newDiv.addEventListener('click', function (event) {
event.stopPropagation();
modelInfoPopUp(modelName, content_type);
modelInfoPopUp(modelName, content_type, modelPath);
});
const svgIcon = document.createElementNS("http://www.w3.org/2000/svg", "svg");
@ -467,8 +480,8 @@ function createCardButtons(event) {
}
document.addEventListener('click', createCardButtons);
function modelInfoPopUp(modelName, content_type) {
select_model(modelName, null, true, content_type);
function modelInfoPopUp(modelName, content_type, modelPath) {
select_model(modelName, null, true, content_type, modelPath);
// Create the overlay
var overlay = document.createElement('div');

3
scripts/civitai_download.py
View File

@ -610,8 +610,7 @@ def download_create_thread(download_finish, queue_trigger, progress=gr.Progress(
item['install_path'] = item['existing_path']
gl.isDownloading = True
if not os.path.exists(item['install_path']):
os.makedirs(item['install_path'])
_file.make_dir(item['install_path'])
path_to_new_file = os.path.join(item['install_path'], item['model_filename'])

93
scripts/civitai_file_manage.py
View File

@ -7,7 +7,7 @@ import os
import io
import re
import time
import shutil
import errno
import requests
import hashlib
from pathlib import Path
@ -221,8 +221,7 @@ def get_image_path(install_path, api_response, sub_folder):
image_path = os.path.join(image_path, sub_folder.lstrip("/").lstrip("\\"))
else:
image_path = Path(image_location)
if not os.path.exists(image_path):
os.makedirs(image_path)
make_dir(image_path)
return image_path
def save_images(preview_html, model_filename, install_path, sub_folder, api_response=None):
@ -341,34 +340,49 @@ def gen_sha256(file_path):
return hash_value
def model_from_sent(model_name, content_type, tile_count):
def model_from_sent(model_name, content_type, tile_count, path_input):
modelID_failed = False
output_html = None
model_file = None
use_local_html = getattr(opts, "use_local_html", False)
local_path_in_html = getattr(opts, "local_path_in_html", False)
div = '<div style="color: white; font-family: var(--font); font-size: 24px; text-align: center; margin: 50px !important;">'
not_found = div + "Model ID not found.<br>Maybe the model doesn\'t exist on CivitAI?</div>"
path_not_found = div + "Model ID not found.<br>Could not locate the model path.</div>"
offline = div + "CivitAI failed to respond.<br>The servers are likely offline."
if local_path_in_html:
use_local_html = False
if path_input == "Not Found":
model_name = re.sub(r'\.\d{3}$', '', model_name)
content_type = re.sub(r'\.\d{3}$', '', content_type)
content_mapping = {
"txt2img_textual_inversion_cards_html": ['TextualInversion'],
"txt2img_hypernetworks_cards_html": ['Hypernetwork'],
"txt2img_checkpoints_cards_html": ['Checkpoint'],
"txt2img_lora_cards_html": ['LORA', 'LoCon']
}
content_type = content_mapping.get(content_type, content_type)
extensions = ['.pt', '.ckpt', '.pth', '.safetensors', '.th', '.zip', '.vae']
model_name = re.sub(r'\.\d{3}$', '', model_name)
content_type = re.sub(r'\.\d{3}$', '', content_type)
content_mapping = {
"txt2img_textual_inversion_cards_html": ['TextualInversion'],
"txt2img_hypernetworks_cards_html": ['Hypernetwork'],
"txt2img_checkpoints_cards_html": ['Checkpoint'],
"txt2img_lora_cards_html": ['LORA', 'LoCon']
}
content_type = content_mapping.get(content_type, content_type)
extensions = ['.pt', '.ckpt', '.pth', '.safetensors', '.th', '.zip', '.vae']
for content_type_item in content_type:
folder = _api.contenttype_folder(content_type_item)
for folder_path, _, files in os.walk(folder):
for file in files:
if file.startswith(model_name) and file.endswith(tuple(extensions)):
model_file = os.path.join(folder_path, file)
for content_type_item in content_type:
folder = _api.contenttype_folder(content_type_item)
for folder_path, _, files in os.walk(folder):
for file in files:
if file.startswith(model_name) and file.endswith(tuple(extensions)):
model_file = os.path.join(folder_path, file)
if not model_file:
output_html = path_not_found
print(f'Error: Could not find model path for model: "{model_name}"')
print(f'Content type: "{content_type}"')
print(f'Main folder path: "{folder}"')
use_local_html = False
else:
model_file = path_input
if use_local_html:
html_file = os.path.splitext(model_file)[0] + ".html"
if os.path.exists(html_file):
@ -377,10 +391,7 @@ def model_from_sent(model_name, content_type, tile_count):
index = output_html.find("</head>")
if index != -1:
output_html = output_html[index + len("</head>"):]
div = '<div style="color: white; font-family: var(--font); font-size: 24px; text-align: center; margin: 50px !important;">'
not_found = div + "Model ID not found.<br>Maybe the model doesn\'t exist on CivitAI?</div>"
offline = div + "CivitAI failed to respond.<br>The servers are likely offline."
if not output_html:
modelID = get_models(model_file, True)
if not modelID or modelID == "Model not found":
@ -391,7 +402,8 @@ def model_from_sent(model_name, content_type, tile_count):
modelID_failed = True
if not modelID_failed:
json_data = _api.api_to_data(content_type, "Newest", "AllTime", "Model name", None, None, None, tile_count, f"civitai.com/models/{modelID}")
else: json_data = None
else:
json_data = None
if json_data == "timeout":
output_html = offline
@ -455,11 +467,28 @@ def clean_description(desc):
cleaned_text = desc
return cleaned_text
def save_model_info(install_path, file_name, sub_folder, sha256=None, preview_html=None, overwrite_toggle=False, api_response=None, from_update=False):
def make_dir(path):
try:
if not os.path.exists(path):
os.makedirs(path)
except OSError as e:
if e.errno == errno.EACCES:
try:
os.makedirs(path, mode=0o777)
except OSError as e:
if e.errno == errno.EACCES:
print("Permission denied even with elevated permissions.")
else:
print(f"Error creating directory: {e}")
else:
print(f"Error creating directory: {e}")
except Exception as e:
print(f"Error creating directory: {e}")
def save_model_info(install_path, file_name, sub_folder, sha256=None, preview_html=None, overwrite_toggle=False, api_response=None):
filename = os.path.splitext(file_name)[0]
json_file = os.path.join(install_path, f'{filename}.json')
if not os.path.exists(install_path):
os.makedirs(install_path)
make_dir(install_path)
save_api_info = getattr(opts, "save_api_info", False)
use_local = getattr(opts, "local_path_in_html", False)
@ -971,7 +1000,7 @@ def file_scan(folders, ver_finish, tag_finish, installed_finish, preview_finish,
model_versions = _api.update_model_versions(id_value, api_response)
preview_html = _api.update_model_info(None, model_versions.get('value'), True, id_value, api_response)
sub_folder = os.path.normpath(os.path.relpath(install_path, gl.main_folder))
save_model_info(install_path, file_name, sub_folder, preview_html=preview_html, api_response=api_response, overwrite_toggle=overwrite_toggle, from_update=True)
save_model_info(install_path, file_name, sub_folder, preview_html=preview_html, api_response=api_response, overwrite_toggle=overwrite_toggle)
if progress != None:
progress(1, desc=f"All tags succesfully saved!")
gl.scan_files = False

3
scripts/civitai_gui.py
View File

@ -284,6 +284,7 @@ def on_ui_tabs():
civitai_text2img_input = gr.Textbox(elem_id="civitai_text2img_input", visible=False)
selected_model_list = gr.Textbox(elem_id="selected_model_list", visible=False)
selected_type_list = gr.Textbox(elem_id="selected_type_list", visible=False)
model_path_input = gr.Textbox(elem_id="model_path_input", visible=False)
model_select = gr.Textbox(elem_id="model_select", visible=False)
model_sent = gr.Textbox(elem_id="model_sent", visible=False)
type_sent = gr.Textbox(elem_id="type_sent", visible=False)
@ -408,7 +409,7 @@ def on_ui_tabs():
model_sent.change(
fn=_file.model_from_sent,
inputs=[model_sent, type_sent, tile_count_slider],
inputs=[model_sent, type_sent, tile_count_slider, model_path_input],
outputs=[model_preview_html]
)