Merge remote-tracking branch 'upstream/master' into ModelLoader

1 files changed, 9 insertions, 1 deletions

diff --git a/modules/shared.py b/modules/shared.py
index e617bce4..c27079eb 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -76,7 +76,7 @@ class State:
     job = ""

     job_no = 0

     job_count = 0

-    job_timestamp = 0

+    job_timestamp = '0'

     sampling_step = 0

     sampling_steps = 0

     current_latent = None

@@ -90,6 +90,7 @@ class State:
         self.job_no += 1

         self.sampling_step = 0

         self.current_image_sampling_step = 0

+        

     def get_job_timestamp(self):

         return datetime.datetime.now().strftime("%Y%m%d%H%M%S")

 

@@ -229,6 +230,13 @@ options_templates.update(options_section(('ui', "User interface"), {
     "js_modal_lightbox_initialy_zoomed": OptionInfo(True, "Show images zoomed in by default in full page image viewer"),

 }))

 

+options_templates.update(options_section(('sampler-params', "Sampler parameters"), {

+  "ddim_eta": OptionInfo(0.0, "DDIM eta", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),

+  "ddim_discretize": OptionInfo('uniform', "img2img DDIM discretize", gr.Radio, {"choices": ['uniform','quad']}),

+  's_churn': OptionInfo(0.0, "sigma churn", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),

+  's_tmin':  OptionInfo(0.0, "sigma tmin",  gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),

+  's_noise': OptionInfo(1.0, "sigma noise", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}),

+}))

 

 class Options:

     data = None