Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
246c269a
Commit
246c269a
authored
Apr 23, 2024
by
w-e-w
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add option to check file hash after download
if the sha256 hash does not match it will be automatically deleted
parent
ddb28b33
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
modules/modelloader.py
modules/modelloader.py
+5
-3
No files found.
modules/modelloader.py
View file @
246c269a
...
@@ -23,6 +23,7 @@ def load_file_from_url(
...
@@ -23,6 +23,7 @@ def load_file_from_url(
model_dir
:
str
,
model_dir
:
str
,
progress
:
bool
=
True
,
progress
:
bool
=
True
,
file_name
:
str
|
None
=
None
,
file_name
:
str
|
None
=
None
,
hash_prefix
:
str
|
None
=
None
,
)
->
str
:
)
->
str
:
"""Download a file from `url` into `model_dir`, using the file present if possible.
"""Download a file from `url` into `model_dir`, using the file present if possible.
...
@@ -36,11 +37,11 @@ def load_file_from_url(
...
@@ -36,11 +37,11 @@ def load_file_from_url(
if
not
os
.
path
.
exists
(
cached_file
):
if
not
os
.
path
.
exists
(
cached_file
):
print
(
f
'Downloading: "{url}" to {cached_file}
\n
'
)
print
(
f
'Downloading: "{url}" to {cached_file}
\n
'
)
from
torch.hub
import
download_url_to_file
from
torch.hub
import
download_url_to_file
download_url_to_file
(
url
,
cached_file
,
progress
=
progress
)
download_url_to_file
(
url
,
cached_file
,
progress
=
progress
,
hash_prefix
=
hash_prefix
)
return
cached_file
return
cached_file
def
load_models
(
model_path
:
str
,
model_url
:
str
=
None
,
command_path
:
str
=
None
,
ext_filter
=
None
,
download_name
=
None
,
ext_blacklist
=
None
)
->
list
:
def
load_models
(
model_path
:
str
,
model_url
:
str
=
None
,
command_path
:
str
=
None
,
ext_filter
=
None
,
download_name
=
None
,
ext_blacklist
=
None
,
hash_prefix
=
None
)
->
list
:
"""
"""
A one-and done loader to try finding the desired models in specified directories.
A one-and done loader to try finding the desired models in specified directories.
...
@@ -49,6 +50,7 @@ def load_models(model_path: str, model_url: str = None, command_path: str = None
...
@@ -49,6 +50,7 @@ def load_models(model_path: str, model_url: str = None, command_path: str = None
@param model_path: The location to store/find models in.
@param model_path: The location to store/find models in.
@param command_path: A command-line argument to search for models in first.
@param command_path: A command-line argument to search for models in first.
@param ext_filter: An optional list of filename extensions to filter by
@param ext_filter: An optional list of filename extensions to filter by
@param hash_prefix: the expected sha256 of the model_url
@return: A list of paths containing the desired model(s)
@return: A list of paths containing the desired model(s)
"""
"""
output
=
[]
output
=
[]
...
@@ -78,7 +80,7 @@ def load_models(model_path: str, model_url: str = None, command_path: str = None
...
@@ -78,7 +80,7 @@ def load_models(model_path: str, model_url: str = None, command_path: str = None
if
model_url
is
not
None
and
len
(
output
)
==
0
:
if
model_url
is
not
None
and
len
(
output
)
==
0
:
if
download_name
is
not
None
:
if
download_name
is
not
None
:
output
.
append
(
load_file_from_url
(
model_url
,
model_dir
=
places
[
0
],
file_name
=
download_name
))
output
.
append
(
load_file_from_url
(
model_url
,
model_dir
=
places
[
0
],
file_name
=
download_name
,
hash_prefix
=
hash_prefix
))
else
:
else
:
output
.
append
(
model_url
)
output
.
append
(
model_url
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment