From cc34ec0c83010c575095e04263ebf9bd7d9c0609 Mon Sep 17 00:00:00 2001
From: Divam Gupta <divamgupta@gmail.com>
Date: Sun, 12 Feb 2023 22:49:21 -0500
Subject: [PATCH] model select on front screen

---
 backends/model_converter/fake_torch.py        |  8 ++++++-
 .../stable_diffusion_tf/environment_m1.yml    |  4 ++--
 electron_app/package-lock.json                |  4 ++--
 electron_app/package.json                     |  2 +-
 electron_app/src/components/ImgGenerate.vue   | 24 +++++++++++++++----
 package-lock.json                             |  6 +++++
 6 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 package-lock.json

diff --git a/backends/model_converter/fake_torch.py b/backends/model_converter/fake_torch.py
index 7a070d45..c6863ba5 100644
--- a/backends/model_converter/fake_torch.py
+++ b/backends/model_converter/fake_torch.py
@@ -1,5 +1,11 @@
 import numpy as np
-from math import prod
+
+try:
+  from math import prod
+except:
+  from functools import reduce
+  def prod(iterable):
+    return reduce(operator.mul, iterable, 1)
 import zipfile
 import pickle
 import sys
diff --git a/backends/stable_diffusion_tf/environment_m1.yml b/backends/stable_diffusion_tf/environment_m1.yml
index 5da4363d..6648d385 100644
--- a/backends/stable_diffusion_tf/environment_m1.yml
+++ b/backends/stable_diffusion_tf/environment_m1.yml
@@ -30,7 +30,7 @@ dependencies:
   - google-auth=1.35.0=pyh6c4a22f_0
   - google-auth-oauthlib=0.4.6=pyhd8ed1ab_0
   - google-pasta=0.2.0=pyh8c360ce_0
-  - grpcio=1.49.1=py39h13431ec_0
+  - grpcio=1.49.1
   - h5py=3.1.0=nompi_py39h99babb8_100
   - hdf5=1.10.6=nompi_h0fc092c_1114
   - idna=3.4=pyhd8ed1ab_0
@@ -53,7 +53,7 @@ dependencies:
   - libffi=3.4.2=h3422bc3_5
   - libgfortran=5.0.0=11_3_0_hd922786_25
   - libgfortran5=11.3.0=hdaf2cc0_25
-  - libgrpc=1.49.1=h503f348_0
+  - libgrpc=1.49.1
   - liblapack=3.9.0=16_osxarm64_openblas
   - libllvm11=11.1.0=hfa12f05_5
   - libnghttp2=1.47.0=h232270b_1
diff --git a/electron_app/package-lock.json b/electron_app/package-lock.json
index e99b4781..cf3d5af9 100644
--- a/electron_app/package-lock.json
+++ b/electron_app/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "DiffusionBee",
-  "version": "1.4.4",
+  "version": "1.5.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "DiffusionBee",
-      "version": "1.4.4",
+      "version": "1.5.1",
       "hasInstallScript": true,
       "dependencies": {
         "@codekraft-studio/vue-record": "^0.0.3",
diff --git a/electron_app/package.json b/electron_app/package.json
index 1349c9cf..41ac4b86 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "DiffusionBee",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "build_number": "0016",
   "website": "https://diffusionbee.com",
   "description": "Diffusion Bee - Stable Diffusion App.",
diff --git a/electron_app/src/components/ImgGenerate.vue b/electron_app/src/components/ImgGenerate.vue
index f5689e00..51c696e1 100644
--- a/electron_app/src/components/ImgGenerate.vue
+++ b/electron_app/src/components/ImgGenerate.vue
@@ -24,13 +24,8 @@
                     
                     <div class="l_button button_medium button_colored" style="float:right ; " @click="generate_from_prompt">Generate</div>
 
-                    <!-- <div style="float:right;"  >
-                        <div class="l_button" @click="is_adv_options = !is_adv_options">Advanced options</div>
-                    </div> -->
-
                     <SDOptionsDropdown :options_model_values="this_object"  :elements_hidden="[ 'inp_img_strength' ]"> </SDOptionsDropdown>
 
-
                     <div style="float:right; margin-top: -5px; " >
                         <b-dropdown id="dropdown-form" variant="link" ref="dropdown" toggle-class="text-decoration-none" no-caret >
                         
@@ -58,6 +53,25 @@
                         </b-dropdown>
                     </div>
 
+                    <div style="float:right; margin-top: -5px; " >
+                        <b-dropdown id="dropdown-form" variant="link" ref="dropdown" toggle-class="text-decoration-none" no-caret >
+                            <template #button-content>
+                                <div class="l_button"  style="margin-right: -20px;" >Model : <span style="font-weight:">{{selected_model.substring(0, 10)}} <font-awesome-icon icon="chevron-down" />  </span></div>
+                            </template>
+                            <b-dropdown-item v-for="option in ['Default'].concat(Object.keys(app_state.app_data.custom_models))" :key="option" @click="selected_model = option" >
+                                {{option}}
+                            </b-dropdown-item>
+                            <hr style="opacity:0.1">
+                            <b-dropdown-item @click="$parent.$parent.$refs.app_frame.selectTab('settings')">
+                                Add New Model
+                            </b-dropdown-item>
+                            <!-- <b-dropdown-item @click="$parent.$parent.$refs.app_frame.selectTab('settings')">
+                                Browse Models
+                            </b-dropdown-item> -->
+                        </b-dropdown>
+                            
+                    </div>
+
                     <div class="l_button button_medium" style="float:right ;margin-right: -10px; margin-top: -1px;" @click="open_arthub">Prompt Ideas</div>
 
 
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..468f0dfc
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "diffusion_bee_public",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}