13 Commits
Author SHA1 Message Date
Emre 6af416966b Update version in pyproject.toml to 1.0.2
- Incremented the version number from 1.0.1 to 1.0.2 to reflect recent changes and improvements in the DSD package.

This update ensures users are informed of the latest version and can access new features and fixes.
2025-03-15 19:55:01 +03:00
Emre bf1fbd24a5 Refactor DSD model loading and update pipeline configuration
- Changed the model identifier in `dsd_nodes.py` from "FLUX.1-dev" to "FLUX.1-schnell" to eliminate the need for Hugging Face login.
- Removed the `hf_token` parameter from the `download_and_load_model` method to streamline the model loading process.
2025-03-15 19:53:25 +03:00
Emre 2d9a5faf08 Enhance DSDGeminiPromptEnhancer and add UI integration for enhanced prompts
- Introduced a new `OUTPUT_NODE` attribute in the `DSDGeminiPromptEnhancer` class to facilitate UI data transmission.
- Implemented state management for the enhanced prompt within the class, ensuring it can be accessed and displayed in the UI.
- Created a new JavaScript file `showEnhancedPrompt.js` to handle the display of the enhanced prompt in the ComfyUI, including normalization and widget management.
- Updated the `__init__.py` file to include the new `WEB_DIRECTORY` constant in the module's exports.

These changes improve the functionality and user experience of the DSDGeminiPromptEnhancer node by enabling enhanced prompt visualization in the UI.
2025-03-14 13:50:55 +03:00
Emre c1dfc7b5da Update version in pyproject.toml to 1.0.1
- Incremented the version number from 1.0.0 to 1.0.1 to reflect the latest changes and improvements in the DSD package.

This update ensures that users are aware of the new version and can access the latest features and fixes.
2025-03-14 01:49:35 +03:00
Emre 1b2795d033 Create LICENSE 2025-03-14 01:44:33 +03:00
Emre ac3d589a43 Merge branch 'main' of https://github.com/irreveloper/ComfyUI-DSD 2025-03-14 01:19:20 +03:00
Emre b6d193f19f Enhance README and example workflow for DSD model
- Added multiple image resizing options to the README, detailing new parameters for the DSD Image Generator.
- Updated example workflow JSON to include the new `DSDResizeSelector` node, enhancing image resizing capabilities.
- Removed outdated screenshot files and replaced them with a new workflow image for better clarity.

These updates improve documentation and provide users with clearer guidance on utilizing the new features.
2025-03-14 01:17:15 +03:00
Emre 238a46fa2f Refactor DSD model loading and image processing functionalities
- Updated `load_model` and `download_and_load_model` methods in `dsd_nodes.py` to include new parameters for CPU memory management and offloading options.
- Introduced `DSDResizeSelector` class for flexible image resizing options, including methods for center cropping, padding, and fitting images.
- Enhanced `center_crop_and_resize` and added new utility functions in `utils.py` for improved image processing.
- Updated `README.md` to document the new resizing options available in the DSD Image Generator.

These changes improve memory efficiency and provide users with more control over image processing during model inference.
2025-03-14 00:26:32 +03:00
Emre 48d020ac58 Merge pull request #3 from ComfyNodePRs/pyproject
Add pyproject.toml for Custom Node Registry
2025-03-13 20:39:03 +03:00
Emre f0b8fea80c Merge pull request #4 from ComfyNodePRs/publish
Add Github Action for Publishing to Comfy Registry
2025-03-13 20:38:26 +03:00
Emre 08560abdc4 Update pyproject.toml 2025-03-13 20:27:49 +03:00
snomiao 9491680921 chore(pyproject): Add pyproject.toml for Custom Node Registry 2025-03-13 16:01:28 +00:00
snomiao de10acb2a0 chore(publish): Add Github Action for Publishing to Comfy Registry 2025-03-13 16:01:27 +00:00
13 changed files with 1393 additions and 265 deletions
+28
View File
@@ -0,0 +1,28 @@
name: Publish to Comfy registry
on:
workflow_dispatch:
push:
branches:
- main
- master
paths:
- "pyproject.toml"
permissions:
issues: write
jobs:
publish-node:
name: Publish Custom Node to registry
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'irreveloper' }}
steps:
- name: Check out code
uses: actions/checkout@v4
with:
submodules: true
- name: Publish Custom Node
uses: Comfy-Org/publish-node-action@v1
with:
## Add your own personal access token to your Github Repository secrets and reference it here.
personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
+674
View File
@@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://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
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.
+57 -6
View File
@@ -10,6 +10,7 @@ DSD is a model for subject-preserving image generation that allows you to create
- Gemini API prompt enhancement
- Direct model download from Hugging Face
- Fine-grained control over generation parameters
- Multiple image resizing options
## Installation
@@ -39,31 +40,81 @@ pip install -r requirements.txt
## Available Nodes
1. **DSD Model Downloader**: Automatically downloads the model from Hugging Face
- Supports downloading from custom repositories with the `repo_id` parameter
- Includes options for model precision (bfloat16, float16, float32)
- Provides memory optimization options (low_cpu_mem_usage, model_cpu_offload, sequential_cpu_offload)
- Optional Hugging Face token support via parameter or HF_TOKEN environment variable
2. **DSD Model Loader**: Loads a pre-downloaded model
- Supports custom model and LoRA paths
- Multiple precision options (bfloat16, float16, float32)
- Memory optimization options for different hardware configurations
3. **DSD Model Selector**: Helps select models from local directories
- Automatically finds models in the default ComfyUI model paths
- Verifies model existence and provides appropriate warnings
4. **DSD Gemini Prompt Enhancer**: Uses Google's Gemini API to enhance prompts for better image generation results. The API key can be provided in two ways:
- As an input parameter to the node (not recommended for sharing workflows)
- Through the `GEMINI_API_KEY` environment variable (strongly recommended)
4. **DSD Gemini Prompt Enhancer**: Uses Google's Gemini API to enhance prompts for better image generation results
- The API key can be provided in two ways:
- As an input parameter to the node (not recommended for sharing workflows)
- Through the `GEMINI_API_KEY` environment variable (strongly recommended)
- Analyzes both the input image and text prompt to generate improved prompts
Note: To use the enhanced prompts, make sure to enable the `use_gemini_prompt` option on the DSD Image Generator node. If you don't enter a API Key it will be skipped automatically.
Note: To use the enhanced prompts, connect this node's output to the DSD Image Generator's prompt input and enable the `use_gemini_prompt` option. If no API key is provided, the original prompt will be used.
5. **DSD Image Generator**: Generates images with the DSD model
- Supports detailed parameter control:
- Guidance scale (overall, image-specific, and text-specific)
- Inference steps
- Resolution control
- Seed control (0 for random seed)
- Returns both the generated image and the reference image
- Displays progress during generation
6. **DSD Resize Selector**: Provides flexible image resizing options for the DSD Image Generator:
- **resize_and_center_crop**: Resizes and center crops the image (default behavior)
- **center_crop**: Simple center crop and resize
- **pad**: Preserves aspect ratio and adds padding to reach target size
- **fit**: Resizes to target dimensions without preserving aspect ratio
- Additional customization:
- Interpolation method (LANCZOS, BICUBIC, BILINEAR, NEAREST)
- Padding color (RGB values for pad mode)
## Basic Workflow
![Sample1](examples/screenshot.png)
![Sample](examples/workflow.png)
![Sample2](examples/screenshot-2.png)
## Advanced Usage
### Memory Optimization
The DSD model can be memory-intensive. Several options are available to optimize memory usage:
- **Precision**: Use `bfloat16` (default) for the best balance of speed and memory usage
- **CPU Offloading**: Enable `model_cpu_offload` or `sequential_cpu_offload` for systems with limited VRAM
- **Resolution**: Lower resolution and fewer inference steps can significantly reduce memory requirements
### Gemini API Integration
For optimal results with the Gemini API:
1. Obtain a Gemini API key from Google AI Studio
2. Set it as an environment variable: `GEMINI_API_KEY=your_key_here`
3. Connect the DSD Gemini Prompt Enhancer to your workflow
4. Enable `use_gemini_prompt` on the DSD Image Generator
### Custom Model Loading
If you have custom DSD models or want to use a different repository:
1. Use the DSD Model Downloader with a custom `repo_id`
2. Or manually download the model files and use DSD Model Loader with custom paths
## Troubleshooting
- **Memory Issues**: Try reducing precision (use bfloat16), lower resolution, or fewer steps
- **Gemini API**: Ensure you have a valid API key (can be set via GEMINI_API_KEY environment variable)
- **Model Loading**: If you see errors, try using the Model Downloader node to re-download files
- **Import Errors**: Make sure all dependencies are installed correctly
- **CUDA Errors**: If you encounter CUDA out-of-memory errors, try enabling CPU offloading options
## Examples
+3 -1
View File
@@ -4,4 +4,6 @@ Diffusion Self-Distillation ComfyUI nodes
from .dsd_nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS"]
WEB_DIRECTORY = "./web"
__all__ = ["NODE_CLASS_MAPPINGS", "NODE_DISPLAY_NAME_MAPPINGS", "WEB_DIRECTORY"]
+28 -56
View File
@@ -393,8 +393,8 @@ class FluxConditionalPipeline(DiffusionPipeline, SD3LoraLoaderMixin):
prompt=prompt_2,
num_images_per_prompt=num_images_per_prompt,
max_sequence_length=max_sequence_length,
device=device,
)
device=device
)
if self.text_encoder is not None:
if isinstance(self, SD3LoraLoaderMixin) and USE_PEFT_BACKEND:
@@ -615,9 +615,7 @@ class FluxConditionalPipeline(DiffusionPipeline, SD3LoraLoaderMixin):
negative_pooled_prompt_embeds: Optional[torch.FloatTensor] = None,
no_cfg_until_timestep: int = 2,
image: Optional[torch.FloatTensor] = None,
image_path = None,
cut_output = True,
gemini_prompt = True
cut_output = True
):
r"""
Function invoked when calling the pipeline for generation.
@@ -782,7 +780,7 @@ class FluxConditionalPipeline(DiffusionPipeline, SD3LoraLoaderMixin):
image = torch.nn.functional.interpolate(image, size=(height, width // 2))
black_image = torch.full((1, 3, height, width // 2), -1.0)
image = torch.cat([image, black_image], dim=3)
latents_cond = self.vae.encode(image.to(self.vae.dtype).to(self.vae.device)).latent_dist.sample()
latents_cond = self.vae.encode(image.to(dtype=self.vae.dtype).to(device)).latent_dist.sample()
latents_cond = (
latents_cond - self.vae.config.shift_factor
) * self.vae.config.scaling_factor
@@ -829,11 +827,6 @@ class FluxConditionalPipeline(DiffusionPipeline, SD3LoraLoaderMixin):
)
self._num_timesteps = len(timesteps)
latents = latents.to(self.transformer.device)
latent_image_ids = latent_image_ids.to(self.transformer.device)
timesteps = timesteps.to(self.transformer.device)
text_ids = text_ids.to(self.transformer.device)
# 6. Denoising loop
with self.progress_bar(total=num_inference_steps) as progress_bar:
for i, t in enumerate(timesteps):
@@ -846,7 +839,7 @@ class FluxConditionalPipeline(DiffusionPipeline, SD3LoraLoaderMixin):
# handle guidance
if self.transformer.config.guidance_embeds:
guidance = torch.tensor(
[guidance_scale], device=self.transformer.device
[guidance_scale], device=device
)
guidance = guidance.expand(latents.shape[0])
else:
@@ -859,79 +852,58 @@ class FluxConditionalPipeline(DiffusionPipeline, SD3LoraLoaderMixin):
)
noise_pred = self.transformer(
hidden_states=latents.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
hidden_states=latents,
# YiYi notes: divide it by 1000 for now because we scale it by 1000 in the transforme rmodel (we should not keep it but I want to keep the inputs same for the model for testing)
timestep=timestep / 1000,
guidance=guidance,
pooled_projections=pooled_prompt_embeds.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
encoder_hidden_states=prompt_embeds.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
pooled_projections=pooled_prompt_embeds,
encoder_hidden_states=prompt_embeds,
txt_ids=text_ids,
img_ids=latent_image_ids,
joint_attention_kwargs=self.joint_attention_kwargs,
return_dict=False,
condition_hidden_states=latents_cond.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
condition_hidden_states=latents_cond,
**extra_transformer_args,
)[0]
# TODO optionally use batch prediction to speed this up.
if guidance_scale_real_i > 1.0 and i >= no_cfg_until_timestep:
noise_pred_uncond = self.transformer(
hidden_states=latents.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
hidden_states=latents,
# YiYi notes: divide it by 1000 for now because we scale it by 1000 in the transforme rmodel (we should not keep it but I want to keep the inputs same for the model for testing)
timestep=timestep / 1000,
guidance=guidance,
pooled_projections=negative_pooled_prompt_embeds.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
encoder_hidden_states=negative_prompt_embeds.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
txt_ids=negative_text_ids.to(device=self.transformer.device),
img_ids=latent_image_ids.to(device=self.transformer.device),
pooled_projections=negative_pooled_prompt_embeds,
encoder_hidden_states=negative_prompt_embeds,
txt_ids=negative_text_ids,
img_ids=latent_image_ids,
joint_attention_kwargs=self.joint_attention_kwargs,
return_dict=False,
condition_hidden_states=torch.zeros_like(latents_cond).to(
device=self.transformer.device, dtype=self.transformer.dtype
),
condition_hidden_states=torch.zeros_like(latents_cond),
)[0]
noise_pred_uncond_t = self.transformer(
hidden_states=latents.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
hidden_states=latents,
# YiYi notes: divide it by 1000 for now because we scale it by 1000 in the transforme rmodel (we should not keep it but I want to keep the inputs same for the model for testing)
timestep=timestep / 1000,
guidance=guidance,
pooled_projections=negative_pooled_prompt_embeds.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
encoder_hidden_states=negative_prompt_embeds.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
txt_ids=negative_text_ids.to(device=self.transformer.device),
img_ids=latent_image_ids.to(device=self.transformer.device),
pooled_projections=negative_pooled_prompt_embeds,
encoder_hidden_states=negative_prompt_embeds,
txt_ids=negative_text_ids,
img_ids=latent_image_ids,
joint_attention_kwargs=self.joint_attention_kwargs,
return_dict=False,
condition_hidden_states=latents_cond.to(
device=self.transformer.device, dtype=self.transformer.dtype
),
condition_hidden_states=latents_cond,
)[0]
# noise_pred = noise_pred_uncond + guidance_scale_real * (
# noise_pred - noise_pred_uncond
# )
noise_pred = noise_pred_uncond + \
guidance_scale_real_i * (noise_pred_uncond_t - noise_pred_uncond) + \
guidance_scale_real_t * (noise_pred - noise_pred_uncond_t)
noise_pred = (
noise_pred_uncond
+ guidance_scale_real_i
* (noise_pred_uncond_t - noise_pred_uncond)
+ guidance_scale_real_t * (noise_pred - noise_pred_uncond_t)
)
# compute the previous noisy sample x_t -> x_t-1
latents_dtype = latents.dtype
@@ -976,7 +948,7 @@ class FluxConditionalPipeline(DiffusionPipeline, SD3LoraLoaderMixin):
) + self.vae.config.shift_factor
image = self.vae.decode(
latents.to(device=self.vae.device, dtype=self.vae.dtype),
latents,
return_dict=False,
)[0]
+139 -50
View File
@@ -10,7 +10,7 @@ from pathlib import Path
from tqdm import tqdm
from huggingface_hub import hf_hub_download, snapshot_download
from .utils import get_model_path, get_lora_path, comfy_to_pil, pil_to_comfy, center_crop_and_resize
from .utils import get_model_path, get_lora_path, comfy_to_pil, pil_to_comfy, resize_and_center_crop, center_crop, pad_resize, fit_resize
from .dsd_imports import FluxConditionalPipeline, FluxTransformer2DConditionalModel, enhance_prompt, IMPORTS_AVAILABLE
from comfy.utils import ProgressBar
try:
@@ -42,7 +42,10 @@ class DSDModelLoader:
"model_path": ("STRING", {"default": ""}),
"lora_path": ("STRING", {"default": ""}),
"device": (["cuda", "cpu"], {"default": "cuda"}),
"dtype": (["bfloat16", "float16", "float32"], {"default": "bfloat16"})
"dtype": (["bfloat16", "float16", "float32"], {"default": "bfloat16"}),
"low_cpu_mem_usage": ("BOOLEAN", {"default": True, "tooltip": "Reduces CPU memory usage during model loading. Recommended for faster loading."}),
"model_cpu_offload": ("BOOLEAN", {"default": False, "tooltip": "Offloads state dict to reduce memory usage during loading. May slow down inference speed."}),
"sequential_cpu_offload": ("BOOLEAN", {"default": False, "tooltip": "Enables sequential CPU offloading. Only use if low on VRAM. Significantly impacts inference speed."})
}
}
@@ -51,7 +54,7 @@ class DSDModelLoader:
FUNCTION = "load_model"
CATEGORY = "DSD"
def load_model(self, model_path, lora_path, device, dtype):
def load_model(self, model_path, lora_path, device, dtype, low_cpu_mem_usage, model_cpu_offload, sequential_cpu_offload):
if not IMPORTS_AVAILABLE:
raise ImportError("Could not import DSD modules. Make sure DSD project files (pipeline.py, transformer.py) are properly installed in the parent directory.")
@@ -83,24 +86,30 @@ class DSDModelLoader:
print("Loading transformer...")
model_folder = os.path.dirname(model_path)
# Load model with optimized parameters
# Load model with user-specified parameters
transformer = FluxTransformer2DConditionalModel.from_pretrained(
model_folder,
torch_dtype=torch_dtype,
low_cpu_mem_usage=True, # Changed to True for faster loading
low_cpu_mem_usage=low_cpu_mem_usage,
ignore_mismatched_sizes=True,
use_safetensors=True, # Added for faster loading
offload_state_dict=True # Added to reduce memory usage during loading
use_safetensors=True,
)
print("Loading pipeline...")
# Use the optimized from_pretrained method (which was monkey-patched in pipeline.py)
# Use the optimized from_pretrained method
pipe = FluxConditionalPipeline.from_pretrained(
"black-forest-labs/FLUX.1-dev",
"black-forest-labs/FLUX.1-schnell",
transformer=transformer,
torch_dtype=torch_dtype
)
)
# Access and modify scheduler configs
pipe.scheduler.config.shift = 3
pipe.scheduler.config.use_dynamic_shifting = True
print("Loading LoRA weights...")
@@ -110,8 +119,16 @@ class DSDModelLoader:
print("Moving to device...")
# Move to device
pipe.to(device)
# Apply sequential CPU offloading if requested and device is CPU
if model_cpu_offload:
pipe.enable_model_cpu_offload()
if sequential_cpu_offload:
pipe.enable_sequential_cpu_offload()
if not model_cpu_offload and not sequential_cpu_offload:
pipe.to(device)
print("Model loaded successfully")
@@ -135,14 +152,25 @@ class DSDGeminiPromptEnhancer:
RETURN_NAMES = ("enhanced_prompt",)
FUNCTION = "enhance_prompt"
CATEGORY = "DSD"
OUTPUT_NODE = True # This ensures that UI data is sent to the node
def __init__(self):
self.enhanced_prompt = None
def get_state(self):
return {
"enhanced_prompt": self.enhanced_prompt
}
def enhance_prompt(self, image, prompt, api_key):
if not IMPORTS_AVAILABLE:
print("Warning: DSD modules not available. Using original prompt.")
self.enhanced_prompt = None
return (prompt,)
if not GEMINI_AVAILABLE:
print("Warning: Google Gemini API not available. Returning original prompt.")
self.enhanced_prompt = None
return (prompt,)
if not api_key:
@@ -150,6 +178,7 @@ class DSDGeminiPromptEnhancer:
api_key = os.getenv("GEMINI_API_KEY")
if not api_key:
print("Warning: No API key provided for Gemini. Returning original prompt.")
self.enhanced_prompt = None
return (prompt,)
# Convert from ComfyUI image to PIL
@@ -159,14 +188,20 @@ class DSDGeminiPromptEnhancer:
try:
# Call the imported enhance_prompt function
enhanced_prompt = enhance_prompt(pil_image, prompt,api_key)
enhanced_prompt = enhance_prompt(pil_image, prompt, api_key)
print("Original prompt:", prompt)
print("Enhanced prompt:", enhanced_prompt)
return (enhanced_prompt,)
# Store the enhanced prompt for UI display
self.enhanced_prompt = enhanced_prompt
# Return the enhanced prompt and explicitly include it in the UI data
# Make sure enhanced_prompt is a proper string, not an array/list of characters
return {"ui": {"enhanced_prompt": str(enhanced_prompt)}, "result": (enhanced_prompt,)}
except Exception as e:
print(f"Error enhancing prompt: {e}")
self.enhanced_prompt = None
return (prompt,)
@@ -186,9 +221,12 @@ class DSDImageGenerator:
"image_guidance_scale": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 20.0, "step": 0.1}),
"text_guidance_scale": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 20.0, "step": 0.1}),
"num_inference_steps": ("INT", {"default": 28, "min": 1, "max": 100}),
"width": ("INT", {"default": 1024, "min": 512, "max": 2048, "step": 8}),
"height": ("INT", {"default": 512, "min": 512, "max": 2048, "step": 8}),
"width": ("INT", {"default": 1024, "min": 512, "max": 2048, "step": 64}),
"height": ("INT", {"default": 512, "min": 512, "max": 2048, "step": 64}),
"use_gemini_prompt": ("BOOLEAN", {"default": False})
},
"optional": {
"resize_params": ("RESIZE_PARAMS",),
}
}
@@ -216,15 +254,33 @@ class DSDImageGenerator:
def generate(self, dsd_model, image, prompt, negative_prompt, seed,
guidance_scale, image_guidance_scale, text_guidance_scale, num_inference_steps,
width, height, use_gemini_prompt):
width, height, use_gemini_prompt, resize_params=None):
# Initialize progress bar
pbar = ProgressBar(num_inference_steps)
# Reset progress value
self.progress_value = 0.0
# Convert from ComfyUI image format to PIL and prepare
# Convert from ComfyUI image format to PIL
pil_image = comfy_to_pil(image)
pil_image = center_crop_and_resize(pil_image, width//2) # DSD expects 512x512 input images
# Process the image based on resize_params
if resize_params is not None:
method = resize_params.get("method", "center_crop")
interpolation = resize_params.get("interpolation", "LANCZOS")
pad_color = resize_params.get("pad_color", (0, 0, 0))
# Apply the selected resize method
if method == "resize_and_center_crop":
pil_image = resize_and_center_crop(pil_image, height, width//2)
elif method == "center_crop":
pil_image = center_crop(pil_image, height, width//2, interpolation)
elif method == "pad":
pil_image = pad_resize(pil_image, height, width//2, pad_color, interpolation)
elif method == "fit":
pil_image = fit_resize(pil_image, height, width//2, interpolation)
else:
# Use the default center_crop_and_resize if no resize_params provided
pil_image = resize_and_center_crop(pil_image, height, width//2)
# Clean prompt
prompt = prompt.strip().replace("\n", "").replace("\r", "")
@@ -271,7 +327,6 @@ class DSDImageGenerator:
image=pil_image,
guidance_scale_real_i=image_guidance_scale,
guidance_scale_real_t=text_guidance_scale,
gemini_prompt=use_gemini_prompt,
callback_on_step_end=progress_callback,
generator=generator
).images
@@ -367,10 +422,10 @@ class DSDModelDownloader:
"repo_id": ("STRING", {"default": "primecai/dsd_model"}),
"force_download": ("BOOLEAN", {"default": False}),
"device": (["cuda", "cpu"], {"default": "cuda"}),
"dtype": (["bfloat16", "float16", "float32"], {"default": "bfloat16"})
},
"optional": {
"hf_token": ("STRING", {"default": "", "multiline": False, "tooltip": "Enter your Hugging Face token here or use the environment variable HF_TOKEN."})
"dtype": (["bfloat16", "float16", "float32"], {"default": "bfloat16", "tooltip": "bfloat16 provides best speed/memory tradeoff"}),
"low_cpu_mem_usage": ("BOOLEAN", {"default": True, "tooltip": "Reduces CPU memory usage during model loading. Recommended for faster loading."}),
"model_cpu_offload": ("BOOLEAN", {"default": False, "tooltip": "Offloads state dict to reduce memory usage during loading. May slow down loading speed."}),
"sequential_cpu_offload": ("BOOLEAN", {"default": False, "tooltip": "Enables sequential CPU offloading. Only use if low on VRAM. Significantly impacts loading speed."})
}
}
@@ -389,17 +444,10 @@ class DSDModelDownloader:
"status_text": self.status_text
}
def download_and_load_model(self, repo_id, force_download, device, dtype, hf_token=""):
def download_and_load_model(self, repo_id, force_download, device, dtype, low_cpu_mem_usage, model_cpu_offload, sequential_cpu_offload):
if not IMPORTS_AVAILABLE:
raise ImportError("Could not import DSD modules. Make sure DSD project files (pipeline.py, transformer.py) are properly installed in the parent directory.")
# Get token from environment variable if not provided
if not hf_token:
hf_token = os.getenv("HF_TOKEN")
if hf_token:
self.status_text = "Using HF_TOKEN from environment variable"
print(self.status_text)
# Create the dsd_model directory in ComfyUI models folder if it doesn't exist
os.makedirs(dsd_model_path, exist_ok=True)
transformer_path = os.path.join(dsd_model_path, "transformer")
@@ -427,8 +475,7 @@ class DSDModelDownloader:
repo_id=repo_id,
local_dir=dsd_model_path,
local_dir_use_symlinks=False,
resume_download=True,
token=hf_token
resume_download=True
)
self.progress_value = 0.5
@@ -466,28 +513,34 @@ class DSDModelDownloader:
self.progress_value = 0.6
try:
# Load model with optimized parameters
# Load model with user-specified parameters
transformer = FluxTransformer2DConditionalModel.from_pretrained(
transformer_path,
torch_dtype=torch_dtype,
low_cpu_mem_usage=True,
low_cpu_mem_usage=low_cpu_mem_usage,
ignore_mismatched_sizes=True,
use_safetensors=True,
offload_state_dict=True,
token=hf_token
use_safetensors=True
)
self.status_text = "Loading pipeline..."
print(self.status_text)
self.progress_value = 0.7
# Use the optimized from_pretrained method
# Using black-forest-labs/FLUX.1-schnell,so we don't need to login to Hugging Face
pipe = FluxConditionalPipeline.from_pretrained(
"black-forest-labs/FLUX.1-dev",
"black-forest-labs/FLUX.1-schnell",
transformer=transformer,
torch_dtype=torch_dtype,
token=hf_token
)
torch_dtype=torch_dtype
)
# Access and modify scheduler configs
pipe.scheduler.config.shift = 3
pipe.scheduler.config.use_dynamic_shifting = True
self.status_text = "Loading LoRA weights..."
print(self.status_text)
@@ -496,12 +549,15 @@ class DSDModelDownloader:
# Load LoRA weights
pipe.load_lora_weights(lora_file)
self.status_text = f"Moving to {device}..."
print(self.status_text)
self.progress_value = 0.9
# Apply sequential CPU offloading if requested and device is CPU
if model_cpu_offload:
pipe.enable_model_cpu_offload()
if sequential_cpu_offload:
pipe.enable_sequential_cpu_offload()
if not model_cpu_offload and not sequential_cpu_offload:
pipe.to(device)
# Move to device
pipe.to(device)
self.progress_value = 0.9
self.status_text = "Model loaded successfully"
print(self.status_text)
@@ -515,13 +571,45 @@ class DSDModelDownloader:
raise
class DSDResizeSelector:
"""Selects image resize options for DSD Image Generator"""
@classmethod
def INPUT_TYPES(cls):
return {
"required": {
"resize_method": (["resize_and_center_crop", "center_crop", "pad", "fit"], {"default": "resize_and_center_crop"}),
"interpolation": (["LANCZOS", "BICUBIC", "BILINEAR", "NEAREST"], {"default": "LANCZOS"}),
"pad_r": ("INT", {"default": 0, "min": 0, "max": 255}),
"pad_g": ("INT", {"default": 0, "min": 0, "max": 255}),
"pad_b": ("INT", {"default": 0, "min": 0, "max": 255}),
}
}
RETURN_TYPES = ("RESIZE_PARAMS",)
RETURN_NAMES = ("resize_params",)
FUNCTION = "select_resize_options"
CATEGORY = "DSD"
def select_resize_options(self, resize_method, interpolation, pad_r, pad_g, pad_b):
# Create a JSON object with the resize parameters
resize_params = {
"method": resize_method,
"interpolation": interpolation,
"pad_color": (pad_r, pad_g, pad_b)
}
return (resize_params,)
# Register nodes
NODE_CLASS_MAPPINGS = {
"DSDModelLoader": DSDModelLoader,
"DSDGeminiPromptEnhancer": DSDGeminiPromptEnhancer,
"DSDImageGenerator": DSDImageGenerator,
"DSDModelSelector": DSDModelSelector,
"DSDModelDownloader": DSDModelDownloader
"DSDModelDownloader": DSDModelDownloader,
"DSDResizeSelector": DSDResizeSelector
}
# Node display names
@@ -530,5 +618,6 @@ NODE_DISPLAY_NAME_MAPPINGS = {
"DSDGeminiPromptEnhancer": "DSD Gemini Prompt Enhancer",
"DSDImageGenerator": "DSD Image Generator",
"DSDModelSelector": "DSD Model Selector",
"DSDModelDownloader": "DSD Model Downloader"
"DSDModelDownloader": "DSD Model Downloader",
"DSDResizeSelector": "DSD Resize Selector"
}
+201 -143
View File
@@ -1,17 +1,46 @@
{
"last_node_id": 38,
"last_link_id": 116,
"last_node_id": 39,
"last_link_id": 117,
"nodes": [
{
"id": 11,
"type": "PrimitiveNode",
"id": 18,
"type": "PreviewImage",
"pos": [
20.652568817138672,
635.3331909179688
1214.10986328125,
-74.78528594970703
],
"size": [
210,
88
406.026123046875,
409.0712585449219
],
"flags": {},
"order": 7,
"mode": 0,
"inputs": [
{
"name": "images",
"type": "IMAGE",
"link": 115
}
],
"outputs": [],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.26",
"Node name for S&R": "PreviewImage"
},
"widgets_values": []
},
{
"id": 3,
"type": "LoadImage",
"pos": [
-119.63543701171875,
-71.78013610839844
],
"size": [
366.44219970703125,
419.337890625
],
"flags": {},
"order": 0,
@@ -19,34 +48,74 @@
"inputs": [],
"outputs": [
{
"name": "STRING",
"type": "STRING",
"name": "IMAGE",
"type": "IMAGE",
"shape": 3,
"links": [
111
]
4,
109
],
"slot_index": 0
},
{
"name": "MASK",
"type": "MASK",
"shape": 3,
"links": []
}
],
"title": "negative_prompt",
"properties": {
"Run widget replace on values": false
"cnr_id": "comfy-core",
"ver": "0.3.26",
"Node name for S&R": "LoadImage"
},
"widgets_values": [
"text, watermark, blurry"
"DALL·E 2024-08-18 18.34.08 - A 2D anime-style character concept art in the style of Porco Rosso. The character is a young, male airplane mechanic in his early 20s, with messy brow.webp",
"image"
]
},
{
"id": 19,
"type": "PreviewImage",
"pos": [
1271.379638671875,
431.7550964355469
],
"size": [
210,
246
],
"flags": {},
"order": 8,
"mode": 0,
"inputs": [
{
"name": "images",
"type": "IMAGE",
"link": 113
}
],
"outputs": [],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.26",
"Node name for S&R": "PreviewImage"
},
"widgets_values": []
},
{
"id": 5,
"type": "DSDGeminiPromptEnhancer",
"pos": [
299.8087463378906,
312.0589294433594
299.41937255859375,
386.8332824707031
],
"size": [
404.98046875,
125.29296875
334.03948974609375,
137.88925170898438
],
"flags": {},
"order": 4,
"order": 5,
"mode": 0,
"inputs": [
{
@@ -75,28 +144,67 @@
}
],
"properties": {
"aux_id": "irreveloper/ComfyUI-DSD-Node",
"cnr_id": "dsd",
"ver": "4642def54ab46095a128cc2f8d37abde99a0f099",
"Node name for S&R": "DSDGeminiPromptEnhancer"
"Node name for S&R": "DSDGeminiPromptEnhancer",
"aux_id": "irreveloper/ComfyUI-DSD-Node"
},
"widgets_values": [
"Superhero fights with evil fish underwater.",
"Side view of anime character.",
""
]
},
{
"id": 39,
"type": "DSDResizeSelector",
"pos": [
314.8365478515625,
171.76687622070312
],
"size": [
315,
154
],
"flags": {},
"order": 1,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "resize_params",
"type": "RESIZE_PARAMS",
"links": [
117
],
"slot_index": 0
}
],
"properties": {
"cnr_id": "dsd",
"ver": "48d020ac58d05c8a14223dac597a645ee908684a",
"Node name for S&R": "DSDResizeSelector"
},
"widgets_values": [
"resize_and_center_crop",
"LANCZOS",
0,
0,
0
]
},
{
"id": 38,
"type": "DSDModelDownloader",
"pos": [
317.01739501953125,
13.488250732421875
328.3520812988281,
-165.09207153320312
],
"size": [
315,
194
266
],
"flags": {},
"order": 1,
"order": 2,
"mode": 0,
"inputs": [],
"outputs": [
@@ -119,125 +227,28 @@
}
],
"properties": {
"aux_id": "irreveloper/ComfyUI-DSD-Node",
"cnr_id": "dsd",
"ver": "4642def54ab46095a128cc2f8d37abde99a0f099",
"Node name for S&R": "DSDModelDownloader"
"Node name for S&R": "DSDModelDownloader",
"aux_id": "irreveloper/ComfyUI-DSD-Node"
},
"widgets_values": [
"primecai/dsd_model",
false,
"cuda",
"bfloat16",
true,
false,
false,
""
]
},
{
"id": 19,
"type": "PreviewImage",
"pos": [
1260.008544921875,
416.4699401855469
],
"size": [
210,
246
],
"flags": {},
"order": 7,
"mode": 0,
"inputs": [
{
"name": "images",
"type": "IMAGE",
"link": 113
}
],
"outputs": [],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.26",
"Node name for S&R": "PreviewImage"
},
"widgets_values": []
},
{
"id": 18,
"type": "PreviewImage",
"pos": [
1214.10986328125,
-74.78528594970703
],
"size": [
406.026123046875,
409.0712585449219
],
"flags": {},
"order": 6,
"mode": 0,
"inputs": [
{
"name": "images",
"type": "IMAGE",
"link": 115
}
],
"outputs": [],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.26",
"Node name for S&R": "PreviewImage"
},
"widgets_values": []
},
{
"id": 3,
"type": "LoadImage",
"pos": [
-94.37196350097656,
-36.992637634277344
],
"size": [
366.44219970703125,
419.337890625
],
"flags": {},
"order": 2,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "IMAGE",
"type": "IMAGE",
"shape": 3,
"links": [
4,
109
],
"slot_index": 0
},
{
"name": "MASK",
"type": "MASK",
"shape": 3,
"links": []
}
],
"properties": {
"cnr_id": "comfy-core",
"ver": "0.3.26",
"Node name for S&R": "LoadImage"
},
"widgets_values": [
"image (17).webp",
"image"
]
},
{
"id": 4,
"type": "PrimitiveNode",
"pos": [
-77.04129791259766,
436.9585266113281
-117.78815460205078,
407.2402648925781
],
"size": [
315,
@@ -262,22 +273,54 @@
"Run widget replace on values": false
},
"widgets_values": [
"Superhero fights with evil fish underwater."
"Side view of anime character."
]
},
{
"id": 11,
"type": "PrimitiveNode",
"pos": [
-106.84088897705078,
607.5902099609375
],
"size": [
301.3577880859375,
88
],
"flags": {},
"order": 4,
"mode": 0,
"inputs": [],
"outputs": [
{
"name": "STRING",
"type": "STRING",
"links": [
111
]
}
],
"title": "negative_prompt",
"properties": {
"Run widget replace on values": false
},
"widgets_values": [
"text, watermark, blurry"
]
},
{
"id": 37,
"type": "DSDImageGenerator",
"pos": [
754.3903198242188,
41.60234832763672
721.5396728515625,
86.6509017944336
],
"size": [
400,
398
],
"flags": {},
"order": 5,
"order": 6,
"mode": 0,
"inputs": [
{
@@ -305,6 +348,12 @@
"name": "negative_prompt"
},
"link": 111
},
{
"name": "resize_params",
"type": "RESIZE_PARAMS",
"shape": 7,
"link": 117
}
],
"outputs": [
@@ -329,9 +378,10 @@
}
],
"properties": {
"aux_id": "irreveloper/ComfyUI-DSD-Node",
"cnr_id": "dsd",
"ver": "4642def54ab46095a128cc2f8d37abde99a0f099",
"Node name for S&R": "DSDImageGenerator"
"Node name for S&R": "DSDImageGenerator",
"aux_id": "irreveloper/ComfyUI-DSD-Node"
},
"widgets_values": [
"",
@@ -342,8 +392,8 @@
1,
1,
28,
1536,
768,
1024,
512,
true
]
}
@@ -412,16 +462,24 @@
37,
0,
"DSD_MODEL"
],
[
117,
39,
0,
37,
4,
"RESIZE_PARAMS"
]
],
"groups": [],
"config": {},
"extra": {
"ds": {
"scale": 1.3310000000000017,
"scale": 0.8768324088719838,
"offset": [
145.57362443895767,
125.29861875515397
773.2185529985686,
450.555653889974
]
}
},
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 MiB

+15
View File
@@ -0,0 +1,15 @@
[project]
name = "dsd"
description = "An Unofficial ComfyUI custom node package that integrates [a/Diffusion Self-Distillation (DSD)](https://github.com/primecai/diffusion-self-distillation) for zero-shot customized image generation.\nDSD is a model for subject-preserving image generation that allows you to create images of a specific subject in novel contexts without per-instance tuning."
version = "1.0.2"
license = {file = "LICENSE"}
dependencies = ["torch>=2.0.0", "diffusers>=0.24.0", "transformers>=4.36.0", "sentencepiece>=0.1.99", "accelerate>=0.27.0", "google-genai>=0.1.0", "Pillow>=9.5.0", "protobuf>=4.25.0", "peft>=0.7.0", "hf_transfer"]
[project.urls]
Repository = "https://github.com/irreveloper/ComfyUI-DSD"
# Used by Comfy Registry https://comfyregistry.org
[tool.comfy]
PublisherId = "irreveloper"
DisplayName = "ComfyUI-DSD"
Icon = ""
+171 -9
View File
@@ -92,13 +92,14 @@ def pil_to_comfy(image: Union[Image.Image, List[Image.Image], None]) -> Optional
# Convert to torch tensor and add batch dimension
return torch.from_numpy(image_np)[None,]
def center_crop_and_resize(image: Union[torch.Tensor, Image.Image], target_size: int = 512) -> Union[torch.Tensor, Image.Image]:
def resize_and_center_crop(image: Union[torch.Tensor, Image.Image], target_height: int = 512,target_width: int = 512) -> Union[torch.Tensor, Image.Image]:
"""
Center crop and resize an image.
Args:
image: Image to process (ComfyUI tensor or PIL Image)
target_size: Target size for width and height
target_height: Target height
target_width: Target width
Returns:
Processed image in the same format as input
@@ -106,15 +107,176 @@ def center_crop_and_resize(image: Union[torch.Tensor, Image.Image], target_size:
# Handle ComfyUI tensor
if isinstance(image, torch.Tensor):
pil_image = comfy_to_pil(image)
result = center_crop_and_resize(pil_image, target_size)
result = resize_and_center_crop(pil_image, target_height, target_width)
return pil_to_comfy(result)
# Handle PIL Image
w, h = image.size
min_size = min(w, h)
cropped = image.crop(((w - min_size) // 2,
(h - min_size) // 2,
(w + min_size) // 2,
(h + min_size) // 2))
resized = cropped.resize((target_size, target_size), Image.LANCZOS)
return resized
# Calculate target aspect ratio
target_ratio = target_width / target_height
# Calculate current aspect ratio
current_ratio = w / h
# Resize to match target width or height while preserving aspect ratio
if current_ratio > target_ratio:
# Image is wider than target - resize by height
new_height = target_height
new_width = int(w * (target_height / h))
else:
# Image is taller than target - resize by width
new_width = target_width
new_height = int(h * (target_width / w))
image = image.resize((new_width, new_height), Image.BILINEAR)
# Center crop the image to the target size
cropped = image.crop(((new_width - target_width) // 2,
(new_height - target_height) // 2,
(new_width + target_width) // 2,
(new_height + target_height) // 2))
return cropped
def center_crop(image: Union[torch.Tensor, Image.Image], target_height: int = 512, target_width: int = 512,
interpolation: str = "LANCZOS") -> Union[torch.Tensor, Image.Image]:
"""
Center crop an image to target size. If image is smaller than target size,
resize first before cropping.
Args:
image: Image to process (ComfyUI tensor or PIL Image)
target_height: Target height
target_width: Target width
interpolation: Interpolation method (NEAREST, BILINEAR, BICUBIC, LANCZOS)
Returns:
Processed image in the same format as input
"""
# Handle ComfyUI tensor
if isinstance(image, torch.Tensor):
pil_image = comfy_to_pil(image)
result = center_crop(pil_image, target_height, target_width, interpolation)
return pil_to_comfy(result)
# Handle PIL Image
w, h = image.size
# Get interpolation method
interp_method = {
"NEAREST": Image.NEAREST,
"BILINEAR": Image.BILINEAR,
"BICUBIC": Image.BICUBIC,
"LANCZOS": Image.LANCZOS
}.get(interpolation, Image.LANCZOS)
# If image is smaller than target in either dimension, resize first
if w < target_width or h < target_height:
# Calculate scale factor needed
scale = max(target_width / w, target_height / h)
new_w = int(w * scale)
new_h = int(h * scale)
image = image.resize((new_w, new_h), interp_method)
w, h = new_w, new_h
# Calculate crop coordinates
left = (w - target_width) // 2
top = (h - target_height) // 2
right = left + target_width
bottom = top + target_height
# Perform center crop
cropped = image.crop((left, top, right, bottom))
return cropped
def pad_resize(image: Union[torch.Tensor, Image.Image], target_height: int = 512, target_width: int = 512,
pad_color: tuple = (0, 0, 0), interpolation: str = "LANCZOS") -> Union[torch.Tensor, Image.Image]:
"""
Resize image preserving aspect ratio and pad to target size.
Args:
image: Image to process (ComfyUI tensor or PIL Image)
target_height: Target height
target_width: Target width
pad_color: RGB color tuple for padding (default: black)
interpolation: Interpolation method (NEAREST, BILINEAR, BICUBIC, LANCZOS)
Returns:
Processed image in the same format as input
"""
# Handle ComfyUI tensor
if isinstance(image, torch.Tensor):
pil_image = comfy_to_pil(image)
result = pad_resize(pil_image, target_height, target_width, pad_color, interpolation)
return pil_to_comfy(result)
# Handle PIL Image
w, h = image.size
# Get interpolation method
interp_method = {
"NEAREST": Image.NEAREST,
"BILINEAR": Image.BILINEAR,
"BICUBIC": Image.BICUBIC,
"LANCZOS": Image.LANCZOS
}.get(interpolation, Image.LANCZOS)
# Calculate target aspect ratio
target_ratio = target_width / target_height
# Calculate current aspect ratio
current_ratio = w / h
# Create a new image with the target size and fill with the pad color
new_image = Image.new("RGB", (target_width, target_height), pad_color)
# Resize the original image preserving aspect ratio
if current_ratio > target_ratio:
# Image is wider than target - resize by width
new_w = target_width
new_h = int(h * (target_width / w))
resized = image.resize((new_w, new_h), interp_method)
# Paste in the center (horizontally)
new_image.paste(resized, (0, (target_height - new_h) // 2))
else:
# Image is taller than target - resize by height
new_h = target_height
new_w = int(w * (target_height / h))
resized = image.resize((new_w, new_h), interp_method)
# Paste in the center (vertically)
new_image.paste(resized, ((target_width - new_w) // 2, 0))
return new_image
def fit_resize(image: Union[torch.Tensor, Image.Image], target_height: int = 512, target_width: int = 512,
interpolation: str = "LANCZOS") -> Union[torch.Tensor, Image.Image]:
"""
Resize image to target size without preserving aspect ratio.
Args:
image: Image to process (ComfyUI tensor or PIL Image)
target_height: Target height
target_width: Target width
interpolation: Interpolation method (NEAREST, BILINEAR, BICUBIC, LANCZOS)
Returns:
Processed image in the same format as input
"""
# Handle ComfyUI tensor
if isinstance(image, torch.Tensor):
pil_image = comfy_to_pil(image)
result = fit_resize(pil_image, target_height, target_width, interpolation)
return pil_to_comfy(result)
# Handle PIL Image
# Get interpolation method
interp_method = {
"NEAREST": Image.NEAREST,
"BILINEAR": Image.BILINEAR,
"BICUBIC": Image.BICUBIC,
"LANCZOS": Image.LANCZOS
}.get(interpolation, Image.LANCZOS)
# Resize directly to target size (no aspect ratio preservation)
resized = image.resize((target_width, target_height), interp_method)
return resized
+77
View File
@@ -0,0 +1,77 @@
import { app } from "../../../scripts/app.js";
import { ComfyWidgets } from "../../../scripts/widgets.js";
// Displays enhanced prompt on DSDGeminiPromptEnhancer node
app.registerExtension({
name: "comfyui.dsd.showEnhancedPrompt",
async beforeRegisterNodeDef(nodeType, nodeData, app) {
if (nodeData.name === "DSDGeminiPromptEnhancer") {
function normalizePrompt(prompt) {
if (!prompt) return "";
if (Array.isArray(prompt)) {
return prompt.join("");
}
return prompt;
}
function populateEnhancedPrompt(enhancedPrompt) {
enhancedPrompt = normalizePrompt(enhancedPrompt);
if (!enhancedPrompt) {
return;
}
try {
if (this.widgets) {
for (let i = 0; i < this.widgets.length; i++) {
if (this.widgets[i].name === "enhanced_prompt_display") {
this.widgets[i].onRemove?.();
this.widgets.splice(i, 1);
i--;
}
}
}
const textWidgetResult = ComfyWidgets["STRING"](this, "enhanced_prompt_text", ["STRING", { multiline: true }], app);
if (!textWidgetResult || !textWidgetResult.widget || !textWidgetResult.widget.inputEl) {
return;
}
const w = textWidgetResult.widget;
w.inputEl.readOnly = true;
w.inputEl.style.opacity = 0.8;
w.inputEl.style.backgroundColor = "#1e2124";
w.inputEl.style.color = "#9eec51";
w.name = "enhanced_prompt_display";
w.value = enhancedPrompt;
requestAnimationFrame(() => {
const sz = this.computeSize();
if (sz[0] < this.size[0]) sz[0] = this.size[0];
if (sz[1] < this.size[1]) sz[1] = this.size[1];
this.onResize?.(sz);
app.graph.setDirtyCanvas(true, false);
});
} catch (error) {
// Silent error handling
}
}
const onExecuted = nodeType.prototype.onExecuted;
nodeType.prototype.onExecuted = function (message) {
try {
onExecuted?.apply(this, arguments);
if (message.enhanced_prompt) {
populateEnhancedPrompt.call(this, message.enhanced_prompt);
} else if (message.ui && message.ui.enhanced_prompt) {
populateEnhancedPrompt.call(this, message.ui.enhanced_prompt);
} else if (message.text) {
populateEnhancedPrompt.call(this, message.text);
}
} catch (error) {
// Silent error handling
}
};
}
},
});
window.DSD_ENHANCED_PROMPT_LOADED = true;