Revert "Revert "Stop messing with %USERPROFILE%""

Revert "Stop messing with %USERPROFILE%"

3rd-PARTY-LICENSES

@@ -4,24 +4,711 @@ https://craftpip.github.io/jquery-confirm/
 
 jquery-confirm is licensed under the MIT license:
 
-  The MIT License (MIT)
+    The MIT License (MIT)
+  
+    Copyright (c) 2019 Boniface Pereira
+  
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+  
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+  
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
 
-  Copyright (c) 2019 Boniface Pereira
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
+jszip
+=====
+https://stuk.github.io/jszip/
 
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
+JSZip is dual licensed. At your choice you may use it under the MIT license *or* the GPLv3
+license.
 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
+    The MIT License
+    ===============
+    
+    Copyright (c) 2009-2016 Stuart Knightley, David Duponchel, Franz Buchinger, António Afonso
+    
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+    
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+    
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+    
+    
+    GPL version 3
+    =============
+    
+                        GNU GENERAL PUBLIC LICENSE
+                           Version 3, 29 June 2007
+    
+     Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+    
+                                Preamble
+    
+      The GNU General Public License is a free, copyleft license for
+    software and other kinds of works.
+    
+      The licenses for most software and other practical works are designed
+    to take away your freedom to share and change the works.  By contrast,
+    the GNU General Public License is intended to guarantee your freedom to
+    share and change all versions of a program--to make sure it remains free
+    software for all its users.  We, the Free Software Foundation, use the
+    GNU General Public License for most of our software; it applies also to
+    any other work released this way by its authors.  You can apply it to
+    your programs, too.
+    
+      When we speak of free software, we are referring to freedom, not
+    price.  Our General Public Licenses are designed to make sure that you
+    have the freedom to distribute copies of free software (and charge for
+    them if you wish), that you receive source code or can get it if you
+    want it, that you can change the software or use pieces of it in new
+    free programs, and that you know you can do these things.
+    
+      To protect your rights, we need to prevent others from denying you
+    these rights or asking you to surrender the rights.  Therefore, you have
+    certain responsibilities if you distribute copies of the software, or if
+    you modify it: responsibilities to respect the freedom of others.
+    
+      For example, if you distribute copies of such a program, whether
+    gratis or for a fee, you must pass on to the recipients the same
+    freedoms that you received.  You must make sure that they, too, receive
+    or can get the source code.  And you must show them these terms so they
+    know their rights.
+    
+      Developers that use the GNU GPL protect your rights with two steps:
+    (1) assert copyright on the software, and (2) offer you this License
+    giving you legal permission to copy, distribute and/or modify it.
+    
+      For the developers' and authors' protection, the GPL clearly explains
+    that there is no warranty for this free software.  For both users' and
+    authors' sake, the GPL requires that modified versions be marked as
+    changed, so that their problems will not be attributed erroneously to
+    authors of previous versions.
+    
+      Some devices are designed to deny users access to install or run
+    modified versions of the software inside them, although the manufacturer
+    can do so.  This is fundamentally incompatible with the aim of
+    protecting users' freedom to change the software.  The systematic
+    pattern of such abuse occurs in the area of products for individuals to
+    use, which is precisely where it is most unacceptable.  Therefore, we
+    have designed this version of the GPL to prohibit the practice for those
+    products.  If such problems arise substantially in other domains, we
+    stand ready to extend this provision to those domains in future versions
+    of the GPL, as needed to protect the freedom of users.
+    
+      Finally, every program is threatened constantly by software patents.
+    States should not allow patents to restrict development and use of
+    software on general-purpose computers, but in those that do, we wish to
+    avoid the special danger that patents applied to a free program could
+    make it effectively proprietary.  To prevent this, the GPL assures that
+    patents cannot be used to render the program non-free.
+    
+      The precise terms and conditions for copying, distribution and
+    modification follow.
+    
+                           TERMS AND CONDITIONS
+    
+      0. Definitions.
+    
+      "This License" refers to version 3 of the GNU General Public License.
+    
+      "Copyright" also means copyright-like laws that apply to other kinds of
+    works, such as semiconductor masks.
+    
+      "The Program" refers to any copyrightable work licensed under this
+    License.  Each licensee is addressed as "you".  "Licensees" and
+    "recipients" may be individuals or organizations.
+    
+      To "modify" a work means to copy from or adapt all or part of the work
+    in a fashion requiring copyright permission, other than the making of an
+    exact copy.  The resulting work is called a "modified version" of the
+    earlier work or a work "based on" the earlier work.
+    
+      A "covered work" means either the unmodified Program or a work based
+    on the Program.
+    
+      To "propagate" a work means to do anything with it that, without
+    permission, would make you directly or secondarily liable for
+    infringement under applicable copyright law, except executing it on a
+    computer or modifying a private copy.  Propagation includes copying,
+    distribution (with or without modification), making available to the
+    public, and in some countries other activities as well.
+    
+      To "convey" a work means any kind of propagation that enables other
+    parties to make or receive copies.  Mere interaction with a user through
+    a computer network, with no transfer of a copy, is not conveying.
+    
+      An interactive user interface displays "Appropriate Legal Notices"
+    to the extent that it includes a convenient and prominently visible
+    feature that (1) displays an appropriate copyright notice, and (2)
+    tells the user that there is no warranty for the work (except to the
+    extent that warranties are provided), that licensees may convey the
+    work under this License, and how to view a copy of this License.  If
+    the interface presents a list of user commands or options, such as a
+    menu, a prominent item in the list meets this criterion.
+    
+      1. Source Code.
+    
+      The "source code" for a work means the preferred form of the work
+    for making modifications to it.  "Object code" means any non-source
+    form of a work.
+    
+      A "Standard Interface" means an interface that either is an official
+    standard defined by a recognized standards body, or, in the case of
+    interfaces specified for a particular programming language, one that
+    is widely used among developers working in that language.
+    
+      The "System Libraries" of an executable work include anything, other
+    than the work as a whole, that (a) is included in the normal form of
+    packaging a Major Component, but which is not part of that Major
+    Component, and (b) serves only to enable use of the work with that
+    Major Component, or to implement a Standard Interface for which an
+    implementation is available to the public in source code form.  A
+    "Major Component", in this context, means a major essential component
+    (kernel, window system, and so on) of the specific operating system
+    (if any) on which the executable work runs, or a compiler used to
+    produce the work, or an object code interpreter used to run it.
+    
+      The "Corresponding Source" for a work in object code form means all
+    the source code needed to generate, install, and (for an executable
+    work) run the object code and to modify the work, including scripts to
+    control those activities.  However, it does not include the work's
+    System Libraries, or general-purpose tools or generally available free
+    programs which are used unmodified in performing those activities but
+    which are not part of the work.  For example, Corresponding Source
+    includes interface definition files associated with source files for
+    the work, and the source code for shared libraries and dynamically
+    linked subprograms that the work is specifically designed to require,
+    such as by intimate data communication or control flow between those
+    subprograms and other parts of the work.
+    
+      The Corresponding Source need not include anything that users
+    can regenerate automatically from other parts of the Corresponding
+    Source.
+    
+      The Corresponding Source for a work in source code form is that
+    same work.
+    
+      2. Basic Permissions.
+    
+      All rights granted under this License are granted for the term of
+    copyright on the Program, and are irrevocable provided the stated
+    conditions are met.  This License explicitly affirms your unlimited
+    permission to run the unmodified Program.  The output from running a
+    covered work is covered by this License only if the output, given its
+    content, constitutes a covered work.  This License acknowledges your
+    rights of fair use or other equivalent, as provided by copyright law.
+    
+      You may make, run and propagate covered works that you do not
+    convey, without conditions so long as your license otherwise remains
+    in force.  You may convey covered works to others for the sole purpose
+    of having them make modifications exclusively for you, or provide you
+    with facilities for running those works, provided that you comply with
+    the terms of this License in conveying all material for which you do
+    not control copyright.  Those thus making or running the covered works
+    for you must do so exclusively on your behalf, under your direction
+    and control, on terms that prohibit them from making any copies of
+    your copyrighted material outside their relationship with you.
+    
+      Conveying under any other circumstances is permitted solely under
+    the conditions stated below.  Sublicensing is not allowed; section 10
+    makes it unnecessary.
+    
+      3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+    
+      No covered work shall be deemed part of an effective technological
+    measure under any applicable law fulfilling obligations under article
+    11 of the WIPO copyright treaty adopted on 20 December 1996, or
+    similar laws prohibiting or restricting circumvention of such
+    measures.
+    
+      When you convey a covered work, you waive any legal power to forbid
+    circumvention of technological measures to the extent such circumvention
+    is effected by exercising rights under this License with respect to
+    the covered work, and you disclaim any intention to limit operation or
+    modification of the work as a means of enforcing, against the work's
+    users, your or third parties' legal rights to forbid circumvention of
+    technological measures.
+    
+      4. Conveying Verbatim Copies.
+    
+      You may convey verbatim copies of the Program's source code as you
+    receive it, in any medium, provided that you conspicuously and
+    appropriately publish on each copy an appropriate copyright notice;
+    keep intact all notices stating that this License and any
+    non-permissive terms added in accord with section 7 apply to the code;
+    keep intact all notices of the absence of any warranty; and give all
+    recipients a copy of this License along with the Program.
+    
+      You may charge any price or no price for each copy that you convey,
+    and you may offer support or warranty protection for a fee.
+    
+      5. Conveying Modified Source Versions.
+    
+      You may convey a work based on the Program, or the modifications to
+    produce it from the Program, in the form of source code under the
+    terms of section 4, provided that you also meet all of these conditions:
+    
+        a) The work must carry prominent notices stating that you modified
+        it, and giving a relevant date.
+    
+        b) The work must carry prominent notices stating that it is
+        released under this License and any conditions added under section
+        7.  This requirement modifies the requirement in section 4 to
+        "keep intact all notices".
+    
+        c) You must license the entire work, as a whole, under this
+        License to anyone who comes into possession of a copy.  This
+        License will therefore apply, along with any applicable section 7
+        additional terms, to the whole of the work, and all its parts,
+        regardless of how they are packaged.  This License gives no
+        permission to license the work in any other way, but it does not
+        invalidate such permission if you have separately received it.
+    
+        d) If the work has interactive user interfaces, each must display
+        Appropriate Legal Notices; however, if the Program has interactive
+        interfaces that do not display Appropriate Legal Notices, your
+        work need not make them do so.
+    
+      A compilation of a covered work with other separate and independent
+    works, which are not by their nature extensions of the covered work,
+    and which are not combined with it such as to form a larger program,
+    in or on a volume of a storage or distribution medium, is called an
+    "aggregate" if the compilation and its resulting copyright are not
+    used to limit the access or legal rights of the compilation's users
+    beyond what the individual works permit.  Inclusion of a covered work
+    in an aggregate does not cause this License to apply to the other
+    parts of the aggregate.
+    
+      6. Conveying Non-Source Forms.
+    
+      You may convey a covered work in object code form under the terms
+    of sections 4 and 5, provided that you also convey the
+    machine-readable Corresponding Source under the terms of this License,
+    in one of these ways:
+    
+        a) Convey the object code in, or embodied in, a physical product
+        (including a physical distribution medium), accompanied by the
+        Corresponding Source fixed on a durable physical medium
+        customarily used for software interchange.
+    
+        b) Convey the object code in, or embodied in, a physical product
+        (including a physical distribution medium), accompanied by a
+        written offer, valid for at least three years and valid for as
+        long as you offer spare parts or customer support for that product
+        model, to give anyone who possesses the object code either (1) a
+        copy of the Corresponding Source for all the software in the
+        product that is covered by this License, on a durable physical
+        medium customarily used for software interchange, for a price no
+        more than your reasonable cost of physically performing this
+        conveying of source, or (2) access to copy the
+        Corresponding Source from a network server at no charge.
+    
+        c) Convey individual copies of the object code with a copy of the
+        written offer to provide the Corresponding Source.  This
+        alternative is allowed only occasionally and noncommercially, and
+        only if you received the object code with such an offer, in accord
+        with subsection 6b.
+    
+        d) Convey the object code by offering access from a designated
+        place (gratis or for a charge), and offer equivalent access to the
+        Corresponding Source in the same way through the same place at no
+        further charge.  You need not require recipients to copy the
+        Corresponding Source along with the object code.  If the place to
+        copy the object code is a network server, the Corresponding Source
+        may be on a different server (operated by you or a third party)
+        that supports equivalent copying facilities, provided you maintain
+        clear directions next to the object code saying where to find the
+        Corresponding Source.  Regardless of what server hosts the
+        Corresponding Source, you remain obligated to ensure that it is
+        available for as long as needed to satisfy these requirements.
+    
+        e) Convey the object code using peer-to-peer transmission, provided
+        you inform other peers where the object code and Corresponding
+        Source of the work are being offered to the general public at no
+        charge under subsection 6d.
+    
+      A separable portion of the object code, whose source code is excluded
+    from the Corresponding Source as a System Library, need not be
+    included in conveying the object code work.
+    
+      A "User Product" is either (1) a "consumer product", which means any
+    tangible personal property which is normally used for personal, family,
+    or household purposes, or (2) anything designed or sold for incorporation
+    into a dwelling.  In determining whether a product is a consumer product,
+    doubtful cases shall be resolved in favor of coverage.  For a particular
+    product received by a particular user, "normally used" refers to a
+    typical or common use of that class of product, regardless of the status
+    of the particular user or of the way in which the particular user
+    actually uses, or expects or is expected to use, the product.  A product
+    is a consumer product regardless of whether the product has substantial
+    commercial, industrial or non-consumer uses, unless such uses represent
+    the only significant mode of use of the product.
+    
+      "Installation Information" for a User Product means any methods,
+    procedures, authorization keys, or other information required to install
+    and execute modified versions of a covered work in that User Product from
+    a modified version of its Corresponding Source.  The information must
+    suffice to ensure that the continued functioning of the modified object
+    code is in no case prevented or interfered with solely because
+    modification has been made.
+    
+      If you convey an object code work under this section in, or with, or
+    specifically for use in, a User Product, and the conveying occurs as
+    part of a transaction in which the right of possession and use of the
+    User Product is transferred to the recipient in perpetuity or for a
+    fixed term (regardless of how the transaction is characterized), the
+    Corresponding Source conveyed under this section must be accompanied
+    by the Installation Information.  But this requirement does not apply
+    if neither you nor any third party retains the ability to install
+    modified object code on the User Product (for example, the work has
+    been installed in ROM).
+    
+      The requirement to provide Installation Information does not include a
+    requirement to continue to provide support service, warranty, or updates
+    for a work that has been modified or installed by the recipient, or for
+    the User Product in which it has been modified or installed.  Access to a
+    network may be denied when the modification itself materially and
+    adversely affects the operation of the network or violates the rules and
+    protocols for communication across the network.
+    
+      Corresponding Source conveyed, and Installation Information provided,
+    in accord with this section must be in a format that is publicly
+    documented (and with an implementation available to the public in
+    source code form), and must require no special password or key for
+    unpacking, reading or copying.
+    
+      7. Additional Terms.
+    
+      "Additional permissions" are terms that supplement the terms of this
+    License by making exceptions from one or more of its conditions.
+    Additional permissions that are applicable to the entire Program shall
+    be treated as though they were included in this License, to the extent
+    that they are valid under applicable law.  If additional permissions
+    apply only to part of the Program, that part may be used separately
+    under those permissions, but the entire Program remains governed by
+    this License without regard to the additional permissions.
+    
+      When you convey a copy of a covered work, you may at your option
+    remove any additional permissions from that copy, or from any part of
+    it.  (Additional permissions may be written to require their own
+    removal in certain cases when you modify the work.)  You may place
+    additional permissions on material, added by you to a covered work,
+    for which you have or can give appropriate copyright permission.
+    
+      Notwithstanding any other provision of this License, for material you
+    add to a covered work, you may (if authorized by the copyright holders of
+    that material) supplement the terms of this License with terms:
+    
+        a) Disclaiming warranty or limiting liability differently from the
+        terms of sections 15 and 16 of this License; or
+    
+        b) Requiring preservation of specified reasonable legal notices or
+        author attributions in that material or in the Appropriate Legal
+        Notices displayed by works containing it; or
+    
+        c) Prohibiting misrepresentation of the origin of that material, or
+        requiring that modified versions of such material be marked in
+        reasonable ways as different from the original version; or
+    
+        d) Limiting the use for publicity purposes of names of licensors or
+        authors of the material; or
+    
+        e) Declining to grant rights under trademark law for use of some
+        trade names, trademarks, or service marks; or
+    
+        f) Requiring indemnification of licensors and authors of that
+        material by anyone who conveys the material (or modified versions of
+        it) with contractual assumptions of liability to the recipient, for
+        any liability that these contractual assumptions directly impose on
+        those licensors and authors.
+    
+      All other non-permissive additional terms are considered "further
+    restrictions" within the meaning of section 10.  If the Program as you
+    received it, or any part of it, contains a notice stating that it is
+    governed by this License along with a term that is a further
+    restriction, you may remove that term.  If a license document contains
+    a further restriction but permits relicensing or conveying under this
+    License, you may add to a covered work material governed by the terms
+    of that license document, provided that the further restriction does
+    not survive such relicensing or conveying.
+    
+      If you add terms to a covered work in accord with this section, you
+    must place, in the relevant source files, a statement of the
+    additional terms that apply to those files, or a notice indicating
+    where to find the applicable terms.
+    
+      Additional terms, permissive or non-permissive, may be stated in the
+    form of a separately written license, or stated as exceptions;
+    the above requirements apply either way.
+    
+      8. Termination.
+    
+      You may not propagate or modify a covered work except as expressly
+    provided under this License.  Any attempt otherwise to propagate or
+    modify it is void, and will automatically terminate your rights under
+    this License (including any patent licenses granted under the third
+    paragraph of section 11).
+    
+      However, if you cease all violation of this License, then your
+    license from a particular copyright holder is reinstated (a)
+    provisionally, unless and until the copyright holder explicitly and
+    finally terminates your license, and (b) permanently, if the copyright
+    holder fails to notify you of the violation by some reasonable means
+    prior to 60 days after the cessation.
+    
+      Moreover, your license from a particular copyright holder is
+    reinstated permanently if the copyright holder notifies you of the
+    violation by some reasonable means, this is the first time you have
+    received notice of violation of this License (for any work) from that
+    copyright holder, and you cure the violation prior to 30 days after
+    your receipt of the notice.
+    
+      Termination of your rights under this section does not terminate the
+    licenses of parties who have received copies or rights from you under
+    this License.  If your rights have been terminated and not permanently
+    reinstated, you do not qualify to receive new licenses for the same
+    material under section 10.
+    
+      9. Acceptance Not Required for Having Copies.
+    
+      You are not required to accept this License in order to receive or
+    run a copy of the Program.  Ancillary propagation of a covered work
+    occurring solely as a consequence of using peer-to-peer transmission
+    to receive a copy likewise does not require acceptance.  However,
+    nothing other than this License grants you permission to propagate or
+    modify any covered work.  These actions infringe copyright if you do
+    not accept this License.  Therefore, by modifying or propagating a
+    covered work, you indicate your acceptance of this License to do so.
+    
+      10. Automatic Licensing of Downstream Recipients.
+    
+      Each time you convey a covered work, the recipient automatically
+    receives a license from the original licensors, to run, modify and
+    propagate that work, subject to this License.  You are not responsible
+    for enforcing compliance by third parties with this License.
+    
+      An "entity transaction" is a transaction transferring control of an
+    organization, or substantially all assets of one, or subdividing an
+    organization, or merging organizations.  If propagation of a covered
+    work results from an entity transaction, each party to that
+    transaction who receives a copy of the work also receives whatever
+    licenses to the work the party's predecessor in interest had or could
+    give under the previous paragraph, plus a right to possession of the
+    Corresponding Source of the work from the predecessor in interest, if
+    the predecessor has it or can get it with reasonable efforts.
+    
+      You may not impose any further restrictions on the exercise of the
+    rights granted or affirmed under this License.  For example, you may
+    not impose a license fee, royalty, or other charge for exercise of
+    rights granted under this License, and you may not initiate litigation
+    (including a cross-claim or counterclaim in a lawsuit) alleging that
+    any patent claim is infringed by making, using, selling, offering for
+    sale, or importing the Program or any portion of it.
+    
+      11. Patents.
+    
+      A "contributor" is a copyright holder who authorizes use under this
+    License of the Program or a work on which the Program is based.  The
+    work thus licensed is called the contributor's "contributor version".
+    
+      A contributor's "essential patent claims" are all patent claims
+    owned or controlled by the contributor, whether already acquired or
+    hereafter acquired, that would be infringed by some manner, permitted
+    by this License, of making, using, or selling its contributor version,
+    but do not include claims that would be infringed only as a
+    consequence of further modification of the contributor version.  For
+    purposes of this definition, "control" includes the right to grant
+    patent sublicenses in a manner consistent with the requirements of
+    this License.
+    
+      Each contributor grants you a non-exclusive, worldwide, royalty-free
+    patent license under the contributor's essential patent claims, to
+    make, use, sell, offer for sale, import and otherwise run, modify and
+    propagate the contents of its contributor version.
+    
+      In the following three paragraphs, a "patent license" is any express
+    agreement or commitment, however denominated, not to enforce a patent
+    (such as an express permission to practice a patent or covenant not to
+    sue for patent infringement).  To "grant" such a patent license to a
+    party means to make such an agreement or commitment not to enforce a
+    patent against the party.
+    
+      If you convey a covered work, knowingly relying on a patent license,
+    and the Corresponding Source of the work is not available for anyone
+    to copy, free of charge and under the terms of this License, through a
+    publicly available network server or other readily accessible means,
+    then you must either (1) cause the Corresponding Source to be so
+    available, or (2) arrange to deprive yourself of the benefit of the
+    patent license for this particular work, or (3) arrange, in a manner
+    consistent with the requirements of this License, to extend the patent
+    license to downstream recipients.  "Knowingly relying" means you have
+    actual knowledge that, but for the patent license, your conveying the
+    covered work in a country, or your recipient's use of the covered work
+    in a country, would infringe one or more identifiable patents in that
+    country that you have reason to believe are valid.
+    
+      If, pursuant to or in connection with a single transaction or
+    arrangement, you convey, or propagate by procuring conveyance of, a
+    covered work, and grant a patent license to some of the parties
+    receiving the covered work authorizing them to use, propagate, modify
+    or convey a specific copy of the covered work, then the patent license
+    you grant is automatically extended to all recipients of the covered
+    work and works based on it.
+    
+      A patent license is "discriminatory" if it does not include within
+    the scope of its coverage, prohibits the exercise of, or is
+    conditioned on the non-exercise of one or more of the rights that are
+    specifically granted under this License.  You may not convey a covered
+    work if you are a party to an arrangement with a third party that is
+    in the business of distributing software, under which you make payment
+    to the third party based on the extent of your activity of conveying
+    the work, and under which the third party grants, to any of the
+    parties who would receive the covered work from you, a discriminatory
+    patent license (a) in connection with copies of the covered work
+    conveyed by you (or copies made from those copies), or (b) primarily
+    for and in connection with specific products or compilations that
+    contain the covered work, unless you entered into that arrangement,
+    or that patent license was granted, prior to 28 March 2007.
+    
+      Nothing in this License shall be construed as excluding or limiting
+    any implied license or other defenses to infringement that may
+    otherwise be available to you under applicable patent law.
+    
+      12. No Surrender of Others' Freedom.
+    
+      If conditions are imposed on you (whether by court order, agreement or
+    otherwise) that contradict the conditions of this License, they do not
+    excuse you from the conditions of this License.  If you cannot convey a
+    covered work so as to satisfy simultaneously your obligations under this
+    License and any other pertinent obligations, then as a consequence you may
+    not convey it at all.  For example, if you agree to terms that obligate you
+    to collect a royalty for further conveying from those to whom you convey
+    the Program, the only way you could satisfy both those terms and this
+    License would be to refrain entirely from conveying the Program.
+    
+      13. Use with the GNU Affero General Public License.
+    
+      Notwithstanding any other provision of this License, you have
+    permission to link or combine any covered work with a work licensed
+    under version 3 of the GNU Affero General Public License into a single
+    combined work, and to convey the resulting work.  The terms of this
+    License will continue to apply to the part which is the covered work,
+    but the special requirements of the GNU Affero General Public License,
+    section 13, concerning interaction through a network will apply to the
+    combination as such.
+    
+      14. Revised Versions of this License.
+    
+      The Free Software Foundation may publish revised and/or new versions of
+    the GNU General Public License from time to time.  Such new versions will
+    be similar in spirit to the present version, but may differ in detail to
+    address new problems or concerns.
+    
+      Each version is given a distinguishing version number.  If the
+    Program specifies that a certain numbered version of the GNU General
+    Public License "or any later version" applies to it, you have the
+    option of following the terms and conditions either of that numbered
+    version or of any later version published by the Free Software
+    Foundation.  If the Program does not specify a version number of the
+    GNU General Public License, you may choose any version ever published
+    by the Free Software Foundation.
+    
+      If the Program specifies that a proxy can decide which future
+    versions of the GNU General Public License can be used, that proxy's
+    public statement of acceptance of a version permanently authorizes you
+    to choose that version for the Program.
+    
+      Later license versions may give you additional or different
+    permissions.  However, no additional obligations are imposed on any
+    author or copyright holder as a result of your choosing to follow a
+    later version.
+    
+      15. Disclaimer of Warranty.
+    
+      THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+    APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+    HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+    OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+    IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+    ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+    
+      16. Limitation of Liability.
+    
+      IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+    THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+    GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+    USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+    DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+    PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+    EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGES.
+    
+      17. Interpretation of Sections 15 and 16.
+    
+      If the disclaimer of warranty and limitation of liability provided
+    above cannot be given local legal effect according to their terms,
+    reviewing courts shall apply local law that most closely approximates
+    an absolute waiver of all civil liability in connection with the
+    Program, unless a warranty or assumption of liability accompanies a
+    copy of the Program in return for a fee.
+    
+                         END OF TERMS AND CONDITIONS
+
+FileSaver.js
+============
+https://github.com/eligrey/FileSaver.js
+
+FileSaver.js is licensed under the MIT license:
+
+    The MIT License
+    
+    Copyright © 2016 [Eli Grey][1].
+    
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is furnished
+    to do so, subject to the following conditions:
+    
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+    
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+    
+      [1]: http://eligrey.com

CHANGES.md

@@ -21,6 +21,28 @@
 Our focus continues to remain on an easy installation experience, and an easy user-interface. While still remaining pretty powerful, in terms of features and speed.
 
 ### Detailed changelog
+* 2.5.34 - 22 Apr 2023 - Nothing, just keeping this line warm.
+* 2.5.33 - 21 Apr 2023 - Install PyTorch 2.0 on new installations (on Windows and Linux).
+* 2.5.32 - 19 Apr 2023 - Automatically check for black images, and set full-precision if necessary (for attn). This means custom models based on Stable Diffusion v2.1 will just work, without needing special command-line arguments or editing of yaml config files.
+* 2.5.32 - 18 Apr 2023 - Automatic support for AMD graphics cards on Linux. Thanks @DianaNites and @JeLuf.
+* 2.5.31 - 10 Apr 2023 - Reduce VRAM usage while upscaling.
+* 2.5.31 - 6 Apr 2023 - Allow seeds upto `4,294,967,295`. Thanks @ogmaresca.
+* 2.5.31 - 6 Apr 2023 - Buttons to show the previous/next image in the image popup. Thanks @ogmaresca.
+* 2.5.30 - 5 Apr 2023 - Fix a bug where the JPEG image quality wasn't being respected when embedding the metadata into it. Thanks @JeLuf.
+* 2.5.30 - 1 Apr 2023 - (beta-only) Slider to control the strength of the LoRA model.
+* 2.5.30 - 28 Mar 2023 - Refactor task entry config to use a generating method. Added ability for plugins to easily add to this. Removed confusing sentence from `contributing.md`
+* 2.5.30 - 28 Mar 2023 - Allow the user to undo the deletion of tasks or images, instead of showing a pop-up each time. The new `Undo` button will be present at the top of the UI. Thanks @JeLuf.
+* 2.5.30 - 28 Mar 2023 - Support saving lossless WEBP images. Thanks @ogmaresca.
+* 2.5.30 - 28 Mar 2023 - Lots of bug fixes for the UI (Read LoRA flag in metadata files, new prompt weight format with scrollwheel, fix overflow with lots of tabs, clear button in image editor, shorter filenames in download). Thanks @patriceac, @JeLuf and @ogmaresca.
+* 2.5.29 - 27 Mar 2023 - (beta-only) Fix a bug where some non-square images would fail while inpainting with a `The size of tensor a must match size of tensor b` error.
+* 2.5.29 - 27 Mar 2023 - (beta-only) Fix the `incorrect number of channels` error, when given a PNG image with an alpha channel in `Test Diffusers`.
+* 2.5.29 - 27 Mar 2023 - (beta-only) Fix broken inpainting in `Test Diffusers`.
+* 2.5.28 - 24 Mar 2023 - (beta-only) Support for weighted prompts and long prompt lengths (not limited to 77 tokens). This change requires enabling the `Test Diffusers` setting in beta (in the Settings tab), and restarting the program.
+* 2.5.27 - 21 Mar 2023 - (beta-only) LoRA support, accessible by enabling the `Test Diffusers` setting (in the Settings tab in the UI). This change switches the internal engine to diffusers (if the `Test Diffusers` setting is enabled). If the `Test Diffusers` flag is disabled, it'll have no impact for the user.
+* 2.5.26 - 15 Mar 2023 - Allow styling the buttons displayed on an image. Update the API to allow multiple buttons and text labels in a single row. Thanks @ogmaresca.
+* 2.5.26 - 15 Mar 2023 - View images in full-screen, by either clicking on the image, or clicking the "Full screen" icon next to the Seed number on the image. Thanks @ogmaresca for the internal API.
+* 2.5.25 - 14 Mar 2023 - Button to download all the images, and all the metadata as a zip file. This is available at the top of the UI, as well as on each image. Thanks @JeLuf.
+* 2.5.25 - 14 Mar 2023 - Lots of UI tweaks and bug fixes. Thanks @patriceac and @JeLuf.
 * 2.5.24 - 11 Mar 2023 - Button to load an image mask from a file.
 * 2.5.24 - 10 Mar 2023 - Logo change. Image credit: @lazlo_vii.
 * 2.5.23 - 8 Mar 2023 - Experimental support for Mac M1/M2. Thanks @michaelgallacher, @JeLuf and vishae!

CONTRIBUTING.md

@@ -42,8 +42,6 @@ or for Windows
 10) Congrats, now any changes you make in your repo `ui` folder are linked to this running archive of the app and can be previewed in the browser.
 11) Please update CHANGES.md in your pull requests.
 
-Check the `ui/frontend/build/README.md` for instructions on running and building the React code.
-
 ## Development environment for Installer changes
 Build the Windows installer using Windows, and the Linux installer using Linux. Don't mix the two, and don't use WSL. An Ubuntu VM is fine for building the Linux installer on a Windows host.
 

NSIS/sdui.nsi

@@ -157,6 +157,10 @@ Function MediaPackDialog
     nsDialogs::Show
 FunctionEnd
 
+Function FinishPageAction
+CreateShortCut "$DESKTOP\Easy Diffusion.lnk" "$INSTDIR\Start Stable Diffusion UI.cmd" "" "$INSTDIR\installer_files\cyborg_flower_girl.ico"
+FunctionEnd
+
 ;---------------------------------------------------------------------------------------------------------
 ; MUI Settings
 ;---------------------------------------------------------------------------------------------------------
@@ -182,6 +186,11 @@ Page custom MediaPackDialog
 !insertmacro MUI_PAGE_INSTFILES 
 
 ; Finish page
+!define MUI_FINISHPAGE_SHOWREADME ""
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"
+!define MUI_FINISHPAGE_SHOWREADME_FUNCTION FinishPageAction
+
 !define MUI_FINISHPAGE_RUN "$INSTDIR\Start Stable Diffusion UI.cmd"
 !insertmacro MUI_PAGE_FINISH
 
@@ -208,6 +217,8 @@ Section "MainSection" SEC01
   File /r "${EXISTING_INSTALLATION_DIR}\installer_files"
   File /r "${EXISTING_INSTALLATION_DIR}\profile"
   File /r "${EXISTING_INSTALLATION_DIR}\sd-ui-files"
+  SetOutPath "$INSTDIR\installer_files"
+  File "cyborg_flower_girl.ico"
   SetOutPath "$INSTDIR\scripts"
   File "${EXISTING_INSTALLATION_DIR}\scripts\install_status.txt"
   File "..\scripts\on_env_start.bat"
@@ -218,13 +229,13 @@ Section "MainSection" SEC01
   CreateDirectory "$INSTDIR\models\realesrgan"
   CreateDirectory "$INSTDIR\models\vae"
   CreateDirectory "$SMPROGRAMS\Easy Diffusion"
-  CreateShortCut "$SMPROGRAMS\Easy Diffusion\Easy Diffusion.lnk" "$INSTDIR\Start Stable Diffusion UI.cmd"
+  CreateShortCut "$SMPROGRAMS\Easy Diffusion\Easy Diffusion.lnk" "$INSTDIR\Start Stable Diffusion UI.cmd" "" "$INSTDIR\installer_files\cyborg_flower_girl.ico"
 
   DetailPrint 'Downloading the Stable Diffusion 1.4 model...'
   NScurl::http get "https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt" "$INSTDIR\models\stable-diffusion\sd-v1-4.ckpt" /CANCEL /INSIST /END
 
   DetailPrint 'Downloading the GFPGAN model...'
-  NScurl::http get "https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth" "$INSTDIR\models\gfpgan\GFPGANv1.3.pth" /CANCEL /INSIST /END
+  NScurl::http get "https://github.com/TencentARC/GFPGAN/releases/download/v1.3.4/GFPGANv1.4.pth" "$INSTDIR\models\gfpgan\GFPGANv1.4.pth" /CANCEL /INSIST /END
 
   DetailPrint 'Downloading the RealESRGAN_x4plus model...'
   NScurl::http get "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth" "$INSTDIR\models\realesrgan\RealESRGAN_x4plus.pth" /CANCEL /INSIST /END

README.md

@@ -3,37 +3,36 @@
 
 Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community.
 
-[Installation guide](#step-1-download-and-extract-the-installer) | [Troubleshooting guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting) | <sub>[![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB)</sub> <sup>(for support queries, and development discussions)</sup>
+[Installation guide](#installation) | [Troubleshooting guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting) | <sub>[![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB)</sub> <sup>(for support queries, and development discussions)</sup>
 
 ![t2i](https://raw.githubusercontent.com/Stability-AI/stablediffusion/main/assets/stable-samples/txt2img/768/merged-0006.png)
 
-# Step 1: Download and extract the installer
+# Installation
 Click the download button for your operating system:
 
 <p float="left">
-  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.5.15/stable-diffusion-ui-windows.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-win.png" width="200" /></a>
-  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.5.15/stable-diffusion-ui-linux.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-linux.png" width="200" /></a>
+  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.5.24/Easy-Diffusion-Windows.exe"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-win.png" width="200" /></a>
+  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.5.24/Easy-Diffusion-Linux.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-linux.png" width="200" /></a>
+  <a href="https://github.com/cmdr2/stable-diffusion-ui/releases/download/v2.5.24/Easy-Diffusion-Mac.zip"><img src="https://github.com/cmdr2/stable-diffusion-ui/raw/main/media/download-mac.png" width="200" /></a>
 </p>
 
-## On Windows:
-1. Unzip/extract the folder `stable-diffusion-ui` which should be in your downloads folder, unless you changed your default downloads destination.
-2. Move the `stable-diffusion-ui` folder to your `C:` drive (or any other drive like `D:`, at the top root level). `C:\stable-diffusion-ui` or `D:\stable-diffusion-ui` as examples. This will avoid a common problem with Windows (file path length limits).
-## On Linux:
-1. Unzip/extract the folder `stable-diffusion-ui` which should be in your downloads folder, unless you changed your default downloads destination.
-2. Open a terminal window, and navigate to the `stable-diffusion-ui` directory.
-
-# Step 2: Run the program
-## On Windows: 
-Double-click `Start Stable Diffusion UI.cmd`.
-If Windows SmartScreen prevents you from running the program click `More info` and then `Run anyway`.
-## On Linux: 
-Run `./start.sh` (or `bash start.sh`) in a terminal.
-
 The installer will take care of whatever is needed. If you face any problems, you can join the friendly [Discord community](https://discord.com/invite/u9yhsFmEkB) and ask for assistance.
 
-# Step 3: There is no Step 3. It's that simple!
+## On Windows:
+1. Run the downloaded `Easy-Diffusion-Windows.exe` file.
+2. Run `Easy Diffusion` once the installation finishes. You can also start from your Start Menu, or from your desktop (if you created a shortcut).
 
-**To Uninstall:** Just delete the `stable-diffusion-ui` folder to uninstall all the downloaded packages.
+If Windows SmartScreen prevents you from running the program click `More info` and then `Run anyway`.
+
+**Tip:** On Windows 10, please install at the top level in your drive, e.g. `C:\EasyDiffusion` or `D:\EasyDiffusion`. This will avoid a common problem with Windows 10 (file path length limits).
+
+## On Linux/Mac:
+1. Unzip/extract the folder `easy-diffusion` which should be in your downloads folder, unless you changed your default downloads destination.
+2. Open a terminal window, and navigate to the `easy-diffusion` directory.
+3. Run `./start.sh` (or `bash start.sh`) in a terminal.
+
+# To remove/uninstall:
+Just delete the `EasyDiffusion` folder to uninstall all the downloaded packages.
 
 ----
 

scripts/check_models.py

@@ -0,0 +1,101 @@
+# this script runs inside the legacy "stable-diffusion" folder
+
+from sdkit.models import download_model, get_model_info_from_db
+from sdkit.utils import hash_file_quick
+
+import os
+import shutil
+from glob import glob
+import traceback
+
+models_base_dir = os.path.abspath(os.path.join("..", "models"))
+
+models_to_check = {
+    "stable-diffusion": [
+        {"file_name": "sd-v1-4.ckpt", "model_id": "1.4"},
+    ],
+    "gfpgan": [
+        {"file_name": "GFPGANv1.4.pth", "model_id": "1.4"},
+    ],
+    "realesrgan": [
+        {"file_name": "RealESRGAN_x4plus.pth", "model_id": "x4plus"},
+        {"file_name": "RealESRGAN_x4plus_anime_6B.pth", "model_id": "x4plus_anime_6"},
+    ],
+    "vae": [
+        {"file_name": "vae-ft-mse-840000-ema-pruned.ckpt", "model_id": "vae-ft-mse-840000-ema-pruned"},
+    ],
+}
+MODEL_EXTENSIONS = {  # copied from easydiffusion/model_manager.py
+    "stable-diffusion": [".ckpt", ".safetensors"],
+    "vae": [".vae.pt", ".ckpt", ".safetensors"],
+    "hypernetwork": [".pt", ".safetensors"],
+    "gfpgan": [".pth"],
+    "realesrgan": [".pth"],
+    "lora": [".ckpt", ".safetensors"],
+}
+
+
+def download_if_necessary(model_type: str, file_name: str, model_id: str):
+    model_path = os.path.join(models_base_dir, model_type, file_name)
+    expected_hash = get_model_info_from_db(model_type=model_type, model_id=model_id)["quick_hash"]
+
+    other_models_exist = any_model_exists(model_type)
+    known_model_exists = os.path.exists(model_path)
+    known_model_is_corrupt = known_model_exists and hash_file_quick(model_path) != expected_hash
+
+    if known_model_is_corrupt or (not other_models_exist and not known_model_exists):
+        print("> download", model_type, model_id)
+        download_model(model_type, model_id, download_base_dir=models_base_dir)
+
+
+def init():
+    migrate_legacy_model_location()
+
+    for model_type, models in models_to_check.items():
+        for model in models:
+            try:
+                download_if_necessary(model_type, model["file_name"], model["model_id"])
+            except:
+                traceback.print_exc()
+                fail(model_type)
+
+        print(model_type, "model(s) found.")
+
+
+### utilities
+def any_model_exists(model_type: str) -> bool:
+    extensions = MODEL_EXTENSIONS.get(model_type, [])
+    for ext in extensions:
+        if any(glob(f"{models_base_dir}/{model_type}/**/*{ext}", recursive=True)):
+            return True
+
+    return False
+
+
+def migrate_legacy_model_location():
+    'Move the models inside the legacy "stable-diffusion" folder, to their respective folders'
+
+    for model_type, models in models_to_check.items():
+        for model in models:
+            file_name = model["file_name"]
+            if os.path.exists(file_name):
+                dest_dir = os.path.join(models_base_dir, model_type)
+                os.makedirs(dest_dir, exist_ok=True)
+                shutil.move(file_name, os.path.join(dest_dir, file_name))
+
+
+def fail(model_name):
+    print(
+        f"""Error downloading the {model_name} model. Sorry about that, please try to:
+1. Run this installer again.
+2. If that doesn't fix it, please try to download the file manually. The address to download from, and the destination to save to are printed above this message.
+3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB
+4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues
+Thanks!"""
+    )
+    exit(1)
+
+
+### start
+
+init()

scripts/check_modules.py

@@ -1,13 +1,155 @@
-'''
-This script checks if the given modules exist
-'''
+"""
+This script checks and installs the required modules.
 
-import sys
-import pkgutil
+This script runs inside the legacy "stable-diffusion" folder
 
-modules = sys.argv[1:]
-missing_modules = []
-for m in modules:
-    if pkgutil.find_loader(m) is None:
-        print('module', m, 'not found')
-        exit(1)
+TODO - Maybe replace the bulk of this script with a call to `pip install -f requirements.txt`, with
+a custom index URL depending on the platform.
+
+"""
+
+import os
+from importlib.metadata import version as pkg_version
+import platform
+import traceback
+
+os_name = platform.system()
+
+modules_to_check = {
+    "torch": ("1.11.0", "1.13.1", "2.0.0"),
+    "torchvision": ("0.12.0", "0.14.1", "0.15.1"),
+    "sdkit": "1.0.81",
+    "stable-diffusion-sdkit": "2.1.4",
+    "rich": "12.6.0",
+    "uvicorn": "0.19.0",
+    "fastapi": "0.85.1",
+    # "xformers": "0.0.16",
+}
+
+
+def version(module_name: str) -> str:
+    try:
+        return pkg_version(module_name)
+    except:
+        return None
+
+
+def install(module_name: str, module_version: str):
+    if module_name == "xformers" and (os_name == "Darwin" or is_amd_on_linux()):
+        return
+
+    index_url = None
+    if module_name in ("torch", "torchvision"):
+        module_version, index_url = apply_torch_install_overrides(module_version)
+
+    if is_amd_on_linux():  # hack until AMD works properly on torch 2.0 (avoids black images on some cards)
+        if module_name == "torch":
+            module_version = "1.13.1+rocm5.2"
+        elif module_name == "torchvision":
+            module_version = "0.14.1+rocm5.2"
+    elif os_name == "Darwin":
+        if module_name == "torch":
+            module_version = "1.13.1"
+        elif module_name == "torchvision":
+            module_version = "0.14.1"
+
+    install_cmd = f"python -m pip install --upgrade {module_name}=={module_version}"
+    if index_url:
+        install_cmd += f" --index-url {index_url}"
+    if module_name == "sdkit" and version("sdkit") is not None:
+        install_cmd += " -q"
+
+    print(">", install_cmd)
+    os.system(install_cmd)
+
+
+def init():
+    for module_name, allowed_versions in modules_to_check.items():
+        if os.path.exists(f"../src/{module_name}"):
+            print(f"Skipping {module_name} update, since it's in developer/editable mode")
+            continue
+
+        allowed_versions, latest_version = get_allowed_versions(module_name, allowed_versions)
+
+        requires_install = False
+        if module_name in ("torch", "torchvision"):
+            if version(module_name) is None:  # allow any torch version
+                requires_install = True
+            elif os_name == "Darwin" and (  # force mac to downgrade from torch 2.0
+                version("torch").startswith("2.") or version("torchvision").startswith("0.15.")
+            ):
+                requires_install = True
+        elif version(module_name) not in allowed_versions:
+            requires_install = True
+
+        if requires_install:
+            try:
+                install(module_name, latest_version)
+            except:
+                traceback.print_exc()
+                fail(module_name)
+
+        print(f"{module_name}: {version(module_name)}")
+
+
+### utilities
+
+
+def get_allowed_versions(module_name: str, allowed_versions: tuple):
+    allowed_versions = (allowed_versions,) if isinstance(allowed_versions, str) else allowed_versions
+    latest_version = allowed_versions[-1]
+
+    if module_name in ("torch", "torchvision"):
+        allowed_versions = include_cuda_versions(allowed_versions)
+
+    return allowed_versions, latest_version
+
+
+def apply_torch_install_overrides(module_version: str):
+    index_url = None
+    if os_name == "Windows":
+        module_version += "+cu117"
+        index_url = "https://download.pytorch.org/whl/cu117"
+    elif is_amd_on_linux():
+        index_url = "https://download.pytorch.org/whl/rocm5.2"
+
+    return module_version, index_url
+
+
+def include_cuda_versions(module_versions: tuple) -> tuple:
+    "Adds CUDA-specific versions to the list of allowed version numbers"
+
+    allowed_versions = tuple(module_versions)
+    allowed_versions += tuple(f"{v}+cu116" for v in module_versions)
+    allowed_versions += tuple(f"{v}+cu117" for v in module_versions)
+    allowed_versions += tuple(f"{v}+rocm5.2" for v in module_versions)
+    allowed_versions += tuple(f"{v}+rocm5.4.2" for v in module_versions)
+
+    return allowed_versions
+
+
+def is_amd_on_linux():
+    if os_name == "Linux":
+        with open("/proc/bus/pci/devices", "r") as f:
+            device_info = f.read()
+            if "amdgpu" in device_info and "nvidia" not in device_info:
+                return True
+
+    return False
+
+
+def fail(module_name):
+    print(
+        f"""Error installing {module_name}. Sorry about that, please try to:
+1. Run this installer again.
+2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting
+3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB
+4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues
+Thanks!"""
+    )
+    exit(1)
+
+
+### start
+
+init()

scripts/functions.sh

@@ -31,7 +31,7 @@ EOF
 filesize() {
     case "$(uname -s)" in
         Linux*)     stat -c "%s" $1;;
-        Darwin*)    stat -f "%z" $1;;
+        Darwin*)    /usr/bin/stat -f "%z" $1;;
         *)          echo "Unknown OS: $OS_NAME! This script runs only on Linux or Mac" && exit
     esac
 }

scripts/on_env_start.bat

@@ -8,6 +8,10 @@ if exist "scripts\config.bat" (
     @call scripts\config.bat
 )
 
+if exist "scripts\user_config.bat" (
+    @call scripts\user_config.bat
+)
+
 if "%update_branch%"=="" (
     set update_branch=main
 )
@@ -53,6 +57,7 @@ if "%update_branch%"=="" (
 @xcopy sd-ui-files\ui ui /s /i /Y /q
 @copy sd-ui-files\scripts\on_sd_start.bat scripts\ /Y
 @copy sd-ui-files\scripts\check_modules.py scripts\ /Y
+@copy sd-ui-files\scripts\check_models.py scripts\ /Y
 @copy "sd-ui-files\scripts\Start Stable Diffusion UI.cmd" . /Y
 @copy "sd-ui-files\scripts\Developer Console.cmd" . /Y
 

scripts/on_env_start.sh

@@ -8,6 +8,11 @@ if [ -f "scripts/config.sh" ]; then
     source scripts/config.sh
 fi
 
+if [ -f "scripts/user_config.sh" ]; then
+    source scripts/user_config.sh
+fi
+
+
 if [ "$update_branch" == "" ]; then
     export update_branch="main"
 fi
@@ -38,6 +43,7 @@ cp -Rf sd-ui-files/ui .
 cp sd-ui-files/scripts/on_sd_start.sh scripts/
 cp sd-ui-files/scripts/bootstrap.sh scripts/
 cp sd-ui-files/scripts/check_modules.py scripts/
+cp sd-ui-files/scripts/check_models.py scripts/
 cp sd-ui-files/scripts/start.sh .
 cp sd-ui-files/scripts/developer_console.sh .
 cp sd-ui-files/scripts/functions.sh scripts/

scripts/on_sd_start.bat

@@ -4,11 +4,11 @@
 @REM Note to self: Please rewrite this in Python. For the sake of your own sanity.
 
 @copy sd-ui-files\scripts\on_env_start.bat scripts\ /Y
-@copy sd-ui-files\scripts\bootstrap.bat scripts\ /Y
 @copy sd-ui-files\scripts\check_modules.py scripts\ /Y
+@copy sd-ui-files\scripts\check_models.py scripts\ /Y
 
 if exist "%cd%\profile" (
-    set USERPROFILE=%cd%\profile
+    set HF_HOME=%cd%\profile\.cache\huggingface
 )
 
 @rem set the correct installer path (current vs legacy)
@@ -34,8 +34,6 @@ call conda activate
 @REM remove the old version of the dev console script, if it's still present
 if exist "Open Developer Console.cmd" del "Open Developer Console.cmd"
 
-@call python -c "import os; import shutil; frm = 'sd-ui-files\\ui\\hotfix\\9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');"
-
 @rem create the stable-diffusion folder, to work with legacy installations
 if not exist "stable-diffusion" mkdir stable-diffusion
 cd stable-diffusion
@@ -49,111 +47,22 @@ if exist "env" (
 if exist src rename src src-old
 if exist ldm rename ldm ldm-old
 
-if not exist "..\models\stable-diffusion" mkdir "..\models\stable-diffusion"
-if not exist "..\models\gfpgan" mkdir "..\models\gfpgan"
-if not exist "..\models\realesrgan" mkdir "..\models\realesrgan"
-if not exist "..\models\vae" mkdir "..\models\vae"
-
-@rem migrate the legacy models to the correct path (if already downloaded)
-if exist "sd-v1-4.ckpt" move sd-v1-4.ckpt ..\models\stable-diffusion\
-if exist "custom-model.ckpt" move custom-model.ckpt ..\models\stable-diffusion\
-if exist "GFPGANv1.3.pth" move GFPGANv1.3.pth ..\models\gfpgan\
-if exist "RealESRGAN_x4plus.pth" move RealESRGAN_x4plus.pth ..\models\realesrgan\
-if exist "RealESRGAN_x4plus_anime_6B.pth" move RealESRGAN_x4plus_anime_6B.pth ..\models\realesrgan\
 
 if not exist "%INSTALL_ENV_DIR%\DLLs\libssl-1_1-x64.dll"    copy "%INSTALL_ENV_DIR%\Library\bin\libssl-1_1-x64.dll"    "%INSTALL_ENV_DIR%\DLLs\"
 if not exist "%INSTALL_ENV_DIR%\DLLs\libcrypto-1_1-x64.dll" copy "%INSTALL_ENV_DIR%\Library\bin\libcrypto-1_1-x64.dll" "%INSTALL_ENV_DIR%\DLLs\"
 
-@rem install torch and torchvision
-call python ..\scripts\check_modules.py torch torchvision
-if "%ERRORLEVEL%" EQU "0" (
-    echo "torch and torchvision have already been installed."
-) else (
-    echo "Installing torch and torchvision.."
-
-    @REM prevent from using packages from the user's home directory, to avoid conflicts
-    set PYTHONNOUSERSITE=1
-    set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
-
-    call python -m pip install --upgrade torch torchvision --extra-index-url https://download.pytorch.org/whl/cu116 || (
-        echo "Error installing torch. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
-        pause
-        exit /b
-    )
-)
-
+@rem install or upgrade the required modules
 set PATH=C:\Windows\System32;%PATH%
 
-@rem install/upgrade sdkit
-call python ..\scripts\check_modules.py sdkit sdkit.models ldm transformers numpy antlr4 gfpgan realesrgan
-if "%ERRORLEVEL%" EQU "0" (
-    echo "sdkit is already installed."
+@REM prevent from using packages from the user's home directory, to avoid conflicts
+set PYTHONNOUSERSITE=1
+set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
 
-    @rem skip sdkit upgrade if in developer-mode
-    if not exist "..\src\sdkit" (
-        @REM prevent from using packages from the user's home directory, to avoid conflicts
-        set PYTHONNOUSERSITE=1
-        set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
-
-        call python -m pip install --upgrade sdkit==1.0.47 -q || (
-            echo "Error updating sdkit"
-        )
-    )
-) else (
-    echo "Installing sdkit: https://pypi.org/project/sdkit/"
-
-    @REM prevent from using packages from the user's home directory, to avoid conflicts
-    set PYTHONNOUSERSITE=1
-    set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
-
-    call python -m pip install sdkit==1.0.47 || (
-        echo "Error installing sdkit. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
-        pause
-        exit /b
-    )
-)
-
-call python -c "from importlib.metadata import version; print('sdkit version:', version('sdkit'))"
-
-@rem upgrade stable-diffusion-sdkit
-call python -m pip install --upgrade stable-diffusion-sdkit==2.1.3 -q || (
-    echo "Error updating stable-diffusion-sdkit"
-)
-call python -c "from importlib.metadata import version; print('stable-diffusion version:', version('stable-diffusion-sdkit'))"
-
-@rem install rich
-call python ..\scripts\check_modules.py rich
-if "%ERRORLEVEL%" EQU "0" (
-    echo "rich has already been installed."
-) else (
-    echo "Installing rich.."
-
-    set PYTHONNOUSERSITE=1
-    set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
-
-    call python -m pip install rich || (
-        echo "Error installing rich. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
-        pause
-        exit /b
-    )
-)
-
-set PATH=C:\Windows\System32;%PATH%
-
-call python ..\scripts\check_modules.py uvicorn fastapi
-@if "%ERRORLEVEL%" EQU "0" (
-    echo "Packages necessary for Easy Diffusion were already installed"
-) else (
-    @echo. & echo "Downloading packages necessary for Easy Diffusion..." & echo.
-
-    set PYTHONNOUSERSITE=1
-    set PYTHONPATH=%INSTALL_ENV_DIR%\lib\site-packages
-
-    @call conda install -c conda-forge -y uvicorn fastapi || (
-        echo "Error installing the packages necessary for Easy Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!"
-        pause
-        exit /b
-    )
+@rem Download the required packages
+call python ..\scripts\check_modules.py
+if "%ERRORLEVEL%" NEQ "0" (
+    pause
+    exit /b
 )
 
 call WHERE uvicorn > .tmp
@@ -169,160 +78,11 @@ call WHERE uvicorn > .tmp
     @echo conda_sd_ui_deps_installed >> ..\scripts\install_status.txt
 )
 
-@if exist "..\models\stable-diffusion\sd-v1-4.ckpt" (
-    for %%I in ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zI" EQU "4265380512" (
-        echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the HuggingFace 4 GB Model."
-    ) else (
-        for %%J in ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zJ" EQU "7703807346" (
-            echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the HuggingFace 7 GB Model."
-        ) else (
-            for %%K in ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zK" EQU "7703810927" (
-                echo "Data files (weights) necessary for Stable Diffusion were already downloaded. Using the Waifu Model."
-            ) else (
-                echo. & echo "The model file present at models\stable-diffusion\sd-v1-4.ckpt is invalid. It is only %%~zK bytes in size. Re-downloading.." & echo.
-                del "..\models\stable-diffusion\sd-v1-4.ckpt"
-            )
-        )
-    )
-)
-
-@if not exist "..\models\stable-diffusion\sd-v1-4.ckpt" (
-    @echo. & echo "Downloading data files (weights) for Stable Diffusion.." & echo.
-
-    @call curl -L -k https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt > ..\models\stable-diffusion\sd-v1-4.ckpt
-
-    @if exist "..\models\stable-diffusion\sd-v1-4.ckpt" (
-        for %%I in ("..\models\stable-diffusion\sd-v1-4.ckpt") do if "%%~zI" NEQ "4265380512" (
-            echo. & echo "Error: The downloaded model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-            pause
-            exit /b
-        )
-    ) else (
-        @echo. & echo "Error downloading the data files (weights) for Stable Diffusion. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-)
-
-
-
-@if exist "..\models\gfpgan\GFPGANv1.3.pth" (
-    for %%I in ("..\models\gfpgan\GFPGANv1.3.pth") do if "%%~zI" EQU "348632874" (
-        echo "Data files (weights) necessary for GFPGAN (Face Correction) were already downloaded"
-    ) else (
-        echo. & echo "The GFPGAN model file present at models\gfpgan\GFPGANv1.3.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "..\models\gfpgan\GFPGANv1.3.pth"
-    )
-)
-
-@if not exist "..\models\gfpgan\GFPGANv1.3.pth" (
-    @echo. & echo "Downloading data files (weights) for GFPGAN (Face Correction).." & echo.
-
-    @call curl -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > ..\models\gfpgan\GFPGANv1.3.pth
-
-    @if exist "..\models\gfpgan\GFPGANv1.3.pth" (
-        for %%I in ("..\models\gfpgan\GFPGANv1.3.pth") do if "%%~zI" NEQ "348632874" (
-            echo. & echo "Error: The downloaded GFPGAN model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-            pause
-            exit /b
-        )
-    ) else (
-        @echo. & echo "Error downloading the data files (weights) for GFPGAN (Face Correction). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-)
-
-
-
-@if exist "..\models\realesrgan\RealESRGAN_x4plus.pth" (
-    for %%I in ("..\models\realesrgan\RealESRGAN_x4plus.pth") do if "%%~zI" EQU "67040989" (
-        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus were already downloaded"
-    ) else (
-        echo. & echo "The RealESRGAN model file present at models\realesrgan\RealESRGAN_x4plus.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "..\models\realesrgan\RealESRGAN_x4plus.pth"
-    )
-)
-
-@if not exist "..\models\realesrgan\RealESRGAN_x4plus.pth" (
-    @echo. & echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus.." & echo.
-
-    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > ..\models\realesrgan\RealESRGAN_x4plus.pth
-
-    @if exist "..\models\realesrgan\RealESRGAN_x4plus.pth" (
-        for %%I in ("..\models\realesrgan\RealESRGAN_x4plus.pth") do if "%%~zI" NEQ "67040989" (
-            echo. & echo "Error: The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-            pause
-            exit /b
-        )
-    ) else (
-        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-)
-
-
-
-@if exist "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth" (
-    for %%I in ("..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" EQU "17938799" (
-        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus_anime were already downloaded"
-    ) else (
-        echo. & echo "The RealESRGAN model file present at models\realesrgan\RealESRGAN_x4plus_anime_6B.pth is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth"
-    )
-)
-
-@if not exist "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth" (
-    @echo. & echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime.." & echo.
-
-    @call curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > ..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth
-
-    @if exist "..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth" (
-        for %%I in ("..\models\realesrgan\RealESRGAN_x4plus_anime_6B.pth") do if "%%~zI" NEQ "17938799" (
-            echo. & echo "Error: The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-            pause
-            exit /b
-        )
-    ) else (
-        @echo. & echo "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime. Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
-)
-
-
-
-@if exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
-    for %%I in ("..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt") do if "%%~zI" EQU "334695179" (
-        echo "Data files (weights) necessary for the default VAE (sd-vae-ft-mse-original) were already downloaded"
-    ) else (
-        echo. & echo "The default VAE (sd-vae-ft-mse-original) file present at models\vae\vae-ft-mse-840000-ema-pruned.ckpt is invalid. It is only %%~zI bytes in size. Re-downloading.." & echo.
-        del "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt"
-    )
-)
-
-@if not exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
-    @echo. & echo "Downloading data files (weights) for the default VAE (sd-vae-ft-mse-original).." & echo.
-
-    @call curl -L -k https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt > ..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt
-
-    @if exist "..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt" (
-        for %%I in ("..\models\vae\vae-ft-mse-840000-ema-pruned.ckpt") do if "%%~zI" NEQ "334695179" (
-            echo. & echo "Error: The downloaded default VAE (sd-vae-ft-mse-original) file was invalid! Bytes downloaded: %%~zI" & echo.
-            echo. & echo "Error downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-            pause
-            exit /b
-        )
-    ) else (
-        @echo. & echo "Error downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:" & echo "  1. Run this installer again." & echo "  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting" & echo "  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB" & echo "  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues" & echo "Thanks!" & echo.
-        pause
-        exit /b
-    )
+@rem Download the required models
+call python ..\scripts\check_models.py
+if "%ERRORLEVEL%" NEQ "0" (
+    pause
+    exit /b
 )
 
 @>nul findstr /m "sd_install_complete" ..\scripts\install_status.txt

scripts/on_sd_start.sh

@@ -4,6 +4,7 @@ cp sd-ui-files/scripts/functions.sh scripts/
 cp sd-ui-files/scripts/on_env_start.sh scripts/
 cp sd-ui-files/scripts/bootstrap.sh scripts/
 cp sd-ui-files/scripts/check_modules.py scripts/
+cp sd-ui-files/scripts/check_models.py scripts/
 
 source ./scripts/functions.sh
 
@@ -18,11 +19,6 @@ if [ -e "open_dev_console.sh" ]; then
     rm "open_dev_console.sh"
 fi
 
-python -c "import os; import shutil; frm = 'sd-ui-files/ui/hotfix/9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'; dst = os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'transformers', '9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142'); shutil.copyfile(frm, dst) if os.path.exists(dst) else print(''); print('Hotfixed broken JSON file from OpenAI');" 
-
-# Caution, this file will make your eyes and brain bleed. It's such an unholy mess.
-# Note to self: Please rewrite this in Python. For the sake of your own sanity.
-
 # set the correct installer path (current vs legacy)
 if [ -e "installer_files/env" ]; then
     export INSTALL_ENV_DIR="$(pwd)/installer_files/env"
@@ -44,236 +40,20 @@ fi
 if [ -e "src" ]; then mv src src-old; fi
 if [ -e "ldm" ]; then mv ldm ldm-old; fi
 
-mkdir -p "../models/stable-diffusion"
-mkdir -p "../models/gfpgan"
-mkdir -p "../models/realesrgan"
-mkdir -p "../models/vae"
-
-# migrate the legacy models to the correct path (if already downloaded)
-if [ -e "sd-v1-4.ckpt" ]; then mv sd-v1-4.ckpt ../models/stable-diffusion/; fi
-if [ -e "custom-model.ckpt" ]; then mv custom-model.ckpt ../models/stable-diffusion/; fi
-if [ -e "GFPGANv1.3.pth" ]; then mv GFPGANv1.3.pth ../models/gfpgan/; fi
-if [ -e "RealESRGAN_x4plus.pth" ]; then mv RealESRGAN_x4plus.pth ../models/realesrgan/; fi
-if [ -e "RealESRGAN_x4plus_anime_6B.pth" ]; then mv RealESRGAN_x4plus_anime_6B.pth ../models/realesrgan/; fi
-
-# install torch and torchvision
-if python ../scripts/check_modules.py torch torchvision; then
-    echo "torch and torchvision have already been installed."
-else
-    echo "Installing torch and torchvision.."
-
-    export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
-
-    if python -m pip install --upgrade torch torchvision --extra-index-url https://download.pytorch.org/whl/cu116 ; then
-        echo "Installed."
-    else
-        fail "torch install failed" 
-    fi
+# Download the required packages
+if ! python ../scripts/check_modules.py; then
+    read -p "Press any key to continue"
+    exit 1
 fi
 
-# install/upgrade sdkit
-if python ../scripts/check_modules.py sdkit sdkit.models ldm transformers numpy antlr4 gfpgan realesrgan ; then
-    echo "sdkit is already installed."
-
-    # skip sdkit upgrade if in developer-mode
-    if [ ! -e "../src/sdkit" ]; then
-        export PYTHONNOUSERSITE=1
-        export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
-
-        python -m pip install --upgrade sdkit==1.0.47 -q
-    fi
-else
-    echo "Installing sdkit: https://pypi.org/project/sdkit/"
-
-    export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
-
-    if python -m pip install sdkit==1.0.47 ; then
-        echo "Installed."
-    else
-        fail "sdkit install failed"
-    fi
+if ! command -v uvicorn &> /dev/null; then
+    fail "UI packages not found!"
 fi
 
-python -c "from importlib.metadata import version; print('sdkit version:', version('sdkit'))"
-
-# upgrade stable-diffusion-sdkit
-python -m pip install --upgrade stable-diffusion-sdkit==2.1.3 -q
-python -c "from importlib.metadata import version; print('stable-diffusion version:', version('stable-diffusion-sdkit'))"
-
-# install rich
-if python ../scripts/check_modules.py rich; then
-    echo "rich has already been installed."
-else
-    echo "Installing rich.."
-
-    export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
-
-    if python -m pip install rich ; then
-        echo "Installed."
-    else
-        fail "Install failed for rich"
-    fi
-fi
-
-if python ../scripts/check_modules.py uvicorn fastapi ; then
-    echo "Packages necessary for Easy Diffusion were already installed"
-else
-    printf "\n\nDownloading packages necessary for Easy Diffusion..\n\n"
-
-    export PYTHONNOUSERSITE=1
-    export PYTHONPATH="$INSTALL_ENV_DIR/lib/python3.8/site-packages"
-
-    if conda install -c conda-forge -y uvicorn fastapi ; then
-        echo "Installed. Testing.."
-    else
-        fail "'conda install uvicorn' failed" 
-    fi
-
-    if ! command -v uvicorn &> /dev/null; then
-        fail "UI packages not found!"
-    fi
-fi
-
-if [ -f "../models/stable-diffusion/sd-v1-4.ckpt" ]; then
-    model_size=`filesize "../models/stable-diffusion/sd-v1-4.ckpt"`
-
-    if [ "$model_size" -eq "4265380512" ] || [ "$model_size" -eq "7703807346" ] || [ "$model_size" -eq "7703810927" ]; then
-        echo "Data files (weights) necessary for Stable Diffusion were already downloaded"
-    else
-        printf "\n\nThe model file present at models/stable-diffusion/sd-v1-4.ckpt is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm ../models/stable-diffusion/sd-v1-4.ckpt
-    fi
-fi
-
-if [ ! -f "../models/stable-diffusion/sd-v1-4.ckpt" ]; then
-    echo "Downloading data files (weights) for Stable Diffusion.."
-
-    curl -L -k https://huggingface.co/CompVis/stable-diffusion-v-1-4-original/resolve/main/sd-v1-4.ckpt > ../models/stable-diffusion/sd-v1-4.ckpt
-
-    if [ -f "../models/stable-diffusion/sd-v1-4.ckpt" ]; then
-        model_size=`filesize "../models/stable-diffusion/sd-v1-4.ckpt"`
-        if [ ! "$model_size" == "4265380512" ]; then
-	    fail "The downloaded model file was invalid! Bytes downloaded: $model_size"
-        fi
-    else
-        fail "Error downloading the data files (weights) for Stable Diffusion"
-    fi
-fi
-
-
-if [ -f "../models/gfpgan/GFPGANv1.3.pth" ]; then
-    model_size=`filesize "../models/gfpgan/GFPGANv1.3.pth"`
-
-    if [ "$model_size" -eq "348632874" ]; then
-        echo "Data files (weights) necessary for GFPGAN (Face Correction) were already downloaded"
-    else
-        printf "\n\nThe model file present at models/gfpgan/GFPGANv1.3.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm ../models/gfpgan/GFPGANv1.3.pth
-    fi
-fi
-
-if [ ! -f "../models/gfpgan/GFPGANv1.3.pth" ]; then
-    echo "Downloading data files (weights) for GFPGAN (Face Correction).."
-
-    curl -L -k https://github.com/TencentARC/GFPGAN/releases/download/v1.3.0/GFPGANv1.3.pth > ../models/gfpgan/GFPGANv1.3.pth
-
-    if [ -f "../models/gfpgan/GFPGANv1.3.pth" ]; then
-        model_size=`filesize "../models/gfpgan/GFPGANv1.3.pth"`
-        if [ ! "$model_size" -eq "348632874" ]; then
-            fail "The downloaded GFPGAN model file was invalid! Bytes downloaded: $model_size"
-        fi
-    else
-        fail "Error downloading the data files (weights) for GFPGAN (Face Correction)."
-    fi
-fi
-
-
-if [ -f "../models/realesrgan/RealESRGAN_x4plus.pth" ]; then
-    model_size=`filesize "../models/realesrgan/RealESRGAN_x4plus.pth"`
-
-    if [ "$model_size" -eq "67040989" ]; then
-        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus were already downloaded"
-    else
-        printf "\n\nThe model file present at models/realesrgan/RealESRGAN_x4plus.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm ../models/realesrgan/RealESRGAN_x4plus.pth
-    fi
-fi
-
-if [ ! -f "../models/realesrgan/RealESRGAN_x4plus.pth" ]; then
-    echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus.."
-
-    curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth > ../models/realesrgan/RealESRGAN_x4plus.pth
-
-    if [ -f "../models/realesrgan/RealESRGAN_x4plus.pth" ]; then
-        model_size=`filesize "../models/realesrgan/RealESRGAN_x4plus.pth"`
-        if [ ! "$model_size" -eq "67040989" ]; then
-            fail "The downloaded ESRGAN x4plus model file was invalid! Bytes downloaded: $model_size"
-        fi
-    else
-        fail "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus"
-    fi
-fi
-
-
-if [ -f "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" ]; then
-    model_size=`filesize "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth"`
-
-    if [ "$model_size" -eq "17938799" ]; then
-        echo "Data files (weights) necessary for ESRGAN (Resolution Upscaling) x4plus_anime were already downloaded"
-    else
-        printf "\n\nThe model file present at models/realesrgan/RealESRGAN_x4plus_anime_6B.pth is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm ../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth
-    fi
-fi
-
-if [ ! -f "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" ]; then
-    echo "Downloading data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime.."
-
-    curl -L -k https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth > ../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth
-
-    if [ -f "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth" ]; then
-        model_size=`filesize "../models/realesrgan/RealESRGAN_x4plus_anime_6B.pth"`
-        if [ ! "$model_size" -eq "17938799" ]; then
-            fail "The downloaded ESRGAN x4plus_anime model file was invalid! Bytes downloaded: $model_size"
-        fi
-    else
-        fail "Error downloading the data files (weights) for ESRGAN (Resolution Upscaling) x4plus_anime."
-    fi
-fi
-
-
-if [ -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
-    model_size=`filesize "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt"`
-
-    if [ "$model_size" -eq "334695179" ]; then
-        echo "Data files (weights) necessary for the default VAE (sd-vae-ft-mse-original) were already downloaded"
-    else
-        printf "\n\nThe model file present at models/vae/vae-ft-mse-840000-ema-pruned.ckpt is invalid. It is only $model_size bytes in size. Re-downloading.."
-        rm ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt
-    fi
-fi
-
-if [ ! -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
-    echo "Downloading data files (weights) for the default VAE (sd-vae-ft-mse-original).."
-
-    curl -L -k https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.ckpt > ../models/vae/vae-ft-mse-840000-ema-pruned.ckpt
-
-    if [ -f "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt" ]; then
-        model_size=`filesize "../models/vae/vae-ft-mse-840000-ema-pruned.ckpt"`
-        if [ ! "$model_size" -eq "334695179" ]; then
-            printf "\n\nError: The downloaded default VAE (sd-vae-ft-mse-original) file was invalid! Bytes downloaded: $model_size\n\n"
-            printf "\n\nError downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-            read -p "Press any key to continue"
-            exit
-        fi
-    else
-        printf "\n\nError downloading the data files (weights) for the default VAE (sd-vae-ft-mse-original). Sorry about that, please try to:\n  1. Run this installer again.\n  2. If that doesn't fix it, please try the common troubleshooting steps at https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting\n  3. If those steps don't help, please copy *all* the error messages in this window, and ask the community at https://discord.com/invite/u9yhsFmEkB\n  4. If that doesn't solve the problem, please file an issue at https://github.com/cmdr2/stable-diffusion-ui/issues\nThanks!\n\n"
-        read -p "Press any key to continue"
-        exit
-    fi
+# Download the required models
+if ! python ../scripts/check_models.py; then
+    read -p "Press any key to continue"
+    exit 1
 fi
 
 if [ `grep -c sd_install_complete ../scripts/install_status.txt` -gt "0" ]; then

ui/easydiffusion/model_manager.py

@@ -7,13 +7,14 @@ from easydiffusion.utils import log
 from sdkit import Context
 from sdkit.models import load_model, unload_model, scan_model
 
-KNOWN_MODEL_TYPES = ["stable-diffusion", "vae", "hypernetwork", "gfpgan", "realesrgan"]
+KNOWN_MODEL_TYPES = ["stable-diffusion", "vae", "hypernetwork", "gfpgan", "realesrgan", "lora"]
 MODEL_EXTENSIONS = {
     "stable-diffusion": [".ckpt", ".safetensors"],
     "vae": [".vae.pt", ".ckpt", ".safetensors"],
     "hypernetwork": [".pt", ".safetensors"],
     "gfpgan": [".pth"],
     "realesrgan": [".pth"],
+    "lora": [".ckpt", ".safetensors"],
 }
 DEFAULT_MODELS = {
     "stable-diffusion": [  # needed to support the legacy installations
@@ -23,7 +24,7 @@ DEFAULT_MODELS = {
     "gfpgan": ["GFPGANv1.3"],
     "realesrgan": ["RealESRGAN_x4plus"],
 }
-MODELS_TO_LOAD_ON_START = ["stable-diffusion", "vae", "hypernetwork"]
+MODELS_TO_LOAD_ON_START = ["stable-diffusion", "vae", "hypernetwork", "lora"]
 
 known_models = {}
 
@@ -40,12 +41,15 @@ def load_default_models(context: Context):
     for model_type in MODELS_TO_LOAD_ON_START:
         context.model_paths[model_type] = resolve_model_to_use(model_type=model_type)
         try:
-            load_model(context, model_type)
+            load_model(
+                context,
+                model_type,
+                scan_model = context.model_paths[model_type] != None and not context.model_paths[model_type].endswith('.safetensors')
+            )
         except Exception as e:
             log.error(f"[red]Error while loading {model_type} model: {context.model_paths[model_type]}[/red]")
-            log.error(f"[red]Error: {e}[/red]")
-            log.error(f"[red]Consider removing the model from the model folder.[red]")
-
+            log.exception(e)
+            del context.model_paths[model_type]
 
 def unload_all(context: Context):
     for model_type in KNOWN_MODEL_TYPES:
@@ -102,6 +106,7 @@ def reload_models_if_necessary(context: Context, task_data: TaskData):
         "gfpgan": task_data.use_face_correction,
         "realesrgan": task_data.use_upscale,
         "nsfw_checker": True if task_data.block_nsfw else None,
+        "lora": task_data.use_lora_model,
     }
     models_to_reload = {
         model_type: path
@@ -125,6 +130,7 @@ def resolve_model_paths(task_data: TaskData):
     )
     task_data.use_vae_model = resolve_model_to_use(task_data.use_vae_model, model_type="vae")
     task_data.use_hypernetwork_model = resolve_model_to_use(task_data.use_hypernetwork_model, model_type="hypernetwork")
+    task_data.use_lora_model = resolve_model_to_use(task_data.use_lora_model, model_type="lora")
 
     if task_data.use_face_correction:
         task_data.use_face_correction = resolve_model_to_use(task_data.use_face_correction, "gfpgan")
@@ -184,11 +190,13 @@ def getModels():
             "stable-diffusion": "sd-v1-4",
             "vae": "",
             "hypernetwork": "",
+            "lora": "",
         },
         "options": {
             "stable-diffusion": ["sd-v1-4"],
             "vae": [],
             "hypernetwork": [],
+            "lora": [],
         },
     }
 
@@ -238,11 +246,13 @@ def getModels():
         except MaliciousModelException as e:
             models["scan-error"] = e
 
+    log.info(f"[green]Scanning all model folders for models...[/]")
     # custom models
     listModels(model_type="stable-diffusion")
     listModels(model_type="vae")
     listModels(model_type="hypernetwork")
     listModels(model_type="gfpgan")
+    listModels(model_type="lora")
 
     if models_scanned > 0:
         log.info(f"[green]Scanned {models_scanned} models. Nothing infected[/]")

ui/easydiffusion/renderer.py

@@ -10,7 +10,13 @@ from easydiffusion.utils import get_printable_request, save_images_to_disk, log
 from sdkit import Context
 from sdkit.generate import generate_images
 from sdkit.filter import apply_filters
-from sdkit.utils import img_to_buffer, img_to_base64_str, latent_samples_to_images, gc
+from sdkit.utils import (
+    img_to_buffer,
+    img_to_base64_str,
+    latent_samples_to_images,
+    diffusers_latent_samples_to_images,
+    gc,
+)
 
 context = Context()  # thread-local
 """
@@ -26,6 +32,13 @@ def init(device):
     context.temp_images = {}
     context.partial_x_samples = None
 
+    from easydiffusion import app
+
+    app_config = app.getConfig()
+    context.test_diffusers = (
+        app_config.get("test_diffusers", False) and app_config.get("update_branch", "main") != "main"
+    )
+
     device_manager.device_init(context, device)
 
 
@@ -55,10 +68,16 @@ def print_task_info(req: GenerateImageRequest, task_data: TaskData):
 def make_images_internal(
     req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback
 ):
-
     images, user_stopped = generate_images_internal(
-        req, task_data, data_queue, task_temp_images, step_callback, task_data.stream_image_progress, task_data.stream_image_progress_interval
+        req,
+        task_data,
+        data_queue,
+        task_temp_images,
+        step_callback,
+        task_data.stream_image_progress,
+        task_data.stream_image_progress_interval,
     )
+    gc(context)
     filtered_images = filter_images(task_data, images, user_stopped)
 
     if task_data.save_to_disk_path is not None:
@@ -82,10 +101,18 @@ def generate_images_internal(
 ):
     context.temp_images.clear()
 
-    callback = make_step_callback(req, task_data, data_queue, task_temp_images, step_callback, stream_image_progress, stream_image_progress_interval)
+    callback = make_step_callback(
+        req,
+        task_data,
+        data_queue,
+        task_temp_images,
+        step_callback,
+        stream_image_progress,
+        stream_image_progress_interval,
+    )
 
     try:
-        if req.init_image is not None:
+        if req.init_image is not None and not context.test_diffusers:
             req.sampler_name = "ddim"
 
         images = generate_images(context, callback=callback, **req.dict())
@@ -94,10 +121,14 @@ def generate_images_internal(
         images = []
         user_stopped = True
         if context.partial_x_samples is not None:
-            images = latent_samples_to_images(context, context.partial_x_samples)
+            if context.test_diffusers:
+                images = diffusers_latent_samples_to_images(context, context.partial_x_samples)
+            else:
+                images = latent_samples_to_images(context, context.partial_x_samples)
     finally:
         if hasattr(context, "partial_x_samples") and context.partial_x_samples is not None:
-            del context.partial_x_samples
+            if not context.test_diffusers:
+                del context.partial_x_samples
             context.partial_x_samples = None
 
     return images, user_stopped
@@ -124,7 +155,7 @@ def filter_images(task_data: TaskData, images: list, user_stopped):
 def construct_response(images: list, seeds: list, task_data: TaskData, base_seed: int):
     return [
         ResponseImage(
-            data=img_to_base64_str(img, task_data.output_format, task_data.output_quality),
+            data=img_to_base64_str(img, task_data.output_format, task_data.output_quality, task_data.output_lossless),
             seed=seed,
         )
         for img, seed in zip(images, seeds)
@@ -145,7 +176,15 @@ def make_step_callback(
 
     def update_temp_img(x_samples, task_temp_images: list):
         partial_images = []
-        images = latent_samples_to_images(context, x_samples)
+
+        if context.test_diffusers:
+            images = diffusers_latent_samples_to_images(context, x_samples)
+        else:
+            images = latent_samples_to_images(context, x_samples)
+
+        if task_data.block_nsfw:
+            images = apply_filters(context, "nsfw_checker", images)
+
         for i, img in enumerate(images):
             buf = img_to_buffer(img, output_format="JPEG")
 
@@ -155,17 +194,21 @@ def make_step_callback(
         del images
         return partial_images
 
-    def on_image_step(x_samples, i):
+    def on_image_step(x_samples, i, *args):
         nonlocal last_callback_time
 
-        context.partial_x_samples = x_samples
+        if context.test_diffusers:
+            context.partial_x_samples = (x_samples, args[0])
+        else:
+            context.partial_x_samples = x_samples
+
         step_time = time.time() - last_callback_time if last_callback_time != -1 else -1
         last_callback_time = time.time()
 
         progress = {"step": i, "step_time": step_time, "total_steps": n_steps}
 
         if stream_image_progress and stream_image_progress_interval > 0 and i % stream_image_progress_interval == 0:
-            progress["output"] = update_temp_img(x_samples, task_temp_images)
+            progress["output"] = update_temp_img(context.partial_x_samples, task_temp_images)
 
         data_queue.put(json.dumps(progress))
 

ui/easydiffusion/server.py

@@ -10,12 +10,14 @@ from typing import List, Union
 from fastapi import FastAPI, HTTPException
 from fastapi.staticfiles import StaticFiles
 from starlette.responses import FileResponse, JSONResponse, StreamingResponse
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 from easydiffusion import app, model_manager, task_manager
 from easydiffusion.types import TaskData, GenerateImageRequest, MergeRequest
 from easydiffusion.utils import log
 
+import mimetypes
+
 log.info(f"started in {app.SD_DIR}")
 log.info(f"started at {datetime.datetime.now():%x %X}")
 
@@ -27,10 +29,10 @@ NOCACHE_HEADERS = {"Cache-Control": "no-cache, no-store, must-revalidate", "Prag
 class NoCacheStaticFiles(StaticFiles):
     def __init__(self, directory: str):
         # follow_symlink is only available on fastapi >= 0.92.0
-        if (os.path.islink(directory)):
-            super().__init__(directory = os.path.realpath(directory))
+        if os.path.islink(directory):
+            super().__init__(directory=os.path.realpath(directory))
         else:
-            super().__init__(directory = directory)
+            super().__init__(directory=directory)
 
     def is_not_modified(self, response_headers, request_headers) -> bool:
         if "content-type" in response_headers and (
@@ -42,16 +44,20 @@ class NoCacheStaticFiles(StaticFiles):
         return super().is_not_modified(response_headers, request_headers)
 
 
-class SetAppConfigRequest(BaseModel):
+class SetAppConfigRequest(BaseModel, extra=Extra.allow):
     update_branch: str = None
     render_devices: Union[List[str], List[int], str, int] = None
     model_vae: str = None
     ui_open_browser_on_start: bool = None
     listen_to_network: bool = None
     listen_port: int = None
+    test_diffusers: bool = False
 
 
 def init():
+    mimetypes.init()
+    mimetypes.add_type("text/css", ".css")
+
     if os.path.isdir(app.CUSTOM_MODIFIERS_DIR):
         server_api.mount(
             "/media/modifier-thumbnails/custom",
@@ -127,6 +133,13 @@ def set_app_config_internal(req: SetAppConfigRequest):
         if "net" not in config:
             config["net"] = {}
         config["net"]["listen_port"] = int(req.listen_port)
+
+    config["test_diffusers"] = req.test_diffusers
+
+    for property, property_value in req.dict().items():
+        if property_value is not None and property not in req.__fields__:
+            config[property] = property_value
+
     try:
         app.setConfig(config)
 

ui/easydiffusion/task_manager.py

@@ -317,6 +317,9 @@ def thread_render(device):
             def step_callback():
                 global current_state_error
 
+                task_cache.keep(id(task), TASK_TTL)
+                session_cache.keep(task.task_data.session_id, TASK_TTL)
+
                 if (
                     isinstance(current_state_error, SystemExit)
                     or isinstance(current_state_error, StopAsyncIteration)

ui/easydiffusion/types.py

@@ -21,6 +21,7 @@ class GenerateImageRequest(BaseModel):
 
     sampler_name: str = None  # "ddim", "plms", "heun", "euler", "euler_a", "dpm2", "dpm2_a", "lms"
     hypernetwork_strength: float = 0
+    lora_alpha: float = 0
 
 
 class TaskData(BaseModel):
@@ -36,11 +37,13 @@ class TaskData(BaseModel):
     # use_stable_diffusion_config: str = "v1-inference"
     use_vae_model: str = None
     use_hypernetwork_model: str = None
+    use_lora_model: str = None
 
     show_only_filtered_image: bool = False
     block_nsfw: bool = False
     output_format: str = "jpeg"  # or "png" or "webp"
     output_quality: int = 75
+    output_lossless: bool = False
     metadata_output_format: str = "txt"  # or "json"
     stream_image_progress: bool = False
     stream_image_progress_interval: int = 5

ui/easydiffusion/utils/save_utils.py

@@ -1,13 +1,17 @@
 import os
 import time
-import base64
 import re
 
+from easydiffusion import app
 from easydiffusion.types import TaskData, GenerateImageRequest
+from functools import reduce
+from datetime import datetime
 
 from sdkit.utils import save_images, save_dicts
+from numpy import base_repr
 
 filename_regex = re.compile("[^a-zA-Z0-9._-]")
+img_number_regex = re.compile("([0-9]{5,})")
 
 # keep in sync with `ui/media/js/dnd.js`
 TASK_TEXT_MAPPING = {
@@ -27,14 +31,90 @@ TASK_TEXT_MAPPING = {
     "use_vae_model": "VAE model",
     "use_hypernetwork_model": "Hypernetwork model",
     "hypernetwork_strength": "Hypernetwork Strength",
+    "use_lora_model": "LoRA model",
+    "lora_alpha": "LoRA Strength",
 }
 
+time_placeholders = {
+    "$yyyy": "%Y",
+    "$MM": "%m",
+    "$dd": "%d",
+    "$HH": "%H",
+    "$mm": "%M",
+    "$ss": "%S",
+}
+
+other_placeholders = {
+    "$id": lambda req, task_data: filename_regex.sub("_", task_data.session_id),
+    "$p": lambda req, task_data: filename_regex.sub("_", req.prompt)[:50],
+    "$s": lambda req, task_data: str(req.seed),
+}
+
+class ImageNumber:
+    _factory = None
+    _evaluated = False
+
+    def __init__(self, factory):
+        self._factory = factory
+        self._evaluated = None
+    def __call__(self) -> int:
+        if self._evaluated is None:
+            self._evaluated = self._factory()
+        return self._evaluated
+
+def format_placeholders(format: str, req: GenerateImageRequest, task_data: TaskData, now = None):
+    if now is None:
+        now = time.time()
+
+    for placeholder, time_format in time_placeholders.items():
+        if placeholder in format:
+            format = format.replace(placeholder, datetime.fromtimestamp(now).strftime(time_format))
+    for placeholder, replace_func in other_placeholders.items():
+        if placeholder in format:
+            format = format.replace(placeholder, replace_func(req, task_data))
+
+    return format
+
+def format_folder_name(format: str, req: GenerateImageRequest, task_data: TaskData):
+    format = format_placeholders(format, req, task_data)
+    return filename_regex.sub("_", format)
+
+def format_file_name(
+    format: str,
+    req: GenerateImageRequest,
+    task_data: TaskData,
+    now: float,
+    batch_file_number: int,
+    folder_img_number: ImageNumber,
+):
+    format = format_placeholders(format, req, task_data, now)
+    
+    if "$n" in format:
+        format = format.replace("$n", f"{folder_img_number():05}")
+    
+    if "$tsb64" in format:
+        img_id = base_repr(int(now * 10000), 36)[-7:] + base_repr(int(batch_file_number), 36) # Base 36 conversion, 0-9, A-Z
+        format = format.replace("$tsb64", img_id)
+    
+    if "$ts" in format:
+        format = format.replace("$ts", str(int(now * 1000) + batch_file_number))
+
+    return filename_regex.sub("_", format)
 
 def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageRequest, task_data: TaskData):
     now = time.time()
-    save_dir_path = os.path.join(task_data.save_to_disk_path, filename_regex.sub("_", task_data.session_id))
+    app_config = app.getConfig()
+    folder_format = app_config.get("folder_format", "$id")
+    save_dir_path = os.path.join(task_data.save_to_disk_path, format_folder_name(folder_format, req, task_data))
     metadata_entries = get_metadata_entries_for_request(req, task_data)
-    make_filename = make_filename_callback(req, now=now)
+    file_number = calculate_img_number(save_dir_path, task_data)
+    make_filename = make_filename_callback(
+        app_config.get("filename_format", "$p_$tsb64"),
+        req,
+        task_data,
+        file_number,
+        now=now,
+    )
 
     if task_data.show_only_filtered_image or filtered_images is images:
         save_images(
@@ -43,17 +123,26 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR
             file_name=make_filename,
             output_format=task_data.output_format,
             output_quality=task_data.output_quality,
+            output_lossless=task_data.output_lossless,
         )
-        if task_data.metadata_output_format.lower() in ["json", "txt", "embed"]:
-            save_dicts(
-                metadata_entries,
-                save_dir_path,
-                file_name=make_filename,
-                output_format=task_data.metadata_output_format,
-                file_format=task_data.output_format,
-            )
+        if task_data.metadata_output_format:
+            for metadata_output_format in task_data.metadata_output_format.split(','):
+                if metadata_output_format.lower() in ["json", "txt", "embed"]:
+                    save_dicts(
+                        metadata_entries,
+                        save_dir_path,
+                        file_name=make_filename,
+                        output_format=metadata_output_format,
+                        file_format=task_data.output_format,
+                    )
     else:
-        make_filter_filename = make_filename_callback(req, now=now, suffix="filtered")
+        make_filter_filename = make_filename_callback(
+            app_config.get("filename_format", "$p_$tsb64"),
+            req,
+            task_data,
+            file_number,
+            now=now,
+            suffix="filtered")
 
         save_images(
             images,
@@ -61,6 +150,7 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR
             file_name=make_filename,
             output_format=task_data.output_format,
             output_quality=task_data.output_quality,
+            output_lossless=task_data.output_lossless,
         )
         save_images(
             filtered_images,
@@ -68,6 +158,7 @@ def save_images_to_disk(images: list, filtered_images: list, req: GenerateImageR
             file_name=make_filter_filename,
             output_format=task_data.output_format,
             output_quality=task_data.output_quality,
+            output_lossless=task_data.output_lossless,
         )
         if task_data.metadata_output_format.lower() in ["json", "txt", "embed"]:
             save_dicts(
@@ -86,6 +177,7 @@ def get_metadata_entries_for_request(req: GenerateImageRequest, task_data: TaskD
             "use_stable_diffusion_model": task_data.use_stable_diffusion_model,
             "use_vae_model": task_data.use_vae_model,
             "use_hypernetwork_model": task_data.use_hypernetwork_model,
+            "use_lora_model": task_data.use_lora_model,
             "use_face_correction": task_data.use_face_correction,
             "use_upscale": task_data.use_upscale,
         }
@@ -94,6 +186,12 @@ def get_metadata_entries_for_request(req: GenerateImageRequest, task_data: TaskD
         metadata["upscale_amount"] = task_data.upscale_amount
     if task_data.use_hypernetwork_model is None:
         del metadata["hypernetwork_strength"]
+    if task_data.use_lora_model is None:
+        if "lora_alpha" in metadata:
+            del metadata["lora_alpha"]
+        app_config = app.getConfig()
+        if not app_config.get("test_diffusers", False) and "use_lora_model" in metadata:
+            del metadata["use_lora_model"]
 
     # if text, format it in the text format expected by the UI
     is_txt_format = task_data.metadata_output_format.lower() == "txt"
@@ -116,17 +214,66 @@ def get_printable_request(req: GenerateImageRequest):
     return metadata
 
 
-def make_filename_callback(req: GenerateImageRequest, suffix=None, now=None):
+def make_filename_callback(
+    filename_format: str,
+    req: GenerateImageRequest,
+    task_data: TaskData,
+    folder_img_number: int,
+    suffix=None,
+    now=None,
+):
     if now is None:
         now = time.time()
 
     def make_filename(i):
-        img_id = base64.b64encode(int(now + i).to_bytes(8, "big")).decode()  # Generate unique ID based on time.
-        img_id = img_id.translate({43: None, 47: None, 61: None})[-8:]  # Remove + / = and keep last 8 chars.
-
-        prompt_flattened = filename_regex.sub("_", req.prompt)[:50]
-        name = f"{prompt_flattened}_{img_id}"
+        name = format_file_name(filename_format, req, task_data, now, i, folder_img_number)
         name = name if suffix is None else f"{name}_{suffix}"
+
         return name
 
     return make_filename
+
+def _calculate_img_number(save_dir_path: str, task_data: TaskData):
+    def get_highest_img_number(accumulator: int, file: os.DirEntry) -> int:
+        if not file.is_file:
+            return accumulator
+        
+        if len(list(filter(lambda e: file.name.endswith(e), app.IMAGE_EXTENSIONS))) == 0:
+            return accumulator
+        
+        get_highest_img_number.number_of_images = get_highest_img_number.number_of_images + 1
+        
+        number_match = img_number_regex.match(file.name)
+        if not number_match:
+            return accumulator
+        
+        file_number = number_match.group().lstrip('0')
+        
+        # Handle 00000
+        return int(file_number) if file_number else 0
+    
+    get_highest_img_number.number_of_images = 0
+    
+    highest_file_number = -1
+
+    if os.path.isdir(save_dir_path):
+        existing_files = list(os.scandir(save_dir_path))
+        highest_file_number = reduce(get_highest_img_number, existing_files, -1)
+
+    calculated_img_number = max(highest_file_number, get_highest_img_number.number_of_images - 1)
+
+    if task_data.session_id in _calculate_img_number.session_img_numbers:
+        calculated_img_number = max(
+            _calculate_img_number.session_img_numbers[task_data.session_id],
+            calculated_img_number,
+        )
+    
+    calculated_img_number = calculated_img_number + 1
+    
+    _calculate_img_number.session_img_numbers[task_data.session_id] = calculated_img_number
+    return calculated_img_number
+
+_calculate_img_number.session_img_numbers = {}
+
+def calculate_img_number(save_dir_path: str, task_data: TaskData):
+    return ImageNumber(lambda: _calculate_img_number(save_dir_path, task_data))

ui/hotfix/9c24e6cd9f499d02c4f21a033736dabd365962dc80fe3aeb57a8f85ea45a20a3.26fead7ea4f0f843f6eb4055dfd25693f1a71f3c6871b184042d4b126244e142

@@ -1,171 +0,0 @@
-{
-  "_name_or_path": "clip-vit-large-patch14/",
-  "architectures": [
-    "CLIPModel"
-  ],
-  "initializer_factor": 1.0,
-  "logit_scale_init_value": 2.6592,
-  "model_type": "clip",
-  "projection_dim": 768,
-  "text_config": {
-    "_name_or_path": "",
-    "add_cross_attention": false,
-    "architectures": null,
-    "attention_dropout": 0.0,
-    "bad_words_ids": null,
-    "bos_token_id": 0,
-    "chunk_size_feed_forward": 0,
-    "cross_attention_hidden_size": null,
-    "decoder_start_token_id": null,
-    "diversity_penalty": 0.0,
-    "do_sample": false,
-    "dropout": 0.0,
-    "early_stopping": false,
-    "encoder_no_repeat_ngram_size": 0,
-    "eos_token_id": 2,
-    "finetuning_task": null,
-    "forced_bos_token_id": null,
-    "forced_eos_token_id": null,
-    "hidden_act": "quick_gelu",
-    "hidden_size": 768,
-    "id2label": {
-      "0": "LABEL_0",
-      "1": "LABEL_1"
-    },
-    "initializer_factor": 1.0,
-    "initializer_range": 0.02,
-    "intermediate_size": 3072,
-    "is_decoder": false,
-    "is_encoder_decoder": false,
-    "label2id": {
-      "LABEL_0": 0,
-      "LABEL_1": 1
-    },
-    "layer_norm_eps": 1e-05,
-    "length_penalty": 1.0,
-    "max_length": 20,
-    "max_position_embeddings": 77,
-    "min_length": 0,
-    "model_type": "clip_text_model",
-    "no_repeat_ngram_size": 0,
-    "num_attention_heads": 12,
-    "num_beam_groups": 1,
-    "num_beams": 1,
-    "num_hidden_layers": 12,
-    "num_return_sequences": 1,
-    "output_attentions": false,
-    "output_hidden_states": false,
-    "output_scores": false,
-    "pad_token_id": 1,
-    "prefix": null,
-    "problem_type": null,
-    "projection_dim" : 768,
-    "pruned_heads": {},
-    "remove_invalid_values": false,
-    "repetition_penalty": 1.0,
-    "return_dict": true,
-    "return_dict_in_generate": false,
-    "sep_token_id": null,
-    "task_specific_params": null,
-    "temperature": 1.0,
-    "tie_encoder_decoder": false,
-    "tie_word_embeddings": true,
-    "tokenizer_class": null,
-    "top_k": 50,
-    "top_p": 1.0,
-    "torch_dtype": null,
-    "torchscript": false,
-    "transformers_version": "4.16.0.dev0",
-    "use_bfloat16": false,
-    "vocab_size": 49408
-  },
-  "text_config_dict": {
-    "hidden_size": 768,
-    "intermediate_size": 3072,
-    "num_attention_heads": 12,
-    "num_hidden_layers": 12,
-    "projection_dim": 768
-  },
-  "torch_dtype": "float32",
-  "transformers_version": null,
-  "vision_config": {
-    "_name_or_path": "",
-    "add_cross_attention": false,
-    "architectures": null,
-    "attention_dropout": 0.0,
-    "bad_words_ids": null,
-    "bos_token_id": null,
-    "chunk_size_feed_forward": 0,
-    "cross_attention_hidden_size": null,
-    "decoder_start_token_id": null,
-    "diversity_penalty": 0.0,
-    "do_sample": false,
-    "dropout": 0.0,
-    "early_stopping": false,
-    "encoder_no_repeat_ngram_size": 0,
-    "eos_token_id": null,
-    "finetuning_task": null,
-    "forced_bos_token_id": null,
-    "forced_eos_token_id": null,
-    "hidden_act": "quick_gelu",
-    "hidden_size": 1024,
-    "id2label": {
-      "0": "LABEL_0",
-      "1": "LABEL_1"
-    },
-    "image_size": 224,
-    "initializer_factor": 1.0,
-    "initializer_range": 0.02,
-    "intermediate_size": 4096,
-    "is_decoder": false,
-    "is_encoder_decoder": false,
-    "label2id": {
-      "LABEL_0": 0,
-      "LABEL_1": 1
-    },
-    "layer_norm_eps": 1e-05,
-    "length_penalty": 1.0,
-    "max_length": 20,
-    "min_length": 0,
-    "model_type": "clip_vision_model",
-    "no_repeat_ngram_size": 0,
-    "num_attention_heads": 16,
-    "num_beam_groups": 1,
-    "num_beams": 1,
-    "num_hidden_layers": 24,
-    "num_return_sequences": 1,
-    "output_attentions": false,
-    "output_hidden_states": false,
-    "output_scores": false,
-    "pad_token_id": null,
-    "patch_size": 14,
-    "prefix": null,
-    "problem_type": null,
-    "projection_dim" : 768,
-    "pruned_heads": {},
-    "remove_invalid_values": false,
-    "repetition_penalty": 1.0,
-    "return_dict": true,
-    "return_dict_in_generate": false,
-    "sep_token_id": null,
-    "task_specific_params": null,
-    "temperature": 1.0,
-    "tie_encoder_decoder": false,
-    "tie_word_embeddings": true,
-    "tokenizer_class": null,
-    "top_k": 50,
-    "top_p": 1.0,
-    "torch_dtype": null,
-    "torchscript": false,
-    "transformers_version": "4.16.0.dev0",
-    "use_bfloat16": false
-  },
-  "vision_config_dict": {
-    "hidden_size": 1024,
-    "intermediate_size": 4096,
-    "num_attention_heads": 16,
-    "num_hidden_layers": 24,
-    "patch_size": 14,
-    "projection_dim": 768
-  }
-}

ui/index.html

@@ -15,9 +15,12 @@
     <link rel="stylesheet" href="/media/css/fontawesome-all.min.css">
     <link rel="stylesheet" href="/media/css/image-editor.css">
     <link rel="stylesheet" href="/media/css/searchable-models.css">
+    <link rel="stylesheet" href="/media/css/image-modal.css">
     <link rel="manifest" href="/media/manifest.webmanifest">
     <script src="/media/js/jquery-3.6.1.min.js"></script>
     <script src="/media/js/jquery-confirm.min.js"></script>
+    <script src="/media/js/jszip.min.js"></script>
+    <script src="/media/js/FileSaver.min.js"></script>
     <script src="/media/js/marked.min.js"></script>
 </head>
 <body>
@@ -27,7 +30,7 @@
             <h1>
                 <img id="logo_img" src="/media/images/icon-512x512.png" >
                 Easy Diffusion
-                <small>v2.5.24 <span id="updateBranchLabel"></span></small>
+                <small>v2.5.34 <span id="updateBranchLabel"></span></small>
             </h1>
         </div>
         <div id="server-status">
@@ -151,15 +154,15 @@
                             <option value="dpm2_a">DPM2 Ancestral</option>
                             <option value="lms">LMS</option>
                             <option value="dpm_solver_stability">DPM Solver (Stability AI)</option>
-                            <option value="dpmpp_2s_a">DPM++ 2s Ancestral</option>
-                            <option value="dpmpp_2m">DPM++ 2m</option>
-                            <option value="dpmpp_sde">DPM++ SDE</option>
-                            <option value="dpm_fast">DPM Fast</option>
-                            <option value="dpm_adaptive">DPM Adaptive</option>
+                            <option value="dpmpp_2s_a">DPM++ 2s Ancestral (Karras)</option>
+                            <option value="dpmpp_2m">DPM++ 2m (Karras)</option>
+                            <option value="dpmpp_sde">DPM++ SDE (Karras)</option>
+                            <option value="dpm_fast">DPM Fast (Karras)</option>
+                            <option value="dpm_adaptive">DPM Adaptive (Karras)</option>
                             <option value="unipc_snr">UniPC SNR</option>
                             <option value="unipc_tu">UniPC TU</option>
                             <option value="unipc_snr_2">UniPC SNR 2</option>
-                            <option value="unipc_tu_2">UniPC TC 2</option>
+                            <option value="unipc_tu_2">UniPC TU 2</option>
                             <option value="unipc_tq">UniPC TQ</option>
                         </select>
                         <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to-Use#samplers" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about samplers</span></i></a>
@@ -209,10 +212,18 @@
                             <option value="2048">2048</option>
                         </select>
                         <label for="height"><small>(height)</small></label>
+                        <div id="small_image_warning" class="displayNone">Small image sizes can cause bad image quality</div>
                     </td></tr>
                     <tr class="pl-5"><td><label for="num_inference_steps">Inference Steps:</label></td><td> <input id="num_inference_steps" name="num_inference_steps" size="4" value="25" onkeypress="preventNonNumericalInput(event)"></td></tr>
                     <tr class="pl-5"><td><label for="guidance_scale_slider">Guidance Scale:</label></td><td> <input id="guidance_scale_slider" name="guidance_scale_slider" class="editor-slider" value="75" type="range" min="11" max="500"> <input id="guidance_scale" name="guidance_scale" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"></td></tr>
                     <tr id="prompt_strength_container" class="pl-5"><td><label for="prompt_strength_slider">Prompt Strength:</label></td><td> <input id="prompt_strength_slider" name="prompt_strength_slider" class="editor-slider" value="80" type="range" min="0" max="99"> <input id="prompt_strength" name="prompt_strength" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"><br/></td></tr>
+                    <tr id="lora_model_container" class="pl-5"><td><label for="lora_model">LoRA:</i></label></td><td>
+                        <input id="lora_model" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
+                    </td></tr>
+                    <tr id="lora_alpha_container" class="pl-5">
+                        <td><label for="lora_alpha_slider">LoRA Strength:</label></td>
+                        <td> <input id="lora_alpha_slider" name="lora_alpha_slider" class="editor-slider" value="50" type="range" min="0" max="100"> <input id="lora_alpha" name="lora_alpha" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"><br/></td>
+                    </tr>
                     <tr class="pl-5"><td><label for="hypernetwork_model">Hypernetwork:</i></label></td><td>
                         <input id="hypernetwork_model" type="text" spellcheck="false" autocomplete="off" class="model-filter" data-path="" />
                     </td></tr>
@@ -226,6 +237,9 @@
                             <option value="png">png</option>
                             <option value="webp">webp</option>
                         </select>
+                        <span id="output_lossless_container" class="displayNone">
+                            <input id="output_lossless" name="output_lossless" type="checkbox"><label for="output_lossless">Lossless</label></td></tr>
+                        </span>
                     </td></tr>
                     <tr class="pl-5" id="output_quality_row"><td><label for="output_quality">Image Quality:</label></td><td>
                     <input id="output_quality_slider" name="output_quality" class="editor-slider" value="75" type="range" min="10" max="95"> <input id="output_quality" name="output_quality" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)">
@@ -278,18 +292,22 @@
         </div>
 
         <div id="preview" class="col-free">
+
             <div id="initial-text">
                 Type a prompt and press the "Make Image" button.<br/><br/>You can set an "Initial Image" if you want to guide the AI.<br/><br/>
                 You can also add modifiers like "Realistic", "Pencil Sketch", "ArtStation" etc by browsing through the "Image Modifiers" section 
                 and selecting the desired modifiers.<br/><br/>
                 Click "Image Settings" for additional settings like seed, image size, number of images to generate etc.<br/><br/>Enjoy! :)
             </div>
-
             <div id="preview-content">
-                <div id="preview-tools">
+                <div id="preview-tools" class="displayNone">
                     <button id="clear-all-previews" class="secondaryButton"><i class="fa-solid fa-trash-can icon"></i> Clear All</button>
-                    <button id="save-all-images" class="tertiaryButton"><i class="fa-solid fa-download icon"></i> Download All Images</button>
+                    <button class="tertiaryButton" id="show-download-popup"><i class="fa-solid fa-download"></i> Download images</button>
                     <div class="display-settings">
+                        <button id="undo" class="displayNone primaryButton">
+                            Undo <i class="fa-solid fa-rotate-left icon"></i>
+                            <span class="simple-tooltip left">Undo last remove</span>
+                        </button>
                         <span class="auto-scroll"></span> <!-- hack for Rabbit Hole update -->
                         <button id="auto_scroll_btn" class="tertiaryButton">
                             <i class="fa-solid fa-arrows-up-to-line icon"></i>
@@ -382,6 +400,31 @@
     </div>
     
 
+    <div class="popup" id="download-images-popup">
+        <div>
+            <i class="close-button fa-solid fa-xmark"></i>
+            <h1>Download all images</h1>
+            <div class="parameters-table">
+                <div>
+                    <div><i class="fa fa-file-zipper"></i></div>
+                    <div><label for="theme">Download as a ZIP file</label><small>Instead of downloading individual files, generate one zip file with all images</small></div>
+                    <div><div class="input-toggle"><input id="zip_toggle" name="zip_toggle" checked="" type="checkbox"><label for="zip_toggle"></label></div></div>
+                </div>
+                <div id="download-add-folders">
+                    <div><i class="fa fa-folder-tree"></i></div>
+                    <div><label for="theme">Add per-job folders</label><small>Place images into job folders</small></div>
+                    <div><div class="input-toggle"><input id="tree_toggle" name="tree_toggle" checked="" type="checkbox"><label for="tree_toggle"></label></div></div>
+                </div>
+                <div>
+                    <div><i class="fa fa-sliders"></i></div>
+                    <div><label for="theme">Add metadata files</label><small>For each image, also download a JSON file with all the settings used to generate the image</small></div>
+                    <div><div class="input-toggle"><input id="json_toggle" name="json_toggle" checked="" type="checkbox"><label for="json_toggle"></label></div></div>
+                </div>
+            </div>
+            <br/>
+            <button id="save-all-images" class="primaryButton"><i class="fa-solid fa-images"></i> Start download</button>
+        </div>
+    </div>
     <div id="save-settings-config" class="popup">
         <div>
             <i class="close-button fa-solid fa-xmark"></i>
@@ -392,12 +435,12 @@
         </div>
     </div>
 
-    <div id="modifier-settings-config" class="popup">
+    <div id="modifier-settings-config" class="popup" tabindex="0">
         <div>
             <i class="close-button fa-solid fa-xmark"></i>
             <h1>Modifier Settings</h1>
             <p>Set your custom modifiers (one per line)</p>
-            <textarea id="custom-modifiers-input" placeholder="Enter your custom modifiers, one-per-line"></textarea>
+            <textarea id="custom-modifiers-input" placeholder="Enter your custom modifiers, one-per-line" spellcheck="false"></textarea>
             <p><small><b>Tip:</b> You can include special characters like {} () [] and |. You can also put multiple comma-separated phrases in a single line, to make a single modifier that combines all of those.</small></p>
         </div>
     </div>
@@ -460,6 +503,7 @@
 <script src="media/js/themes.js"></script>
 <script src="media/js/dnd.js"></script>
 <script src="media/js/image-editor.js"></script>
+<script src="media/js/image-modal.js"></script>
 <script>
 async function init() {
     await initSettings()
@@ -471,12 +515,12 @@ async function init() {
 
     SD.init({
         events: {
-            statusChange: setServerStatus
-            , idle: onIdle
+            statusChange: setServerStatus,
+            idle: onIdle
         }
     })
 
-    playSound()
+    // playSound()
 }
 
 init()

ui/media/css/fonts.css

@@ -3,7 +3,7 @@
     font-family: 'Work Sans';
     font-style: normal;
     font-weight: 400;
-    src: local(''),
+    src: local('Work Sans'),
          url('/media/fonts/work-sans-v18-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
          url('/media/fonts/work-sans-v18-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
   }
@@ -13,7 +13,7 @@
     font-family: 'Work Sans';
     font-style: normal;
     font-weight: 600;
-    src: local(''),
+    src: local('Work Sans'),
          url('/media/fonts/work-sans-v18-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
          url('/media/fonts/work-sans-v18-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
   }
@@ -23,7 +23,7 @@
     font-family: 'Work Sans';
     font-style: normal;
     font-weight: 700;
-    src: local(''),
+    src: local('Work Sans'),
          url('/media/fonts/work-sans-v18-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
          url('/media/fonts/work-sans-v18-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
   }
@@ -33,8 +33,8 @@
     font-family: 'Work Sans';
     font-style: normal;
     font-weight: 800;
-    src: local(''),
+    src: local('Work Sans'),
          url('/media/fonts/work-sans-v18-latin-800.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
          url('/media/fonts/work-sans-v18-latin-800.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
   }
-  
+  

ui/media/css/image-editor.css

@@ -149,16 +149,21 @@
 	pointer-events: none;
 }
 
-
 .image-editor-popup {
 	--popup-margin: 16px;
 	--popup-padding: 24px;
 }
 
+@media screen and (min-width: 700px) {
+	.image-editor-popup {
+		overflow-y: auto;
+	}
+}
+
 .image-editor-popup > div {
 	margin: var(--popup-margin);
 	padding: var(--popup-padding);
-	min-height: calc(100vh - (2 * var(--popup-margin)));
+	min-height: calc(99h - (2 * var(--popup-margin)));
 	max-width: none;
 	min-width: fit-content;
 }
@@ -186,7 +191,7 @@
 
 
 .image-editor-popup > div > div {
-	min-height: calc(100vh - (2 * var(--popup-margin)) - (2 * var(--popup-padding)));
+	min-height: calc(99vh - (2 * var(--popup-margin)) - (2 * var(--popup-padding)));
 }
 
 .inpainter .image_editor_color {

ui/media/css/image-modal.css

@@ -0,0 +1,88 @@
+#viewFullSizeImgModal {
+    --popup-padding: 24px;
+    position: sticky;
+    padding: var(--popup-padding);
+    pointer-events: none;
+    width: 100vw;
+    height: 100vh;
+    box-sizing: border-box;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    overflow: hidden;
+    z-index: 1001;
+}
+
+#viewFullSizeImgModal:not(.active) {
+    display: none;
+}
+
+#viewFullSizeImgModal > * {
+    pointer-events: auto;
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
+#viewFullSizeImgModal .backdrop {
+    max-width: unset;
+    width: 100%;
+    max-height: unset;
+    height: 100%;
+    inset: 0;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 1001;
+    opacity: .5;
+    border: none;
+    box-shadow: none;
+    overflow: hidden;
+}
+
+#viewFullSizeImgModal .content {
+    min-height: initial;
+    max-height: calc(100vh - (var(--popup-padding) * 2));
+    height: fit-content;
+    min-width: initial;
+    max-width: calc(100vw - (var(--popup-padding) * 2));
+    width: fit-content;
+    z-index: 1003;
+    overflow: visible;
+}
+
+#viewFullSizeImgModal .image-wrapper {
+    min-height: initial;
+    max-height: calc(100vh - (var(--popup-padding) * 2));
+    height: fit-content;
+    min-width: initial;
+    max-width: calc(100vw - (var(--popup-padding) * 2));
+    width: fit-content;
+    box-sizing: border-box;
+    pointer-events: auto;
+    margin: 0;
+    padding: 0;
+    overflow: auto;
+}
+
+#viewFullSizeImgModal img.natural-zoom {
+    max-width: calc(100vh - (var(--popup-padding) * 2) - 4px);
+    max-height: calc(100vh - (var(--popup-padding) * 2) - 4px);
+}
+
+#viewFullSizeImgModal .content > div::-webkit-scrollbar-track, #viewFullSizeImgModal .content > div::-webkit-scrollbar-corner {
+    background: rgba(0, 0, 0, .5)
+}
+
+#viewFullSizeImgModal .menu-bar {
+    position: absolute;
+    top: 0;
+    right: 0;
+    padding-right: var(--scrollbar-width);
+}
+
+#viewFullSizeImgModal .menu-bar .tertiaryButton {
+    font-size: 1.2em;
+    margin: 12px 12px 0 0;
+    cursor: pointer;
+}

ui/media/css/main.css

@@ -98,11 +98,23 @@ code {
 #footer-spacer {
     flex: 0.7
 }
-.imgSeedLabel {
+.imgInfoLabel {
     font-size: 0.8em;
     background-color: var(--background-color2);
-    border-radius: 3px;
+}
+.imgSeedLabel {
     padding: 5px;
+    border-radius: 0px 3px 3px 0px;
+}
+.imgExpandBtn {
+    border-radius: 3px 0px 0px 3px;
+    border-right: 1px solid var(--tertiary-border-color);
+    padding: 5px 5px 5px;
+    padding-left: 7px;
+    cursor: pointer;
+}
+.imgExpandBtn:hover {
+    background-color: var(--accent-color);
 }
 .imgItem {
     display: inline-block;
@@ -143,9 +155,12 @@ code {
 .imgContainer:hover > .img_bottom_label {
     opacity: 60%;
 }
-.imgItemInfo * {
+.imgItemInfo > * {
     margin-bottom: 7px;
 }
+.imgItemInfo .tasksBtns {
+    margin-left: 5pt;
+}
 .imgItem .image_clear_btn {
     transform: translate(40%, -50%);
 }
@@ -223,6 +238,10 @@ code {
 #stopImage:hover {
     background: rgb(177, 27, 0);
 }
+#undo {
+    float: right;
+    margin-left: 5px;
+}
 
 div#render-buttons {
     gap: 3px;
@@ -280,6 +299,7 @@ div.img-preview img {
     width:100%;
     height: 100%;
     max-height: 70vh;
+    cursor: pointer;
 }
 .line-separator {
     background: var(--background-color3);
@@ -293,8 +313,7 @@ div.img-preview img {
 #server-status {
     position: absolute;
     right: 16px;
-    top: 50%;
-    transform: translateY(-50%);
+    top: 4px;
     text-align: right;
 }
 #server-status-color {
@@ -320,6 +339,7 @@ div.img-preview img {
     position: relative;
     background: var(--background-color4);
     display: flex;
+    padding: 12px 0 0;
 }
 .tab .icon {
     padding-right: 4pt;
@@ -328,8 +348,7 @@ div.img-preview img {
 }
 #logo {
     display: inline;
-    padding: 12px;
-    padding-top: 8px;
+    padding: 0 12px 12px;
     white-space: nowrap;
 }
 #logo h1 {
@@ -414,11 +433,10 @@ div.img-preview img {
     display: none;
     position: absolute;
     z-index: 2;
-    width: max-content;
-
-    padding: 5px;
+    border-radius: 7px;
+    padding: 0px;
     margin-bottom: 15px;
-    box-shadow: 0 20px 28px 0 rgba(0, 0, 0, 0.15), 0 6px 20px 0 rgba(0, 0, 0, 0.15);
+    box-shadow: 0 20px 28px 0 rgba(0, 0, 0, 0.75), 0 6px 20px 0 rgba(0, 0, 0, 0.75);
 }
 .dropdown:hover .dropdown-content {
     display: block;
@@ -442,8 +460,8 @@ div.img-preview img {
 
 .dropdown-item {
     padding: 4px;
-    background: var(--background-color4);
-    border: 2px solid var(--background-color2);
+    background: var(--background-color1);
+    border: 2px solid var(--background-color4);
 }
 
 .dropdown-item:first-child {
@@ -544,15 +562,25 @@ div.img-preview img {
     float: right;
 }
 #preview-tools {
-    display: none;
     padding: 4pt;
 }
+#preview-tools .display-settings .dropdown-content {
+    right: -6px;
+    top: 20px;
+    box-shadow: none;
+    width: max-content;
+}
 .taskConfig {
     font-size: 10pt;
     color: #aaa;
     margin-bottom: 5pt;
     margin-top: 5pt;
 }
+
+.taskConfigContainer {
+    display: inline;
+}
+
 .img-batch {
     display: inline;
 }
@@ -810,7 +838,7 @@ input::file-selector-button {
 }
 
 /* Small screens */
-@media screen and (max-width: 1265px) {
+@media screen and (max-width: 1365px) {
     #top-nav {
         flex-direction: column;
     }
@@ -860,9 +888,6 @@ input::file-selector-button {
     .tab .icon {
         padding-right: 0px;
     }
-    #server-status {
-        top: 75%;
-    }
     .popup > div {
         padding-left: 5px !important;
         padding-right: 5px !important;
@@ -1105,6 +1130,8 @@ input::file-selector-button {
 .tab-container {
     display: flex;
     align-items: flex-end;
+    overflow-x: auto;
+    overflow-y: hidden;
 }
 
 .tab {
@@ -1199,6 +1226,11 @@ div.top-right {
     right: 8px;
 }
 
+#small_image_warning {
+     font-size: smaller;
+     color: var(--status-orange);
+}
+
 button#save-system-settings-btn {
     padding: 4pt 8pt;
 }
@@ -1209,6 +1241,10 @@ button#save-system-settings-btn {
     line-height: 200%;
 }
 
+#download-images-popup .parameters-table > div {
+    background: var(--background-color1);
+}
+
 /* SCROLLBARS */
 :root {
     --scrollbar-width: 14px;

ui/media/css/modifier-thumbnails.css

@@ -153,6 +153,10 @@
     position: absolute;
     z-index: 3;
 }
+.modifier-card-overlay:hover ~ .modifier-card-container .modifier-card-label.tooltip .tooltip-text {
+    visibility: visible;
+    opacity: 1;
+}
 .modifier-card:hover > .modifier-card-image-container .modifier-card-image-overlay {
     opacity: 1;
 }
@@ -220,4 +224,4 @@
 #modifier-settings-config textarea {
     width: 90%;
     height: 150px;
-}
+}

ui/media/css/themes.css

@@ -37,6 +37,9 @@
 
     /* Main theme color, hex color fallback. */
     --theme-color-fallback: #673AB6;
+    --status-orange: rgb(200, 139, 0);
+    --status-green: green;
+    --status-red: red;
 }
 
 .theme-light {
@@ -180,4 +183,4 @@
     border: none;
     box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.25);
     border-radius: 10px;
-}
+}

ui/media/js/FileSaver.min.js

@@ -0,0 +1,2 @@
+(function(a,b){if("function"==typeof define&&define.amd)define([],b);else if("undefined"!=typeof exports)b();else{b(),a.FileSaver={exports:{}}.exports}})(this,function(){"use strict";function b(a,b){return"undefined"==typeof b?b={autoBom:!1}:"object"!=typeof b&&(console.warn("Deprecated: Expected third argument to be a object"),b={autoBom:!b}),b.autoBom&&/^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(a.type)?new Blob(["\uFEFF",a],{type:a.type}):a}function c(a,b,c){var d=new XMLHttpRequest;d.open("GET",a),d.responseType="blob",d.onload=function(){g(d.response,b,c)},d.onerror=function(){console.error("could not download file")},d.send()}function d(a){var b=new XMLHttpRequest;b.open("HEAD",a,!1);try{b.send()}catch(a){}return 200<=b.status&&299>=b.status}function e(a){try{a.dispatchEvent(new MouseEvent("click"))}catch(c){var b=document.createEvent("MouseEvents");b.initMouseEvent("click",!0,!0,window,0,0,0,80,20,!1,!1,!1,!1,0,null),a.dispatchEvent(b)}}var f="object"==typeof window&&window.window===window?window:"object"==typeof self&&self.self===self?self:"object"==typeof global&&global.global===global?global:void 0,a=/Macintosh/.test(navigator.userAgent)&&/AppleWebKit/.test(navigator.userAgent)&&!/Safari/.test(navigator.userAgent),g=f.saveAs||("object"!=typeof window||window!==f?function(){}:"download"in HTMLAnchorElement.prototype&&!a?function(b,g,h){var i=f.URL||f.webkitURL,j=document.createElement("a");g=g||b.name||"download",j.download=g,j.rel="noopener","string"==typeof b?(j.href=b,j.origin===location.origin?e(j):d(j.href)?c(b,g,h):e(j,j.target="_blank")):(j.href=i.createObjectURL(b),setTimeout(function(){i.revokeObjectURL(j.href)},4E4),setTimeout(function(){e(j)},0))}:"msSaveOrOpenBlob"in navigator?function(f,g,h){if(g=g||f.name||"download","string"!=typeof f)navigator.msSaveOrOpenBlob(b(f,h),g);else if(d(f))c(f,g,h);else{var i=document.createElement("a");i.href=f,i.target="_blank",setTimeout(function(){e(i)})}}:function(b,d,e,g){if(g=g||open("","_blank"),g&&(g.document.title=g.document.body.innerText="downloading..."),"string"==typeof b)return c(b,d,e);var h="application/octet-stream"===b.type,i=/constructor/i.test(f.HTMLElement)||f.safari,j=/CriOS\/[\d]+/.test(navigator.userAgent);if((j||h&&i||a)&&"undefined"!=typeof FileReader){var k=new FileReader;k.onloadend=function(){var a=k.result;a=j?a:a.replace(/^data:[^;]*;/,"data:attachment/file;"),g?g.location.href=a:location=a,g=null},k.readAsDataURL(b)}else{var l=f.URL||f.webkitURL,m=l.createObjectURL(b);g?g.location=m:location.href=m,g=null,setTimeout(function(){l.revokeObjectURL(m)},4E4)}});f.saveAs=g.saveAs=g,"undefined"!=typeof module&&(module.exports=g)});
+

ui/media/js/auto-save.js

@@ -15,6 +15,7 @@ const SETTINGS_IDS_LIST = [
     "stable_diffusion_model",
     "vae_model",
     "hypernetwork_model",
+    "lora_model",
     "sampler_name",
     "width",
     "height",
@@ -22,8 +23,10 @@ const SETTINGS_IDS_LIST = [
     "guidance_scale",
     "prompt_strength",
     "hypernetwork_strength",
+    "lora_alpha",
     "output_format",
     "output_quality",
+    "output_lossless",
     "negative_prompt",
     "stream_image_progress",
     "use_face_correction",
@@ -46,7 +49,10 @@ const SETTINGS_IDS_LIST = [
     "apply_color_correction",
     "process_order_toggle",
     "thumbnail_size",
-    "auto_scroll"
+    "auto_scroll",
+    "zip_toggle",
+    "tree_toggle",
+    "json_toggle"
 ]
 
 const IGNORE_BY_DEFAULT = [

ui/media/js/dnd.js

@@ -97,6 +97,7 @@ const TASK_MAPPING = {
                 return
             }
             randomSeedField.checked = false
+            randomSeedField.dispatchEvent(new Event('change')) // let plugins know that the state of the random seed toggle changed
             seedField.disabled = false
             seedField.value = seed
         },
@@ -230,6 +231,28 @@ const TASK_MAPPING = {
         readUI: () => vaeModelField.value,
         parse: (val) => val
     },
+    use_lora_model: { name: 'LoRA model',
+        setUI: (use_lora_model) => {
+            const oldVal = loraModelField.value
+            use_lora_model = (use_lora_model === undefined || use_lora_model === null || use_lora_model === 'None' ? '' : use_lora_model)
+
+            if (use_lora_model !== '') {
+                use_lora_model = getModelPath(use_lora_model, ['.ckpt', '.safetensors'])
+                use_lora_model = use_lora_model !== '' ? use_lora_model : oldVal
+            }
+            loraModelField.value = use_lora_model
+        },
+        readUI: () => loraModelField.value,
+        parse: (val) => val
+    },
+    lora_alpha: { name: 'LoRA Strength',
+        setUI: (lora_alpha) => {
+            loraAlphaField.value = lora_alpha
+            updateLoraAlphaSlider()
+        },
+        readUI: () => parseFloat(loraAlphaField.value),
+        parse: (val) => parseFloat(val)
+    },
     use_hypernetwork_model: { name: 'Hypernetwork model',
         setUI: (use_hypernetwork_model) => {
             const oldVal = hypernetworkModelField.value
@@ -325,7 +348,12 @@ function restoreTaskToUI(task, fieldsToSkip) {
         hypernetworkModelField.value = ""
         hypernetworkModelField.dispatchEvent(new Event("change"))
     }
-
+    
+    if (!('use_lora_model' in task.reqBody)) {
+        loraModelField.value = ""
+        loraModelField.dispatchEvent(new Event("change"))
+    }
+    
     // restore the original prompt if provided (e.g. use settings), fallback to prompt as needed (e.g. copy/paste or d&d)
     promptField.value = task.reqBody.original_prompt
     if (!('original_prompt' in task.reqBody)) {
@@ -490,6 +518,7 @@ async function parseContent(text) {
         return true
     } else {
         console.warn(`Raw text content couldn't be parsed.`)
+        promptField.value = text
         return false
     }
 }
@@ -579,7 +608,7 @@ document.addEventListener('paste', async (event) => {
     }
     const paste = (event.clipboardData || window.clipboardData).getData('text')
     const selection = window.getSelection()
-    if (selection.toString().trim().length <= 0 && await parseContent(paste)) {
+    if (paste != "" && selection.toString().trim().length <= 0 && await parseContent(paste)) {
         event.preventDefault()
         return
     }

ui/media/js/engine.js

@@ -744,6 +744,7 @@
         "block_nsfw": false,
         "output_format": "png",
         "output_quality": 75,
+        "output_lossless": false,
     }
     const TASK_OPTIONAL = {
         "device": 'string',
@@ -755,6 +756,7 @@
         "use_vae_model": 'string',
         "use_hypernetwork_model": 'string',
         "hypernetwork_strength": 'number',
+        "output_lossless": 'boolean',
     }
 
     // Higer values will result in...

ui/media/js/image-editor.js

@@ -171,6 +171,7 @@ const IMAGE_EDITOR_ACTIONS = [
 		icon: "fa-solid fa-xmark",
 		handler: (editor) => {
 			editor.ctx_current.clearRect(0, 0, editor.width, editor.height)
+			imageEditor.setImage(null, editor.width, editor.height) // properly reset the drawing canvas
 		},
 		trackHistory: true
 	},
@@ -511,13 +512,13 @@ class ImageEditor {
 	}
 	show() {
 		this.popup.classList.add("active")
-		document.addEventListener("keydown", this.keyHandlerBound)
-		document.addEventListener("keyup", this.keyHandlerBound)
+		document.addEventListener("keydown", this.keyHandlerBound, true)
+		document.addEventListener("keyup", this.keyHandlerBound, true)
 	}
 	hide() {
 		this.popup.classList.remove("active")
-		document.removeEventListener("keydown", this.keyHandlerBound)
-		document.removeEventListener("keyup", this.keyHandlerBound)
+		document.removeEventListener("keydown", this.keyHandlerBound, true)
+		document.removeEventListener("keyup", this.keyHandlerBound, true)
 	}
 	setSize(width, height) {
 		if (width == this.width && height == this.height) {
@@ -671,12 +672,18 @@ class ImageEditor {
 				else {
 					this.history.redo()
 				}
+				event.stopPropagation();
+				event.preventDefault();
 			}
 			if (event.key == "y" && event.ctrlKey) {
 				this.history.redo()
+				event.stopPropagation();
+				event.preventDefault();
 			}
 			if (event.key === "Escape") {
 				this.hide()
+				event.stopPropagation();
+				event.preventDefault();
 			}
 		}
 		

ui/media/js/image-modal.js

@@ -0,0 +1,191 @@
+"use strict"
+
+/**
+ * @typedef {object} ImageModalRequest
+ * @property {string} src
+ * @property {ImageModalRequest | () => ImageModalRequest | undefined} previous
+ * @property {ImageModalRequest | () => ImageModalRequest | undefined} next
+ */
+
+/**
+ * @type {(() => (string | ImageModalRequest) | string | ImageModalRequest) => {}}
+ */
+const imageModal = (function() {
+    const backElem = createElement(
+        'i',
+        undefined,
+        ['fa-solid', 'fa-arrow-left', 'tertiaryButton'],
+    )
+
+    const forwardElem = createElement(
+        'i',
+        undefined,
+        ['fa-solid', 'fa-arrow-right', 'tertiaryButton'],
+    )
+
+    const zoomElem = createElement(
+        'i',
+        undefined,
+        ['fa-solid', 'tertiaryButton'],
+    )
+
+    const closeElem = createElement(
+        'i',
+        undefined,
+        ['fa-solid', 'fa-xmark', 'tertiaryButton'],
+    )
+
+    const menuBarElem = createElement('div', undefined, 'menu-bar', [backElem, forwardElem, zoomElem, closeElem])
+
+    const imageContainer = createElement('div', undefined, 'image-wrapper')
+
+    const backdrop = createElement('div', undefined, 'backdrop')
+
+    const modalContainer = createElement('div', undefined, 'content', [menuBarElem, imageContainer])
+
+    const modalElem = createElement(
+        'div',
+        { id: 'viewFullSizeImgModal' },
+        ['popup'],
+        [backdrop, modalContainer],
+    )
+    document.body.appendChild(modalElem)
+
+    const setZoomLevel = (value) => {
+        const img = imageContainer.querySelector('img')
+
+        if (value) {
+            zoomElem.classList.remove('fa-magnifying-glass-plus')
+            zoomElem.classList.add('fa-magnifying-glass-minus')
+            if (img) {
+                img.classList.remove('natural-zoom')
+
+                let zoomLevel = typeof value === 'number' ? value : img.dataset.zoomLevel
+                if (!zoomLevel) {
+                    zoomLevel = 100
+                }
+
+                img.dataset.zoomLevel = zoomLevel
+                img.width = img.naturalWidth * (+zoomLevel / 100)
+                img.height = img.naturalHeight * (+zoomLevel / 100)
+            }
+        } else {
+            zoomElem.classList.remove('fa-magnifying-glass-minus')
+            zoomElem.classList.add('fa-magnifying-glass-plus')
+            if (img) {
+                img.classList.add('natural-zoom')
+                img.removeAttribute('width')
+                img.removeAttribute('height')
+            }
+        }
+    }
+
+    zoomElem.addEventListener(
+        'click',
+        () => setZoomLevel(imageContainer.querySelector('img')?.classList?.contains('natural-zoom')),
+    )
+
+    const state = {
+        previous: undefined,
+        next: undefined,
+    }
+
+    const clear = () => {
+        imageContainer.innerHTML = ''
+
+        Object.keys(state).forEach(key => delete state[key])
+    }
+
+    const close = () => {
+        clear()
+        modalElem.classList.remove('active')
+        document.body.style.overflow = 'initial'
+    }
+
+    /**
+     * @param {() => (string | ImageModalRequest) | string | ImageModalRequest} optionsFactory
+     */
+    function init(optionsFactory) {
+        if (!optionsFactory) {
+            close()
+            return
+        }
+
+        clear()
+
+        const options = typeof optionsFactory === 'function' ? optionsFactory() : optionsFactory
+        const src = typeof options === 'string' ? options : options.src
+
+        const imgElem = createElement('img', { src }, 'natural-zoom')
+        imageContainer.appendChild(imgElem)
+        modalElem.classList.add('active')
+        document.body.style.overflow = 'hidden'
+        setZoomLevel(false)
+
+        if (typeof options === 'object' && options.previous) {
+            state.previous = options.previous
+            backElem.style.display = 'unset'
+        } else {
+            backElem.style.display = 'none'
+        }
+
+        if (typeof options === 'object' && options.next) {
+            state.next = options.next
+            forwardElem.style.display = 'unset'
+        } else {
+            forwardElem.style.display = 'none'
+        }
+    }
+
+    const back = () => {
+        if (state.previous) {
+            init(state.previous)
+        } else {
+            backElem.style.display = 'none'
+        }
+    }
+
+    const forward = () => {
+        if (state.next) {
+            init(state.next)
+        } else {
+            forwardElem.style.display = 'none'
+        }
+    }
+
+    window.addEventListener('keydown', (e) => {
+        if (modalElem.classList.contains('active')) {
+            switch (e.key) {
+                case 'Escape':
+                    close()
+                    break
+                case 'ArrowLeft':
+                    back()
+                    break
+                case 'ArrowRight':
+                    forward()
+                    break
+            }
+        }
+    })
+    window.addEventListener('click', (e) => {
+        if (modalElem.classList.contains('active')) {
+            if (e.target === backdrop || e.target === closeElem) {
+                close()
+            }
+
+            e.stopPropagation()
+            e.stopImmediatePropagation()
+            e.preventDefault()
+        }
+    })
+
+    backElem.addEventListener('click', back)
+
+    forwardElem.addEventListener('click', forward)
+
+    /**
+     * @param {() => (string | ImageModalRequest) | string | ImageModalRequest} optionsFactory
+     */
+    return (optionsFactory) => init(optionsFactory)
+})()

ui/media/js/image-modifiers.js

@@ -1,6 +1,7 @@
 let activeTags = []
 let modifiers = []
 let customModifiersGroupElement = undefined
+let customModifiersInitialContent
 
 let editorModifierEntries = document.querySelector('#editor-modifiers-entries')
 let editorModifierTagsList = document.querySelector('#editor-inputs-tags-list')
@@ -18,6 +19,9 @@ const CUSTOM_MODIFIERS_KEY = "customModifiers"
 
 function createModifierCard(name, previews, removeBy) {
     const modifierCard = document.createElement('div')
+    let style = previewImageField.value
+    let styleIndex = (style=='portrait') ? 0 : 1
+
     modifierCard.className = 'modifier-card'
     modifierCard.innerHTML = `
     <div class="modifier-card-overlay"></div>
@@ -37,8 +41,8 @@ function createModifierCard(name, previews, removeBy) {
     errorText.innerText = 'No Image'
 
     if (typeof previews == 'object') {
-        image.src = previews[0]; // portrait
-        image.setAttribute('preview-type', 'portrait')
+        image.src = previews[styleIndex]; // portrait
+        image.setAttribute('preview-type', style)
     } else {
         image.remove()
     }
@@ -125,7 +129,10 @@ function createModifierGroup(modifierGroup, initiallyExpanded, removeBy) {
 }
 
 function trimModifiers(tag) {
-    return tag.replace(/^\(+|\)+$/g, '').replace(/^\[+|\]+$/g, '')
+    // Remove trailing '-' and/or '+'
+    tag = tag.replace(/[-+]+$/, '');
+    // Remove parentheses at beginning and end
+    return tag.replace(/^[(]+|[\s)]+$/g, '');
 }
 
 async function loadModifiers() {
@@ -145,14 +152,15 @@ async function loadModifiers() {
             createCollapsibles(editorModifierEntries)
         }
     } catch (e) {
-        console.log('error fetching modifiers', e)
+        console.error('error fetching modifiers', e)
     }
 
     loadCustomModifiers()
+    resizeModifierCards(modifierCardSizeSlider.value)
     document.dispatchEvent(new Event('loadImageModifiers'))
 }
 
-function refreshModifiersState(newTags) {
+function refreshModifiersState(newTags, inactiveTags) {
     // clear existing modifiers
     document.querySelector('#editor-modifiers').querySelectorAll('.modifier-card').forEach(modifierCard => {
         const modifierName = modifierCard.querySelector('.modifier-card-label p').dataset.fullName // pick the full modifier name
@@ -173,9 +181,9 @@ function refreshModifiersState(newTags) {
                 // add modifier to active array
                 if (!activeTags.map(x => x.name).includes(tag)) { // only add each tag once even if several custom modifier cards share the same tag
                     const imageModifierCard = modifierCard.cloneNode(true)
-                    imageModifierCard.querySelector('.modifier-card-label p').innerText = shortModifierName
+                    imageModifierCard.querySelector('.modifier-card-label p').innerText = tag.replace(modifierName, shortModifierName)
                     activeTags.push({
-                        'name': modifierName,
+                        'name': tag,
                         'element': imageModifierCard,
                         'originElement': modifierCard
                     })
@@ -206,7 +214,7 @@ function refreshModifiersState(newTags) {
             })
         }
     })
-    refreshTagsList()
+    refreshTagsList(inactiveTags)
 }
 
 function refreshInactiveTags(inactiveTags) {
@@ -222,14 +230,14 @@ function refreshInactiveTags(inactiveTags) {
     // update cards
     let overlays = document.querySelector('#editor-inputs-tags-list').querySelectorAll('.modifier-card-overlay')
     overlays.forEach (i => {
-        let modifierName = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].innerText
-        if (inactiveTags.find(element => element === modifierName) !== undefined) {
+        let modifierName = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].dataset.fullName
+        if (inactiveTags?.find(element => element === modifierName) !== undefined) {
             i.parentElement.classList.add('modifier-toggle-inactive')
         }
     })
 }
 
-function refreshTagsList() {
+function refreshTagsList(inactiveTags) {
     editorModifierTagsList.innerHTML = ''
 
     if (activeTags.length == 0) {
@@ -261,6 +269,8 @@ function refreshTagsList() {
     let brk = document.createElement('br')
     brk.style.clear = 'both'
     editorModifierTagsList.appendChild(brk)
+    refreshInactiveTags(inactiveTags)
+    document.dispatchEvent(new Event('refreshImageModifiers')) // notify plugins that the image tags have been refreshed 
 }
 
 function toggleCardState(modifierName, makeActive) {
@@ -344,9 +354,28 @@ previewImageField.onchange = () => changePreviewImages(previewImageField.value)
 
 modifierSettingsBtn.addEventListener('click', function(e) {
     modifierSettingsOverlay.classList.add("active")
+    customModifiersTextBox.setSelectionRange(0, 0)
+    customModifiersTextBox.focus()
+    customModifiersInitialContent = customModifiersTextBox.value // preserve the initial content
     e.stopPropagation()
 })
 
+modifierSettingsOverlay.addEventListener('keydown', function(e) {
+    switch (e.key) {
+        case "Escape": // Escape to cancel
+            customModifiersTextBox.value = customModifiersInitialContent // undo the changes
+            modifierSettingsOverlay.classList.remove("active")
+            e.stopPropagation()
+            break
+        case "Enter":
+            if (e.ctrlKey) { // Ctrl+Enter to confirm
+                modifierSettingsOverlay.classList.remove("active")
+                e.stopPropagation()
+                break
+            }
+    }
+})
+
 function saveCustomModifiers() {
     localStorage.setItem(CUSTOM_MODIFIERS_KEY, customModifiersTextBox.value.trim())
 

ui/media/js/main.js

@@ -5,6 +5,32 @@ const MIN_GPUS_TO_SHOW_SELECTION = 2
 const IMAGE_REGEX = new RegExp('data:image/[A-Za-z]+;base64')
 const htmlTaskMap = new WeakMap()
 
+const taskConfigSetup = {
+    taskConfig: {
+        seed: { value: ({ seed }) => seed, label: 'Seed' },
+        dimensions: { value: ({ reqBody }) => `${reqBody?.width}x${reqBody?.height}`, label: 'Dimensions' },
+        sampler_name: 'Sampler',
+        num_inference_steps: 'Inference Steps',
+        guidance_scale: 'Guidance Scale',
+        use_stable_diffusion_model: 'Model',
+        use_vae_model: { label: 'VAE', visible: ({ reqBody }) => reqBody?.use_vae_model !== undefined && reqBody?.use_vae_model.trim() !== ''},
+        negative_prompt: { label: 'Negative Prompt', visible: ({ reqBody }) => reqBody?.negative_prompt !== undefined && reqBody?.negative_prompt.trim() !== ''},
+        prompt_strength: 'Prompt Strength',
+        use_face_correction: 'Fix Faces',
+        upscale: { value: ({ reqBody }) => `${reqBody?.use_upscale} (${reqBody?.upscale_amount || 4}x)`, label: 'Upscale', visible: ({ reqBody }) => !!reqBody?.use_upscale },
+        use_hypernetwork_model: 'Hypernetwork',
+        hypernetwork_strength: { label: 'Hypernetwork Strength', visible: ({ reqBody }) => !!reqBody?.use_hypernetwork_model },
+        use_lora_model: { label: 'Lora Model', visible: ({ reqBody }) => !!reqBody?.use_lora_model },
+        lora_alpha: { label: 'Lora Strength', visible: ({ reqBody }) => !!reqBody?.use_lora_model },
+        preserve_init_image_color_profile: 'Preserve Color Profile',
+    },
+    pluginTaskConfig: {},
+    getCSSKey: (key) => key.split('_').map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join('')
+}
+
+let imageCounter = 0
+let imageRequest = []
+
 let promptField = document.querySelector('#prompt')
 let promptsFromFileSelector = document.querySelector('#prompt_from_file')
 let promptsFromFileBtn = document.querySelector('#promptsFromFileBtn')
@@ -21,6 +47,7 @@ let randomSeedField = document.querySelector("#random_seed")
 let seedField = document.querySelector('#seed')
 let widthField = document.querySelector('#width')
 let heightField = document.querySelector('#height')
+let smallImageWarning = document.querySelector('#small_image_warning')
 let initImageSelector = document.querySelector("#init_image")
 let initImagePreview = document.querySelector("#init_image_preview")
 let initImageSizeBox = document.querySelector("#init_image_size_box")
@@ -42,7 +69,12 @@ let vaeModelField = new ModelDropdown(document.querySelector('#vae_model'), 'vae
 let hypernetworkModelField = new ModelDropdown(document.querySelector('#hypernetwork_model'), 'hypernetwork', 'None')
 let hypernetworkStrengthSlider = document.querySelector('#hypernetwork_strength_slider')
 let hypernetworkStrengthField = document.querySelector('#hypernetwork_strength')
+let loraModelField = new ModelDropdown(document.querySelector('#lora_model'), 'lora', 'None')
+let loraAlphaSlider = document.querySelector('#lora_alpha_slider')
+let loraAlphaField = document.querySelector('#lora_alpha')
 let outputFormatField = document.querySelector('#output_format')
+let outputLosslessField = document.querySelector('#output_lossless')
+let outputLosslessContainer = document.querySelector('#output_lossless_container')
 let blockNSFWField = document.querySelector('#block_nsfw')
 let showOnlyFilteredImageField = document.querySelector("#show_only_filtered_image")
 let updateBranchLabel = document.querySelector("#updateBranchLabel")
@@ -65,7 +97,13 @@ let promptStrengthContainer = document.querySelector('#prompt_strength_container
 let initialText = document.querySelector("#initial-text")
 let previewTools = document.querySelector("#preview-tools")
 let clearAllPreviewsBtn = document.querySelector("#clear-all-previews")
+let showDownloadPopupBtn = document.querySelector("#show-download-popup")
+let saveAllImagesPopup = document.querySelector("#download-images-popup")
 let saveAllImagesBtn = document.querySelector("#save-all-images")
+let saveAllZipToggle = document.querySelector("#zip_toggle")
+let saveAllTreeToggle = document.querySelector("#tree_toggle")
+let saveAllJSONToggle = document.querySelector("#json_toggle")
+let saveAllFoldersOption = document.querySelector("#download-add-folders")
 
 let maskSetting = document.querySelector('#enable_mask')
 
@@ -73,6 +111,11 @@ const processOrder = document.querySelector('#process_order_toggle')
 
 let imagePreview = document.querySelector("#preview")
 let imagePreviewContent = document.querySelector("#preview-content")
+
+let undoButton = document.querySelector("#undo")
+let undoBuffer = []
+const UNDO_LIMIT = 20
+
 imagePreview.addEventListener('drop', function(ev) {
     const data = ev.dataTransfer?.getData("text/plain");
     if (!data) {
@@ -160,18 +203,18 @@ function setStatus(statusType, msg, msgType) {
 function setServerStatus(event) {
     switch(event.type) {
         case 'online':
-            serverStatusColor.style.color = 'green'
-            serverStatusMsg.style.color = 'green'
+            serverStatusColor.style.color = 'var(--status-green)'
+            serverStatusMsg.style.color = 'var(--status-green)'
             serverStatusMsg.innerText = 'Stable Diffusion is ' + event.message
             break
         case 'busy':
-            serverStatusColor.style.color = 'rgb(200, 139, 0)'
-            serverStatusMsg.style.color = 'rgb(200, 139, 0)'
+            serverStatusColor.style.color = 'var(--status-orange)'
+            serverStatusMsg.style.color = 'var(--status-orange)'
             serverStatusMsg.innerText = 'Stable Diffusion is ' + event.message
             break
         case 'error':
-            serverStatusColor.style.color = 'red'
-            serverStatusMsg.style.color = 'red'
+            serverStatusColor.style.color = 'var(--status-red)'
+            serverStatusMsg.style.color = 'var(--status-red)'
             serverStatusMsg.innerText = 'Stable Diffusion has stopped'
             break
     }
@@ -241,6 +284,48 @@ function playSound() {
     }
 }
 
+function undoableRemove(element, doubleUndo=false) {
+    let data = { 'element': element, 'parent': element.parentNode, 'prev': element.previousSibling, 'next': element.nextSibling, 'doubleUndo': doubleUndo }
+    undoBuffer.push(data)
+    if (undoBuffer.length > UNDO_LIMIT) {
+        // Remove item from memory and also remove it from the data structures
+        let item = undoBuffer.shift()
+        htmlTaskMap.delete(item.element)
+        item.element.querySelectorAll('[data-imagecounter]').forEach( (img) => { delete imageRequest[img.dataset['imagecounter']] })
+    }
+    element.remove()
+    if (undoBuffer.length != 0) {
+        undoButton.classList.remove('displayNone')
+    }
+}
+
+function undoRemove() {
+    let data = undoBuffer.pop()
+    if (!data) {
+        return
+    }
+    if (data.next == null) {
+        data.parent.appendChild(data.element)
+    } else {
+        data.parent.insertBefore(data.element, data.next)
+    }
+    if (data.doubleUndo) {
+        undoRemove()
+    }
+    if (undoBuffer.length == 0) {
+        undoButton.classList.add('displayNone')
+    }
+    updateInitialText()
+}
+
+undoButton.addEventListener('click', () =>  { undoRemove() })
+
+document.addEventListener('keydown', function(e) {
+    if ((e.ctrlKey || e.metaKey) && e.key === 'z' && e.target == document.body) {
+        undoRemove()
+    }
+})
+
 function showImages(reqBody, res, outputContainer, livePreview) {
     let imageItemElements = outputContainer.querySelectorAll('.imgItem')
     if(typeof res != 'object') return
@@ -268,7 +353,9 @@ function showImages(reqBody, res, outputContainer, livePreview) {
                 <div class="imgContainer">
                     <img/>
                     <div class="imgItemInfo">
-                        <span class="imgSeedLabel"></span>
+                        <div>
+                            <span class="imgInfoLabel imgExpandBtn"><i class="fa-solid fa-expand"></i></span><span class="imgInfoLabel imgSeedLabel"></span>
+                        </div>
                     </div>
                     <button class="imgPreviewItemClearBtn image_clear_btn"><i class="fa-solid fa-xmark"></i></button>
                     <span class="img_bottom_label"></span>
@@ -278,18 +365,19 @@ function showImages(reqBody, res, outputContainer, livePreview) {
             const imageRemoveBtn = imageItemElem.querySelector('.imgPreviewItemClearBtn')
             let parentTaskContainer = imageRemoveBtn.closest('.imageTaskContainer')
             imageRemoveBtn.addEventListener('click', (e) => {
-                shiftOrConfirm(e, "Remove the image from the results?", () => { 
-                    imageItemElem.style.display = 'none' 
-                    let allHidden = true;
-                    let children = parentTaskContainer.querySelectorAll('.imgItem');
-                    for(let x = 0; x < children.length; x++) {
-                        let child = children[x];
-                        if(child.style.display != "none") {
-                            allHidden = false;
-                        }
+                undoableRemove(imageItemElem)
+                let allHidden = true;
+                let children = parentTaskContainer.querySelectorAll('.imgItem');
+                for(let x = 0; x < children.length; x++) {
+                    let child = children[x];
+                    if(child.style.display != "none") {
+                        allHidden = false;
                     }
-                    if(allHidden === true) {parentTaskContainer.classList.add("displayNone")}
-                })
+                }
+                if(allHidden === true) {
+                    const req = htmlTaskMap.get(parentTaskContainer)
+                    if(!req.isProcessing || req.batchesDone == req.batchCount) { undoableRemove(parentTaskContainer, true) }
+                }
             })
         }
         const imageElem = imageItemElem.querySelector('img')
@@ -304,25 +392,59 @@ function showImages(reqBody, res, outputContainer, livePreview) {
             imageItemElem.querySelector('.img_bottom_label').innerText = `${this.naturalWidth} x ${this.naturalHeight}`
         })
 
-
         const imageInfo = imageItemElem.querySelector('.imgItemInfo')
         imageInfo.style.visibility = (livePreview ? 'hidden' : 'visible')
 
         if ('seed' in result && !imageElem.hasAttribute('data-seed')) {
+            const imageExpandBtn = imageItemElem.querySelector('.imgExpandBtn')
+            imageExpandBtn.addEventListener('click', function() {
+                function previousImage(img) {
+                    const allImages = Array.from(outputContainer.parentNode.querySelectorAll('.imgItem img'))
+                    const index = allImages.indexOf(img)
+                    return allImages.slice(0, index).reverse()[0]
+                }
+
+                function nextImage(img) {
+                    const allImages = Array.from(outputContainer.parentNode.querySelectorAll('.imgItem img'))
+                    const index = allImages.indexOf(img)
+                    return allImages.slice(index + 1)[0]
+                }
+
+                function imageModalParameter(img) {
+                    const previousImg = previousImage(img)
+                    const nextImg = nextImage(img)
+
+                    return {
+                        src: img.src,
+                        previous: previousImg ? () => imageModalParameter(previousImg) : undefined,
+                        next: nextImg ? () => imageModalParameter(nextImg) : undefined,
+                    }
+                }
+
+                imageModal(imageModalParameter(imageElem))
+            })
+
             const req = Object.assign({}, reqBody, {
                 seed: result?.seed || reqBody.seed
             })
             imageElem.setAttribute('data-seed', req.seed)
+            imageElem.setAttribute('data-imagecounter', ++imageCounter)
+            imageRequest[imageCounter] = req
             const imageSeedLabel = imageItemElem.querySelector('.imgSeedLabel')
             imageSeedLabel.innerText = 'Seed: ' + req.seed
 
             let buttons = [
                 { text: 'Use as Input', on_click: onUseAsInputClick },
-                { text: 'Download', on_click: onDownloadImageClick },
+                [
+                    { html: '<i class="fa-solid fa-download"></i> Download Image', on_click: onDownloadImageClick, class: "download-img" },
+                    { html: '<i class="fa-solid fa-download"></i> JSON', on_click: onDownloadJSONClick, class: "download-json" }
+                ],
                 { text: 'Make Similar Images', on_click: onMakeSimilarClick },
                 { text: 'Draw another 25 steps', on_click: onContinueDrawingClick },
-                { text: 'Upscale', on_click: onUpscaleClick, filter: (req, img) => !req.use_upscale },
-                { text: 'Fix Faces', on_click: onFixFacesClick, filter: (req, img) => !req.use_face_correction }
+                [
+                    { text: 'Upscale', on_click: onUpscaleClick, filter: (req, img) => !req.use_upscale },
+                    { text: 'Fix Faces', on_click: onFixFacesClick, filter: (req, img) => !req.use_face_correction }
+                ]
             ]
 
             // include the plugins
@@ -331,23 +453,60 @@ function showImages(reqBody, res, outputContainer, livePreview) {
             const imgItemInfo = imageItemElem.querySelector('.imgItemInfo')
             const img = imageItemElem.querySelector('img')
             const createButton = function(btnInfo) {
-                const newButton = document.createElement('button')
-                newButton.classList.add('tasksBtns')
-                newButton.innerText = btnInfo.text
-                newButton.addEventListener('click', function(event) {
-                    btnInfo.on_click(req, img, event)
-                })
-                if (btnInfo.class !== undefined) {
-                   newButton.classList.add(btnInfo.class)
+                if (Array.isArray(btnInfo)) {
+                    const wrapper = document.createElement('div');
+                    btnInfo
+                        .map(createButton)
+                        .forEach(buttonElement => wrapper.appendChild(buttonElement))
+                    return wrapper
                 }
-                imgItemInfo.appendChild(newButton)
+
+                const isLabel = btnInfo.type === 'label'
+
+                const newButton = document.createElement(isLabel ? 'span' : 'button')
+                newButton.classList.add('tasksBtns')
+
+                if (btnInfo.html) {
+                    const html = typeof btnInfo.html === 'function' ? btnInfo.html() : btnInfo.html
+                    if (html instanceof HTMLElement) {
+                        newButton.appendChild(html)
+                    } else {
+                        newButton.innerHTML = html
+                    }
+                } else {
+                    newButton.innerText = typeof btnInfo.text === 'function' ? btnInfo.text() : btnInfo.text
+                }
+
+                if (btnInfo.on_click || !isLabel) {
+                    newButton.addEventListener('click', function(event) {
+                        btnInfo.on_click(req, img, event)
+                    })
+                }
+                
+                if (btnInfo.class !== undefined) {
+                    if (Array.isArray(btnInfo.class)) {
+                        newButton.classList.add(...btnInfo.class)
+                    } else {
+                        newButton.classList.add(btnInfo.class)
+                    }
+                }
+                return newButton
             }
             buttons.forEach(btn => {
-                if (btn.filter && btn.filter(req, img) === false) {
+                if (Array.isArray(btn)) {
+                    btn = btn.filter(btnInfo => !btnInfo.filter || btnInfo.filter(req, img) === true)
+                    if (btn.length === 0) {
+                        return
+                    }
+                } else if (btn.filter && btn.filter(req, img) === false) {
                     return
                 }
 
-                createButton(btn)
+                try {
+                    imgItemInfo.appendChild(createButton(btn))
+                } catch (err) {
+                    console.error('Error creating image info button from plugin: ', btn, err)
+                }
             })
         }
     })
@@ -362,17 +521,25 @@ function onUseAsInputClick(req, img) {
     maskSetting.checked = false
 }
 
-function onDownloadImageClick(req, img) {
-    const imgData = img.src
+function getDownloadFilename(img, suffix) {
     const imageSeed = img.getAttribute('data-seed')
     const imagePrompt = img.getAttribute('data-prompt')
     const imageInferenceSteps = img.getAttribute('data-steps')
     const imageGuidanceScale = img.getAttribute('data-guidance')
+    
+    return createFileName(imagePrompt, imageSeed, imageInferenceSteps, imageGuidanceScale, suffix)
+}
 
-    const imgDownload = document.createElement('a')
-    imgDownload.download = createFileName(imagePrompt, imageSeed, imageInferenceSteps, imageGuidanceScale, req['output_format'])
-    imgDownload.href = imgData
-    imgDownload.click()
+function onDownloadJSONClick(req, img) {
+    const name = getDownloadFilename(img, 'json')
+    const blob = new Blob([JSON.stringify(req, null, 2)], { type: 'text/plain' })
+    saveAs(blob, name)
+}
+
+function onDownloadImageClick(req, img) {
+    const name = getDownloadFilename(img, req['output_format'])
+    const blob = dataURItoBlob(img.src)
+    saveAs(blob, name)
 }
 
 function modifyCurrentRequest(...reqDiff) {
@@ -495,7 +662,7 @@ function makeImage() {
     }))
     newTaskRequests.forEach(createTask)
 
-    initialText.style.display = 'none'
+    updateInitialText()
 }
 
 async function onIdle() {
@@ -793,7 +960,7 @@ async function onTaskStart(task) {
     setStatus('request', 'fetching..')
     renderButtons.style.display = 'flex'
     renameMakeImageButton()
-    previewTools.style.display = 'block'
+    updateInitialText()
 }
 
 /* Hover effect for the init image in the task list */
@@ -831,6 +998,29 @@ function onTaskEntryDragOver(event) {
     }
 }
 
+function generateConfig({ label, value, visible, cssKey }) {
+    if (!visible) return null;
+    return `<div class="taskConfigContainer task${cssKey}Container"><b>${label}:</b> <span class="task${cssKey}">${value}`
+}
+
+function getVisibleConfig(config, task) {
+    const mergedTaskConfig = { ...config.taskConfig, ...config.pluginTaskConfig }
+    return Object.keys(mergedTaskConfig)
+        .map((key) => {
+            const value = mergedTaskConfig?.[key]?.value?.(task) ?? task.reqBody[key]
+            const visible = mergedTaskConfig?.[key]?.visible?.(task) ?? value !== undefined ?? true
+            const label = mergedTaskConfig?.[key]?.label ?? mergedTaskConfig?.[key]
+            const cssKey = config.getCSSKey(key)
+            return { label, visible, value, cssKey }
+        })
+        .map((obj) => generateConfig(obj))
+        .filter(obj => obj)
+}
+
+function createTaskConfig(task) {
+    return getVisibleConfig(taskConfigSetup, task).join('</span>,&nbsp;</div>')
+}
+
 function createTask(task) {
     let taskConfig = ''
 
@@ -839,30 +1029,8 @@ function createTask(task) {
         let w = task.reqBody.width * h / task.reqBody.height >>0
         taskConfig += `<div class="task-initimg" style="float:left;"><img style="width:${w}px;height:${h}px;" src="${task.reqBody.init_image}"><div class="task-fs-initimage"></div></div>`
     }
-    taskConfig += `<b>Seed:</b> ${task.seed}, <b>Sampler:</b> ${task.reqBody.sampler_name}, <b>Inference Steps:</b> ${task.reqBody.num_inference_steps}, <b>Guidance Scale:</b> ${task.reqBody.guidance_scale}, <b>Model:</b> ${task.reqBody.use_stable_diffusion_model}`
 
-    if (task.reqBody.use_vae_model.trim() !== '') {
-        taskConfig += `, <b>VAE:</b> ${task.reqBody.use_vae_model}`
-    }
-    if (task.reqBody.negative_prompt.trim() !== '') {
-        taskConfig += `, <b>Negative Prompt:</b> ${task.reqBody.negative_prompt}`
-    }
-    if (task.reqBody.init_image !== undefined) {
-        taskConfig += `, <b>Prompt Strength:</b> ${task.reqBody.prompt_strength}`
-    }
-    if (task.reqBody.use_face_correction) {
-        taskConfig += `, <b>Fix Faces:</b> ${task.reqBody.use_face_correction}`
-    }
-    if (task.reqBody.use_upscale) {
-        taskConfig += `, <b>Upscale:</b> ${task.reqBody.use_upscale} (${task.reqBody.upscale_amount || 4}x)`
-    }
-    if (task.reqBody.use_hypernetwork_model) {
-        taskConfig += `, <b>Hypernetwork:</b> ${task.reqBody.use_hypernetwork_model}`
-        taskConfig += `, <b>Hypernetwork Strength:</b> ${task.reqBody.hypernetwork_strength}`
-    }
-    if (task.reqBody.preserve_init_image_color_profile) {
-        taskConfig += `, <b>Preserve Color Profile:</b> true`
-    }
+    taskConfig += `<div class="taskConfigData">${createTaskConfig(task)}</span></div></div>`;
 
     let taskEntry = document.createElement('div')
     taskEntry.id = `imageTaskContainer-${Date.now()}`
@@ -922,13 +1090,16 @@ function createTask(task) {
     task['stopTask'].addEventListener('click', (e) => {
         e.stopPropagation()
 
-        let question = (task['isProcessing'] ? "Stop this task?" : "Remove this task?")
-        shiftOrConfirm(e, question, async function(e) {
-            if (task.batchesDone <= 0 || !task.isProcessing) {
-                removeTask(taskEntry)
-            }
-            abortTask(task)
-        })
+        if (task['isProcessing']) {
+            shiftOrConfirm(e, "Stop this task?", async function(e) {
+                if (task.batchesDone <= 0 || !task.isProcessing) {
+                    removeTask(taskEntry)
+                }
+                abortTask(task)
+            })
+        } else {
+            removeTask(taskEntry)
+        }
     })
 
     task['useSettings'] = taskEntry.querySelector('.useSettings')
@@ -951,14 +1122,13 @@ function createTask(task) {
 function getCurrentUserRequest() {
     const numOutputsTotal = parseInt(numOutputsTotalField.value)
     const numOutputsParallel = parseInt(numOutputsParallelField.value)
-    const seed = (randomSeedField.checked ? Math.floor(Math.random() * 10000000) : parseInt(seedField.value))
+    const seed = (randomSeedField.checked ? Math.floor(Math.random() * (2**32 - 1)) : parseInt(seedField.value))
 
     const newTask = {
         batchesDone: 0,
         numOutputsTotal: numOutputsTotal,
         batchCount: Math.ceil(numOutputsTotal / numOutputsParallel),
         seed,
-
         reqBody: {
             seed,
             used_random_seed: randomSeedField.checked,
@@ -970,6 +1140,7 @@ function getCurrentUserRequest() {
             height: parseInt(heightField.value),
             // allow_nsfw: allowNSFWField.checked,
             vram_usage_level: vramUsageLevelField.value,
+            sampler_name: samplerField.value,
             //render_device: undefined, // Set device affinity. Prefer this device, but wont activate.
             use_stable_diffusion_model: stableDiffusionModelField.value,
             use_vae_model: vaeModelField.value,
@@ -979,6 +1150,7 @@ function getCurrentUserRequest() {
             block_nsfw: blockNSFWField.checked,
             output_format: outputFormatField.value,
             output_quality: parseInt(outputQualityField.value),
+            output_lossless: outputLosslessField.checked,
             metadata_output_format: metadataOutputFormatField.value,
             original_prompt: promptField.value,
             active_tags: (activeTags.map(x => x.name)),
@@ -988,7 +1160,6 @@ function getCurrentUserRequest() {
     if (IMAGE_REGEX.test(initImagePreview.src)) {
         newTask.reqBody.init_image = initImagePreview.src
         newTask.reqBody.prompt_strength = parseFloat(promptStrengthField.value)
-
         // if (IMAGE_REGEX.test(maskImagePreview.src)) {
         //     newTask.reqBody.mask = maskImagePreview.src
         // }
@@ -996,9 +1167,9 @@ function getCurrentUserRequest() {
             newTask.reqBody.mask = imageInpainter.getImg()
         }
         newTask.reqBody.preserve_init_image_color_profile = applyColorCorrectionField.checked
-        newTask.reqBody.sampler_name = 'ddim'
-    } else {
-        newTask.reqBody.sampler_name = samplerField.value
+        if (!testDiffusers.checked) {
+            newTask.reqBody.sampler_name = 'ddim'
+        }
     }
     if (saveToDiskField.checked && diskPathField.value.trim() !== '') {
         newTask.reqBody.save_to_disk_path = diskPathField.value.trim()
@@ -1014,6 +1185,10 @@ function getCurrentUserRequest() {
         newTask.reqBody.use_hypernetwork_model = hypernetworkModelField.value
         newTask.reqBody.hypernetwork_strength = parseFloat(hypernetworkStrengthField.value)
     }
+    if (testDiffusers.checked && loraModelField.value) {
+        newTask.reqBody.use_lora_model = loraModelField.value
+        newTask.reqBody.lora_alpha = parseFloat(loraAlphaField.value)
+    }
     return newTask
 }
 
@@ -1111,31 +1286,10 @@ function createFileName(prompt, seed, steps, guidance, outputFormat) {
 
     // Most important information is the prompt
     let underscoreName = prompt.replace(/[^a-zA-Z0-9]/g, '_')
-    underscoreName = underscoreName.substring(0, 100)
-    //const steps = numInferenceStepsField.value
-    //const guidance =  guidanceScaleField.value
+    underscoreName = underscoreName.substring(0, 70)
 
     // name and the top level metadata
-    let fileName = `${underscoreName}_Seed-${seed}_Steps-${steps}_Guidance-${guidance}`
-
-    // add the tags
-    // let tags = []
-    // let tagString = ''
-    // document.querySelectorAll(modifyTagsSelector).forEach(function(tag) {
-    //     tags.push(tag.innerHTML)
-    // })
-
-    // join the tags with a pipe
-    // if (activeTags.length > 0) {
-    //     tagString = '_Tags-'
-    //     tagString += tags.join('|')
-    // }
-
-    // // append empty or populated tags
-    // fileName += `${tagString}`
-
-    // add the file extension
-    fileName += '.' + outputFormat
+    let fileName = `${underscoreName}_S${seed}_St${steps}_G${guidance}.${outputFormat}`
 
     return fileName
 }
@@ -1154,15 +1308,25 @@ async function stopAllTasks() {
     })
 }
 
-function removeTask(taskToRemove) {
-    taskToRemove.remove()
-
+function updateInitialText() {
     if (document.querySelector('.imageTaskContainer') === null) {
-        previewTools.style.display = 'none'
-        initialText.style.display = 'block'
+        if (undoBuffer.length > 0) {
+            initialText.prepend(undoButton)
+        }
+        previewTools.classList.add('displayNone')
+        initialText.classList.remove('displayNone')
+    } else {
+        initialText.classList.add('displayNone')
+        previewTools.classList.remove('displayNone')
+        document.querySelector('div.display-settings').prepend(undoButton)
     }
 }
 
+function removeTask(taskToRemove) {
+    undoableRemove(taskToRemove)
+    updateInitialText()
+}
+
 clearAllPreviewsBtn.addEventListener('click', (e) => { shiftOrConfirm(e, "Clear all the results and tasks in this window?", async function() {
     await stopAllTasks()
 
@@ -1170,19 +1334,89 @@ clearAllPreviewsBtn.addEventListener('click', (e) => { shiftOrConfirm(e, "Clear
     taskEntries.forEach(removeTask)
 })})
 
-saveAllImagesBtn.addEventListener('click', (e) => {
+/* Download images popup */
+showDownloadPopupBtn.addEventListener("click", (e) => { saveAllImagesPopup.classList.add("active") })
+
+saveAllZipToggle.addEventListener('change', (e) => {
+    if (saveAllZipToggle.checked) {
+        saveAllFoldersOption.classList.remove('displayNone')
+    } else {
+        saveAllFoldersOption.classList.add('displayNone')
+    }
+})
+
+// convert base64 to raw binary data held in a string
+function dataURItoBlob(dataURI) {
+    var byteString = atob(dataURI.split(',')[1])
+
+    // separate out the mime component
+    var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0]
+
+    // write the bytes of the string to an ArrayBuffer
+    var ab = new ArrayBuffer(byteString.length)
+
+    // create a view into the buffer
+    var ia = new Uint8Array(ab)
+
+    // set the bytes of the buffer to the correct values
+    for (var i = 0; i < byteString.length; i++) {
+        ia[i] = byteString.charCodeAt(i)
+    }
+
+    // write the ArrayBuffer to a blob, and you're done
+    return new Blob([ab], {type: mimeString})
+}
+
+function downloadAllImages() {
     let i = 0
+
+    let optZIP  = saveAllZipToggle.checked
+    let optTree = optZIP && saveAllTreeToggle.checked
+    let optJSON = saveAllJSONToggle.checked
+    
+    let zip = new JSZip()
+    let folder = zip
+
     document.querySelectorAll(".imageTaskContainer").forEach(container => {
-        let req = htmlTaskMap.get(container)
+        if (optTree) {
+            let name = ++i + '-' + container.querySelector('.preview-prompt').textContent.replace(/[^a-zA-Z0-9]/g, '_').substring(0,25)
+            folder = zip.folder(name)
+        }
         container.querySelectorAll(".imgContainer img").forEach(img => {
-            if (img.closest('.imgItem').style.display === 'none') {
+            let imgItem = img.closest('.imgItem')
+
+            if (imgItem.style.display === 'none') {
                 return
             }
-            setTimeout(() => {onDownloadImageClick(req, img)}, i*200)
-            i = i+1
+
+            let req = imageRequest[img.dataset['imagecounter']]
+            if (optZIP) {
+                let suffix = img.dataset['imagecounter'] + '.' + req['output_format']
+                folder.file(getDownloadFilename(img, suffix), dataURItoBlob(img.src))
+                if (optJSON) {
+                    suffix = img.dataset['imagecounter'] + '.json'
+                    folder.file(getDownloadFilename(img, suffix), JSON.stringify(req, null, 2))
+                }
+            } else {
+                setTimeout(() => {imgItem.querySelector('.download-img').click()}, i*200)
+                i = i+1
+                if (optJSON) {
+                    setTimeout(() => {imgItem.querySelector('.download-json').click()}, i*200)
+                    i = i+1
+                }
+            }
         })
     })
-})
+    if (optZIP) {
+        let now = Date.now().toString(36).toUpperCase()
+        zip.generateAsync({type:"blob"}).then(function (blob) { 
+            saveAs(blob, `EasyDiffusion-Images-${now}.zip`);
+        })
+    }
+
+}    
+
+saveAllImagesBtn.addEventListener('click', (e) => { downloadAllImages() })
 
 stopImageBtn.addEventListener('click', (e) => { shiftOrConfirm(e, "Stop all the tasks?", async function(e) {
     await stopAllTasks()
@@ -1204,7 +1438,9 @@ function renameMakeImageButton() {
     }
 }
 numOutputsTotalField.addEventListener('change', renameMakeImageButton)
+numOutputsTotalField.addEventListener('keyup', debounce(renameMakeImageButton, 300))
 numOutputsParallelField.addEventListener('change', renameMakeImageButton)
+numOutputsParallelField.addEventListener('keyup', debounce(renameMakeImageButton, 300))
 
 function onDimensionChange() {
     let widthValue = parseInt(widthField.value)
@@ -1215,6 +1451,11 @@ function onDimensionChange() {
     else {
         imageInpainter.setImage(initImagePreview.src, widthValue, heightValue)
     }
+    if ( widthValue < 512 && heightValue < 512 ) {
+        smallImageWarning.classList.remove('displayNone')
+    } else {
+        smallImageWarning.classList.add('displayNone')
+    }
 }
 
 diskPathField.disabled = !saveToDiskField.checked
@@ -1310,6 +1551,33 @@ function updateHypernetworkStrengthContainer() {
 hypernetworkModelField.addEventListener('change', updateHypernetworkStrengthContainer)
 updateHypernetworkStrengthContainer()
 
+/********************* LoRA alpha **********************/
+function updateLoraAlpha() {
+    loraAlphaField.value = loraAlphaSlider.value / 100
+    loraAlphaField.dispatchEvent(new Event("change"))
+}
+
+function updateLoraAlphaSlider() {
+    if (loraAlphaField.value < 0) {
+        loraAlphaField.value = 0
+    } else if (loraAlphaField.value > 1) {
+        loraAlphaField.value = 1
+    }
+
+    loraAlphaSlider.value = loraAlphaField.value * 100
+    loraAlphaSlider.dispatchEvent(new Event("change"))
+}
+
+loraAlphaSlider.addEventListener('input', updateLoraAlpha)
+loraAlphaField.addEventListener('input', updateLoraAlphaSlider)
+updateLoraAlpha()
+
+function updateLoraAlphaContainer() {
+    document.querySelector("#lora_alpha_container").style.display = (loraModelField.value === "" ? 'none' : '')
+}
+loraModelField.addEventListener('change', updateLoraAlphaContainer)
+updateLoraAlphaContainer()
+
 /********************* JPEG/WEBP Quality **********************/
 function updateOutputQuality() {
     outputQualityField.value =  0 | outputQualitySlider.value
@@ -1331,13 +1599,26 @@ outputQualitySlider.addEventListener('input', updateOutputQuality)
 outputQualityField.addEventListener('input', debounce(updateOutputQualitySlider, 1500))
 updateOutputQuality()
 
-outputFormatField.addEventListener('change', e => {
-    if (outputFormatField.value === 'png') {
-        outputQualityRow.style.display='none'
-    } else {
-        outputQualityRow.style.display='table-row'
+function updateOutputQualityVisibility() {
+    if (outputFormatField.value === 'webp') {
+        outputLosslessContainer.classList.remove('displayNone')
+        if (outputLosslessField.checked) {
+            outputQualityRow.classList.add('displayNone')
+        } else {
+            outputQualityRow.classList.remove('displayNone')
+        }
     }
-})
+    else if (outputFormatField.value === 'png') {
+        outputQualityRow.classList.add('displayNone')
+        outputLosslessContainer.classList.add('displayNone')
+    } else {
+        outputQualityRow.classList.remove('displayNone')
+        outputLosslessContainer.classList.add('displayNone')
+    }
+}
+
+outputFormatField.addEventListener('change', updateOutputQualityVisibility)
+outputLosslessField.addEventListener('change', updateOutputQualityVisibility)
 /********************* Zoom Slider **********************/
 thumbnailSizeField.addEventListener('change', () => {
     (function (s) {
@@ -1402,7 +1683,9 @@ loadImg2ImgFromFile()
 
 function img2imgLoad() {
     promptStrengthContainer.style.display = 'table-row'
-    samplerSelectionContainer.style.display = "none"
+    if (!testDiffusers.checked) {
+        samplerSelectionContainer.style.display = "none"
+    }
     initImagePreviewContainer.classList.add("has-image")
     colorCorrectionSetting.style.display = ''
 
@@ -1417,7 +1700,9 @@ function img2imgUnload() {
     maskSetting.checked = false
 
     promptStrengthContainer.style.display = "none"
-    samplerSelectionContainer.style.display = ""
+    if (!testDiffusers.checked) {
+        samplerSelectionContainer.style.display = ""
+    }
     initImagePreviewContainer.classList.remove("has-image")
     colorCorrectionSetting.style.display = 'none'
     imageEditor.setImage(null, parseInt(widthField.value), parseInt(heightField.value))
@@ -1434,7 +1719,7 @@ promptsFromFileBtn.addEventListener('click', function() {
     promptsFromFileSelector.click()
 })
 
-promptsFromFileSelector.addEventListener('change', function() {
+promptsFromFileSelector.addEventListener('change', async function() {
     if (promptsFromFileSelector.files.length === 0) {
         return
     }
@@ -1442,8 +1727,8 @@ promptsFromFileSelector.addEventListener('change', function() {
     let reader = new FileReader()
     let file = promptsFromFileSelector.files[0]
 
-    reader.addEventListener('load', function() {
-        promptField.value = reader.result
+    reader.addEventListener('load', async function() {
+        await parseContent(reader.result)
     })
 
     if (file) {
@@ -1530,6 +1815,7 @@ resumeBtn.addEventListener("click", function () {
     document.body.classList.remove('wait-pause')
 })
 
+/* Pause function */
 document.querySelectorAll(".tab").forEach(linkTabContents)
 
 window.addEventListener("beforeunload", function(e) {

ui/media/js/parameters.js

@@ -3,7 +3,7 @@
  * @readonly
  * @enum {string}
  */
- var ParameterType = {
+var ParameterType = {
     checkbox: "checkbox",
     select: "select",
     select_multiple: "select_multiple",
@@ -15,10 +15,13 @@
  * JSDoc style
  * @typedef {object} Parameter
  * @property {string} id
- * @property {ParameterType} type
- * @property {string} label
- * @property {?string} note
+ * @property {keyof ParameterType} type
+ * @property {string | (parameter: Parameter) => (HTMLElement | string)} label
+ * @property {string | (parameter: Parameter) => (HTMLElement | string) | undefined} note
+ * @property {(parameter: Parameter) => (HTMLElement | string) | undefined} render
+ * @property {string | undefined} icon
  * @property {number|boolean|string} default
+ * @property {boolean?} saveInAppConfig
  */
 
 
@@ -76,7 +79,15 @@ var PARAMETERS = [
             {
                 value: "embed",
                 label: "embed"
-            }
+            },
+            {
+                value: "embed,txt",
+                label: "embed & txt",
+            },
+            {
+                value: "embed,json",
+                label: "embed & json",
+            },
         ],
     },
     {
@@ -110,6 +121,7 @@ var PARAMETERS = [
         note: "starts the default browser on startup",
         icon: "fa-window-restore",
         default: true,
+        saveInAppConfig: true,
     },
     {
         id: "vram_usage_level",
@@ -171,6 +183,7 @@ var PARAMETERS = [
         note: "Other devices on your network can access this web page",
         icon: "fa-network-wired",
         default: true,
+        saveInAppConfig: true,
     },
     {
         id: "listen_port",
@@ -180,7 +193,8 @@ var PARAMETERS = [
         icon: "fa-anchor",
         render: (parameter) => {
             return `<input id="${parameter.id}" name="${parameter.id}" size="6" value="9000" onkeypress="preventNonNumericalInput(event)">`
-        }
+        },
+        saveInAppConfig: true,
     },
     {
         id: "use_beta_channel",
@@ -190,6 +204,15 @@ var PARAMETERS = [
         icon: "fa-fire",
         default: false,
     },
+    {
+        id: "test_diffusers",
+        type: ParameterType.checkbox,
+        label: "Test Diffusers",
+        note: "<b>Experimental! Can have bugs!</b> Use upcoming features (like LoRA) in our new engine. Please press Save, then restart the program after changing this.",
+        icon: "fa-bolt",
+        default: false,
+        saveInAppConfig: true,
+    },
 ];
 
 function getParameterSettingsEntry(id) {
@@ -212,6 +235,10 @@ function sliderUpdate(event) {
     }
 }
 
+/**
+ * @param {Parameter} parameter 
+ * @returns {string | HTMLElement}
+ */
 function getParameterElement(parameter) {
     switch (parameter.type) {
         case ParameterType.checkbox:
@@ -227,29 +254,74 @@ function getParameterElement(parameter) {
         case ParameterType.custom:
             return parameter.render(parameter)
         default:
-            console.error(`Invalid type for parameter ${parameter.id}`);
+            console.error(`Invalid type ${parameter.type} for parameter ${parameter.id}`);
             return "ERROR: Invalid Type"
     }
 }
 
 let parametersTable = document.querySelector("#system-settings .parameters-table")
-/* fill in the system settings popup table */
-function initParameters() {
-    PARAMETERS.forEach(parameter => {
-        var element = getParameterElement(parameter)
-        var note = parameter.note ? `<small>${parameter.note}</small>` : "";
-        var icon = parameter.icon ? `<i class="fa ${parameter.icon}"></i>` : "";
-        var newrow = document.createElement('div')
-        newrow.innerHTML = `
-            <div>${icon}</div>
-            <div><label for="${parameter.id}">${parameter.label}</label>${note}</div>
-            <div>${element}</div>`
+/**
+ * fill in the system settings popup table
+ * @param {Array<Parameter> | undefined} parameters
+ * */
+function initParameters(parameters) {
+    parameters.forEach(parameter => {
+        const element = getParameterElement(parameter)
+        const elementWrapper = createElement('div')
+        if (element instanceof Node) {
+            elementWrapper.appendChild(element)
+        } else {
+            elementWrapper.innerHTML = element
+        }
+
+        const note = typeof parameter.note === 'function' ? parameter.note(parameter) : parameter.note
+        const noteElements = []
+        if (note) {
+            const noteElement = createElement('small')
+            if (note instanceof Node) {
+                noteElement.appendChild(note)
+            } else {
+                noteElement.innerHTML = note || ''
+            }
+            noteElements.push(noteElement)
+        }
+
+        const icon = parameter.icon ? [createElement('i', undefined, ['fa', parameter.icon])] : []
+
+        const label = typeof parameter.label === 'function' ? parameter.label(parameter) : parameter.label
+        const labelElement = createElement('label', { for: parameter.id })
+        if (label instanceof Node) {
+            labelElement.appendChild(label)
+        } else {
+            labelElement.innerHTML = label
+        }
+
+        const newrow = createElement(
+            'div',
+            { 'data-setting-id': parameter.id, 'data-save-in-app-config': parameter.saveInAppConfig },
+            undefined,
+            [
+                createElement('div', undefined, undefined, icon),
+                createElement('div', undefined, undefined, [labelElement, ...noteElements]),
+                elementWrapper,
+            ]
+        )
         parametersTable.appendChild(newrow)
         parameter.settingsEntry = newrow
     })
 }
 
-initParameters()
+initParameters(PARAMETERS)
+
+// listen to parameters from plugins
+PARAMETERS.addEventListener('push', (...items) => {
+    initParameters(items)
+    
+    if (items.find(item => item.saveInAppConfig)) {
+        console.log('Reloading app config for new parameters', items.map(p => p.id))
+        getAppConfig()
+    }
+})
 
 let vramUsageLevelField = document.querySelector('#vram_usage_level')
 let useCPUField = document.querySelector('#use_cpu')
@@ -263,6 +335,7 @@ let listenPortField = document.querySelector("#listen_port")
 let useBetaChannelField = document.querySelector("#use_beta_channel")
 let uiOpenBrowserOnStartField = document.querySelector("#ui_open_browser_on_start")
 let confirmDangerousActionsField = document.querySelector("#confirm_dangerous_actions")
+let testDiffusers = document.querySelector("#test_diffusers")
 
 let saveSettingsBtn = document.querySelector('#save-system-settings-btn')
 
@@ -289,9 +362,14 @@ async function getAppConfig() {
         let res = await fetch('/get/app_config')
         const config = await res.json()
 
+        applySettingsFromConfig(config)
+
+        // custom overrides
         if (config.update_branch === 'beta') {
             useBetaChannelField.checked = true
             document.querySelector("#updateBranchLabel").innerText = "(beta)"
+        } else {
+            getParameterSettingsEntry("test_diffusers").style.display = "none"
         }
         if (config.ui && config.ui.open_browser_on_start === false) {
             uiOpenBrowserOnStartField.checked = false
@@ -302,13 +380,59 @@ async function getAppConfig() {
         if (config.net && config.net.listen_port !== undefined) {
             listenPortField.value = config.net.listen_port
         }
+        if (config.test_diffusers === undefined || config.update_branch === 'main') {
+            testDiffusers.checked = false
+            document.querySelector("#lora_model_container").style.display = 'none'
+            document.querySelector("#lora_alpha_container").style.display = 'none'
+        } else {
+            testDiffusers.checked = config.test_diffusers && config.update_branch !== 'main'
+            document.querySelector("#lora_model_container").style.display = (testDiffusers.checked ? '' : 'none')
+            document.querySelector("#lora_alpha_container").style.display = (testDiffusers.checked && loraModelField.value !== "" ? '' : 'none')
+        }
 
         console.log('get config status response', config)
+
+        return config
     } catch (e) {
         console.log('get config status error', e)
+
+        return {}
     }
 }
 
+function applySettingsFromConfig(config) {
+    Array.from(parametersTable.children).forEach(parameterRow => {
+        if (parameterRow.dataset.settingId in config && parameterRow.dataset.saveInAppConfig === 'true') {
+            const configValue = config[parameterRow.dataset.settingId]
+            const parameterElement = document.getElementById(parameterRow.dataset.settingId) ||
+                parameterRow.querySelector('input') || parameterRow.querySelector('select')
+
+            switch (parameterElement?.tagName) {
+                case 'INPUT':
+                    if (parameterElement.type === 'checkbox') {
+                        parameterElement.checked = configValue
+                    } else {
+                        parameterElement.value = configValue
+                    }
+                    parameterElement.dispatchEvent(new Event('change'))
+                    break
+                case 'SELECT':
+                    if (Array.isArray(configValue)) {
+                        Array.from(parameterElement.options).forEach(option => {
+                            if (configValue.includes(option.value || option.text)) {
+                                option.selected = true
+                            }
+                        })
+                    } else {
+                        parameterElement.value = configValue
+                    }
+                    parameterElement.dispatchEvent(new Event('change'))
+                    break
+            }
+        }
+    })
+}
+
 saveToDiskField.addEventListener('change', function(e) {
     diskPathField.disabled = !this.checked
     metadataOutputFormatField.disabled = !this.checked
@@ -465,15 +589,43 @@ saveSettingsBtn.addEventListener('click', function() {
         alert('The network port must be a number from 1 to 65535')
         return
     }
-    let updateBranch = (useBetaChannelField.checked ? 'beta' : 'main')
-    changeAppConfig({
+    const updateBranch = (useBetaChannelField.checked ? 'beta' : 'main')
+
+    const updateAppConfigRequest = {
         'render_devices': getCurrentRenderDeviceSelection(),
         'update_branch': updateBranch,
-        'ui_open_browser_on_start': uiOpenBrowserOnStartField.checked,
-        'listen_to_network': listenToNetworkField.checked,
-        'listen_port': listenPortField.value
-    })
-    saveSettingsBtn.classList.add('active')
-    asyncDelay(300).then(() => saveSettingsBtn.classList.remove('active'))
-})
+    }
 
+    Array.from(parametersTable.children).forEach(parameterRow => {
+        if (parameterRow.dataset.saveInAppConfig === 'true') {
+            const parameterElement = document.getElementById(parameterRow.dataset.settingId) ||
+                parameterRow.querySelector('input') || parameterRow.querySelector('select')
+
+            switch (parameterElement?.tagName) {
+                case 'INPUT':
+                    if (parameterElement.type === 'checkbox') {
+                        updateAppConfigRequest[parameterRow.dataset.settingId] = parameterElement.checked
+                    } else {
+                        updateAppConfigRequest[parameterRow.dataset.settingId] = parameterElement.value
+                    }
+                    break
+                case 'SELECT':
+                    if (parameterElement.multiple) {
+                        updateAppConfigRequest[parameterRow.dataset.settingId] = Array.from(parameterElement.options)
+                            .filter(option => option.selected)
+                            .map(option => option.value || option.text)
+                    } else {
+                        updateAppConfigRequest[parameterRow.dataset.settingId] = parameterElement.value
+                    }
+                    break
+                default:
+                    console.error(`Setting parameter ${parameterRow.dataset.settingId} couldn't be saved to app.config - element #${parameter.id} is a <${parameterElement?.tagName} /> instead of a <input /> or a <select />!`)
+                    break
+            }
+        }
+    })
+
+    const savePromise = changeAppConfig(updateAppConfigRequest)
+    saveSettingsBtn.classList.add('active')
+    Promise.all([savePromise, asyncDelay(300)]).then(() => saveSettingsBtn.classList.remove('active'))
+})

ui/media/js/searchable-models.js

@@ -481,7 +481,7 @@ class ModelDropdown
         this.modelFilter.insertAdjacentElement('afterend', rootModelList)
         this.modelFilter.insertAdjacentElement(
             'afterend',
-            this.createElement(
+            createElement(
                 'i',
                 { id: `${this.modelFilter.id}-model-filter-arrow` },
                 ['model-selector-arrow', 'fa-solid', 'fa-angle-down'],
@@ -518,34 +518,6 @@ class ModelDropdown
         this.selectEntry(this.activeModel)
     }
 
-    /**
-     * 
-     * @param {string} tag 
-     * @param {object} attributes
-     * @param {Array<string>} classes
-     * @returns {HTMLElement}
-     */
-    createElement(tagName, attributes, classes, text, icon) {
-        const element = document.createElement(tagName)
-        if (attributes) {
-            Object.entries(attributes).forEach(([key, value]) => {
-                element.setAttribute(key, value)
-            })
-        }
-        if (classes) {
-            classes.forEach(className => element.classList.add(className))
-        }
-        if (icon) {
-            let iconEl = document.createElement('i')
-            iconEl.className = icon + ' icon'
-            element.appendChild(iconEl)
-        }
-        if (text) {
-            element.appendChild(document.createTextNode(text))
-        }
-        return element
-    }
-
     /**
      * @param {Array<string | object} modelTree
      * @param {string} folderName 
@@ -553,7 +525,7 @@ class ModelDropdown
      * @returns {HTMLElement}
      */
     createModelNodeList(folderName, modelTree, isRootFolder) {
-        const listElement = this.createElement('ul')
+        const listElement = createElement('ul')
 
         const foldersMap = new Map()
         const modelsMap = new Map()
@@ -578,7 +550,15 @@ class ModelDropdown
                 const fullPath = folderName ? `${folderName.substring(1)}/${model}` : model
                 modelsMap.set(
                     model,
-                    this.createElement('li', { 'data-path': fullPath }, classes, model, 'fa-regular fa-file'),
+                    createElement(
+                        'li',
+                        { 'data-path': fullPath },
+                        classes,
+                        [
+                            createElement('i', undefined, ['fa-regular', 'fa-file', 'icon']),
+                            model,
+                        ],
+                    ),
                 )
             }
         })
@@ -592,7 +572,17 @@ class ModelDropdown
         const modelElements = modelNames.map(name => modelsMap.get(name))
 
         if (modelElements.length && folderName) {
-            listElement.appendChild(this.createElement('li', undefined, ['model-folder'], folderName.substring(1), 'fa-solid fa-folder-open'))
+            listElement.appendChild(
+                createElement(
+                    'li',
+                    undefined,
+                    ['model-folder'],
+                    [
+                        createElement('i', undefined, ['fa-regular', 'fa-folder-open', 'icon']),
+                        folderName.substring(1),
+                    ],
+                )
+            )
         }
 
         // const allModelElements = isRootFolder ? [...folderElements, ...modelElements] : [...modelElements, ...folderElements]
@@ -606,13 +596,13 @@ class ModelDropdown
      * @returns {HTMLElement}
      */
     createRootModelList(modelTree) {
-        const rootList = this.createElement(
+        const rootList = createElement(
             'ul',
             { id: `${this.modelFilter.id}-model-list` },
             ['model-list'],
         )
         rootList.appendChild(
-            this.createElement(
+            createElement(
                 'li',
                 { id: `${this.modelFilter.id}-model-no-result` },
                 ['model-no-result'],
@@ -622,7 +612,7 @@ class ModelDropdown
 
         if (this.noneEntry) {
             rootList.appendChild(
-                this.createElement(
+                createElement(
                     'li',
                     { 'data-path': '' },
                     ['model-file', 'in-root-folder'],
@@ -632,7 +622,7 @@ class ModelDropdown
         }
 
         if (modelTree.length > 0) {
-            const containerListItem = this.createElement(
+            const containerListItem = createElement(
                 'li',
                 { id: `${this.modelFilter.id}-model-result` },
                 ['model-result'],

ui/media/js/utils.js

@@ -677,3 +677,52 @@ class ServiceContainer {
         return typeof definition === 'function'
     }
 }
+
+/**
+ *
+ * @param {string} tag
+ * @param {object} attributes
+ * @param {string | Array<string>} classes
+ * @param {string | Node | Array<string | Node>}
+ * @returns {HTMLElement}
+ */
+function createElement(tagName, attributes, classes, textOrElements) {
+    const element = document.createElement(tagName)
+    if (attributes) {
+        Object.entries(attributes).forEach(([key, value]) => {
+            if (value !== undefined && value !== null) {
+                element.setAttribute(key, value)
+            }
+        });
+    }
+    if (classes) {
+        (Array.isArray(classes) ? classes : [classes]).forEach(className => element.classList.add(className))
+    }
+    if (textOrElements) {
+        const children = Array.isArray(textOrElements) ? textOrElements : [textOrElements]
+        children.forEach(textOrElem => {
+            if (textOrElem instanceof Node) {
+                element.appendChild(textOrElem)
+            } else {
+                element.appendChild(document.createTextNode(textOrElem))
+            }
+        })
+    }
+    return element
+}
+
+/**
+ * Add a listener for arrays
+ * @param {keyof Array} method
+ * @param {(args) => {}} callback
+ */
+Array.prototype.addEventListener = function(method, callback) {
+    const originalFunction = this[method]
+    if (originalFunction) {
+        this[method] = function() {
+            console.log(`Array.${method}()`, arguments)
+            originalFunction.apply(this, arguments)
+            callback.apply(this, arguments)
+        }
+    }
+}

ui/modifiers.json

@@ -2428,6 +2428,19 @@
             "path": "artist/by_yoshitaka_amano/landscape-0.jpg"
           }
         ]
+      },
+      {
+        "modifier": "by Zdzislaw Beksinski",
+        "previews": [
+          {
+            "name": "portrait",
+            "path": "artist/by_zdzislaw_beksinski/portrait-0.jpg"
+          },
+          {
+            "name": "landscape",
+            "path": "artist/by_zdzislaw_beksinski/landscape-0.jpg"
+          }
+        ]
       }
     ]
   },

ui/plugins/ui/Modifiers-wheel.plugin.js

@@ -1,4 +1,8 @@
-(function () { "use strict"
+(function () {
+    "use strict"
+
+    const MAX_WEIGHT = 5
+    
     if (typeof editorModifierTagsList !== 'object') {
         console.error('editorModifierTagsList missing...')
         return
@@ -26,35 +30,55 @@
     
                     const delta = Math.sign(event.deltaY)
                     let s = i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].innerText
+                    let t
+                    // find the corresponding tag
+                    for (let it = 0; it < overlays.length; it++) {
+                        if (i == overlays[it]) {
+                            t = activeTags[it].name
+                            break
+                        }
+                    }
+                    if (s.charAt(0) !== '(' && s.charAt(s.length - 1) !== ')' && s.trim().includes(' ')) {
+                        s = '(' + s + ')'
+                        t = '(' + t + ')'
+                    }
                     if (delta < 0) {
                         // wheel scrolling up
-                        if (s.substring(0, 1) == '[' && s.substring(s.length-1) == ']') {
-                            s = s.substring(1, s.length - 1)
+                        if (s.substring(s.length - 1) == '-') {
+                            s = s.substring(0, s.length - 1)
+                            t = t.substring(0, t.length - 1)
                         }
                         else
                         {
-                            if (s.substring(0, 10) !== '('.repeat(10) && s.substring(s.length-10) !== ')'.repeat(10)) {
-                                s = '(' + s + ')'
+                            if (s.substring(s.length - MAX_WEIGHT) !== '+'.repeat(MAX_WEIGHT)) {
+                                s = s + '+'
+                                t = t + '+'
                             }
                         }
                     }
                     else{
                         // wheel scrolling down
-                        if (s.substring(0, 1) == '(' && s.substring(s.length-1) == ')') {
-                            s = s.substring(1, s.length - 1)
+                        if (s.substring(s.length - 1) == '+') {
+                            s = s.substring(0, s.length - 1)
+                            t = t.substring(0, t.length - 1)
                         }
                         else
                         {
-                            if (s.substring(0, 10) !== '['.repeat(10) && s.substring(s.length-10) !== ']'.repeat(10)) {
-                                s = '[' + s + ']'
+                            if (s.substring(s.length - MAX_WEIGHT) !== '-'.repeat(MAX_WEIGHT)) {
+                                s = s + '-'
+                                t = t + '-'
                             }
                         }
                     }
+                    if (s.charAt(0) === '(' && s.charAt(s.length - 1) === ')') {
+                        s = s.substring(1, s.length - 1)
+                        t = t.substring(1, t.length - 1)
+                    }
                     i.parentElement.getElementsByClassName('modifier-card-label')[0].getElementsByTagName("p")[0].innerText = s
                     // update activeTags
                     for (let it = 0; it < overlays.length; it++) {
                         if (i == overlays[it]) {
-                            activeTags[it].name = s
+                            activeTags[it].name = t
                             break
                         }
                     }

ui/plugins/ui/merge.plugin.js

@@ -367,8 +367,8 @@
 
     document.querySelector('#merge-button').addEventListener('click', async function(e) {
         // Build request template
-        let model0 = document.querySelector('#mergeModelA').value
-        let model1 = document.querySelector('#mergeModelB').value
+        let model0 = mergeModelAField.value
+        let model1 = mergeModelBField.value
         let request = { model0: model0, model1: model1 }
         request['use_fp16'] = document.querySelector('#merge-fp').value == 'fp16'
         let iterations = document.querySelector('#merge-count').value>>0