Merge pull request #2 from ilian6806/develop

Develop

README.md

@@ -27,9 +27,20 @@ Use *Install from URL* option with this repo url.
 
 ### Requirements
 
+- openmim==0.3.5
+- mmcv-full==1.7.1
+- mmdet==2.27.0
+- lightning-utilities==0.4.0
+- pytorch-lightning==1.7.6
+- setuptools
+- dlib
+
 All requirements will be installed on first use, except for:
  - [cmake](https://cmake.org/download/) - used only for dlib masks
 
+**NOTE:** Some of these packages are incompatible with newer versions of **lightning-utilities** and **pytorch-lightning**. If some other extensions you use require newer versions, they will be incompatible with this extension.
+
+
 ### Mask types
 
 1. Eyes dlib

javascript/eyemask.js

@@ -75,6 +75,15 @@ const EyeMaskController = (function () {
         return result;
     }
 
+    function getSelector(selector) {
+        return (`
+            #em-${selector}-txt2img, 
+            #em-${selector}-img2img,
+            #em-emb-${selector}-txt2img,
+            #em-emb-${selector}-img2img
+        `);
+    }
+
     function loadPlaceHolders() {
         if (config.em_save_prompts) {
             ['txt2img_prompt', 'img2img_prompt'].forEach(handleSavedInput);
@@ -175,11 +184,18 @@ const EyeMaskController = (function () {
         }
     }
 
+    function bindEvents() {
+        $(gradioApp()).on('click', getSelector('eye-info-button'), function () {
+            dialog.image('mask-types.jpg', 'Mask Types', null, '80%');
+        });
+    }
+
     function onFirstLoad() {
         getConfig();
         initRoot();
         loadTitles();
         loadPlaceHolders();
+        bindEvents();
     }
 
     function load() {
@@ -187,13 +203,7 @@ const EyeMaskController = (function () {
         onFirstLoad();
     }
 
-    function showInfo() {
-        dialog.image('mask-types.jpg', 'Mask Types', null, '80%');
-        return true;
-    }
-
     return {
-        load,
-        showInfo
+        load
     };
 }());

scripts/eyemask/ui.py

@@ -98,11 +98,6 @@ class EyeMaskUI():
                 type="index"
             )
             em_info = ToolButton(value="\u2139\uFE0F", elem_id=get_id("eye-info-button"), full_width=False)
-            em_info.click(
-                fn=lambda: True,
-                _js="() => EyeMaskController.showInfo()",
-                show_progress=False
-            )
         with gr.Row(elem_id=get_id("mask-type-row")):
             with gr.Accordion("Mask Preview", open=False):
                 with gr.Row():

style.css.map

@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["style/_mixins.scss","style/_main.scss","style/_dialog.scss","style/_toastr.scss"],"names":[],"mappings":"AAmBgB,oMAEQ,OCpBc,MDelC,wHASY,cClBmB,KDS/B,oGASY,WCdc,KDK1B,gHASY,cCViB,KDUjB,QCViB,ODUjB,UCViB,KDC7B,4HASY,OCJoB,iBClBpC,mBACI,kBACA,SACA,+BACA,gCAGJ,wBACI,eACA,MACA,OACA,WACA,YACA,aACA,qCAGJ,6BACI,aACA,eACA,QACA,OACA,QACA,YACA,cACA,YACA,YACA,WACA,kBACA,yBACA,yBACA,4CACA,gBACA,aAGJ,uCACI,eACA,gBACA,UACA,QAGJ,sDACI,iBAGJ,4DACI,gBAGJ,kEACI,kBAGJ,iCACI,kBAGJ,oCACI,SACA,UACA,eACA,mBAGJ,iCACI,iBAGJ,wCACI,cACA,mBACA,iBACA,eACA,mBACA,0BACA,WAGJ,+CACI,mBAGJ,kCACI,6BACA,gCACA,aACA,iBACA,kBAGJ,gDACI,cAGJ,qDACI,UACA,WClGJ,aACI,iBAEJ,eACI,yBACA,qBAEJ,sCAEI,WAEJ,uBACI,WACA,qBAEJ,oBACI,kBACA,aACA,WACA,YACA,eACA,iBACA,WACA,iCACA,yBACA,WACA,+DACA,yBACA,cAEJ,oDAEI,WACA,qBACA,eACA,WACA,+DACA,yBAEJ,yBACI,YACA,WACA,WAKJ,0BACI,UACA,eACA,yBACA,SACA,wBAEJ,kBACI,MACA,QACA,WAEJ,qBACI,SACA,QACA,WAEJ,sBACI,MACA,QACA,WAEJ,yBACI,SACA,QACA,WAEJ,gBACI,SACA,UAEJ,iBACI,SACA,WAEJ,oBACI,WACA,YAEJ,mBACI,YACA,UAEJ,iBACI,eACA,eACA,oBAGJ,mBACI,2BACA,8BACA,sBAEJ,qBACI,kBACA,oBACA,gBACA,eACA,4BACA,YACA,mCACA,sCACA,8BACA,gCACA,4BACA,8BACA,iCACA,yBACA,WACA,WACA,+DACA,yBAEJ,yBACI,cACA,4BACA,sCAEJ,2BACI,8BACA,iCACA,yBACA,UACA,gEACA,0BACA,eAEJ,6BACI,0wBAEJ,8BACI,kzBAEJ,gCACI,sgBAEJ,gCACI,0uBAEJ,+EAEI,YACA,iBACA,kBAEJ,uFAEI,UACA,iBACA,kBAEJ,OACI,yBAEJ,eACI,yBAEJ,aACI,yBAEJ,YACI,yBAEJ,eACI,yBAEJ,gBACI,kBACA,OACA,SACA,WACA,sBACA,WACA,+DACA,yBAGJ,kCACI,qBACI,yBACA,WAEJ,yBACI,yBAEJ,qCACI,aACA,WAEJ,0CACI,YACA,YAGR,wDACI,qBACI,yBACA,WAEJ,yBACI,yBAEJ,qCACI,aACA,WAEJ,0CACI,YACA,YAGR,wDACI,qBACI,4BACA,WAEJ,yBACI","file":"style.css"}
+{"version":3,"sourceRoot":"","sources":["style/_mixins.scss","style/_main.scss","style/_dialog.scss","style/_toastr.scss"],"names":[],"mappings":"AAmBgB,oMAEQ,OCpBc,MDelC,wHASY,cClBmB,KDS/B,oGASY,WCdc,KDK1B,gHASY,WCViB,KDUjB,cCViB,KDUjB,UCViB,KDC7B,4HASY,OCJoB,iBDLhC,oFASY,cEtBhB,mBACI,kBACA,SACA,+BACA,gCAGJ,wBACI,eACA,MACA,OACA,WACA,YACA,aACA,qCAGJ,6BACI,aACA,eACA,QACA,OACA,QACA,YACA,cACA,YACA,YACA,WACA,kBACA,yBACA,yBACA,4CACA,gBACA,aAGJ,uCACI,eACA,gBACA,UACA,QAGJ,sDACI,iBAGJ,4DACI,gBAGJ,kEACI,kBAGJ,iCACI,kBAGJ,oCACI,SACA,UACA,eACA,mBAGJ,iCACI,iBAGJ,wCACI,cACA,mBACA,iBACA,eACA,mBACA,0BACA,WAGJ,+CACI,mBAGJ,kCACI,6BACA,gCACA,aACA,iBACA,kBAGJ,gDACI,cAGJ,qDACI,UACA,WClGJ,aACI,iBAEJ,eACI,yBACA,qBAEJ,sCAEI,WAEJ,uBACI,WACA,qBAEJ,oBACI,kBACA,aACA,WACA,YACA,eACA,iBACA,WACA,iCACA,yBACA,WACA,+DACA,yBACA,cAEJ,oDAEI,WACA,qBACA,eACA,WACA,+DACA,yBAEJ,yBACI,YACA,WACA,WAKJ,0BACI,UACA,eACA,yBACA,SACA,wBAEJ,kBACI,MACA,QACA,WAEJ,qBACI,SACA,QACA,WAEJ,sBACI,MACA,QACA,WAEJ,yBACI,SACA,QACA,WAEJ,gBACI,SACA,UAEJ,iBACI,SACA,WAEJ,oBACI,WACA,YAEJ,mBACI,YACA,UAEJ,iBACI,eACA,eACA,oBAGJ,mBACI,2BACA,8BACA,sBAEJ,qBACI,kBACA,oBACA,gBACA,eACA,4BACA,YACA,mCACA,sCACA,8BACA,gCACA,4BACA,8BACA,iCACA,yBACA,WACA,WACA,+DACA,yBAEJ,yBACI,cACA,4BACA,sCAEJ,2BACI,8BACA,iCACA,yBACA,UACA,gEACA,0BACA,eAEJ,6BACI,0wBAEJ,8BACI,kzBAEJ,gCACI,sgBAEJ,gCACI,0uBAEJ,+EAEI,YACA,iBACA,kBAEJ,uFAEI,UACA,iBACA,kBAEJ,OACI,yBAEJ,eACI,yBAEJ,aACI,yBAEJ,YACI,yBAEJ,eACI,yBAEJ,gBACI,kBACA,OACA,SACA,WACA,sBACA,WACA,+DACA,yBAGJ,kCACI,qBACI,yBACA,WAEJ,yBACI,yBAEJ,qCACI,aACA,WAEJ,0CACI,YACA,YAGR,wDACI,qBACI,yBACA,WAEJ,yBACI,yBAEJ,qCACI,aACA,WAEJ,0CACI,YACA,YAGR,wDACI,qBACI,4BACA,WAEJ,yBACI","file":"style.css"}

style/_main.scss

@@ -22,3 +22,7 @@
 @include select('reload-extension', (
     margin: 10px 12px 0 12px
 ));
+
+@include select('prompt', (
+    margin: 10px 0
+));