Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
e57b5f7c
Commit
e57b5f7c
authored
Jan 26, 2023
by
EllangoK
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
re_param captures quotes with commas properly
and removes unnecessary regex
parent
15e89ef0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
generation_parameters_copypaste.py
modules/generation_parameters_copypaste.py
+3
-3
No files found.
modules/generation_parameters_copypaste.py
View file @
e57b5f7c
...
...
@@ -11,9 +11,8 @@ from modules import shared, ui_tempdir, script_callbacks
import
tempfile
from
PIL
import
Image
re_param_code
=
r'\s*([\w ]+):\s*(
"(?:\\|\"|[^\"])+"|[^,]*)(?:,|$
)'
re_param_code
=
r'\s*([\w ]+):\s*(
\"[^\"]*\"|[^,]+
)'
re_param
=
re
.
compile
(
re_param_code
)
re_params
=
re
.
compile
(
r"^(?:"
+
re_param_code
+
"){3,}$"
)
re_imagesize
=
re
.
compile
(
r"^(\d+)x(\d+)$"
)
re_hypernet_hash
=
re
.
compile
(
"
\
(([0-9a-f]+)
\
)$"
)
type_of_gr_update
=
type
(
gr
.
update
())
...
...
@@ -243,7 +242,7 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
done_with_prompt
=
False
*
lines
,
lastline
=
x
.
strip
()
.
split
(
"
\n
"
)
if
not
re_param
s
.
match
(
lastline
):
if
not
re_param
.
match
(
lastline
):
lines
.
append
(
lastline
)
lastline
=
''
...
...
@@ -262,6 +261,7 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
res
[
"Negative prompt"
]
=
negative_prompt
for
k
,
v
in
re_param
.
findall
(
lastline
):
v
=
v
[
1
:
-
1
]
if
v
[
0
]
==
'"'
and
v
[
-
1
]
==
'"'
else
v
m
=
re_imagesize
.
match
(
v
)
if
m
is
not
None
:
res
[
k
+
"-1"
]
=
m
.
group
(
1
)
...
...
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