Compare commits
95
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d12fac4576 | ||
|
|
27613ed685 | ||
|
|
92673900c5 | ||
|
|
d9d20018be | ||
|
|
ffa4123f07 | ||
|
|
35b2700251 | ||
|
|
42981b7889 | ||
|
|
091d2ff930 | ||
|
|
85e01a8711 | ||
|
|
4d548bfb5a | ||
|
|
24c17beccf | ||
|
|
4c8e720d05 | ||
|
|
1aa0fc15e2 | ||
|
|
1faaad58f0 | ||
|
|
0904716cd0 | ||
|
|
c80f154659 | ||
|
|
fb3e973b53 | ||
|
|
34f8feb2c0 | ||
|
|
64ebfa42e9 | ||
|
|
deba76e0e7 | ||
|
|
8e8d10b1c5 | ||
|
|
ae2948048a | ||
|
|
4eb3e8b4f7 | ||
|
|
73bfa4e7b0 | ||
|
|
a9d07ba4d3 | ||
|
|
070fdb5132 | ||
|
|
e47726eb77 | ||
|
|
3b5a9b5220 | ||
|
|
f28c2c6b31 | ||
|
|
344a886792 | ||
|
|
fffc29fc2b | ||
|
|
20fcbb2e48 | ||
|
|
f9a3ce43f5 | ||
|
|
cbd714d9ea | ||
|
|
b825b62a96 | ||
|
|
ae8ed60767 | ||
|
|
ddad7b8c40 | ||
|
|
134ccd3c2b | ||
|
|
3c8a5ebc2b | ||
|
|
1a826fa746 | ||
|
|
710104d709 | ||
|
|
752a0de95d | ||
|
|
9417b64458 | ||
|
|
4fb799112a | ||
|
|
d2cfd99a33 | ||
|
|
5521822589 | ||
|
|
2b19a132a6 | ||
|
|
6666050283 | ||
|
|
c0da8f916d | ||
|
|
232bc67c9d | ||
|
|
a4d96afd5d | ||
|
|
45e7caca72 | ||
|
|
15c7d7f60c | ||
|
|
26e57ef44f | ||
|
|
00fb0b91cd | ||
|
|
fc1f9afbcd | ||
|
|
b3042fdf6f | ||
|
|
bf8f352347 | ||
|
|
2eea258bc4 | ||
|
|
be2725c2cb | ||
|
|
3f742ed72f | ||
|
|
6a27517db6 | ||
|
|
68e5dad893 | ||
|
|
9a606f550d | ||
|
|
1b5fd5e7d5 | ||
|
|
44ac4cd0f8 | ||
|
|
83e1caa5fa | ||
|
|
58200be879 | ||
|
|
895fc30c37 | ||
|
|
62ab265a80 | ||
|
|
f1bf4485c1 | ||
|
|
b8292f45ba | ||
|
|
166fb12aba | ||
|
|
3f6f36cd81 | ||
|
|
0982abfcf8 | ||
|
|
e06fb3d5d3 | ||
|
|
6afc9ce442 | ||
|
|
0d9bd35d84 | ||
|
|
f49589ee82 | ||
|
|
c33e93af11 | ||
|
|
60d68d99ef | ||
|
|
b8b6657801 | ||
|
|
ad8715f3a2 | ||
|
|
92ab0995e4 | ||
|
|
e146e2512f | ||
|
|
49fb34f250 | ||
|
|
f2926099fe | ||
|
|
f78f07961e | ||
|
|
8311254009 | ||
|
|
aa185a6ff3 | ||
|
|
83146c06f4 | ||
|
|
6422a94ed4 | ||
|
|
2a59a8a01e | ||
|
|
cf86159484 | ||
|
|
1ec16a1662 |
+674
@@ -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>.
|
||||
@@ -1 +1,35 @@
|
||||
# ComfyUI-ShellAgent-Plugin
|
||||
|
||||
This repository provides utility nodes for defining inputs and outputs in ComfyUI workflows. These nodes are essential for running [ShellAgent](https://github.com/myshell-ai/ShellAgent) apps with ComfyUI, but they can also be used independently to specify input/output variables and their requirements explicitly.
|
||||
|
||||
## Installation
|
||||
|
||||
To install, either:
|
||||
|
||||
1. Download or clone this repository into the ComfyUI/custom_nodes/ directory.
|
||||
2. Use the ComfyUI-Manager.
|
||||
|
||||
## Features
|
||||
|
||||
### Input Nodes
|
||||
|
||||
- Input Text
|
||||
- Input Image
|
||||
- Input Float
|
||||
- Input Integer
|
||||
- Input Video
|
||||
|
||||
Each input node supports setting a default value and additional configuration options.
|
||||
|
||||
### Output Nodes
|
||||
|
||||
- Save Image
|
||||
- Save Images
|
||||
- Save Video - VHS
|
||||
- Output Text
|
||||
- Output Float
|
||||
- Output Integer
|
||||
|
||||
### Convert Widgets to ShellAgent Inputs
|
||||
|
||||
A widget can be easily converted into a ShellAgent Input node of the appropriate type by right-clicking on the widget and selecting the option from the menu.
|
||||
|
||||
+65
-11
@@ -1,5 +1,7 @@
|
||||
import folder_paths
|
||||
from PIL import Image, ImageOps
|
||||
import node_helpers
|
||||
|
||||
from PIL import Image, ImageOps, ImageSequence, ImageFile
|
||||
import numpy as np
|
||||
import torch
|
||||
import os
|
||||
@@ -32,8 +34,8 @@ class ShellAgentPluginInputImage:
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_TYPES = ("IMAGE",)
|
||||
RETURN_NAMES = ("image",)
|
||||
RETURN_TYPES = ("IMAGE", "MASK")
|
||||
# RETURN_NAMES = ("image",)
|
||||
|
||||
FUNCTION = "run"
|
||||
|
||||
@@ -45,10 +47,61 @@ class ShellAgentPluginInputImage:
|
||||
"title": kwargs["input_name"],
|
||||
"type": "string",
|
||||
"default": kwargs["default_value"],
|
||||
"description": kwargs["description"],
|
||||
"description": kwargs.get("description", ""),
|
||||
"url_type": "image"
|
||||
}
|
||||
return schema
|
||||
|
||||
@classmethod
|
||||
def VALIDATE_INPUTS(s, input_name, default_value, description=""):
|
||||
image = default_value
|
||||
if image.startswith("http"):
|
||||
return True
|
||||
|
||||
if not folder_paths.exists_annotated_filepath(image):
|
||||
return "Invalid image file: {}".format(image)
|
||||
|
||||
return True
|
||||
|
||||
def convert_image_mask(self, img):
|
||||
output_images = []
|
||||
output_masks = []
|
||||
w, h = None, None
|
||||
|
||||
excluded_formats = ['MPO']
|
||||
|
||||
for i in ImageSequence.Iterator(img):
|
||||
i = node_helpers.pillow(ImageOps.exif_transpose, i)
|
||||
|
||||
if i.mode == 'I':
|
||||
i = i.point(lambda i: i * (1 / 255))
|
||||
image = i.convert("RGB")
|
||||
|
||||
if len(output_images) == 0:
|
||||
w = image.size[0]
|
||||
h = image.size[1]
|
||||
|
||||
if image.size[0] != w or image.size[1] != h:
|
||||
continue
|
||||
|
||||
image = np.array(image).astype(np.float32) / 255.0
|
||||
image = torch.from_numpy(image)[None,]
|
||||
if 'A' in i.getbands():
|
||||
mask = np.array(i.getchannel('A')).astype(np.float32) / 255.0
|
||||
mask = 1. - torch.from_numpy(mask)
|
||||
else:
|
||||
mask = torch.zeros((64,64), dtype=torch.float32, device="cpu")
|
||||
output_images.append(image)
|
||||
output_masks.append(mask.unsqueeze(0))
|
||||
|
||||
if len(output_images) > 1 and img.format not in excluded_formats:
|
||||
output_image = torch.cat(output_images, dim=0)
|
||||
output_mask = torch.cat(output_masks, dim=0)
|
||||
else:
|
||||
output_image = output_images[0]
|
||||
output_mask = output_masks[0]
|
||||
|
||||
return (output_image, output_mask)
|
||||
|
||||
def run(self, input_name, default_value=None, display_name=None, description=None):
|
||||
input_dir = folder_paths.get_input_directory()
|
||||
@@ -57,8 +110,8 @@ class ShellAgentPluginInputImage:
|
||||
if image_path.startswith('http'):
|
||||
import requests
|
||||
from io import BytesIO
|
||||
print("Fetching image from url: ", image)
|
||||
response = requests.get(image)
|
||||
print("Fetching image from url: ", image_path)
|
||||
response = requests.get(image_path)
|
||||
image = Image.open(BytesIO(response.content))
|
||||
elif image_path.startswith('data:image/png;base64,') or image_path.startswith('data:image/jpeg;base64,') or image_path.startswith('data:image/jpg;base64,'):
|
||||
import base64
|
||||
@@ -73,11 +126,12 @@ class ShellAgentPluginInputImage:
|
||||
image_path = os.path.join(input_dir, image_path)
|
||||
image = Image.open(image_path).convert("RGB")
|
||||
|
||||
image = ImageOps.exif_transpose(image)
|
||||
image = image.convert("RGB")
|
||||
image = np.array(image).astype(np.float32) / 255.0
|
||||
image = torch.from_numpy(image)[None,]
|
||||
return [image]
|
||||
return self.convert_image_mask(image)
|
||||
# image = ImageOps.exif_transpose(image)
|
||||
# image = image.convert("RGB")
|
||||
# image = np.array(image).astype(np.float32) / 255.0
|
||||
# image = torch.from_numpy(image)[None,]
|
||||
# return [image]
|
||||
except Exception as e:
|
||||
raise e
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ class ShellAgentPluginInputText:
|
||||
"title": kwargs["input_name"],
|
||||
"type": "string",
|
||||
"default": kwargs["default_value"],
|
||||
"description": kwargs["description"],
|
||||
"description": kwargs.get("description", ""),
|
||||
}
|
||||
if kwargs.get("choices", "") != "":
|
||||
schema["enums"] = eval(kwargs["choices"])
|
||||
@@ -101,7 +101,7 @@ class ShellAgentPluginInputFloat:
|
||||
"title": kwargs["input_name"],
|
||||
"type": "number",
|
||||
"default": kwargs["default_value"],
|
||||
"description": kwargs["description"],
|
||||
"description": kwargs.get("description", ""),
|
||||
}
|
||||
if kwargs.get("choices", "") != "":
|
||||
schema["enums"] = eval(kwargs["choices"])
|
||||
@@ -184,14 +184,58 @@ class ShellAgentPluginInputInteger:
|
||||
def run(self, input_name, default_value=None, display_name=None, description=None, **kwargs):
|
||||
return [default_value]
|
||||
|
||||
class ShellAgentPluginInputBoolean:
|
||||
@classmethod
|
||||
def INPUT_TYPES(s):
|
||||
return {
|
||||
"required": {
|
||||
"input_name": (
|
||||
"STRING",
|
||||
{"multiline": False, "default": "input_bool"},
|
||||
),
|
||||
},
|
||||
"optional": {
|
||||
"default_value": (
|
||||
"BOOLEAN",
|
||||
{"default": False},
|
||||
),
|
||||
"description": (
|
||||
"STRING",
|
||||
{"multiline": True, "default": ""},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_TYPES = ("BOOLEAN",)
|
||||
RETURN_NAMES = ("boolean",)
|
||||
|
||||
FUNCTION = "run"
|
||||
|
||||
CATEGORY = "shellagent"
|
||||
|
||||
@classmethod
|
||||
def validate(cls, **kwargs):
|
||||
schema = {
|
||||
"title": kwargs["input_name"],
|
||||
"type": "boolean",
|
||||
"default": kwargs["default_value"],
|
||||
"description": kwargs.get("description", ""),
|
||||
}
|
||||
return schema
|
||||
|
||||
def run(self, input_name, default_value=None, display_name=None, description=None, **kwargs):
|
||||
return [default_value]
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {
|
||||
"ShellAgentPluginInputText": ShellAgentPluginInputText,
|
||||
"ShellAgentPluginInputFloat": ShellAgentPluginInputFloat,
|
||||
"ShellAgentPluginInputInteger": ShellAgentPluginInputInteger
|
||||
"ShellAgentPluginInputInteger": ShellAgentPluginInputInteger,
|
||||
"ShellAgentPluginInputBoolean": ShellAgentPluginInputBoolean,
|
||||
}
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"ShellAgentPluginInputText": "Input Text (ShellAgent Plugin)",
|
||||
"ShellAgentPluginInputFloat": "Input Float (ShellAgent Plugin)",
|
||||
"ShellAgentPluginInputInteger": "Input Integer (ShellAgent Plugin)",
|
||||
"ShellAgentPluginInputBoolean": "Input Boolean (ShellAgent Plugin)",
|
||||
}
|
||||
@@ -4,7 +4,7 @@ import numpy as np
|
||||
import torch
|
||||
import os
|
||||
import uuid
|
||||
import tqdm
|
||||
from tqdm import tqdm
|
||||
|
||||
|
||||
# class ShellAgentPluginInputImage:
|
||||
@@ -120,6 +120,15 @@ class ShellAgentPluginInputVideo:
|
||||
"url_type": "video"
|
||||
}
|
||||
return schema
|
||||
|
||||
@classmethod
|
||||
def VALIDATE_INPUTS(s, input_name, default_value, description=""):
|
||||
video = default_value
|
||||
if video.startswith("http"):
|
||||
return True
|
||||
if not folder_paths.exists_annotated_filepath(video):
|
||||
return "Invalid video file: {}".format(video)
|
||||
return True
|
||||
|
||||
def run(self, input_name, default_value=None, description=None):
|
||||
input_dir = folder_paths.get_input_directory()
|
||||
@@ -166,4 +175,4 @@ NODE_CLASS_MAPPINGS = {
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
# "ShellAgentPluginInputImage": "Input Image (ShellAgent Plugin)",
|
||||
"ShellAgentPluginInputVideo": "Input Video (ShellAgent Plugin)"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -75,12 +75,15 @@ class ShellAgentSaveVideoVHS:
|
||||
return schema
|
||||
|
||||
def save_video(self, filenames, **kwargs):
|
||||
status, (preview_image, video_path) = filenames
|
||||
status, output_files = filenames
|
||||
if len(output_files) == 0:
|
||||
raise ValueError("the filenames are empty")
|
||||
print("output_files", output_files)
|
||||
video_path = output_files[-1]
|
||||
cwd = os.getcwd()
|
||||
preview_image = os.path.relpath(preview_image)
|
||||
video_path = os.path.relpath(video_path)
|
||||
results = {"ui": {"image": [preview_image], "video": [video_path]}}
|
||||
print(results)
|
||||
# preview_image = os.path.relpath(preview_image)
|
||||
video_path = os.path.relpath(video_path, folder_paths.base_path)
|
||||
results = {"ui": {"video": [video_path]}}
|
||||
return results
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
|
||||
json_type_mapipng = {
|
||||
"text": "string",
|
||||
"float": "number",
|
||||
"integer": "integer",
|
||||
"boolean": "boolean",
|
||||
}
|
||||
|
||||
class ShellAgentOutputText:
|
||||
TYPE_STR = "text"
|
||||
@classmethod
|
||||
def INPUT_TYPES(s):
|
||||
return {
|
||||
"required": {
|
||||
s.TYPE_STR: ("STRING", {"tooltip": f"The {s.TYPE_STR} to output."}),
|
||||
"output_name": ("STRING", {"multiline": False, "default": f"output_{s.TYPE_STR}"},),
|
||||
},
|
||||
}
|
||||
|
||||
RETURN_TYPES = ()
|
||||
FUNCTION = "output_var"
|
||||
|
||||
OUTPUT_NODE = True
|
||||
|
||||
CATEGORY = "shellagent"
|
||||
DESCRIPTION = "output the text"
|
||||
|
||||
@classmethod
|
||||
def validate(cls, **kwargs):
|
||||
schema = {
|
||||
"title": kwargs["output_name"],
|
||||
"type": json_type_mapipng[cls.TYPE_STR]
|
||||
}
|
||||
return schema
|
||||
|
||||
def output_var(self, **kwargs):
|
||||
results = {"ui": {"output": [kwargs[self.TYPE_STR]]}}
|
||||
return results
|
||||
|
||||
class ShellAgentOutputFloat(ShellAgentOutputText):
|
||||
TYPE_STR = "float"
|
||||
DESCRIPTION = "output the float"
|
||||
@classmethod
|
||||
def INPUT_TYPES(s):
|
||||
return {
|
||||
"required": {
|
||||
s.TYPE_STR: ("FLOAT", {"tooltip": f"The {s.TYPE_STR} to output."}),
|
||||
"output_name": ("STRING", {"multiline": False, "default": f"output_{s.TYPE_STR}"},),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
class ShellAgentOutputInteger(ShellAgentOutputText):
|
||||
TYPE_STR = "integer"
|
||||
DESCRIPTION = "output the integer"
|
||||
@classmethod
|
||||
def INPUT_TYPES(s):
|
||||
return {
|
||||
"required": {
|
||||
s.TYPE_STR: ("INT", {"tooltip": f"The {s.TYPE_STR} to output."}),
|
||||
"output_name": ("STRING", {"multiline": False, "default": f"output_{s.TYPE_STR}"},),
|
||||
},
|
||||
}
|
||||
|
||||
class ShellAgentOutputBoolean(ShellAgentOutputText):
|
||||
TYPE_STR = "boolean"
|
||||
DESCRIPTION = "output the integer"
|
||||
@classmethod
|
||||
def INPUT_TYPES(s):
|
||||
return {
|
||||
"required": {
|
||||
s.TYPE_STR: ("BOOLEAN", {"tooltip": f"The {s.TYPE_STR} to output."}),
|
||||
"output_name": ("STRING", {"multiline": False, "default": f"output_{s.TYPE_STR}"},),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {
|
||||
"ShellAgentPluginOutputText": ShellAgentOutputText,
|
||||
"ShellAgentPluginOutputFloat": ShellAgentOutputFloat,
|
||||
"ShellAgentPluginOutputInteger": ShellAgentOutputInteger,
|
||||
"ShellAgentPluginOutputBoolean": ShellAgentOutputBoolean,
|
||||
}
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"ShellAgentPluginOutputText": "Output Text (ShellAgent Plugin)",
|
||||
"ShellAgentPluginOutputFloat": "Output Float (ShellAgent Plugin)",
|
||||
"ShellAgentPluginOutputInteger": "Output Integer (ShellAgent Plugin)",
|
||||
}
|
||||
+34
-5
@@ -29,6 +29,8 @@ import atexit
|
||||
from datetime import datetime
|
||||
import nodes
|
||||
import traceback
|
||||
import re
|
||||
import keyword
|
||||
|
||||
from .dependency_checker import resolve_dependencies
|
||||
|
||||
@@ -45,6 +47,14 @@ CustomNodeTypeMap = {
|
||||
"ShellAgentPluginSaveVideoVHS": "video",
|
||||
}
|
||||
|
||||
# Regular expression for a valid Python variable name
|
||||
variable_name_pattern = r'^[a-zA-Z_][a-zA-Z0-9_]*$'
|
||||
|
||||
def is_valid_variable_name(name):
|
||||
# Check if it matches the pattern and is not a keyword
|
||||
if re.match(variable_name_pattern, name) and not keyword.iskeyword(name):
|
||||
return True
|
||||
return False
|
||||
|
||||
def schema_validator(prompt):
|
||||
from nodes import NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS
|
||||
@@ -55,9 +65,11 @@ def schema_validator(prompt):
|
||||
"outputs": {}
|
||||
}
|
||||
for node_id, node_info in prompt.items():
|
||||
node_class_type = node_info["class_type"]
|
||||
node_class_type = node_info.get("class_type")
|
||||
if node_class_type is None:
|
||||
raise NotImplementedError(f"Missing nodes founded, please first install the missing nodes using ComfyUI Manager")
|
||||
node_cls = NODE_CLASS_MAPPINGS[node_class_type]
|
||||
if hasattr(node_cls, "RELATIVE_PYTHON_MODULE") and node_cls.RELATIVE_PYTHON_MODULE == "custom_nodes.ComfyUI-ShellAgent-Plugin":
|
||||
if hasattr(node_cls, "RELATIVE_PYTHON_MODULE") and node_cls.RELATIVE_PYTHON_MODULE.startswith("custom_nodes.ComfyUI-ShellAgent-Plugin"):
|
||||
schema = {}
|
||||
if "input_name" in node_info["inputs"]:
|
||||
mode = "inputs"
|
||||
@@ -82,6 +94,9 @@ def schema_validator(prompt):
|
||||
continue
|
||||
if hasattr(node_cls, "validate"):
|
||||
schema = node_cls.validate(**node_info["inputs"])
|
||||
# validate schema
|
||||
if not is_valid_variable_name(schema["title"]):
|
||||
raise ValueError(f'`{schema["title"]}` is not a valid variable name!')
|
||||
else:
|
||||
raise NotImplementedError("the validate is not implemented")
|
||||
schemas[mode][node_id] = schema
|
||||
@@ -122,6 +137,10 @@ async def shellagent_get_file(request):
|
||||
async def shellagent_export(request):
|
||||
data = await request.json()
|
||||
prompt = data["prompt"]
|
||||
custom_dependencies = data.get("custom_dependencies", {
|
||||
"models": {},
|
||||
"custom_nodes": {}
|
||||
})
|
||||
# extra_data = data["extra_data"]
|
||||
workflow_id = str(uuid.uuid4())
|
||||
|
||||
@@ -137,7 +156,7 @@ async def shellagent_export(request):
|
||||
try:
|
||||
schemas = schema_validator(prompt)
|
||||
# custom_node.json
|
||||
dependency_results = resolve_dependencies(prompt)
|
||||
dependency_results = resolve_dependencies(prompt, custom_dependencies)
|
||||
# save_root = os.path.join(WORKFLOW_ROOT, workflow_id)
|
||||
# os.makedirs(save_root, exist_ok=True)
|
||||
|
||||
@@ -152,16 +171,26 @@ async def shellagent_export(request):
|
||||
# for fname, dict_to_save in fname_mapping.items():
|
||||
# with open(os.path.join(save_root, fname), "w") as f:
|
||||
# json.dump(dict_to_save, f, indent=2)
|
||||
warning_message = ""
|
||||
if dependency_results.get("black_list_nodes", []):
|
||||
warning_message = "The following nodes cannot be deployed to myshell:\n"
|
||||
for item in dependency_results["black_list_nodes"]:
|
||||
warning_message += f" {item['name']}: {item['reason']}\n"
|
||||
|
||||
if len(schemas["inputs"]) + len(schemas["outputs"]) == 0:
|
||||
warning_message += f"The workflow contains neither inputs nor outputs!\n"
|
||||
|
||||
return_dict = {
|
||||
"success": True,
|
||||
"dependencies": dependency_results,
|
||||
"dependencies": dependency_results["dependencies"],
|
||||
"warning_message": warning_message,
|
||||
"schemas": schemas
|
||||
}
|
||||
except Exception as e:
|
||||
status = 400
|
||||
return_dict = {
|
||||
"success": False,
|
||||
"message": str(traceback.print_exc())
|
||||
"message_detail": str(traceback.format_exc()),
|
||||
"message": str(e),
|
||||
}
|
||||
return web.json_response(return_dict, status=status)
|
||||
+252
-73
@@ -3,68 +3,50 @@ import subprocess
|
||||
import json
|
||||
import logging
|
||||
from functools import partial
|
||||
import re
|
||||
import glob
|
||||
import sys
|
||||
from folder_paths import models_dir as MODELS_DIR
|
||||
from folder_paths import base_path as BASE_PATH
|
||||
from folder_paths import get_full_path
|
||||
|
||||
from .utils import compute_sha256, windows_to_linux_path
|
||||
|
||||
from .utils.utils import compute_sha256, windows_to_linux_path
|
||||
from .utils.pytree import tree_map
|
||||
from .file_upload import collect_local_file, process_local_file_path_async
|
||||
|
||||
ComfyUIModelLoaders = {
|
||||
'VAELoader': (["vae_name"], "vae"),
|
||||
'CheckpointLoader': (["ckpt_name"], "checkpoints"),
|
||||
'CheckpointLoaderSimple': (["ckpt_name"], "checkpoints"),
|
||||
'DiffusersLoader': (["model_path"], "diffusers"),
|
||||
'unCLIPCheckpointLoader': (["ckpt_name"], "checkpoints"),
|
||||
'LoraLoader': (["lora_name"], "loras"),
|
||||
'LoraLoaderModelOnly': (["lora_name"], "loras"),
|
||||
'ControlNetLoader': (["control_net_name"], "controlnet"),
|
||||
'DiffControlNetLoader': (["control_net_name"], "controlnet"),
|
||||
'UNETLoader': (["unet_name"], "unet"),
|
||||
'CLIPLoader': (["clip_name"], "clip"),
|
||||
'DualCLIPLoader': (["clip_name1", "clip_name2"], "clip"),
|
||||
'CLIPVisionLoader': (["clip_name"], "clip_vision"),
|
||||
'StyleModelLoader': (["style_model_name"], "style_models"),
|
||||
'GLIGENLoader': (["gligen_name"], "gligen"),
|
||||
'ImageOnlyCheckpointLoader': (["ckpt_name"], "checkpoints"),
|
||||
"UpscaleModelLoader": (["model_name"], "upscale_models"),
|
||||
"TripleCLIPLoader": (["clip_name1", "clip_name2", "clip_name3"], "clip"),
|
||||
"HypernetworkLoader": (["hypernetwork_name"], "hypernetworks")
|
||||
}
|
||||
|
||||
|
||||
# ComfyUIFileLoaders = {
|
||||
# 'VAELoader': (["vae_name"], "vae"),
|
||||
# 'CheckpointLoader': (["ckpt_name"], "checkpoints"),
|
||||
# 'CheckpointLoaderSimple': (["ckpt_name"], "checkpoints"),
|
||||
# 'DiffusersLoader': (["model_path"], "diffusers"),
|
||||
# 'unCLIPCheckpointLoader': (["ckpt_name"], "checkpoints"),
|
||||
# 'LoraLoader': (["lora_name"], "loras"),
|
||||
# 'LoraLoaderModelOnly': (["lora_name"], "loras"),
|
||||
# 'ControlNetLoader': (["control_net_name"], "controlnet"),
|
||||
# 'DiffControlNetLoader': (["control_net_name"], "controlnet"),
|
||||
# 'UNETLoader': (["unet_name"], "unet"),
|
||||
# 'CLIPLoader': (["clip_name"], "clip"),
|
||||
# 'DualCLIPLoader': (["clip_name1", "clip_name2"], "clip"),
|
||||
# 'CLIPVisionLoader': (["clip_name"], "clip_vision"),
|
||||
# 'StyleModelLoader': (["style_model_name"], "style_models"),
|
||||
# 'GLIGENLoader': (["gligen_name"], "gligen"),
|
||||
# }
|
||||
|
||||
|
||||
model_list_json = json.load(open(os.path.join(os.path.dirname(__file__), "model_info.json")))
|
||||
def handle_model_info(ckpt_path):
|
||||
model_loaders_info = json.load(open(os.path.join(os.path.dirname(__file__), "model_loader_info.json")))
|
||||
node_deps_info = json.load(open(os.path.join(os.path.dirname(__file__), "node_deps_info.json")))
|
||||
node_blacklist = json.load(open(os.path.join(os.path.dirname(__file__), "node_blacklist.json")))
|
||||
node_remote_skip_models = json.load(open(os.path.join(os.path.dirname(__file__), "node_remote.json")))
|
||||
|
||||
model_suffix = [".ckpt", ".safetensors", ".bin", ".pth", ".pt", ".onnx", ".gguf", ".sft"]
|
||||
extra_packages = ["transformers", "timm", "diffusers", "accelerate"]
|
||||
|
||||
|
||||
def get_full_path_or_raise(folder_name: str, filename: str) -> str:
|
||||
full_path = get_full_path(folder_name, filename)
|
||||
if full_path is None:
|
||||
raise FileNotFoundError(f"Model in folder '{folder_name}' with filename '{filename}' not found.")
|
||||
return full_path
|
||||
|
||||
|
||||
def handle_model_info(ckpt_path, filename, rel_save_path):
|
||||
ckpt_path = windows_to_linux_path(ckpt_path)
|
||||
filename = os.path.basename(ckpt_path)
|
||||
dirname = os.path.dirname(ckpt_path)
|
||||
save_path = dirname.split('/', 1)[1]
|
||||
metadata_path = ckpt_path + ".json"
|
||||
if os.path.isfile(metadata_path):
|
||||
metadata = json.load(open(metadata_path))
|
||||
model_id = metadata["id"]
|
||||
else:
|
||||
logging.info(f"computing sha256 of {ckpt_path}")
|
||||
if not os.path.isfile(ckpt_path):
|
||||
raise NotImplementedError(f"please install {ckpt_path} first!")
|
||||
model_id = compute_sha256(ckpt_path)
|
||||
data = {
|
||||
"id": model_id,
|
||||
"save_path": save_path,
|
||||
"save_path": rel_save_path,
|
||||
"filename": filename,
|
||||
}
|
||||
json.dump(data, open(metadata_path, "w"))
|
||||
@@ -74,8 +56,8 @@ def handle_model_info(ckpt_path):
|
||||
urls = []
|
||||
|
||||
item = {
|
||||
"filename": filename,
|
||||
"save_path": save_path,
|
||||
"filename": windows_to_linux_path(filename),
|
||||
"save_path": windows_to_linux_path(rel_save_path),
|
||||
"urls": urls,
|
||||
}
|
||||
return model_id, item
|
||||
@@ -88,13 +70,17 @@ def inspect_repo_version(module_path):
|
||||
"repo": "",
|
||||
"commit": ""
|
||||
}
|
||||
|
||||
if not os.path.isdir(os.path.join(module_path, ".git")):
|
||||
return result
|
||||
|
||||
# Get the remote repository URL
|
||||
try:
|
||||
remote_url = subprocess.check_output(
|
||||
['git', 'config', '--get', 'remote.origin.url'],
|
||||
cwd=module_path
|
||||
).strip().decode()
|
||||
except subprocess.CalledProcessError:
|
||||
except Exception:
|
||||
return result
|
||||
|
||||
# Get the latest commit hash
|
||||
@@ -103,7 +89,7 @@ def inspect_repo_version(module_path):
|
||||
['git', 'rev-parse', 'HEAD'],
|
||||
cwd=module_path
|
||||
).strip().decode()
|
||||
except subprocess.CalledProcessError:
|
||||
except Exception:
|
||||
return result
|
||||
|
||||
# Create and return the JSON result
|
||||
@@ -114,57 +100,250 @@ def inspect_repo_version(module_path):
|
||||
}
|
||||
return result
|
||||
|
||||
def fetch_model_searcher_results(model_ids):
|
||||
import requests
|
||||
url = "https://models-searcher.myshell.life/search_urls"
|
||||
headers = {
|
||||
"Content-Type": "application/json"
|
||||
}
|
||||
data = {
|
||||
"sha256": model_ids
|
||||
}
|
||||
|
||||
def resolve_dependencies(prompt): # resolve custom nodes and models at the same time
|
||||
response = requests.post(url, headers=headers, json=data)
|
||||
if response.status_code == 200:
|
||||
results = [item[:10] for item in response.json()]
|
||||
else:
|
||||
results = None
|
||||
return results
|
||||
|
||||
def split_package_version(require_line):
|
||||
require_line = require_line.strip()
|
||||
|
||||
pattern = r"^([a-zA-Z0-9_\-\[\]]+)(.*)$"
|
||||
match = re.match(pattern, require_line.strip())
|
||||
|
||||
if match:
|
||||
package_name = match.group(1) # First capturing group is the package name
|
||||
version_specifier = match.group(2) if match.group(2) else "" # Second group is the version, if present
|
||||
return package_name, version_specifier
|
||||
else:
|
||||
assert len(require_line) == 0 or require_line.strip()[0] == "#", require_line
|
||||
return None, None
|
||||
|
||||
def get_package_version(package_name):
|
||||
try:
|
||||
if sys.version_info >= (3, 8):
|
||||
from importlib.metadata import version, PackageNotFoundError
|
||||
return version(package_name)
|
||||
else:
|
||||
from pkg_resources import get_distribution, DistributionNotFound
|
||||
return get_distribution(package_name).version
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
def resolve_dependencies(prompt, custom_dependencies): # resolve custom nodes and models at the same time
|
||||
from nodes import NODE_CLASS_MAPPINGS
|
||||
import folder_paths
|
||||
|
||||
custom_nodes = []
|
||||
ckpt_paths = []
|
||||
ckpt_paths = {}
|
||||
|
||||
file_mapping_dict = {}
|
||||
|
||||
SKIP_FOLDER_NAMES = ["configs", "custom_nodes"]
|
||||
def collect_unknown_models(filename, node_id, node_info, custom_node_path):
|
||||
if type(filename) != str:
|
||||
return
|
||||
is_model = False
|
||||
for possible_suffix in model_suffix:
|
||||
if filename.endswith(possible_suffix):
|
||||
is_model = True
|
||||
if is_model:
|
||||
print(f"find {filename}, is_model=True")
|
||||
# find possible paths
|
||||
matching_files = {}
|
||||
# Walk through all subdirectories and files in the directory
|
||||
rel_save_path = None
|
||||
for possible_folder_name in folder_paths.folder_names_and_paths:
|
||||
if possible_folder_name in SKIP_FOLDER_NAMES:
|
||||
print(f"skip {possible_folder_name}")
|
||||
continue
|
||||
full_path = folder_paths.get_full_path(possible_folder_name, filename)
|
||||
if full_path is None:
|
||||
continue
|
||||
rel_save_path = os.path.relpath(folder_paths.folder_names_and_paths[possible_folder_name][0][0], folder_paths.models_dir)
|
||||
matching_files[full_path] = {
|
||||
"rel_save_path": rel_save_path
|
||||
}
|
||||
|
||||
print(f"matched files: {matching_files}")
|
||||
|
||||
# step 2: search for all the files under "models"
|
||||
|
||||
for full_path in glob.glob(f"{folder_paths.models_dir}/**/*", recursive=True):
|
||||
if os.path.isfile(full_path) and full_path.endswith(filename) and full_path not in matching_files:
|
||||
folder_path = full_path[:-len(filename)]
|
||||
rel_save_path = os.path.relpath(folder_path, folder_paths.models_dir)
|
||||
matching_files[full_path] = {
|
||||
"rel_save_path": rel_save_path
|
||||
}
|
||||
|
||||
print(f"matched files: {matching_files}")
|
||||
|
||||
# step 3: search inside the custom nodes
|
||||
if custom_node_path is not None:
|
||||
for full_path in glob.glob(f"{custom_node_path}/**/*", recursive=True):
|
||||
if os.path.isfile(full_path) and full_path.endswith(filename) and full_path not in matching_files:
|
||||
folder_path = full_path[:-len(filename)]
|
||||
rel_save_path = os.path.relpath(folder_path, folder_paths.models_dir)
|
||||
matching_files[full_path] = {
|
||||
"rel_save_path": rel_save_path
|
||||
}
|
||||
|
||||
if len(matching_files) == 0:
|
||||
raise ValueError(f"Cannot find model: `{filename}`, Node ID: `{node_id}`, Node Info: `{node_info}`")
|
||||
|
||||
elif len(matching_files) <= 3:
|
||||
for full_path, info in matching_files.items():
|
||||
ckpt_paths[full_path] = {
|
||||
"filename": filename,
|
||||
"rel_save_path": info["rel_save_path"]
|
||||
}
|
||||
return
|
||||
else:
|
||||
raise ValueError(f"Multiple models of `{filename}` founded, Node ID: `{node_id}`, Node Info: `{node_info}`, Possible paths: `{list(matching_files.keys())}`")
|
||||
|
||||
|
||||
for node_id, node_info in prompt.items():
|
||||
node_class_type = node_info["class_type"]
|
||||
node_class_type = node_info.get("class_type")
|
||||
if node_class_type is None:
|
||||
raise NotImplementedError(f"Missing nodes founded, please first install the missing nodes using ComfyUI Manager")
|
||||
node_cls = NODE_CLASS_MAPPINGS[node_class_type]
|
||||
if hasattr(node_cls, "RELATIVE_PYTHON_MODULE"):
|
||||
|
||||
skip_model_check = False
|
||||
|
||||
custom_node_path = None
|
||||
if hasattr(node_cls, "RELATIVE_PYTHON_MODULE") and node_cls.RELATIVE_PYTHON_MODULE.startswith("custom_nodes."):
|
||||
print(node_cls.RELATIVE_PYTHON_MODULE)
|
||||
custom_nodes.append(node_cls.RELATIVE_PYTHON_MODULE)
|
||||
if node_class_type in ComfyUIModelLoaders:
|
||||
input_names, save_path = ComfyUIModelLoaders[node_class_type]
|
||||
for input_name in input_names:
|
||||
ckpt_path = os.path.join("models", save_path, node_info["inputs"][input_name])
|
||||
ckpt_paths.append(ckpt_path)
|
||||
custom_node_path = os.path.join(BASE_PATH, node_cls.RELATIVE_PYTHON_MODULE.replace(".", "/"))
|
||||
if node_cls.RELATIVE_PYTHON_MODULE[len("custom_nodes."):] in node_remote_skip_models:
|
||||
skip_model_check = True
|
||||
print(f"skip model check for {node_class_type}")
|
||||
|
||||
if node_class_type in model_loaders_info:
|
||||
for field_name, filename in node_info["inputs"].items():
|
||||
if type(filename) != str:
|
||||
continue
|
||||
for item in model_loaders_info[node_class_type]:
|
||||
pattern = item["field_name"]
|
||||
if re.match(f"^{pattern}$", field_name) and any([filename.endswith(possible_suffix) for possible_suffix in model_suffix]):
|
||||
ckpt_path = get_full_path_or_raise(item["save_path"], filename)
|
||||
if hasattr(folder_paths, "map_legacy"):
|
||||
save_folder = folder_paths.map_legacy(item["save_path"])
|
||||
else:
|
||||
save_folder = item["save_path"]
|
||||
rel_save_path = os.path.relpath(folder_paths.folder_names_and_paths[save_folder][0][0], folder_paths.models_dir)
|
||||
ckpt_paths[ckpt_path] = {
|
||||
"filename": filename,
|
||||
"rel_save_path": rel_save_path
|
||||
}
|
||||
elif not skip_model_check:
|
||||
tree_map(lambda x: collect_unknown_models(x, node_id, node_info, custom_node_path), node_info["inputs"])
|
||||
|
||||
list(map(partial(collect_local_file, mapping_dict=file_mapping_dict), node_info["inputs"].values()))
|
||||
|
||||
ckpt_paths = list(set(ckpt_paths))
|
||||
print("ckpt_paths:", ckpt_paths)
|
||||
custom_nodes = list(set(custom_nodes))
|
||||
# step 0: comfyui version
|
||||
comfyui_version = inspect_repo_version("./")
|
||||
|
||||
repo_info = inspect_repo_version(BASE_PATH)
|
||||
if repo_info["repo"] == "":
|
||||
repo_info["require_recheck"] = True
|
||||
if repo_info["name"] in custom_dependencies["custom_nodes"]:
|
||||
repo_info["repo"] = custom_dependencies["custom_nodes"][repo_info["name"]].get("repo", "")
|
||||
repo_info["commit"] = custom_dependencies["custom_nodes"][repo_info["name"]].get("commit", "")
|
||||
comfyui_version = repo_info
|
||||
|
||||
# step 1: custom nodes
|
||||
custom_nodes_list = []
|
||||
custom_nodes_names = []
|
||||
requirements_lines = []
|
||||
for custom_node in custom_nodes:
|
||||
try:
|
||||
repo_info = inspect_repo_version(custom_node.replace(".", "/"))
|
||||
repo_info = inspect_repo_version(os.path.join(BASE_PATH, custom_node.replace(".", "/")))
|
||||
custom_nodes_list.append(repo_info)
|
||||
if repo_info["repo"] == "":
|
||||
repo_info["require_recheck"] = True
|
||||
if repo_info["name"] in custom_dependencies["custom_nodes"]:
|
||||
repo_info["repo"] = custom_dependencies["custom_nodes"][repo_info["name"]].get("repo", "")
|
||||
repo_info["commit"] = custom_dependencies["custom_nodes"][repo_info["name"]].get("commit", "")
|
||||
custom_nodes_names.append(repo_info["name"])
|
||||
except:
|
||||
print(f"failed to resolve repo info of {custom_node}")
|
||||
requirement_file = os.path.join(BASE_PATH, custom_node.replace(".", "/"), "requirements.txt")
|
||||
if os.path.isfile(requirement_file):
|
||||
requirements_lines += open(requirement_file).readlines()
|
||||
requirements_lines = list(set(requirements_lines))
|
||||
requirements_packages = [package_name for package_name, version_specifier in map(split_package_version, requirements_lines) if package_name is not None]
|
||||
package_names = set(requirements_packages + extra_packages)
|
||||
pypi_deps = {
|
||||
package_name: get_package_version(package_name)
|
||||
for package_name in package_names
|
||||
}
|
||||
|
||||
for repo_name in custom_nodes_names:
|
||||
if repo_name in node_deps_info:
|
||||
for deps_node in node_deps_info[repo_name]:
|
||||
if deps_node["name"] not in custom_nodes_names:
|
||||
repo_info = inspect_repo_version(os.path.join(BASE_PATH, "custom_nodes", deps_node["name"]))
|
||||
deps_node["commit"] = repo_info["commit"]
|
||||
custom_nodes_list.append(deps_node)
|
||||
custom_nodes_names.append(deps_node["name"])
|
||||
|
||||
black_list_nodes = []
|
||||
for repo_name in custom_nodes_names:
|
||||
if repo_name in node_blacklist:
|
||||
black_list_nodes.append({"name": repo_name, "reason": node_blacklist[repo_name]["reason"]})
|
||||
|
||||
# step 2: models
|
||||
models_dict = {}
|
||||
for ckpt_path in ckpt_paths:
|
||||
model_id, item = handle_model_info(ckpt_path)
|
||||
missing_model_ids = []
|
||||
for ckpt_path, ckpt_info in ckpt_paths.items():
|
||||
model_id, item = handle_model_info(ckpt_path, ckpt_info["filename"], ckpt_info["rel_save_path"])
|
||||
models_dict[model_id] = item
|
||||
if len(item["urls"]) == 0:
|
||||
item["require_recheck"] = True
|
||||
if model_id in custom_dependencies["models"]:
|
||||
item["urls"] = custom_dependencies["models"][model_id].get("urls", [])
|
||||
missing_model_ids.append(model_id)
|
||||
|
||||
# try to fetch from myshell model searcher
|
||||
missing_model_results_myshell = fetch_model_searcher_results(missing_model_ids)
|
||||
if missing_model_results_myshell is not None:
|
||||
for missing_model_id, missing_model_urls in zip(missing_model_ids, missing_model_results_myshell):
|
||||
if len(missing_model_urls) > 0:
|
||||
models_dict[missing_model_id]["require_recheck"] = False
|
||||
models_dict[missing_model_id]["urls"] = missing_model_urls
|
||||
print("successfully fetch results from myshell", models_dict[missing_model_id])
|
||||
|
||||
# step 3: handle local files
|
||||
process_local_file_path_async(file_mapping_dict, max_workers=20)
|
||||
files_dict = {v[0]: {"filename": v[2], "urls": [v[1]]} for v in file_mapping_dict.values()}
|
||||
dependencies = {
|
||||
"models": models_dict,
|
||||
"files": files_dict
|
||||
}
|
||||
files_dict = {
|
||||
v[0]: {
|
||||
"filename": windows_to_linux_path(os.path.relpath(v[2], BASE_PATH)) if not v[3] else v[2],
|
||||
"urls": [v[1]]} for v in file_mapping_dict.values()}
|
||||
|
||||
results = {
|
||||
depencencies = {
|
||||
"comfyui_version": comfyui_version,
|
||||
"custom_nodes": custom_nodes_list,
|
||||
"models": models_dict,
|
||||
"files": files_dict,
|
||||
"pypi": pypi_deps
|
||||
}
|
||||
return results
|
||||
|
||||
return_dict = {
|
||||
"dependencies": depencencies,
|
||||
"black_list_nodes": black_list_nodes,
|
||||
}
|
||||
return return_dict
|
||||
|
||||
+27
-13
@@ -3,8 +3,9 @@ import os
|
||||
import requests
|
||||
import time
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
import folder_paths
|
||||
|
||||
from .utils import compute_sha256
|
||||
from .utils.utils import compute_sha256, get_alphanumeric_hash
|
||||
|
||||
ext_to_type = {
|
||||
# image
|
||||
@@ -26,7 +27,7 @@ ext_to_type = {
|
||||
'.m4a': 'audio/mp4',
|
||||
}
|
||||
|
||||
def upload_file_to_myshell(local_file: str) -> str:
|
||||
def upload_file_to_myshell(local_file: str, target_path: str, is_abs) -> str:
|
||||
''' Now we only support upload file one-by-one
|
||||
'''
|
||||
MYSHELL_KEY = os.environ.get('MYSHELL_KEY', "OPENSOURCE_FIXED")
|
||||
@@ -45,13 +46,13 @@ def upload_file_to_myshell(local_file: str) -> str:
|
||||
start_time = time.time()
|
||||
ext = os.path.splitext(local_file)[1]
|
||||
files = [
|
||||
('file', (os.path.basename(local_file), open(local_file, 'rb'), ext_to_type[ext])),
|
||||
('file', (os.path.basename(local_file), open(local_file, 'rb'), ext_to_type[ext.lower()])),
|
||||
]
|
||||
response = requests.request("POST", server_url, headers=headers, files=files)
|
||||
if response.status_code == 200:
|
||||
end_time = time.time()
|
||||
logging.info(f"{local_file} uploaded, time elapsed: {end_time - start_time}")
|
||||
return [sha256sum, response.json()['url'], local_file]
|
||||
logging.info(f"{local_file} uploaded, time elapsed: {end_time - start_time}, will be saved to {target_path}")
|
||||
return [sha256sum, response.json()['url'], target_path, is_abs]
|
||||
else:
|
||||
raise Exception(
|
||||
f"[HTTP ERROR] {response.status_code} - {response.text} \n"
|
||||
@@ -59,19 +60,31 @@ def upload_file_to_myshell(local_file: str) -> str:
|
||||
|
||||
|
||||
def collect_local_file(item, mapping_dict={}):
|
||||
input_dir = folder_paths.get_input_directory()
|
||||
if not isinstance(item, str):
|
||||
return
|
||||
abspath = os.path.abspath(item)
|
||||
input_abspath = os.path.join(input_dir, item)
|
||||
# required file type
|
||||
if os.path.isfile(item):
|
||||
fpath = item
|
||||
elif os.path.isfile(f"input/{item}"):
|
||||
fpath = f"input/{item}"
|
||||
is_abs = False
|
||||
if os.path.isfile(abspath):
|
||||
fpath = abspath
|
||||
is_abs = True
|
||||
|
||||
elif os.path.isfile(input_abspath):
|
||||
fpath = input_abspath
|
||||
else:
|
||||
fpath = None
|
||||
if fpath is not None:
|
||||
ext = os.path.splitext(fpath)[1]
|
||||
if ext in ext_to_type.keys():
|
||||
mapping_dict[item] = fpath
|
||||
if ext.lower() in ext_to_type.keys():
|
||||
if is_abs: # if use abs path, replace it
|
||||
filename_hash = get_alphanumeric_hash(abspath)[:16]
|
||||
count = len(mapping_dict)
|
||||
target_path = f"/ShellAgentDeploy/ComfyUI/input/{filename_hash}_{count:06d}{ext}"
|
||||
mapping_dict[item] = (fpath, target_path, is_abs)
|
||||
else:
|
||||
mapping_dict[item] = (fpath, fpath, is_abs)
|
||||
return
|
||||
else:
|
||||
return
|
||||
@@ -82,7 +95,7 @@ def process_local_file_path_async(mapping_dict, max_workers=10):
|
||||
start_time = time.time()
|
||||
with ThreadPoolExecutor(max_workers=max_workers) as executor:
|
||||
# Submit tasks to the executor
|
||||
futures = {executor.submit(upload_file_to_myshell, full_path): filename for filename, full_path in mapping_dict.items()}
|
||||
futures = {executor.submit(upload_file_to_myshell, source_path, target_path, is_abs): filename for filename, (source_path, target_path, is_abs) in mapping_dict.items()}
|
||||
logging.info("submit done")
|
||||
# Collect the results as they complete
|
||||
for future in as_completed(futures):
|
||||
@@ -91,7 +104,8 @@ def process_local_file_path_async(mapping_dict, max_workers=10):
|
||||
result = future.result()
|
||||
mapping_dict[filename] = result
|
||||
except Exception as e:
|
||||
print(f"Error processing {filename}: {e}")
|
||||
del mapping_dict[filename]
|
||||
raise NotImplementedError(f"Error processing {filename}: {e}")
|
||||
end_time = time.time()
|
||||
logging.info(f"upload end, elapsed time: {end_time - start_time}")
|
||||
return
|
||||
@@ -0,0 +1,148 @@
|
||||
{
|
||||
"VAELoader": [
|
||||
{
|
||||
"field_name": "vae_name",
|
||||
"save_path": "vae"
|
||||
}
|
||||
],
|
||||
"CheckpointLoader": [
|
||||
{
|
||||
"field_name": "ckpt_name",
|
||||
"save_path": "checkpoints"
|
||||
}
|
||||
],
|
||||
"CheckpointLoaderSimple": [
|
||||
{
|
||||
"field_name": "ckpt_name",
|
||||
"save_path": "checkpoints"
|
||||
}
|
||||
],
|
||||
"DiffusersLoader": [
|
||||
{
|
||||
"field_name": "model_path",
|
||||
"save_path": "diffusers"
|
||||
}
|
||||
],
|
||||
"unCLIPCheckpointLoader": [
|
||||
{
|
||||
"field_name": "ckpt_name",
|
||||
"save_path": "checkpoints"
|
||||
}
|
||||
],
|
||||
"LoraLoader": [
|
||||
{
|
||||
"field_name": "lora_name",
|
||||
"save_path": "loras"
|
||||
}
|
||||
],
|
||||
"LoraLoaderModelOnly": [
|
||||
{
|
||||
"field_name": "lora_name",
|
||||
"save_path": "loras"
|
||||
}
|
||||
],
|
||||
"ControlNetLoader": [
|
||||
{
|
||||
"field_name": "control_net_name",
|
||||
"save_path": "controlnet"
|
||||
}
|
||||
],
|
||||
"DiffControlNetLoader": [
|
||||
{
|
||||
"field_name": "control_net_name",
|
||||
"save_path": "controlnet"
|
||||
}
|
||||
],
|
||||
"UNETLoader": [
|
||||
{
|
||||
"field_name": "unet_name",
|
||||
"save_path": "unet"
|
||||
}
|
||||
],
|
||||
"CLIPLoader": [
|
||||
{
|
||||
"field_name": "clip_name",
|
||||
"save_path": "clip"
|
||||
}
|
||||
],
|
||||
"DualCLIPLoader": [
|
||||
{
|
||||
"field_name": "clip_name[1-2]",
|
||||
"save_path": "clip"
|
||||
}
|
||||
],
|
||||
"CLIPVisionLoader": [
|
||||
{
|
||||
"field_name": "clip_name",
|
||||
"save_path": "clip_vision"
|
||||
}
|
||||
],
|
||||
"StyleModelLoader": [
|
||||
{
|
||||
"field_name": "style_model_name",
|
||||
"save_path": "style_models"
|
||||
}
|
||||
],
|
||||
"GLIGENLoader": [
|
||||
{
|
||||
"field_name": "gligen_name",
|
||||
"save_path": "gligen"
|
||||
}
|
||||
],
|
||||
"ImageOnlyCheckpointLoader": [
|
||||
{
|
||||
"field_name": "ckpt_name",
|
||||
"save_path": "checkpoints"
|
||||
}
|
||||
],
|
||||
"UpscaleModelLoader": [
|
||||
{
|
||||
"field_name": "model_name",
|
||||
"save_path": "upscale_models"
|
||||
}
|
||||
],
|
||||
"TripleCLIPLoader": [
|
||||
{
|
||||
"field_name": "clip_name[1-3]",
|
||||
"save_path": "clip"
|
||||
}
|
||||
],
|
||||
"HypernetworkLoader": [
|
||||
{
|
||||
"field_name": "hypernetwork_name",
|
||||
"save_path": "hypernetworks"
|
||||
}
|
||||
],
|
||||
"SUPIR_model_loader_v2": [
|
||||
{
|
||||
"field_name": "supir_model",
|
||||
"save_path": "checkpoints"
|
||||
}
|
||||
],
|
||||
"SUPIR_model_loader_v2_clip": [
|
||||
{
|
||||
"field_name": "supir_model",
|
||||
"save_path": "checkpoints"
|
||||
}
|
||||
],
|
||||
"Efficient Loader": [
|
||||
{
|
||||
"field_name": "ckpt_name",
|
||||
"save_path": "checkpoints"
|
||||
},
|
||||
{
|
||||
"field_name": "vae_name",
|
||||
"save_path": "vae"
|
||||
},
|
||||
{
|
||||
"field_name": "lora_name",
|
||||
"save_path": "loras"
|
||||
}
|
||||
],
|
||||
"LoRA Stacker": [
|
||||
{
|
||||
"field_name": "lora_name_([1-9]|[1-4][0-9]|50)",
|
||||
"save_path": "loras"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"comfyui-ollama": {
|
||||
"reason": "this node requires installing an extra software on linux, which is currently unsupported"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
"ComfyUI-Easy-Use": [
|
||||
{
|
||||
"name": "ComfyUI-Inspire-Pack",
|
||||
"repo": "https://github.com/ltdrdata/ComfyUI-Inspire-Pack.git",
|
||||
"commit": ""
|
||||
},
|
||||
{
|
||||
"name": "ComfyUI-Advanced-ControlNet",
|
||||
"repo": "https://github.com/Kosinkadink/ComfyUI-Advanced-ControlNet.git",
|
||||
"commit": ""
|
||||
},
|
||||
{
|
||||
"name": "ComfyUI_smZNodes",
|
||||
"repo": "https://github.com/shiimizu/ComfyUI_smZNodes.git",
|
||||
"commit": ""
|
||||
}
|
||||
],
|
||||
"efficiency-nodes-comfyui": [
|
||||
{
|
||||
"name": "comfyui_controlnet_aux",
|
||||
"repo": "https://github.com/Fannovel16/comfyui_controlnet_aux.git",
|
||||
"commit": ""
|
||||
}
|
||||
],
|
||||
"ComfyUI-Anyline": [
|
||||
{
|
||||
"name": "comfyui_controlnet_aux",
|
||||
"repo": "https://github.com/Fannovel16/comfyui_controlnet_aux.git",
|
||||
"commit": ""
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
[
|
||||
"BizyAir"
|
||||
]
|
||||
@@ -0,0 +1,6 @@
|
||||
aiofiles
|
||||
pydantic
|
||||
opencv-python
|
||||
imageio-ffmpeg
|
||||
brotli
|
||||
# logfire
|
||||
@@ -1,20 +0,0 @@
|
||||
import hashlib
|
||||
import time
|
||||
from pathlib import PurePosixPath, Path
|
||||
|
||||
def windows_to_linux_path(windows_path):
|
||||
return str(PurePosixPath(Path(windows_path)))
|
||||
|
||||
def compute_sha256(file_path, chunk_size=1024 ** 2):
|
||||
# Create a new sha256 hash object
|
||||
start = time.time()
|
||||
sha256 = hashlib.sha256()
|
||||
print("start compute sha256 for", file_path)
|
||||
# Open the file in binary mode
|
||||
with open(file_path, 'rb') as file:
|
||||
# Read the file in chunks to handle large files efficiently
|
||||
while chunk := file.read(chunk_size):
|
||||
sha256.update(chunk)
|
||||
print("finish compute sha256 for", file_path, f"time: {time.time() - start}")
|
||||
# Return the hexadecimal digest of the hash
|
||||
return sha256.hexdigest()
|
||||
+1197
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,35 @@
|
||||
import hashlib
|
||||
import time
|
||||
from pathlib import PurePosixPath, Path, PureWindowsPath
|
||||
import base64
|
||||
import re
|
||||
|
||||
def windows_to_linux_path(windows_path):
|
||||
return PureWindowsPath(windows_path).as_posix()
|
||||
|
||||
def compute_sha256(file_path, chunk_size=1024 ** 2):
|
||||
# Create a new sha256 hash object
|
||||
start = time.time()
|
||||
sha256 = hashlib.sha256()
|
||||
print("start compute sha256 for", file_path)
|
||||
# Open the file in binary mode
|
||||
with open(file_path, 'rb') as file:
|
||||
# Read the file in chunks to handle large files efficiently
|
||||
while chunk := file.read(chunk_size):
|
||||
sha256.update(chunk)
|
||||
print("finish compute sha256 for", file_path, f"time: {time.time() - start}")
|
||||
# Return the hexadecimal digest of the hash
|
||||
return sha256.hexdigest()
|
||||
|
||||
|
||||
def get_alphanumeric_hash(input_string: str) -> str:
|
||||
# Generate a SHA-256 hash of the input string
|
||||
sha256_hash = hashlib.sha256(input_string.encode()).digest()
|
||||
|
||||
# Encode the hash in base64 to get a string with [A-Za-z0-9+/=]
|
||||
base64_hash = base64.b64encode(sha256_hash).decode('ascii')
|
||||
|
||||
# Remove any non-alphanumeric characters (+, /, =)
|
||||
alphanumeric_hash = re.sub(r'[^a-zA-Z0-9]', '', base64_hash)
|
||||
|
||||
return alphanumeric_hash
|
||||
+177
-30
@@ -37,11 +37,15 @@ app.registerExtension({
|
||||
});
|
||||
},
|
||||
async beforeRegisterNodeDef(nodeType, nodeData, app) {
|
||||
if (["ShellAgentPluginOutputText", "ShellAgentPluginOutputFloat", "ShellAgentPluginOutputInteger"].indexOf(nodeData.name) > -1) {
|
||||
chainCallback(nodeType.prototype, "onNodeCreated", function () {
|
||||
this.convertWidgetToInput(this.widgets[0])
|
||||
})
|
||||
}
|
||||
|
||||
if (["ShellAgentPluginInputText", "ShellAgentPluginInputFloat", "ShellAgentPluginInputInteger"].indexOf(nodeData.name) > -1) {
|
||||
chainCallback(nodeType.prototype, "onNodeCreated", function () {
|
||||
const widget = this.widgets.find(w => w.name === 'choices')
|
||||
|
||||
this.addWidget('button', 'manage choices', null, () => {
|
||||
const container = document.createElement("div");
|
||||
Object.assign(container.style, {
|
||||
@@ -93,7 +97,7 @@ app.registerExtension({
|
||||
try {
|
||||
arr = JSON.parse(widget.value)
|
||||
} catch { }
|
||||
} else if(Array.isArray(widget.value)) {
|
||||
} else if (Array.isArray(widget.value)) {
|
||||
arr = widget.value
|
||||
}
|
||||
|
||||
@@ -137,6 +141,27 @@ app.registerExtension({
|
||||
})
|
||||
}
|
||||
|
||||
if (['LoadImage', 'LoadImageMask'].indexOf(nodeData.name) > -1) {
|
||||
addMenuHandler(nodeType, function (_, options) {
|
||||
options.unshift({
|
||||
content: "Replace with ShellAgent Input Image",
|
||||
callback: () => {
|
||||
const node = addNode("ShellAgentPluginInputImage", this, { before: true });
|
||||
|
||||
const dvn = node.widgets.find(w => w.name === 'default_value')
|
||||
dvn.value = this.widgets.find(w => w.name === 'image')?.value
|
||||
|
||||
app.graph.links.filter(l => l != null)
|
||||
.forEach(l => {
|
||||
const tn = app.graph._nodes_by_id[l.target_id]
|
||||
node.connect(0, tn, 0)
|
||||
})
|
||||
app.graph.remove(this);
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
if (nodeData.name === "ShellAgentPluginInputImage") {
|
||||
if (
|
||||
nodeData?.input?.required?.default_value?.[1]?.image_upload === true
|
||||
@@ -151,7 +176,6 @@ app.registerExtension({
|
||||
if (nodeData.name === "ShellAgentPluginInputVideo") {
|
||||
addUploadWidget(nodeType, nodeData, "default_value");
|
||||
chainCallback(nodeType.prototype, "onNodeCreated", function () {
|
||||
// const pathWidget = this.widgets.find((w) => w.name === "video");
|
||||
const pathWidget = this.widgets.find((w) => w.name === "default_value");
|
||||
chainCallback(pathWidget, "callback", (value) => {
|
||||
if (!value) {
|
||||
@@ -174,57 +198,180 @@ app.registerExtension({
|
||||
|
||||
if (nodeData.name.indexOf('ShellAgentPlugin') === -1) {
|
||||
addMenuHandler(nodeType, function (_, options) {
|
||||
|
||||
if (this.widgets) {
|
||||
let toInput = [];
|
||||
|
||||
for (const w of this.widgets) {
|
||||
if (["customtext"].indexOf(w.type) > -1) {
|
||||
toInput.push({
|
||||
content: `${w.name} <- Input Text`,
|
||||
callback: () => {
|
||||
this.convertWidgetToInput(w);
|
||||
const node = addNode("ShellAgentPluginInputText", this, { before: true });
|
||||
// if (nodeData.name === 'CLIPTextEncode') {
|
||||
node.connect(0, this, this.inputs.length - 1);
|
||||
// } else {
|
||||
// window.alert('[ShellAgent] Unsupported quick operation.')
|
||||
// }
|
||||
}
|
||||
content: w.name,
|
||||
submenu: {
|
||||
options: [
|
||||
{
|
||||
content: 'Input Text',
|
||||
callback: () => {
|
||||
this.convertWidgetToInput(w);
|
||||
const node = addNode("ShellAgentPluginInputText", this, { before: true });
|
||||
const dvn = node.widgets.find(w => w.name === 'default_value')
|
||||
dvn.value = w.value;
|
||||
node.connect(0, this, this.inputs.length - 1);
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
})
|
||||
}
|
||||
if (["number"].indexOf(w.type) > -1) {
|
||||
toInput.push({
|
||||
content: `${w.name} <- Input Interger`,
|
||||
callback: () => {
|
||||
this.convertWidgetToInput(w);
|
||||
const node = addNode("ShellAgentPluginInputInteger", this, { before: true });
|
||||
node.connect(0, this, this.inputs.length - 1);
|
||||
}
|
||||
})
|
||||
|
||||
toInput.push({
|
||||
content: `${w.name} <- Input Float`,
|
||||
callback: () => {
|
||||
this.convertWidgetToInput(w);
|
||||
const node = addNode("ShellAgentPluginInputFloat", this, { before: true });
|
||||
node.connect(0, this, this.inputs.length - 1);
|
||||
content: w.name,
|
||||
submenu: {
|
||||
options: [
|
||||
{
|
||||
content: 'Input Interger',
|
||||
callback: () => {
|
||||
this.convertWidgetToInput(w);
|
||||
const node = addNode("ShellAgentPluginInputInteger", this, { before: true });
|
||||
const dvn = node.widgets.find(w => w.name === 'default_value')
|
||||
dvn.value = w.value;
|
||||
node.connect(0, this, this.inputs.length - 1);
|
||||
}
|
||||
},
|
||||
{
|
||||
content: 'Input Float',
|
||||
callback: () => {
|
||||
this.convertWidgetToInput(w);
|
||||
const node = addNode("ShellAgentPluginInputFloat", this, { before: true });
|
||||
const dvn = node.widgets.find(w => w.name === 'default_value')
|
||||
dvn.value = w.value;
|
||||
node.connect(0, this, this.inputs.length - 1);
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if (toInput.length) {
|
||||
options.unshift({
|
||||
content: "Convert to ShellAgent",
|
||||
content: "Convert to ShellAgent (Input)",
|
||||
submenu: {
|
||||
options: toInput
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if (this.outputs) {
|
||||
let toOutput = [];
|
||||
for (const o of this.outputs) {
|
||||
if (o.type === 'IMAGE') {
|
||||
toOutput.push({
|
||||
content: o.name,
|
||||
submenu: {
|
||||
options: [
|
||||
{
|
||||
content: 'Save Image',
|
||||
callback: () => {
|
||||
const node = addNode("ShellAgentPluginSaveImage", this);
|
||||
this.connect(0, node, 0);
|
||||
}
|
||||
},
|
||||
{
|
||||
content: 'Save Images',
|
||||
callback: () => {
|
||||
const node = addNode("ShellAgentPluginSaveImages", this);
|
||||
this.connect(0, node, 0);
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
if (o.type === 'STRING') {
|
||||
toOutput.push({
|
||||
content: o.name,
|
||||
submenu: {
|
||||
options: [
|
||||
{
|
||||
content: `Output Text`,
|
||||
callback: () => {
|
||||
const node = addNode("ShellAgentPluginOutputText", this);
|
||||
this.connect(0, node, 0);
|
||||
}
|
||||
},
|
||||
{
|
||||
content: `Output Float`,
|
||||
callback: () => {
|
||||
const node = addNode("ShellAgentPluginOutputFloat", this);
|
||||
this.connect(0, node, 0);
|
||||
}
|
||||
},
|
||||
{
|
||||
content: `Output Integer`,
|
||||
callback: () => {
|
||||
const node = addNode("ShellAgentPluginOutputInteger", this);
|
||||
this.connect(0, node, 0);
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
if (o.type === "VHS_FILENAMES") {
|
||||
toOutput.push({
|
||||
content: o.name,
|
||||
submenu: {
|
||||
options: [
|
||||
{
|
||||
content: `Save Video - VHS`,
|
||||
callback: () => {
|
||||
const node = addNode("ShellAgentPluginSaveVideoVHS", this);
|
||||
this.connect(0, node, 0);
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if (toOutput.length) {
|
||||
options.unshift({
|
||||
content: "Connect to ShellAgent (Output)",
|
||||
submenu: {
|
||||
options: toOutput
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
afterConfigureGraph(missingNodeTypes, app) {
|
||||
function addIn(type, nodeId) {
|
||||
if (LiteGraph.slot_types_default_in[type].indexOf(nodeId) === -1) {
|
||||
LiteGraph.slot_types_default_in[type].unshift(nodeId)
|
||||
}
|
||||
}
|
||||
|
||||
function addOut(type, nodeId) {
|
||||
if (LiteGraph.slot_types_default_out[type].indexOf(nodeId) === -1) {
|
||||
LiteGraph.slot_types_default_out[type].unshift(nodeId)
|
||||
}
|
||||
}
|
||||
|
||||
addIn('IMAGE', 'ShellAgentPluginInputImage')
|
||||
addOut('IMAGE', 'ShellAgentPluginSaveImage')
|
||||
addOut('IMAGE', 'ShellAgentPluginSaveImages')
|
||||
// addOut('STRING', 'ShellAgentPluginOutputInteger')
|
||||
// addOut('STRING', 'ShellAgentPluginOutputFloat')
|
||||
// addOut('STRING', 'ShellAgentPluginOutputText')
|
||||
}
|
||||
});
|
||||
|
||||
function addMenuHandler(nodeType, cb) {
|
||||
|
||||
Reference in New Issue
Block a user