Nickkao/volume improvemnts v3 (#4)

* fix: attempt fixing timeout

* be validation work

* arbitrary model input, BE validation, error record creation with error logs during potential failure points

* remove unused type

---------

Co-authored-by: bennykok <[email protected]>

.devcontainer/Dockerfile

@@ -12,6 +12,11 @@ RUN curl -L https://fly.io/install.sh | sh
 ENV FLYCTL_INSTALL="/root/.fly"
 ENV PATH="$FLYCTL_INSTALL/bin:$PATH"
 
+RUN sudo apt-get update
+RUN sudo apt-get install python3-pip python3 -y
+
+RUN pip3 install modal
+
 # RUN echo 'export FLYCTL_INSTALL="/home/node/.fly"' >> ~/.bashrc
 # RUN echo 'export PATH="$FLYCTL_INSTALL/bin:$PATH"' >> ~/.bashrc
 

.devcontainer/devcontainer.json

@@ -14,7 +14,8 @@
         "stivo.tailwind-fold",
         "streetsidesoftware.code-spell-checker",
         "GitHub.copilot",
-        "ms-azuretools.vscode-docker"
+        "ms-azuretools.vscode-docker",
+        "ms-python.python"
       ]
     }
   }

.gitignore

@@ -1,2 +1,3 @@
 __pycache__
-.DS_Store
+.DS_Store
+.vercel

LICENSE

@@ -1,208 +1,21 @@
-GNU AFFERO GENERAL PUBLIC LICENSE
+MIT License
-Version 3, 19 November 2007
+
-
+Copyright (c) 2023 BennyKok
-Copyright © 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.
+Permission is hereby granted, free of charge, to any person obtaining a copy
-
+of this software and associated documentation files (the "Software"), to deal
-Preamble
+in the Software without restriction, including without limitation the rights
-The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software.
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-
+copies of the Software, and to permit persons to whom the Software is
-The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are 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.
+furnished to do so, subject to the following conditions:
-
+
-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.
+The above copyright notice and this permission notice shall be included in all
-
+copies or substantial portions of the Software.
-Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software.
+
-
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version.
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-
+SOFTWARE.
-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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
-Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph.
-
-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 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 work with which it is combined will remain governed by version 3 of the GNU General Public License.
-
-14. Revised Versions of this License.
-The Free Software Foundation may publish revised and/or new versions of the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements.
-
-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 AGPL, see <https://www.gnu.org/licenses/>.

README.md

@@ -75,11 +75,10 @@ Major areas
 3. `bun i`
 4. Start docker
 5. `cp .env.example .env.local`
-6. Replace `JWT_SECRET` with `openssl rand -hex 32`
+6. Repace `JWT_SECRET` with `openssl rand -hex 32`
 7. Get a local clerk dev key for `NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY` and `CLERK_SECRET_KEY`
 8. Keep a terminal live for `bun run db-dev`
-9. Execute the local migration to create the initial data `bun run migrate-local`
+9. Finally start the next server with `bun dev`
-10. Finally start the next server with `bun dev`
 
 **Schema Changes**
 
@@ -93,10 +92,6 @@ Major areas
 
 # Self Hosting with Vercel
 
-[![Video](https://img.mytsi.org/i/nFOG479.png)](https://www.youtube.com/watch?v=hWvsEY1cS2M)
-Tutorial Created by [Ross](https://github.com/rossman22590) and [Syn](https://github.com/mortlsyn)
-
-
 Build command
 
 ```

builder/modal-builder/.env.example

@@ -1,5 +1,8 @@
 MODAL_TOKEN_ID=
 MODAL_TOKEN_SECRET=
+CIVITAI_API_KEY=
 
 # On production set to False
-DEPLOY_TEST_FLAG=True
+DEPLOY_TEST_FLAG=True
+CIVITAI_API_KEY=
+PUBLIC_MODEL_VOLUME_NAME=

builder/modal-builder/README.md

@@ -42,6 +42,9 @@ fly secrets set MODAL_TOKEN_SECRET=
 
 ## To deploy
 
+We have 2 `toml` files one for `production` and the other for `staging`
+it will default to `staging` if you don't include the `-c` flag to choose your config file
+
 ```
 // model-builder/fly.toml
 app = <APP_NAME>
@@ -53,5 +56,5 @@ fly launch
 ```
 if not, run this instead
 ```
-fly deploy
+fly deploy -c "toml file"
-```
+```

builder/modal-builder/fly.production.toml

@@ -0,0 +1,22 @@
+# fly.toml app configuration file generated for modal-builder on 2024-01-03T22:29:34+08:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app = "modal-builder-production"
+primary_region = "sea"
+
+[build]
+
+[http_service]
+  internal_port = 8080
+  force_https = true
+  auto_stop_machines = true
+  auto_start_machines = true
+  min_machines_running = 0
+  processes = ["app"]
+
+[[vm]]
+  cpu_kind = 'shared'
+  cpus = 1
+  memory_mb = 1024

builder/modal-builder/fly.toml

@@ -1,10 +1,10 @@
-# fly.toml app configuration file generated for modal-builder on 2024-01-03T22:29:34+08:00
+# fly.toml app configuration file generated for modal-builder-preview on 2024-01-25T09:26:31Z
 #
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
-app = "modal-builder"
+app = 'modal-builder-preview'
-primary_region = "sea"
+primary_region = 'sea'
 
 [build]
 
@@ -14,4 +14,9 @@ primary_region = "sea"
   auto_stop_machines = true
   auto_start_machines = true
   min_machines_running = 0
-  processes = ["app"]
+  processes = ['app']
+
+[[vm]]
+  cpu_kind = 'shared'
+  cpus = 1
+  memory_mb = 1024

builder/modal-builder/src/main.py

@@ -8,6 +8,7 @@ from enum import Enum
 import json
 import subprocess
 import time
+from uuid import uuid4
 from contextlib import asynccontextmanager
 import asyncio
 import threading
@@ -19,6 +20,7 @@ from urllib.parse import parse_qs
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.types import ASGIApp, Scope, Receive, Send
 
+
 from concurrent.futures import ThreadPoolExecutor
 
 # executor = ThreadPoolExecutor(max_workers=5)
@@ -45,6 +47,8 @@ machine_id_websocket_dict = {}
 machine_id_status = {}
 
 fly_instance_id = os.environ.get('FLY_ALLOC_ID', 'local').split('-')[0]
+civitai_api_key = os.environ.get('FLY_ALLOC_ID', 'local')
+public_model_volume_name = os.environ.get('PUBLIC_MODEL_VOLUME_NAME', 'local')
 
 
 class FlyReplayMiddleware(BaseHTTPMiddleware):
@@ -139,6 +143,7 @@ def read_root():
 class GitCustomNodes(BaseModel):
     hash: str
     disabled: bool
+    pip: Optional[List[str]] = None
 
 class FileCustomNodes(BaseModel):
     filename: str
@@ -174,6 +179,7 @@ class Item(BaseModel):
     snapshot: Snapshot
     models: List[Model]
     callback_url: str
+    model_volume_name: str
     gpu: GPUType = Field(default=GPUType.T4)
 
     @field_validator('gpu')
@@ -223,6 +229,71 @@ async def websocket_endpoint(websocket: WebSocket, machine_id: str):
 
 #     return {"Hello": "World"}
 
+# definition based on web schema
+class UploadType(str, Enum):
+    checkpoint = "checkpoint"
+    lora = "lora"
+    embedding = "embedding"
+
+class UploadBody(BaseModel):
+    download_url: str
+    volume_name: str
+    volume_id: str
+    model_id: str
+    upload_type: UploadType
+    callback_url: str
+
+
+# based on ComfyUI's model dir, and our mappings in ./src/template/data/extra_model_paths.yaml
+UPLOAD_TYPE_DIR_MAP = {
+    UploadType.checkpoint: "checkpoints",
+    UploadType.lora: "loras",
+    UploadType.embedding: "embeddings",
+}
+
+
+@app.post("/upload-volume")
+async def upload_model(body: UploadBody):
+    global last_activity_time
+    last_activity_time = time.time()
+    logger.info(f"Extended inactivity time to {global_timeout}")
+
+    asyncio.create_task(upload_logic(body))
+
+    # check that this
+    return JSONResponse(status_code=200, content={"message": "Volume uploading", "build_machine_instance_id": fly_instance_id})
+
+
+async def upload_logic(body: UploadBody):
+    folder_path = f"/app/builds/{body.volume_id}"
+
+    cp_process = await asyncio.subprocess.create_subprocess_exec("cp", "-r", "/app/src/volume-builder", folder_path)
+    await cp_process.wait()
+
+    upload_path = UPLOAD_TYPE_DIR_MAP[body.upload_type]
+    config = {
+        "volume_names": {
+            body.volume_name: {"download_url": body.download_url, "folder_path": upload_path}
+        }, 
+        "volume_paths": {
+            body.volume_name: f'/volumes/{uuid4()}'
+        }, 
+        "callback_url": body.callback_url,
+        "callback_body": {
+            "model_id": body.model_id,
+            "volume_id": body.volume_id,
+            "folder_path": upload_path,
+        },
+        "civitai_api_key": os.environ.get('CIVITAI_API_KEY')
+    }
+    with open(f"{folder_path}/config.py", "w") as f:
+        f.write("config = " + json.dumps(config))
+
+    await asyncio.subprocess.create_subprocess_shell(
+        f"modal run app.py",
+        cwd=folder_path,
+        env={**os.environ, "COLUMNS": "10000"}
+    )
 
 @app.post("/create")
 async def create_machine(item: Item):
@@ -308,12 +379,19 @@ async def build_logic(item: Item):
     cp_process = await asyncio.subprocess.create_subprocess_exec("cp", "-r", "/app/src/template", folder_path)
     await cp_process.wait()
 
+    pip_modules = set()
+    for git_custom_node in item.snapshot.git_custom_nodes.values():
+        if git_custom_node.pip:
+            pip_modules.update(git_custom_node.pip)
+
     # Write the config file
     config = {
         "name": item.name,
         "deploy_test": os.environ.get("DEPLOY_TEST_FLAG", "False"),
         "gpu": item.gpu,
-        "civitai_token": os.environ.get("CIVITAI_TOKEN", "")
+        "public_model_volume": public_model_volume_name,
+        "private_model_volume": item.model_volume_name,
+        "pip": list(pip_modules)
     }
     with open(f"{folder_path}/config.py", "w") as f:
         f.write("config = " + json.dumps(config))

builder/modal-builder/src/template/app.py

@@ -1,13 +1,14 @@
 from config import config
 import modal
-from modal import Image, Mount, web_endpoint, Stub, asgi_app
+from modal import Image, Mount, web_endpoint, Stub, asgi_app, method, enter, exit
 import json
 import urllib.request
 import urllib.parse
 from pydantic import BaseModel
-from fastapi import FastAPI, Request
+from fastapi import FastAPI, Request, HTTPException
 from fastapi.responses import HTMLResponse
-
+from volume_setup import volumes
+from datetime import datetime
 # deploy_test = False
 
 import os
@@ -27,8 +28,8 @@ deploy_test = config["deploy_test"] == "True"
 web_app = FastAPI()
 print(config)
 print("deploy_test ", deploy_test)
+print('volumes', volumes)
 stub = Stub(name=config["name"])
-# print(stub.app_id)
 
 if not deploy_test:
     # dockerfile_image = Image.from_dockerfile(f"{current_directory}/Dockerfile", context_mount=Mount.from_local_dir(f"{current_directory}/data", remote_path="/data"))
@@ -36,9 +37,6 @@ if not deploy_test:
 
     dockerfile_image = (
         modal.Image.debian_slim()
-        .env({
-            "CIVITAI_TOKEN": config["civitai_token"],
-        })
         .apt_install("git", "wget")
         .pip_install(
             "git+https://github.com/modal-labs/asgiproxy.git", "httpx", "tqdm"
@@ -55,16 +53,20 @@ if not deploy_test:
             "cd /comfyui/custom_nodes/ComfyUI-Manager && pip install -r requirements.txt",
             "cd /comfyui/custom_nodes/ComfyUI-Manager && mkdir startup-scripts",
         )
+        .run_commands(f"cat /comfyui/server.py")
+        .run_commands(f"ls /comfyui/app")
         # .run_commands(
         #     # Install comfy deploy
         #     "cd /comfyui/custom_nodes && git clone https://github.com/BennyKok/comfyui-deploy.git",
         # )
-        # .copy_local_file(f"{current_directory}/data/extra_model_paths.yaml", "/comfyui")
+        .copy_local_file(f"{current_directory}/data/extra_model_paths.yaml", "/comfyui")
 
         .copy_local_file(f"{current_directory}/data/start.sh", "/start.sh")
         .run_commands("chmod +x /start.sh")
 
         # Restore the custom nodes first
+        .pip_install(config["pip"])
+
         .copy_local_file(f"{current_directory}/data/restore_snapshot.py", "/")
         .copy_local_file(f"{current_directory}/data/snapshot.json", "/comfyui/custom_nodes/ComfyUI-Manager/startup-scripts/restore-snapshot.json")
         .run_commands("python restore_snapshot.py")
@@ -156,90 +158,110 @@ image = Image.debian_slim()
 
 target_image = image if deploy_test else dockerfile_image
 
+@stub.cls(image=target_image, gpu=config["gpu"] ,volumes=volumes, timeout=60 * 10, container_idle_timeout=60 * 5)
+class ComfyDeployRunner:
 
-@stub.function(image=target_image, gpu=config["gpu"])
+    @enter()
-def run(input: Input):
+    def setup(self):
-    import subprocess
+        import subprocess
-    import time
+        import time
-    # Make sure that the ComfyUI API is available
+        # Make sure that the ComfyUI API is available
-    print(f"comfy-modal - check server")
+        print(f"comfy-modal - check server")
 
-    command = ["python", "main.py",
+        command = ["python", "main.py",
-               "--disable-auto-launch", "--disable-metadata"]
+                "--disable-auto-launch", "--disable-metadata"]
-    server_process = subprocess.Popen(command, cwd="/comfyui")
 
-    check_server(
+        self.server_process = subprocess.Popen(command, cwd="/comfyui")
-        f"http://{COMFY_HOST}",
-        COMFY_API_AVAILABLE_MAX_RETRIES,
-        COMFY_API_AVAILABLE_INTERVAL_MS,
-    )
 
-    job_input = input
+        check_server(
+            f"http://{COMFY_HOST}",
+            COMFY_API_AVAILABLE_MAX_RETRIES,
+            COMFY_API_AVAILABLE_INTERVAL_MS,
+        )
 
-    # print(f"comfy-modal - got input {job_input}")
+    @exit()
+    def cleanup(self, exc_type, exc_value, traceback):
+        self.server_process.terminate()
 
-    # Queue the workflow
+    @method()
-    try:
+    def run(self, input: Input):
-        # job_input is the json input
+        data = json.dumps({
-        queued_workflow = queue_workflow_comfy_deploy(
+            "run_id": input.prompt_id,
-            job_input)  # queue_workflow(workflow)
+            "status": "started",
-        prompt_id = queued_workflow["prompt_id"]
+            "time": datetime.now().isoformat()
-        print(f"comfy-modal - queued workflow with ID {prompt_id}")
+        }).encode('utf-8')
-    except Exception as e:
+        req = urllib.request.Request(input.status_endpoint, data=data, method='POST')
-        import traceback
+        urllib.request.urlopen(req)
-        print(traceback.format_exc())
-        return {"error": f"Error queuing workflow: {str(e)}"}
 
-    # Poll for completion
+        job_input = input
-    print(f"comfy-modal - wait until image generation is complete")
-    retries = 0
-    status = ""
-    try:
-        print("getting request")
-        while retries < COMFY_POLLING_MAX_RETRIES:
-            status_result = check_status(prompt_id=prompt_id)
-            # history = get_history(prompt_id)
 
-            # Exit the loop if we have found the history
+        try:
-            # if prompt_id in history and history[prompt_id].get("outputs"):
+            queued_workflow = queue_workflow_comfy_deploy(job_input)  # queue_workflow(workflow)
-            #     break
+            prompt_id = queued_workflow["prompt_id"]
+            print(f"comfy-modal - queued workflow with ID {prompt_id}")
+        except Exception as e:
+            import traceback
+            print(traceback.format_exc())
+            return {"error": f"Error queuing workflow: {str(e)}"}
 
-            # Exit the loop if we have found the status both success or failed
+        # Poll for completion
-            if 'status' in status_result and (status_result['status'] == 'success' or status_result['status'] == 'failed'):
+        print(f"comfy-modal - wait until image generation is complete")
-                status = status_result['status']
+        retries = 0
-                print(status)
+        status = ""
-                break
+        try:
+            print("getting request")
+            while retries < COMFY_POLLING_MAX_RETRIES:
+                status_result = check_status(prompt_id=prompt_id)
+                # history = get_history(prompt_id)
+
+                # Exit the loop if we have found the history
+                # if prompt_id in history and history[prompt_id].get("outputs"):
+                #     break
+
+                # Exit the loop if we have found the status both success or failed
+                if 'status' in status_result and (status_result['status'] == 'success' or status_result['status'] == 'failed'):
+                    status = status_result['status']
+                    print(status)
+                    break
+                else:
+                    # Wait before trying again
+                    time.sleep(COMFY_POLLING_INTERVAL_MS / 1000)
+                    retries += 1
             else:
-                # Wait before trying again
+                return {"error": "Max retries reached while waiting for image generation"}
-                time.sleep(COMFY_POLLING_INTERVAL_MS / 1000)
+        except Exception as e:
-                retries += 1
+            return {"error": f"Error waiting for image generation: {str(e)}"}
-        else:
-            return {"error": "Max retries reached while waiting for image generation"}
-    except Exception as e:
-        return {"error": f"Error waiting for image generation: {str(e)}"}
 
-    print(f"comfy-modal - Finished, turning off")
+        print(f"comfy-modal - Finished, turning off")
-    server_process.terminate()
 
-    # Get the generated image and return it as URL in an AWS bucket or as base64
+        result = {"status": status}
-    # images_result = process_output_images(history[prompt_id].get("outputs"), job["id"])
-    # result = {**images_result, "refresh_worker": REFRESH_WORKER}
-    result = {"status": status}
-
-    return result
-    print("Running remotely on Modal!")
 
+        return result
+    
 
 @web_app.post("/run")
-async def bar(request_input: RequestInput):
+async def post_run(request_input: RequestInput):
-    # print(request_input)
     if not deploy_test:
-        run.spawn(request_input.input)
+        # print(request_input.input.prompt_id, request_input.input.status_endpoint)
-        return {"status": "success"}
+        data = json.dumps({
-    # pass
+            "run_id": request_input.input.prompt_id,
+            "status": "queued",
+            "time": datetime.now().isoformat()
+        }).encode('utf-8')
+        req = urllib.request.Request(request_input.input.status_endpoint, data=data, method='POST')
+        urllib.request.urlopen(req)
 
+        model = ComfyDeployRunner()
+        call = model.run.spawn(request_input.input)
 
-@stub.function(image=image)
+        # call = run.spawn()
+        return {"call_id": call.object_id}
+    
+    return {"call_id": None}
+
+@stub.function(image=image
+   ,volumes=volumes
+)
 @asgi_app()
 def comfyui_api():
     return web_app
@@ -289,6 +311,7 @@ def spawn_comfyui_in_background():
     # to be on a single container.
     concurrency_limit=1,
     timeout=10 * 60,
+    volumes=volumes,
 )
 @asgi_app()
 def comfyui_app():
@@ -307,4 +330,4 @@ def comfyui_app():
         },
     )()
 
-    return make_simple_proxy_app(ProxyContext(config))
+    return make_simple_proxy_app(ProxyContext(config))

builder/modal-builder/src/template/config.py

@@ -1 +1,8 @@
-config = {"name": "my-app", "deploy_test": "True", "gpu": "T4"}
+config = {
+    "name": "my-app",
+    "deploy_test": "False",
+    "gpu": "T4", 
+    "public_model_volume": "model-store",
+    "private_model_volume": "private-model-store",
+    "pip": []
+}

builder/modal-builder/src/template/data/extra_model_paths.yaml

@@ -1,11 +1,23 @@
-comfyui:
+public:
-    base_path: /runpod-volume/ComfyUI/
+  base_path: /public_models/
-    checkpoints: models/checkpoints/
+  checkpoints: checkpoints
-    clip: models/clip/
+  clip: clip
-    clip_vision: models/clip_vision/
+  clip_vision: clip_vision
-    configs: models/configs/
+  configs: configs
-    controlnet: models/controlnet/
+  controlnet: controlnet
-    embeddings: models/embeddings/
+  embeddings: embeddings
-    loras: models/loras/
+  loras: loras
-    upscale_models: models/upscale_models/
+  upscale_models: upscale_models
-    vae: models/vae/
+  vae: vae
+
+private:
+  base_path: /private_models/
+  checkpoints: checkpoints
+  clip: clip
+  clip_vision: clip_vision
+  configs: configs
+  controlnet: controlnet
+  embeddings: embeddings
+  loras: loras
+  upscale_models: upscale_models
+  vae: vae

builder/modal-builder/src/template/data/install_deps.py

@@ -49,15 +49,9 @@ with open('models.json') as f:
     models = json.load(f)
 
 for model in models:
-    import os
-    if "civitai.com/api" in model['url'] and not "token=" in model['url']:
-        if "?" in model['url']:
-            model['url'] += "&token=" + os.environ.get('CIVITAI_TOKEN', '')
-        else:
-            model['url'] += "?token=" + os.environ.get('CIVITAI_TOKEN', '')
     response = requests.request("POST", f"{root_url}/model/install", json=model, headers=headers)
     print(response.text)
 
 # Close the server
 server_process.terminate()
-print("Finished installing dependencies.")
+print("Finished installing dependencies.")

builder/modal-builder/src/template/data/snapshot.json

@@ -1,5 +1,10 @@
 {
-    "comfyui": "d0165d819afe76bd4e6bdd710eb5f3e571b6a804",
+  "comfyui": "d0165d819afe76bd4e6bdd710eb5f3e571b6a804",
-    "git_custom_nodes": {},
+  "git_custom_nodes": {
-    "file_custom_nodes": []
+    "https://github.com/BennyKok/comfyui-deploy.git": {
-}
+      "hash": "a838cb7ad425e5652c3931fbafdc886b53c48a22",
+      "disabled": false
+    }
+  },
+  "file_custom_nodes": []
+}

builder/modal-builder/src/template/volume_setup.py

@@ -0,0 +1,9 @@
+import modal
+from config import config
+
+public_model_volume = modal.Volume.persisted(config["public_model_volume"])
+private_volume = modal.Volume.persisted(config["private_model_volume"])
+
+PUBLIC_BASEMODEL_DIR = "/public_models"
+PRIVATE_BASEMODEL_DIR = "/private_models"
+volumes = {PUBLIC_BASEMODEL_DIR: public_model_volume, PRIVATE_BASEMODEL_DIR: private_volume}

builder/modal-builder/src/volume-builder/app.py

@@ -0,0 +1,74 @@
+import modal
+from config import config
+import os
+import subprocess
+from pprint import pprint
+
+stub = modal.Stub()
+
+# Volume names may only contain alphanumeric characters, dashes, periods, and underscores, and must be less than 64 characters in length.
+def is_valid_name(name: str) -> bool:
+    allowed_characters = set("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._")
+    return 0 < len(name) <= 64 and all(char in allowed_characters for char in name)
+
+def create_volumes(volume_names, paths):
+    path_to_vol = {}
+    for volume_name in volume_names.keys():
+        if not is_valid_name(volume_name):
+            pass
+        modal_volume = modal.Volume.persisted(volume_name)
+        path_to_vol[paths[volume_name]] = modal_volume
+ 
+    return path_to_vol
+
+vol_name_to_links = config["volume_names"]
+vol_name_to_path = config["volume_paths"]
+callback_url = config["callback_url"]
+callback_body = config["callback_body"]
+civitai_key = config["civitai_api_key"]
+
+volumes = create_volumes(vol_name_to_links, vol_name_to_path)
+image = ( 
+   modal.Image.debian_slim().apt_install("wget").pip_install("requests")
+)
+
+# download config { "download_url": "", "folder_path": ""}
+timeout=5000
+@stub.function(volumes=volumes, image=image, timeout=timeout, gpu=None)
+def download_model(volume_name, download_config):
+    import requests
+    download_url = download_config["download_url"]
+    folder_path = download_config["folder_path"]
+
+    volume_base_path = vol_name_to_path[volume_name]
+    model_store_path = os.path.join(volume_base_path, folder_path)
+    modified_download_url = download_url + ("&" if "?" in download_url else "?") + "token=" + civitai_key # civitai requires auth
+    print('downloading', modified_download_url)
+
+    subprocess.run(["wget", modified_download_url , "--content-disposition", "-P", model_store_path])
+    subprocess.run(["ls", "-la", volume_base_path])
+    subprocess.run(["ls", "-la", model_store_path])
+    volumes[volume_base_path].commit()
+
+
+    status =  {"status": "success"}
+    requests.post(callback_url, json={**status, **callback_body})
+    print(f"finished! sending to {callback_url}")
+    pprint({**status, **callback_body})
+
+@stub.local_entrypoint()
+def simple_download():
+    import requests
+    try:
+        list(download_model.starmap([(vol_name, link) for vol_name,link in vol_name_to_links.items()]))
+    except modal.exception.FunctionTimeoutError as e:
+        status =  {"status": "failed", "error_logs": f"{str(e)}", "timeout": timeout}
+        requests.post(callback_url, json={**status, **callback_body})
+        print(f"finished! sending to {callback_url}")
+        pprint({**status, **callback_body})
+    except Exception as e:
+        status =  {"status": "failed", "error_logs": str(e)}
+        requests.post(callback_url, json={**status, **callback_body})
+        print(f"finished! sending to {callback_url}")
+        pprint({**status, **callback_body})
+        

builder/modal-builder/src/volume-builder/config.py

@@ -0,0 +1,18 @@
+config = {
+    "volume_names": {
+        "user4": {
+            "download_url": "https://civitai.com/api/download/models/11745",
+            "folder_path": "checkpoints"
+        }
+    }, 
+    "volume_paths": {
+        "user4": "/volumes/something",
+    },
+    "callback_url": "",
+    "callback_body": {
+        "model_id": "",
+        "volume_id": "",
+        "folder_path": "checkpoints",
+    }, 
+    "civitai_api_key": "",
+}

comfy-nodes/external_checkpoints.py

@@ -16,7 +16,7 @@ class ComfyUIDeployExternalCheckpoint:
                 ),
             },
             "optional": {
-                "default_value": (folder_paths.get_filename_list("checkpoints"), ),
+                "default_checkpoint_name": (folder_paths.get_filename_list("checkpoints"), ),
             }
         }
 
@@ -27,12 +27,12 @@ class ComfyUIDeployExternalCheckpoint:
 
     CATEGORY = "deploy"
 
-    def run(self, input_id, default_value=None):
+    def run(self, input_id, default_checkpoint_name=None):
         import requests
         import os
         import uuid
 
-        if default_value.startswith('http'):
+        if input_id and input_id.startswith('http'):
             unique_filename = str(uuid.uuid4()) + ".safetensors"
             print(unique_filename)
             print(folder_paths.folder_names_and_paths["checkpoints"][0][0])
@@ -59,7 +59,7 @@ class ComfyUIDeployExternalCheckpoint:
                     out_file.write(chunk)
             return (unique_filename,)
         else:
-            return (default_value,)
+            return (default_checkpoints_name,)
 
 
 NODE_CLASS_MAPPINGS = {

comfy-nodes/external_image_batch.py

@@ -1,85 +0,0 @@
-import folder_paths
-from PIL import Image, ImageOps
-import numpy as np
-import torch
-import json
-import comfy
-
-class ComfyUIDeployExternalImageBatch:
-    @classmethod
-    def INPUT_TYPES(s):
-        return {
-            "required": {
-                "input_id": (
-                    "STRING",
-                    {"multiline": False, "default": "input_images"},
-                ),
-                "images": (
-                    "STRING",
-                    {"multiline": False, "default": "[]"},
-                ),
-            },
-            "optional": {
-                "default_value": ("IMAGE",),
-            }
-        }
-
-    RETURN_TYPES = ("IMAGE",)
-    RETURN_NAMES = ("image",)
-
-    FUNCTION = "run"
-
-    CATEGORY = "image"
-    
-    def run(self, input_id, images=None, default_value=None):
-        processed_images = []
-        try:
-            images_list = json.loads(images)  # Assuming images is a JSON array string
-            print(images_list)
-            for img_input in images_list:
-                if img_input.startswith('http'):
-                    import requests
-                    from io import BytesIO
-                    print("Fetching image from url: ", img_input)
-                    response = requests.get(img_input)
-                    image = Image.open(BytesIO(response.content))
-                elif img_input.startswith('data:image/png;base64,') or img_input.startswith('data:image/jpeg;base64,') or img_input.startswith('data:image/jpg;base64,'):
-                    import base64
-                    from io import BytesIO
-                    print("Decoding base64 image")
-                    base64_image = img_input[img_input.find(",")+1:]
-                    decoded_image = base64.b64decode(base64_image)
-                    image = Image.open(BytesIO(decoded_image))
-                else:
-                    raise ValueError("Invalid image url or base64 data provided.")
-
-                image = ImageOps.exif_transpose(image)
-                image = image.convert("RGB")
-                image = np.array(image).astype(np.float32) / 255.0
-                image_tensor = torch.from_numpy(image)[None,]
-                processed_images.append(image_tensor)
-        except Exception as e:
-            print(f"Error processing images: {e}")
-            pass
-            
-        if default_value is not None and len(images_list) == 0:
-            processed_images.append(default_value)  # Assuming default_value is a pre-processed image tensor
-
-        # Resize images if necessary and concatenate from MakeImageBatch in ImpactPack
-        if processed_images:
-            base_shape = processed_images[0].shape[1:]  # Get the shape of the first image for comparison
-            batch_tensor = processed_images[0]
-            for i in range(1, len(processed_images)):
-                if processed_images[i].shape[1:] != base_shape:
-                    # Resize to match the first image's dimensions
-                    processed_images[i] = comfy.utils.common_upscale(processed_images[i].movedim(-1, 1), base_shape[1], base_shape[0], "lanczos", "center").movedim(1, -1)
-
-                batch_tensor = torch.cat((batch_tensor, processed_images[i]), dim=0)
-            # Concatenate using torch.cat
-        else:
-            batch_tensor = None  # or handle the empty case as needed
-        return (batch_tensor, )
-
-
-NODE_CLASS_MAPPINGS = {"ComfyUIDeployExternalImageBatch": ComfyUIDeployExternalImageBatch}
-NODE_DISPLAY_NAME_MAPPINGS = {"ComfyUIDeployExternalImageBatch": "External Image Batch (ComfyUI Deploy)"}

comfy-nodes/external_lora.py

@@ -32,26 +32,19 @@ class ComfyUIDeployExternalLora:
         import os
         import uuid
 
-        print('external lora using')
+        if input_id and input_id.startswith('http'):
-        print("input id: ", input_id)
+            unique_filename = str(uuid.uuid4()) + ".safetensors"
-        print("default lora : ", default_lora_name)
+            print(unique_filename)
-
+            print(folder_paths.folder_names_and_paths["loras"][0][0])
-        if input_id:
+            destination_path = os.path.join(folder_paths.folder_names_and_paths["loras"][0][0], unique_filename)
-            if input_id.startswith('http'):
+            print(destination_path)
-                unique_filename = str(uuid.uuid4()) + ".safetensors"
+            print("Downloading external lora - " + input_id + " to " + destination_path)
-                print(unique_filename)
+            response = requests.get(input_id, headers={'User-Agent': 'Mozilla/5.0'}, allow_redirects=True)
-                print(folder_paths.folder_names_and_paths["loras"][0][0])
+            with open(destination_path, 'wb') as out_file:
-                destination_path = os.path.join(folder_paths.folder_names_and_paths["loras"][0][0], unique_filename)
+                out_file.write(response.content)
-                print(destination_path)
+            return (unique_filename,)
-                print("Downloading external lora - " + input_id + " to " + destination_path)
+        else:
-                response = requests.get(input_id, headers={'User-Agent': 'Mozilla/5.0'}, allow_redirects=True)
+            return (default_lora_name,)
-                with open(destination_path, 'wb') as out_file:
-                    out_file.write(response.content)
-                return (unique_filename,)
-            else:
-                return (input_id,)
-
-        return (default_lora_name,)
         
 
 NODE_CLASS_MAPPINGS = {"ComfyUIDeployExternalLora": ComfyUIDeployExternalLora}

comfy-nodes/external_number.py

@@ -16,7 +16,7 @@ class ComfyUIDeployExternalNumber:
             "optional": {
                 "default_value": (
                     "FLOAT",
-                    {"multiline": True, "display": "number", "default": 0, "step": 0.01},
+                    {"multiline": True, "display": "number", "default": 0},
                 ),
             }
         }
@@ -29,12 +29,9 @@ class ComfyUIDeployExternalNumber:
     CATEGORY = "number"
 
     def run(self, input_id, default_value=None):
-        try:
+        if not input_id or not input_id.strip().isdigit():
-            float_value = float(input_id)
-            print("my number", float_value)
-            return [float_value]
-        except ValueError:
             return [default_value]
+        return [int(input_id)]
 
 
 NODE_CLASS_MAPPINGS = {"ComfyUIDeployExternalNumber": ComfyUIDeployExternalNumber}

comfy-nodes/external_text.py

@@ -29,7 +29,9 @@ class ComfyUIDeployExternalText:
     CATEGORY = "text"
 
     def run(self, input_id, default_value=None):
-        return [default_value]
+        if not input_id or len(input_id.strip()) == 0:
+            return [default_value]
+        return [input_id]
 
 
 NODE_CLASS_MAPPINGS = {"ComfyUIDeployExternalText": ComfyUIDeployExternalText}

comfy-nodes/input_websocket_image.py

@@ -1,66 +0,0 @@
-import folder_paths
-from PIL import Image, ImageOps
-import numpy as np
-import torch
-from server import PromptServer, BinaryEventTypes
-import asyncio
-
-from globals import streaming_prompt_metadata, max_output_id_length
-
-class ComfyDeployWebscoketImageInput:
-    @classmethod
-    def INPUT_TYPES(s):
-        return {
-            "required": {
-                "input_id": (
-                    "STRING",
-                    {"multiline": False, "default": "input_id"},
-                ),
-                "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-            },
-            "optional": {
-                "default_value": ("IMAGE", ),
-                "client_id": (
-                    "STRING",
-                    {"multiline": False, "default": ""},
-                ),
-            }
-        }
-
-    OUTPUT_NODE = True
-
-    RETURN_TYPES = ("IMAGE", )
-    RETURN_NAMES = ("images",)
-
-    FUNCTION = "run"
-
-    @classmethod
-    def VALIDATE_INPUTS(s, input_id):
-        try:
-            if len(input_id.encode('ascii')) > max_output_id_length:
-                raise ValueError(f"input_id size is greater than {max_output_id_length} bytes")
-        except UnicodeEncodeError:
-            raise ValueError("input_id is not ASCII encodable")
-
-        return True
-
-    def run(self, input_id, seed, default_value=None ,client_id=None):
-        # print(streaming_prompt_metadata[client_id].inputs)
-        if client_id in streaming_prompt_metadata and input_id in streaming_prompt_metadata[client_id].inputs:
-            if isinstance(streaming_prompt_metadata[client_id].inputs[input_id], Image.Image):
-                print("Returning image from websocket input")
-                
-                image = streaming_prompt_metadata[client_id].inputs[input_id]
-                
-                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]
-
-        print("Returning default value")
-        return [default_value]
-
-NODE_CLASS_MAPPINGS = {"ComfyDeployWebscoketImageInput": ComfyDeployWebscoketImageInput}
-NODE_DISPLAY_NAME_MAPPINGS = {"ComfyDeployWebscoketImageInput": "Image Websocket Input (ComfyDeploy)"}

comfy-nodes/output_websocket_image.py

@@ -1,71 +0,0 @@
-import folder_paths
-from PIL import Image, ImageOps
-import numpy as np
-import torch
-from server import PromptServer, BinaryEventTypes
-import asyncio
-
-from globals import send_image, max_output_id_length
-
-class ComfyDeployWebscoketImageOutput:
-    @classmethod
-    def INPUT_TYPES(s):
-        return {
-            "required": {
-                "output_id": (
-                    "STRING",
-                    {"multiline": False, "default": "output_id"},
-                ),
-                "images": ("IMAGE", ),
-                "file_type": (["WEBP", "PNG", "JPEG"], ),
-                "quality": ("INT", {"default": 80, "min": 1, "max": 100, "step": 1}),
-            },
-            "optional": {
-                    "client_id": (
-                    "STRING",
-                    {"multiline": False, "default": ""},
-                ),
-            }
-            # "hidden": {"client_id": "CLIENT_ID"},
-        }
-
-    OUTPUT_NODE = True
-
-    RETURN_TYPES = ()
-    RETURN_NAMES = ("text",)
-
-    FUNCTION = "run"
-
-    CATEGORY = "output"
-    
-    @classmethod
-    def VALIDATE_INPUTS(s, output_id):
-        try:
-            if len(output_id.encode('ascii')) > max_output_id_length:
-                raise ValueError(f"output_id size is greater than {max_output_id_length} bytes")
-        except UnicodeEncodeError:
-            raise ValueError("output_id is not ASCII encodable")
-
-        return True
-
-    def run(self, output_id, images, file_type, quality, client_id):
-        prompt_server = PromptServer.instance
-        loop = prompt_server.loop
-        
-        def schedule_coroutine_blocking(target, *args):
-            future = asyncio.run_coroutine_threadsafe(target(*args), loop)
-            return future.result()  # This makes the call blocking
-        
-        for tensor in images:
-            array = 255.0 * tensor.cpu().numpy()
-            image = Image.fromarray(np.clip(array, 0, 255).astype(np.uint8))
-
-            schedule_coroutine_blocking(send_image, [file_type, image, None, quality], client_id, output_id)
-            print("Image sent")
-
-        return {"ui": {}}
-        
-
-
-NODE_CLASS_MAPPINGS = {"ComfyDeployWebscoketImageOutput": ComfyDeployWebscoketImageOutput}
-NODE_DISPLAY_NAME_MAPPINGS = {"ComfyDeployWebscoketImageOutput": "Image Websocket Output (ComfyDeploy)"}

custom_routes.py

@@ -1,47 +1,31 @@
-from io import BytesIO
 from aiohttp import web
 import os
 import requests
 import folder_paths
 import json
+import numpy as np
 import server
+import re
+import base64
 from PIL import Image
+import io
 import time
 import execution
 import random
 import traceback
 import uuid
 import asyncio
+import atexit
 import logging
+import sys
+from logging.handlers import RotatingFileHandler
+from enum import Enum
 from urllib.parse import quote
 import threading
-import hashlib
-import aiohttp
-import aiofiles
-from typing import List, Union, Any, Optional
-from PIL import Image
-import copy
-import struct
-
-from globals import StreamingPrompt, Status, sockets, SimplePrompt, streaming_prompt_metadata, prompt_metadata
 
 api = None
 api_task = None
-
+prompt_metadata = {}
-cd_enable_log = os.environ.get('CD_ENABLE_LOG', 'false').lower() == 'true'
-cd_enable_run_log = os.environ.get('CD_ENABLE_RUN_LOG', 'false').lower() == 'true'
-
-def clear_current_prompt(sid):
-    prompt_server = server.PromptServer.instance
-    to_delete = list(streaming_prompt_metadata[sid].running_prompt_ids)  # Convert set to list
-    
-    print("clearning out prompt: ", to_delete)
-    for id_to_delete in to_delete:
-        delete_func = lambda a: a[1] == id_to_delete
-        prompt_server.prompt_queue.delete_queue_item(delete_func)
-        print("deleted prompt: ", id_to_delete, prompt_server.prompt_queue.get_tasks_remaining())
-        
-    streaming_prompt_metadata[sid].running_prompt_ids.clear()
 
 def post_prompt(json_data):
     prompt_server = server.PromptServer.instance
@@ -90,105 +74,19 @@ def randomSeed(num_digits=15):
     range_end = (10**num_digits) - 1
     return random.randint(range_start, range_end)
 
-def apply_random_seed_to_workflow(workflow_api):
-    """
-    Applies a random seed to each element in the workflow_api that has a 'seed' input.
-
-    Args:
-        workflow_api (dict): The workflow API dictionary to modify.
-    """
-    for key in workflow_api:
-        if 'inputs' in workflow_api[key] and 'seed' in workflow_api[key]['inputs']:
-            if isinstance(workflow_api[key]['inputs']['seed'], list):
-                continue
-            if workflow_api[key]['class_type'] == "PromptExpansion":
-                workflow_api[key]['inputs']['seed'] = randomSeed(8);
-                continue
-            workflow_api[key]['inputs']['seed'] = randomSeed();
-            
-def apply_inputs_to_workflow(workflow_api: Any, inputs: Any, sid: str = None):
-    # Loop through each of the inputs and replace them
-    for key, value in workflow_api.items():
-        if 'inputs' in value:
-            
-            # Support websocket
-            if sid is not None:
-                if (value["class_type"] == "ComfyDeployWebscoketImageOutput"):
-                    value['inputs']["client_id"] = sid
-                if (value["class_type"] == "ComfyDeployWebscoketImageInput"):
-                    value['inputs']["client_id"] = sid
-                    
-            if "input_id" in value['inputs'] and value['inputs']['input_id'] in inputs:
-                new_value = inputs[value['inputs']['input_id']]
-                
-                # Lets skip it if its an image
-                if isinstance(new_value, Image.Image):
-                    continue
-                
-                # Backward compactibility
-                value['inputs']["input_id"] = new_value
-            
-                # Fix for external text default value
-                if (value["class_type"] == "ComfyUIDeployExternalText"):
-                    value['inputs']["default_value"] = new_value
-                    
-                if (value["class_type"] == "ComfyUIDeployExternalCheckpoint"):
-                    value['inputs']["default_value"] = new_value
-                    
-                if (value["class_type"] == "ComfyUIDeployExternalImageBatch"):
-                    value['inputs']["images"] = new_value
-
-def send_prompt(sid: str, inputs: StreamingPrompt):
-    # workflow_api = inputs.workflow_api
-    workflow_api = copy.deepcopy(inputs.workflow_api)
-    
-    # Random seed
-    apply_random_seed_to_workflow(workflow_api)
-            
-    print("getting inputs" , inputs.inputs)
-    
-    apply_inputs_to_workflow(workflow_api, inputs.inputs, sid=sid)
-                
-    print(workflow_api)
-                
-    prompt_id = str(uuid.uuid4())
-            
-    prompt = {
-        "prompt": workflow_api,
-        "client_id": sid, #"comfy_deploy_instance", #api.client_id
-        "prompt_id": prompt_id
-    }
-    
-    try:
-        res = post_prompt(prompt)
-        inputs.running_prompt_ids.add(prompt_id)
-        prompt_metadata[prompt_id] = SimplePrompt(
-            status_endpoint=inputs.status_endpoint,
-            file_upload_endpoint=inputs.file_upload_endpoint,
-            workflow_api=workflow_api,
-            is_realtime=True
-        )
-    except Exception as e:
-        error_type = type(e).__name__
-        stack_trace_short = traceback.format_exc().strip().split('\n')[-2]
-        stack_trace = traceback.format_exc().strip()
-        print(f"error: {error_type}, {e}")
-        print(f"stack trace: {stack_trace_short}")
-       
 @server.PromptServer.instance.routes.post("/comfyui-deploy/run")
 async def comfy_deploy_run(request):
     prompt_server = server.PromptServer.instance
     data = await request.json()
 
-    # In older version, we use workflow_api, but this has inputs already swapped in nextjs frontend, which is tricky
+    workflow_api = data.get("workflow_api")
-    workflow_api = data.get("workflow_api_raw")
+
     # The prompt id generated from comfy deploy, can be None
     prompt_id = data.get("prompt_id")
-    inputs = data.get("inputs")
 
-    # Now it handles directly in here
+    for key in workflow_api:
-    apply_random_seed_to_workflow(workflow_api)
+        if 'inputs' in workflow_api[key] and 'seed' in workflow_api[key]['inputs']:
-    apply_inputs_to_workflow(workflow_api, inputs)
+            workflow_api[key]['inputs']['seed'] = randomSeed()
 
     prompt = {
         "prompt": workflow_api,
@@ -196,11 +94,10 @@ async def comfy_deploy_run(request):
         "prompt_id": prompt_id
     }
 
-    prompt_metadata[prompt_id] = SimplePrompt(
+    prompt_metadata[prompt_id] = {
-        status_endpoint=data.get('status_endpoint'),
+        'status_endpoint': data.get('status_endpoint'),
-        file_upload_endpoint=data.get('file_upload_endpoint'),
+        'file_upload_endpoint': data.get('file_upload_endpoint'),
-        workflow_api=workflow_api
+    }
-    )
 
     try:
         res = post_prompt(prompt)
@@ -216,8 +113,6 @@ async def comfy_deploy_run(request):
                 "stack_trace": stack_trace
             }
         })
-         # When there are critical errors, the prompt is actually not run
-        await update_run(prompt_id, Status.FAILED)
         return web.Response(status=500, reason=f"{error_type}: {e}, {stack_trace_short}")
 
     status = 200
@@ -244,202 +139,7 @@ async def comfy_deploy_run(request):
 
     return web.json_response(res, status=status)
 
-
+sockets = dict()
-def get_comfyui_path_from_file_path(file_path):
-    file_path_parts = file_path.split("\\")
-
-    if file_path_parts[0] == "input":
-        print("matching input")
-        file_path = os.path.join(folder_paths.get_directory_by_type("input"), *file_path_parts[1:])
-    elif file_path_parts[0] == "models":
-        print("matching models")
-        file_path = folder_paths.get_full_path(file_path_parts[1], os.path.join(*file_path_parts[2:]))
-
-    print(file_path)
-
-    return file_path
-
-# Form ComfyUI Manager
-async def compute_sha256_checksum(filepath):
-    print("computing sha256 checksum")
-    chunk_size = 1024 * 256  # Example: 256KB
-    filepath = get_comfyui_path_from_file_path(filepath)
-    """Compute the SHA256 checksum of a file, in chunks, asynchronously"""
-    sha256 = hashlib.sha256()
-    async with aiofiles.open(filepath, 'rb') as f:
-        while True:
-            chunk = await f.read(chunk_size)
-            if not chunk:
-                break
-            sha256.update(chunk)
-    return sha256.hexdigest()
-
-@server.PromptServer.instance.routes.get('/comfyui-deploy/models')
-async def get_installed_models(request):
-    # Directly return the list of paths as JSON
-    new_dict = {}
-    for key, value in folder_paths.folder_names_and_paths.items():
-        # Convert set to list for JSON compatibility
-        # for path in value[0]:
-        file_list = folder_paths.get_filename_list(key)
-        value_json_compatible = (value[0], list(value[1]), file_list)
-        new_dict[key] = value_json_compatible
-    # print(new_dict)
-    return web.json_response(new_dict)
-
-# This is start uploading the files to Comfy Deploy
-@server.PromptServer.instance.routes.post('/comfyui-deploy/upload-file')
-async def upload_file_endpoint(request):
-    data = await request.json()
-
-    file_path = data.get("file_path")
-
-    print("Original file path", file_path)
-
-    file_path = get_comfyui_path_from_file_path(file_path)
-
-    # return web.json_response({
-    #     "error": f"File not uploaded"
-    # }, status=500)
-
-    token = data.get("token")
-    get_url = data.get("url")
-
-    try:
-        base = folder_paths.base_path
-        file_path = os.path.join(base, file_path)
-        
-        if os.path.exists(file_path):
-            file_size = os.path.getsize(file_path)
-            file_extension = os.path.splitext(file_path)[1]
-
-            if file_extension in ['.jpg', '.jpeg']:
-                file_type = 'image/jpeg'
-            elif file_extension == '.png':
-                file_type = 'image/png'
-            elif file_extension == '.webp':
-                file_type = 'image/webp'
-            else:
-                file_type = 'application/octet-stream'  # Default to binary file type if unknown
-        else:
-            return web.json_response({
-                "error": f"File not found: {file_path}"
-            }, status=404)
-
-    except Exception as e:
-        return web.json_response({
-            "error": str(e)
-        }, status=500)
-
-    if get_url:
-        try:
-            async with aiohttp.ClientSession() as session:
-                headers = {'Authorization': f'Bearer {token}'}
-                params = {'file_size': file_size, 'type': file_type}
-                async with session.get(get_url, params=params, headers=headers) as response:
-                    if response.status == 200:
-                        content = await response.json()
-                        upload_url = content["upload_url"]
-
-                        with open(file_path, 'rb') as f:
-                            headers = {
-                                "Content-Type": file_type,
-                                "x-amz-acl": "public-read",
-                                "Content-Length": str(file_size)
-                            }
-                            async with session.put(upload_url, data=f, headers=headers) as upload_response:
-                                if upload_response.status == 200:
-                                    return web.json_response({
-                                        "message": "File uploaded successfully",
-                                        "download_url": content["download_url"]
-                                    })
-                                else:
-                                    return web.json_response({
-                                        "error": f"Failed to upload file to {upload_url}. Status code: {upload_response.status}"
-                                    }, status=upload_response.status)
-                    else:
-                        return web.json_response({
-                            "error": f"Failed to fetch data from {get_url}. Status code: {response.status}"
-                        }, status=response.status)
-        except Exception as e:
-            return web.json_response({
-                "error": f"An error occurred while fetching data from {get_url}: {str(e)}"
-            }, status=500)
-        
-    return web.json_response({
-        "error": f"File not uploaded"
-    }, status=500)
-        
-
-script_dir = os.path.dirname(os.path.abspath(__file__))
-# Assuming the cache file is stored in the same directory as this script
-CACHE_FILE_PATH = script_dir + '/file-hash-cache.json'
-
-# Global in-memory cache
-file_hash_cache = {}
-
-# Load cache from disk at startup
-def load_cache():
-    global file_hash_cache
-    try:
-        with open(CACHE_FILE_PATH, 'r') as cache_file:
-            file_hash_cache = json.load(cache_file)
-    except (FileNotFoundError, json.JSONDecodeError):
-        file_hash_cache = {}
-
-# Save cache to disk
-def save_cache():
-    with open(CACHE_FILE_PATH, 'w') as cache_file:
-        json.dump(file_hash_cache, cache_file)
-
-# Initialize cache on application start
-load_cache()
-
-@server.PromptServer.instance.routes.get('/comfyui-deploy/get-file-hash')
-async def get_file_hash(request):
-    file_path = request.rel_url.query.get('file_path', '')
-
-    if not file_path:
-        return web.json_response({
-            "error": "file_path is required"
-        }, status=400)
-    
-    try:
-        base = folder_paths.base_path
-        full_file_path = os.path.join(base, file_path)
-
-        # Check if the file hash is in the cache
-        if full_file_path in file_hash_cache:
-            file_hash = file_hash_cache[full_file_path]
-        else:
-            start_time = time.time()
-            file_hash = await compute_sha256_checksum(full_file_path)
-            end_time = time.time()
-            elapsed_time = end_time - start_time
-            print(f"Cache miss -> Execution time: {elapsed_time} seconds")
-
-            # Update the in-memory cache
-            file_hash_cache[full_file_path] = file_hash
-            
-            save_cache()
-
-        return web.json_response({
-            "file_hash": file_hash
-        })
-    except Exception as e:
-        return web.json_response({
-            "error": str(e)
-        }, status=500)
-        
-async def update_realtime_run_status(realtime_id: str, status_endpoint: str, status: Status):
-    body = {
-        "run_id": realtime_id,
-        "status": status.value,
-    }
-    # requests.post(status_endpoint, json=body)
-    async with aiohttp.ClientSession() as session:
-        async with session.post(status_endpoint, json=body) as response:
-            pass
 
 @server.PromptServer.instance.routes.get('/comfyui-deploy/ws')
 async def websocket_handler(request):
@@ -453,135 +153,34 @@ async def websocket_handler(request):
         sid = uuid.uuid4().hex
 
     sockets[sid] = ws
-    
-    auth_token = request.rel_url.query.get('token', None)
-    get_workflow_endpoint_url = request.rel_url.query.get('workflow_endpoint', None)
-    realtime_id = request.rel_url.query.get('realtime_id', None)
-    status_endpoint = request.rel_url.query.get('status_endpoint', None)
-    
-    if auth_token is not None and get_workflow_endpoint_url is not None:
-        async with aiohttp.ClientSession() as session:
-            headers = {'Authorization': f'Bearer {auth_token}'}
-            async with session.get(get_workflow_endpoint_url, headers=headers) as response:
-                if response.status == 200:
-                    workflow = await response.json()
-                   
-                    print("Loaded workflow version ",workflow["version"])
-                    
-                    streaming_prompt_metadata[sid] = StreamingPrompt(
-                        workflow_api=workflow["workflow_api"], 
-                        auth_token=auth_token,
-                        inputs={},
-                        status_endpoint=status_endpoint,
-                        file_upload_endpoint=request.rel_url.query.get('file_upload_endpoint', None),
-                    )
-                    
-                    await update_realtime_run_status(realtime_id, status_endpoint, Status.RUNNING)
-                    # await send("workflow_api", workflow_api, sid)
-                else:
-                    error_message = await response.text()
-                    print(f"Failed to fetch workflow endpoint. Status: {response.status}, Error: {error_message}")
-                    # await send("error", {"message": error_message}, sid)
 
     try:
         # Send initial state to the new client
         await send("status", { 'sid': sid }, sid)
-
+        await send_first_time_log(sid)
-        # Make sure when its connected via client, the full log is not being sent
-        if cd_enable_log and get_workflow_endpoint_url is None:
-            await send_first_time_log(sid)
             
         async for msg in ws:
-            if msg.type == aiohttp.WSMsgType.TEXT:
-                try:
-                    data = json.loads(msg.data)
-                    print(data)
-                    event_type = data.get('event')
-                    if event_type == 'input':
-                        print("Got input: ", data.get("inputs"))
-                        input = data.get('inputs')
-                        streaming_prompt_metadata[sid].inputs.update(input)
-                    elif event_type == 'queue_prompt':
-                        clear_current_prompt(sid)
-                        send_prompt(sid, streaming_prompt_metadata[sid])
-                    else:
-                        # Handle other event types
-                        pass
-                except json.JSONDecodeError:
-                    print('Failed to decode JSON from message')
-            
-            if msg.type == aiohttp.WSMsgType.BINARY:
-                data = msg.data
-                event_type, = struct.unpack("<I", data[:4])
-                if event_type == 0:  # Image input
-                    image_type_code, = struct.unpack("<I", data[4:8])
-                    input_id_bytes = data[8:32]  # Extract the next 24 bytes for the input ID
-                    input_id = input_id_bytes.decode('ascii').strip()  # Decode the input ID from ASCII
-                    print(event_type)
-                    print(image_type_code)
-                    print(input_id)
-                    image_data = data[32:]  # The rest is the image data
-                    if image_type_code == 1:
-                        image_type = "JPEG"
-                    elif image_type_code == 2:
-                        image_type = "PNG"
-                    elif image_type_code == 3:
-                        image_type = "WEBP"
-                    else:
-                        print("Unknown image type code:", image_type_code)
-                        return
-                    image = Image.open(BytesIO(image_data))
-                    # Check if the input ID already exists and replace the input with the new one
-                    if input_id in streaming_prompt_metadata[sid].inputs:
-                        # If the input exists, we assume it's an image and attempt to close it to free resources
-                        try:
-                            existing_image = streaming_prompt_metadata[sid].inputs[input_id]
-                            if hasattr(existing_image, 'close'):
-                                existing_image.close()
-                        except Exception as e:
-                            print(f"Error closing previous image for input ID {input_id}: {e}")
-                    streaming_prompt_metadata[sid].inputs[input_id] = image
-                    # clear_current_prompt(sid)
-                    # send_prompt(sid, streaming_prompt_metadata[sid])
-                    print(f"Received {image_type} image of size {image.size} with input ID {input_id}")
-            
             if msg.type == aiohttp.WSMsgType.ERROR:
                 print('ws connection closed with exception %s' % ws.exception())
     finally:
         sockets.pop(sid, None)
-        
-        if realtime_id is not None:
-            await update_realtime_run_status(realtime_id, status_endpoint, Status.SUCCESS)
     return ws
 
 @server.PromptServer.instance.routes.get('/comfyui-deploy/check-status')
 async def comfy_deploy_check_status(request):
+    prompt_server = server.PromptServer.instance
     prompt_id = request.rel_url.query.get('prompt_id', None)
-    if prompt_id in prompt_metadata:
+    if prompt_id in prompt_metadata and 'status' in prompt_metadata[prompt_id]:
         return web.json_response({
-            "status": prompt_metadata[prompt_id].status.value
+            "status": prompt_metadata[prompt_id]['status'].value
         })
     else:
         return web.json_response({
             "message": "prompt_id not found"
         })
-        
-@server.PromptServer.instance.routes.get('/comfyui-deploy/check-ws-status')
-async def comfy_deploy_check_ws_status(request):
-    client_id = request.rel_url.query.get('client_id', None)
-    if client_id in streaming_prompt_metadata:
-        remaining_queue = 0  # Initialize remaining queue count
-        for prompt_id in streaming_prompt_metadata[client_id].running_prompt_ids:
-            prompt_status = prompt_metadata[prompt_id].status
-            if prompt_status not in [Status.FAILED, Status.SUCCESS]:
-                remaining_queue += 1  # Increment for each prompt still running
-        return web.json_response({"remaining_queue": remaining_queue})
-    else:
-        return web.json_response({"message": "client_id not found"}, status=404)
 
 async def send(event, data, sid=None):
     try:
-        # message = {"event": event, "data": data}
         if sid:
             ws = sockets.get(sid)
             if ws != None and not ws.closed:  # Check if the WebSocket connection is open and not closing
@@ -597,75 +196,26 @@ async def send(event, data, sid=None):
 logging.basicConfig(level=logging.INFO)
 
 prompt_server = server.PromptServer.instance
-send_json = prompt_server.send_json
 
+send_json = prompt_server.send_json
 async def send_json_override(self, event, data, sid=None):
     # print("INTERNAL:", event, data, sid)
     prompt_id = data.get('prompt_id')
-    
-    target_sid = sid
-    if target_sid == "comfy_deploy_instance":
-        target_sid = None
 
     # now we send everything
     await asyncio.wait([
-        asyncio.create_task(send(event, data, sid=target_sid)),
+        asyncio.create_task(send(event, data)),
         asyncio.create_task(self.send_json_original(event, data, sid))
     ])
 
     if event == 'execution_start':
         update_run(prompt_id, Status.RUNNING)
-        
-        if prompt_id in prompt_metadata:
-            prompt_metadata[prompt_id].start_time = time.perf_counter()
 
     # the last executing event is none, then the workflow is finished
     if event == 'executing' and data.get('node') is None:
         mark_prompt_done(prompt_id=prompt_id)
         if not have_pending_upload(prompt_id):
             update_run(prompt_id, Status.SUCCESS)
-            if prompt_id in prompt_metadata:
-                current_time = time.perf_counter()
-                if prompt_metadata[prompt_id].start_time is not None:
-                    elapsed_time = current_time - prompt_metadata[prompt_id].start_time
-                    print(f"Elapsed time: {elapsed_time} seconds")
-                    await send("elapsed_time", {
-                        "prompt_id": prompt_id,
-                        "elapsed_time": elapsed_time
-                    }, sid=sid)
-
-    if event == 'executing' and data.get('node') is not None:
-        node = data.get('node')
-        
-        if prompt_id in prompt_metadata:
-            # if 'progress' not in prompt_metadata[prompt_id]:
-            #     prompt_metadata[prompt_id]["progress"] = set()
-              
-            prompt_metadata[prompt_id].progress.add(node)
-            calculated_progress = len(prompt_metadata[prompt_id].progress) / len(prompt_metadata[prompt_id].workflow_api)
-            # print("calculated_progress", calculated_progress)
-         
-            if prompt_metadata[prompt_id].last_updated_node is not None and prompt_metadata[prompt_id].last_updated_node == node:
-                return
-            prompt_metadata[prompt_id].last_updated_node = node
-            class_type = prompt_metadata[prompt_id].workflow_api[node]['class_type']
-            print("updating run live status", class_type)
-            await send("live_status", {
-                "prompt_id": prompt_id,
-                "current_node": class_type,
-                "progress": calculated_progress,
-            }, sid=sid)
-            await update_run_live_status(prompt_id, "Executing " + class_type, calculated_progress)
-
-    if event == 'execution_cached' and data.get('nodes') is not None:
-        if prompt_id in prompt_metadata:
-            # if 'progress' not in prompt_metadata[prompt_id]:
-            #     prompt_metadata[prompt_id].progress = set()
-           
-            if 'nodes' in data:
-                for node in data.get('nodes', []):
-                    prompt_metadata[prompt_id].progress.add(node)
-            # prompt_metadata[prompt_id]["progress"].update(data.get('nodes'))
 
     if event == 'execution_error':
         # Careful this might not be fully awaited.
@@ -674,109 +224,43 @@ async def send_json_override(self, event, data, sid=None):
         # await update_run_with_output(prompt_id, data)
 
     if event == 'executed' and 'node' in data and 'output' in data:
-        print("executed", data)
-        if prompt_id in prompt_metadata:
-            node = data.get('node')
-            class_type = prompt_metadata[prompt_id].workflow_api[node]['class_type']
-            print("executed", class_type)
-            if class_type == "PreviewImage":
-                print("skipping preview image")
-                return
-            
         await update_run_with_output(prompt_id, data.get('output'), node_id=data.get('node'))
         # await update_run_with_output(prompt_id, data.get('output'), node_id=data.get('node'))
         # update_run_with_output(prompt_id, data.get('output'))
 
-# Global variable to keep track of the last read line number
-last_read_line_number = 0
 
-async def update_run_live_status(prompt_id, live_status, calculated_progress: float):
+class Status(Enum):
+    NOT_STARTED = "not-started"
+    RUNNING = "running"
+    SUCCESS = "success"
+    FAILED = "failed"
+    UPLOADING = "uploading"
+
+def update_run(prompt_id, status: Status):
     if prompt_id not in prompt_metadata:
         return
-    
-    if prompt_metadata[prompt_id].is_realtime is True:
-        return
-    
-    print("progress", calculated_progress)
-    
-    status_endpoint = prompt_metadata[prompt_id].status_endpoint
-    body = {
-        "run_id": prompt_id,
-        "live_status": live_status,
-        "progress": calculated_progress
-    }
-    # requests.post(status_endpoint, json=body)
-    async with aiohttp.ClientSession() as session:
-        async with session.post(status_endpoint, json=body) as response:
-            pass
 
-
+    if ('status' not in prompt_metadata[prompt_id] or prompt_metadata[prompt_id]['status'] != status):
-def update_run(prompt_id: str, status: Status):
-    global last_read_line_number
-
-    if prompt_id not in prompt_metadata:
-        return
-    
-    # if prompt_metadata[prompt_id].start_time is None and status == Status.RUNNING:
-    # if its realtime prompt we need to skip that.
-    if prompt_metadata[prompt_id].is_realtime is True:
-        prompt_metadata[prompt_id].status = status
-        return
-
-    if (prompt_metadata[prompt_id].status != status):
 
         # when the status is already failed, we don't want to update it to success
-        if (prompt_metadata[prompt_id].status is Status.FAILED):
+        if ('status' in prompt_metadata[prompt_id] and prompt_metadata[prompt_id]['status'] == Status.FAILED):
             return
 
-        status_endpoint = prompt_metadata[prompt_id].status_endpoint
+        status_endpoint = prompt_metadata[prompt_id]['status_endpoint']
         body = {
             "run_id": prompt_id,
             "status": status.value,
         }
+        prompt_metadata[prompt_id]['status'] = status
         print(f"Status: {status.value}")
 
         try:
             requests.post(status_endpoint, json=body)
-
-            if cd_enable_run_log and (status == Status.SUCCESS or status == Status.FAILED):
-                try:
-                    with open(comfyui_file_path, 'r') as log_file:
-                        # log_data = log_file.read()
-                        # Move to the last read line
-                        all_log_data = log_file.read()  # Read all log data
-                        print("All log data before skipping:", all_log_data)  # Log all data before skipping
-                        log_file.seek(0)  # Reset file pointer to the beginning
-                        
-                        for _ in range(last_read_line_number):
-                            next(log_file)
-                        log_data = log_file.read()
-                        # Update the last read line number
-                        last_read_line_number += log_data.count('\n')
-                        print("last_read_line_number", last_read_line_number)
-                        print("log_data", log_data)
-                        print("log_data.count(n)", log_data.count('\n'))
-
-                        body = {
-                            "run_id": prompt_id,
-                            "log_data": [
-                                {
-                                    "logs": log_data,
-                                    # "timestamp": time.time(),
-                                }
-                            ]
-                        }
-                        requests.post(status_endpoint, json=body)
-                except Exception as log_error:
-                    print(f"Error reading log file: {log_error}")
-                
         except Exception as e:
             error_type = type(e).__name__
             stack_trace = traceback.format_exc().strip()
             print(f"Error occurred while updating run: {e} {stack_trace}")
-        finally:
+
-            prompt_metadata[prompt_id].status = status
-            
 
 async def upload_file(prompt_id, filename, subfolder=None, content_type="image/png", type="output"):
     """
@@ -807,7 +291,7 @@ async def upload_file(prompt_id, filename, subfolder=None, content_type="image/p
 
     print("uploading file", file)
 
-    file_upload_endpoint = prompt_metadata[prompt_id].file_upload_endpoint
+    file_upload_endpoint = prompt_metadata[prompt_id]['file_upload_endpoint']
 
     filename = quote(filename)
     prompt_id = quote(prompt_id)
@@ -826,42 +310,26 @@ async def upload_file(prompt_id, filename, subfolder=None, content_type="image/p
             "Content-Length": str(len(data)),
         }
         response = requests.put(ok.get("url"), headers=headers, data=data)
-        async with aiohttp.ClientSession() as session:
+        print("upload file response", response.status_code)
-            async with session.put(ok.get("url"), headers=headers, data=data) as response:
-                print("upload file response", response.status)
 
 def have_pending_upload(prompt_id):
-    if prompt_id in prompt_metadata and len(prompt_metadata[prompt_id].uploading_nodes) > 0:
+    if 'prompt_id' in prompt_metadata and 'uploading_nodes' in prompt_metadata[prompt_id] and len(prompt_metadata[prompt_id]['uploading_nodes']) > 0:
-        print("have pending upload ", len(prompt_metadata[prompt_id].uploading_nodes))
+        print("have pending upload ", len(prompt_metadata[prompt_id]['uploading_nodes']))
         return True
 
     print("no pending upload")
     return False
 
 def mark_prompt_done(prompt_id):
-    """
-    Mark the prompt as done in the prompt metadata.
-
-    Args:
-        prompt_id (str): The ID of the prompt to mark as done.
-    """
     if prompt_id in prompt_metadata:
-        prompt_metadata[prompt_id].done = True
+        prompt_metadata[prompt_id]["done"] = True
         print("Prompt done")
 
-def is_prompt_done(prompt_id: str):
+def is_prompt_done(prompt_id):
-    """
+    if prompt_id in prompt_metadata and "done" in prompt_metadata[prompt_id]:
-    Check if the prompt with the given ID is marked as done.
+        if prompt_metadata[prompt_id]["done"] == True:
-
+            return True
-    Args:
+    
-        prompt_id (str): The ID of the prompt to check.
-
-    Returns:
-        bool: True if the prompt is marked as done, False otherwise.
-    """
-    if prompt_id in prompt_metadata and prompt_metadata[prompt_id].done is True:
-        return True
-
     return False
 
 # Use to handle upload error and send back to ComfyDeploy
@@ -883,17 +351,17 @@ async def handle_error(prompt_id, data, e: Exception):
     print(f"Error occurred while uploading file: {e}")
 
 # Mark the current prompt requires upload, and block it from being marked as success
-async def update_file_status(prompt_id: str, data, uploading, have_error=False, node_id=None):
+async def update_file_status(prompt_id, data, uploading, have_error=False, node_id=None):
-    # if 'uploading_nodes' not in prompt_metadata[prompt_id]:
+    if 'uploading_nodes' not in prompt_metadata[prompt_id]:
-    #     prompt_metadata[prompt_id]['uploading_nodes'] = set()
+        prompt_metadata[prompt_id]['uploading_nodes'] = set()
 
     if node_id is not None:
         if uploading:
-            prompt_metadata[prompt_id].uploading_nodes.add(node_id)
+            prompt_metadata[prompt_id]['uploading_nodes'].add(node_id)
         else:
-            prompt_metadata[prompt_id].uploading_nodes.discard(node_id)
+            prompt_metadata[prompt_id]['uploading_nodes'].discard(node_id)
 
-    print(prompt_metadata[prompt_id].uploading_nodes)
+    print(prompt_metadata[prompt_id]['uploading_nodes'])
     # Update the remote status
 
     if have_error:
@@ -905,12 +373,12 @@ async def update_file_status(prompt_id: str, data, uploading, have_error=False,
 
     # if there are still nodes that are uploading, then we set the status to uploading
     if uploading:
-        if prompt_metadata[prompt_id].status != Status.UPLOADING:
+        if prompt_metadata[prompt_id]['status'] != Status.UPLOADING:
             update_run(prompt_id, Status.UPLOADING)
             await send("uploading", {
                 "prompt_id": prompt_id,
             })
-   
+    
     # if there are no nodes that are uploading, then we set the status to success
     elif not uploading and not have_pending_upload(prompt_id) and is_prompt_done(prompt_id=prompt_id):
         update_run(prompt_id, Status.SUCCESS)
@@ -919,27 +387,20 @@ async def update_file_status(prompt_id: str, data, uploading, have_error=False,
             "prompt_id": prompt_id,
         })
 
-async def handle_upload(prompt_id: str, data, key: str, content_type_key: str, default_content_type: str):
-    items = data.get(key, [])
-    for item in items:
-        # # Skipping temp files
-        if item.get("type") == "temp":
-            continue
-        await upload_file(
-            prompt_id,
-            item.get("filename"),
-            subfolder=item.get("subfolder"),
-            type=item.get("type"),
-            content_type=item.get(content_type_key, default_content_type)
-        )
-
 # Upload files in the background
-async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=True):
+async def upload_in_background(prompt_id, data, node_id=None, have_upload=True):
     try:
-        await handle_upload(prompt_id, data, 'images', "content_type", "image/png")
+        images = data.get('images', [])
-        await handle_upload(prompt_id, data, 'files', "content_type", "image/png")
+        for image in images:
-        # This will also be mp4
+            await upload_file(prompt_id, image.get("filename"), subfolder=image.get("subfolder"), type=image.get("type"), content_type=image.get("content_type", "image/png"))
-        await handle_upload(prompt_id, data, 'gifs', "format", "image/gif")
+
+        files = data.get('files', [])
+        for file in files:
+            await upload_file(prompt_id, file.get("filename"), subfolder=file.get("subfolder"), type=file.get("type"), content_type=file.get("content_type", "image/png"))
+
+        gifs = data.get('gifs', [])
+        for gif in gifs:
+            await upload_file(prompt_id, gif.get("filename"), subfolder=gif.get("subfolder"), type=gif.get("type"), content_type=gif.get("format", "image/gif"))
             
         if have_upload:
             await update_file_status(prompt_id, data, False, node_id=node_id)
@@ -947,37 +408,32 @@ async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=T
         await handle_error(prompt_id, data, e)
 
 async def update_run_with_output(prompt_id, data, node_id=None):
-    if prompt_id not in prompt_metadata:
+    if prompt_id in prompt_metadata:
-        return
+        status_endpoint = prompt_metadata[prompt_id]['status_endpoint']
-        
-    if prompt_metadata[prompt_id].is_realtime is True:
-        return
-    
-    status_endpoint = prompt_metadata[prompt_id].status_endpoint
 
-    body = {
+        body = {
-        "run_id": prompt_id,
+            "run_id": prompt_id,
-        "output_data": data
+            "output_data": data
-    }
+        }
 
-    try:
+        try:
-        have_upload = 'images' in data or 'files' in data or 'gifs' in data
+            have_upload = 'images' in data or 'files' in data or 'gifs' in data
-        print("\nhave_upload", have_upload, node_id)
+            print("\nhave_upload", have_upload, node_id)
 
-        if have_upload:
+            if have_upload:
-            await update_file_status(prompt_id, data, True, node_id=node_id)
+                await update_file_status(prompt_id, data, True, node_id=node_id)
 
-        asyncio.create_task(upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload))
+            asyncio.create_task(upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload))
 
-    except Exception as e:
+        except Exception as e:
-        await handle_error(prompt_id, data, e)
+            await handle_error(prompt_id, data, e)
-        
+            
 
-    requests.post(status_endpoint, json=body)
+        requests.post(status_endpoint, json=body)
 
-    await send('outputs_uploaded', {
+        await send('outputs_uploaded', {
-        "prompt_id": prompt_id
+            "prompt_id": prompt_id
-    })
+        })
 
 prompt_server.send_json_original = prompt_server.send_json
 prompt_server.send_json = send_json_override.__get__(prompt_server, server.PromptServer)
@@ -985,7 +441,6 @@ prompt_server.send_json = send_json_override.__get__(prompt_server, server.Promp
 root_path = os.path.dirname(os.path.abspath(__file__))
 two_dirs_up = os.path.dirname(os.path.dirname(root_path))
 log_file_path = os.path.join(two_dirs_up, 'comfy-deploy.log')
-comfyui_file_path = os.path.join(two_dirs_up, 'comfyui.log')
 
 last_read_line = 0
 
@@ -1025,5 +480,4 @@ def run_in_new_thread(coroutine):
     t.start()
     asyncio.run_coroutine_threadsafe(coroutine, new_loop)
 
-if cd_enable_log:
+run_in_new_thread(watch_file_changes(log_file_path, send_logs_to_websocket))
-    run_in_new_thread(watch_file_changes(log_file_path, send_logs_to_websocket))

globals.py

@@ -1,115 +0,0 @@
-import struct
-from enum import Enum
-import aiohttp
-from typing import List, Union, Any, Optional
-from PIL import Image, ImageOps
-from io import BytesIO
-from pydantic import BaseModel as PydanticBaseModel
-
-class BaseModel(PydanticBaseModel):
-    class Config:
-        arbitrary_types_allowed = True
-        
-class Status(Enum):
-    NOT_STARTED = "not-started"
-    RUNNING = "running"
-    SUCCESS = "success"
-    FAILED = "failed"
-    UPLOADING = "uploading"
-
-class StreamingPrompt(BaseModel):
-    workflow_api: Any
-    auth_token: str
-    inputs: dict[str, Union[str, bytes, Image.Image]]
-    running_prompt_ids: set[str] = set()
-    status_endpoint: str
-    file_upload_endpoint: str
-    
-class SimplePrompt(BaseModel):
-    status_endpoint: str
-    file_upload_endpoint: str
-    workflow_api: dict
-    status: Status = Status.NOT_STARTED
-    progress: set = set()
-    last_updated_node: Optional[str] = None,
-    uploading_nodes: set = set()
-    done: bool = False
-    is_realtime: bool = False,
-    start_time: Optional[float] = None,
-
-sockets = dict()
-prompt_metadata: dict[str, SimplePrompt] = {}
-streaming_prompt_metadata: dict[str, StreamingPrompt] = {}
-
-class BinaryEventTypes:
-    PREVIEW_IMAGE = 1
-    UNENCODED_PREVIEW_IMAGE = 2
-    
-max_output_id_length = 24
-
-async def send_image(image_data, sid=None, output_id:str = None):
-    max_length = max_output_id_length
-    output_id = output_id[:max_length]
-    padded_output_id = output_id.ljust(max_length, '\x00')
-    encoded_output_id = padded_output_id.encode('ascii', 'replace')
-    
-    image_type = image_data[0]
-    image = image_data[1]
-    max_size = image_data[2]
-    quality = image_data[3]
-    if max_size is not None:
-        if hasattr(Image, 'Resampling'):
-            resampling = Image.Resampling.BILINEAR
-        else:
-            resampling = Image.ANTIALIAS
-
-        image = ImageOps.contain(image, (max_size, max_size), resampling)
-    type_num = 1
-    if image_type == "JPEG":
-        type_num = 1
-    elif image_type == "PNG":
-        type_num = 2
-    elif image_type == "WEBP":
-        type_num = 3
-
-    bytesIO = BytesIO()
-    header = struct.pack(">I", type_num)
-    # 4 bytes for the type
-    bytesIO.write(header)
-    # 10 bytes for the output_id
-    position_before = bytesIO.tell()
-    bytesIO.write(encoded_output_id)
-    position_after = bytesIO.tell()
-    bytes_written = position_after - position_before
-    print(f"Bytes written: {bytes_written}")
-    
-    image.save(bytesIO, format=image_type, quality=quality, compress_level=1)
-    preview_bytes = bytesIO.getvalue()
-    await send_bytes(BinaryEventTypes.PREVIEW_IMAGE, preview_bytes, sid=sid)
-        
-async def send_socket_catch_exception(function, message):
-    try:
-        await function(message)
-    except (aiohttp.ClientError, aiohttp.ClientPayloadError, ConnectionResetError) as err:
-        print("send error:", err)
-
-def encode_bytes(event, data):
-    if not isinstance(event, int):
-        raise RuntimeError(f"Binary event types must be integers, got {event}")
-
-    packed = struct.pack(">I", event)
-    message = bytearray(packed)
-    message.extend(data)
-    return message
-
-async def send_bytes(event, data, sid=None):
-    message = encode_bytes(event, data)
-    
-    print("sending image to ", event, sid)
-
-    if sid is None:
-        _sockets = list(sockets.values())
-        for ws in _sockets:
-            await send_socket_catch_exception(ws.send_bytes, message)
-    elif sid in sockets:
-        await send_socket_catch_exception(sockets[sid].send_bytes, message)

prestartup_script.py

@@ -7,60 +7,46 @@ import threading
 import logging
 from logging.handlers import RotatingFileHandler
 
-# Running with export CD_ENABLE_LOG=true; python main.py
+handler = RotatingFileHandler('comfy-deploy.log', maxBytes=500000, backupCount=5)
 
-# Check for 'cd-enable-log' flag in input arguments
+original_stdout = sys.stdout
-# cd_enable_log = '--cd-enable-log' in sys.argv
+original_stderr = sys.stderr
-cd_enable_log = os.environ.get('CD_ENABLE_LOG', 'false').lower() == 'true'
 
-def setup():
+class StreamToLogger():
-    handler = RotatingFileHandler('comfy-deploy.log', maxBytes=500000, backupCount=5)
+    def __init__(self, log_level):
+        self.log_level = log_level
 
-    original_stdout = sys.stdout
+    def write(self, buf):
-    original_stderr = sys.stderr
+        if (self.log_level == logging.INFO):
+            original_stdout.write(buf)
+            original_stdout.flush()
+        elif (self.log_level == logging.ERROR):
+            original_stderr.write(buf)
+            original_stderr.flush()
 
-    class StreamToLogger():
+        for line in buf.rstrip().splitlines():
-        def __init__(self, log_level):
+            handler.handle(
-            self.log_level = log_level
+                logging.LogRecord(
-
+                    name="comfy-deploy",
-        def write(self, buf):
+                    level=self.log_level,
-            if (self.log_level == logging.INFO):
+                    pathname="prestartup_script.py",
-                original_stdout.write(buf)
+                    lineno=1,
-                original_stdout.flush()
+                    msg=line.rstrip(),
-            elif (self.log_level == logging.ERROR):
+                    args=None,
-                original_stderr.write(buf)
+                    exc_info=None
-                original_stderr.flush()
-
-            for line in buf.rstrip().splitlines():
-                handler.handle(
-                    logging.LogRecord(
-                        name="comfy-deploy",
-                        level=self.log_level,
-                        pathname="prestartup_script.py",
-                        lineno=1,
-                        msg=line.rstrip(),
-                        args=None,
-                        exc_info=None
-                    )
                 )
+            )
 
-        def flush(self):
+    def flush(self):
-            if (self.log_level == logging.INFO):
+        if (self.log_level == logging.INFO):
-                original_stdout.flush()
+            original_stdout.flush()
-            elif (self.log_level == logging.ERROR):
+        elif (self.log_level == logging.ERROR):
-                original_stderr.flush()
+            original_stderr.flush()
 
-    # Redirect stdout and stderr to the logger
+# Redirect stdout and stderr to the logger
-    sys.stdout = StreamToLogger(logging.INFO)
+sys.stdout = StreamToLogger(logging.INFO)
-    sys.stderr = StreamToLogger(logging.ERROR)
+sys.stderr = StreamToLogger(logging.ERROR)
 
-if cd_enable_log:
-   print("** Comfy Deploy logging enabled")
-   setup() 
-
-
-# Store the original working directory
-original_cwd = os.getcwd()
 try:
     # Get the absolute path of the script's directory
     script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -69,7 +55,4 @@ try:
     current_git_commit = subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode('utf-8').strip()
     print(f"** Comfy Deploy Revision: {current_git_commit}")
 except Exception as e:
-    print(f"** Comfy Deploy failed to get current git commit: {str(e)}")
+    print(f"** Comfy Deploy failed to get current git commit: {str(e)}")
-finally:
-    # Change back to the original directory
-    os.chdir(original_cwd)

requirements.txt

@@ -1,2 +0,0 @@
-aiofiles
-pydantic

web-plugin/index.js

@@ -1,17 +1,6 @@
 import { app } from "./app.js";
 import { api } from "./api.js";
 import { ComfyWidgets, LGraphNode } from "./widgets.js";
-import { generateDependencyGraph } from "https://esm.sh/[email protected]";
-
-const loadingIcon = `<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><g fill="none" stroke="#888888" stroke-linecap="round" stroke-width="2"><path stroke-dasharray="60" stroke-dashoffset="60" stroke-opacity=".3" d="M12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3Z"><animate fill="freeze" attributeName="stroke-dashoffset" dur="1.3s" values="60;0"/></path><path stroke-dasharray="15" stroke-dashoffset="15" d="M12 3C16.9706 3 21 7.02944 21 12"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="15;0"/><animateTransform attributeName="transform" dur="1.5s" repeatCount="indefinite" type="rotate" values="0 12 12;360 12 12"/></path></g></svg>`;
-
-function sendEventToCD(event, data) {
-  const message = {
-    type: event,
-    data: data,
-  };
-  window.parent.postMessage(JSON.stringify(message), "*");
-}
 
 /** @typedef {import('../../../web/types/comfy.js').ComfyExtension} ComfyExtension*/
 /** @type {ComfyExtension} */
@@ -26,11 +15,6 @@ const ext = {
     const auth_token = queryParams.get("auth_token");
     const org_display = queryParams.get("org_display");
     const origin = queryParams.get("origin");
-    const workspace_mode = queryParams.get("workspace_mode");
-
-    if (workspace_mode) {
-      document.querySelector(".comfy-menu").style.display = "none";
-    }
 
     const data = getData();
     let endpoint = data.endpoint;
@@ -66,22 +50,11 @@ const ext = {
       })
         .then(async (res) => {
           const data = await res.json();
-          const { workflow, workflow_id, error } = data;
+          const { workflow, error } = data;
           if (error) {
             infoDialog.showMessage("Unable to load this workflow", error);
             return;
           }
-
-          // // Adding a delay to wait for the intial graph to load
-          // await new Promise((resolve) => setTimeout(resolve, 2000));
-
-          workflow?.nodes.forEach((x) => {
-            if (x?.type === "ComfyDeploy") {
-              x.widgets_values[1] = workflow_id;
-              // x.widgets_values[2] = workflow_version.version;
-            }
-          });
-
           /** @type {LGraph} */
           app.loadGraphData(workflow);
         })
@@ -165,32 +138,9 @@ const ext = {
   async setup() {
     // const graphCanvas = document.getElementById("graph-canvas");
 
-    window.addEventListener("message", async (event) => {
+    window.addEventListener("message", (event) => {
-      try {
+      if (!event.data.flow || Object.entries(event.data.flow).length <= 0)
-        const message = JSON.parse(event.data);
+        return;
-        if (message.type === "graph_load") {
-          const comfyUIWorkflow = message.data;
-          console.log("recieved: ", comfyUIWorkflow);
-          // Assuming there's a method to load the workflow data into the ComfyUI
-          // This part of the code would depend on how the ComfyUI expects to receive and process the workflow data
-          // For demonstration, let's assume there's a loadWorkflow method in the ComfyUI API
-          if (comfyUIWorkflow && app && app.loadGraphData) {
-            app.loadGraphData(comfyUIWorkflow);
-          }
-        } else if (message.type === "deploy") {
-          // deployWorkflow();
-          const prompt = await app.graphToPrompt();
-          sendEventToCD("cd_plugin_onDeployChanges", prompt);
-        } else if (message.type === "queue_prompt") {
-          const prompt = await app.graphToPrompt();
-          sendEventToCD("cd_plugin_onQueuePrompt", prompt);
-        }
-      } catch (error) {
-        // console.error("Error processing message:", error);
-      }
-
-      // if (!event.data.flow || Object.entries(event.data.flow).length <= 0)
-      //   return;
       //   updateBlendshapesPrompts(event.data.flow);
     });
 
@@ -203,17 +153,6 @@ const ext = {
 
       //   }
     });
-
-    app.graph.onAfterChange = ((originalFunction) => async function () {
-        const prompt = await app.graphToPrompt();
-        sendEventToCD("cd_plugin_onAfterChange", prompt);
-
-        if (typeof originalFunction === "function") {
-          originalFunction.apply(this, arguments);
-        }
-      })(app.graph.onAfterChange);
-
-    sendEventToCD("cd_plugin_setup");
   },
 };
 
@@ -228,387 +167,142 @@ function showError(title, message) {
   );
 }
 
-function createDynamicUIHtml(data) {
-  console.log(data);
-  let html =
-    '<div style="min-width: 600px; max-width: 1024px; margin: 14px auto; display: flex; flex-direction: column; gap: 24px;">';
-  const bgcolor = "var(--comfy-input-bg)";
-  const evenBg = "var(--border-color)";
-  const textColor = "var(--input-text)";
-
-  // Custom Nodes
-  html += `<div style="background-color: ${bgcolor}; padding: 24px; border-radius: 8px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);">`;
-  html +=
-    '<h2 style="margin-top: 0px; font-size: 24px; font-weight: bold; margin-bottom: 16px;">Custom Nodes</h2>';
-
-  if (data.missing_nodes?.length > 0) {
-    html += `
-      <div style="border-bottom: 1px solid #e2e8f0; padding: 4px 12px; background-color: ${evenBg}">
-          <h3 style="font-size: 14px; font-weight: semibold; margin-bottom: 8px;">Missing Nodes</h3>
-          <p style="font-size: 12px;">These nodes are not found with any matching custom_nodes in the ComfyUI Manager Database</p>
-          ${data.missing_nodes
-            .map((node) => {
-              return `<p style="font-size: 14px; color: #d69e2e;">${node}</p>`;
-            })
-            .join("")}
-      </div>
-  `;
-  }
-
-  Object.values(data.custom_nodes).forEach((node) => {
-    html += `
-          <div style="border-bottom: 1px solid #e2e8f0; padding-top: 16px;">
-              <a href="${
-                node.url
-              }" target="_blank" style="font-size: 18px; font-weight: semibold; color: white; text-decoration: none;">${
-                node.name
-              }</a>
-              <p style="font-size: 14px; color: #4b5563;">${node.hash}</p>
-              ${
-                node.warning
-                  ? `<p style="font-size: 14px; color: #d69e2e;">${node.warning}</p>`
-                  : ""
-              }
-          </div>
-      `;
-  });
-  html += "</div>";
-
-  // Models
-  html += `<div style="background-color: ${bgcolor}; padding: 24px; border-radius: 8px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);">`;
-  html +=
-    '<h2 style="margin-top: 0px; font-size: 24px; font-weight: bold; margin-bottom: 16px;">Models</h2>';
-
-  Object.entries(data.models).forEach(([section, items]) => {
-    html += `
-    <div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
-        <h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${
-          section.charAt(0).toUpperCase() + section.slice(1)
-        }</h3>`;
-    items.forEach((item) => {
-      html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
-    });
-    html += "</div>";
-  });
-  html += "</div>";
-
-  // Models
-  html += `<div style="background-color: ${bgcolor}; padding: 24px; border-radius: 8px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);">`;
-  html +=
-    '<h2 style="margin-top: 0px; font-size: 24px; font-weight: bold; margin-bottom: 16px;">Files</h2>';
-
-  Object.entries(data.files).forEach(([section, items]) => {
-    html += `
-    <div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
-        <h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${
-          section.charAt(0).toUpperCase() + section.slice(1)
-        }</h3>`;
-    items.forEach((item) => {
-      html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
-    });
-    html += "</div>";
-  });
-  html += "</div>";
-
-  html += "</div>";
-  return html;
-}
-
-async function deployWorkflow() {
-  const deploy = document.getElementById("deploy-button");
-
-  /** @type {LGraph} */
-  const graph = app.graph;
-
-  let { endpoint, apiKey, displayName } = getData();
-
-  if (!endpoint || !apiKey || apiKey === "" || endpoint === "") {
-    configDialog.show();
-    return;
-  }
-
-  let deployMeta = graph.findNodesByType("ComfyDeploy");
-
-  if (deployMeta.length == 0) {
-    const text = await inputDialog.input(
-      "Create your deployment",
-      "Workflow name",
-    );
-    if (!text) return;
-    console.log(text);
-    app.graph.beforeChange();
-    var node = LiteGraph.createNode("ComfyDeploy");
-    node.configure({
-      widgets_values: [text],
-    });
-    node.pos = [0, 0];
-    app.graph.add(node);
-    app.graph.afterChange();
-    deployMeta = [node];
-  }
-
-  const deployMetaNode = deployMeta[0];
-
-  const workflow_name = deployMetaNode.widgets[0].value;
-  const workflow_id = deployMetaNode.widgets[1].value;
-
-  const ok = await confirmDialog.confirm(
-    `Confirm deployment`,
-    `
-    <div>
-
-    A new version of <button style="font-size: 18px;">${workflow_name}</button> will be deployed, do you confirm? 
-    <br><br>
-
-    <button style="font-size: 18px;">${displayName}</button>
-    <br>
-    <button style="font-size: 18px;">${endpoint}</button>
-
-    <br><br>
-    <label>
-    <input id="include-deps" type="checkbox" checked>Include dependency</input>
-    </label>
-    <br>
-    <label>
-    <input id="reuse-hash" type="checkbox" checked>Reuse hash from last version</input>
-    </label>
-    </div>
-    `,
-  );
-  if (!ok) return;
-
-  const includeDeps = document.getElementById("include-deps").checked;
-  const reuseHash = document.getElementById("reuse-hash").checked;
-
-  if (endpoint.endsWith("/")) {
-    endpoint = endpoint.slice(0, -1);
-  }
-  loadingDialog.showLoading("Generating snapshot");
-
-  const snapshot = await fetch("/snapshot/get_current").then((x) => x.json());
-  // console.log(snapshot);
-  loadingDialog.close();
-
-  if (!snapshot) {
-    showError(
-      "Error when deploying",
-      "Unable to generate snapshot, please install ComfyUI Manager",
-    );
-    return;
-  }
-
-  const title = deploy.querySelector("#button-title");
-
-  const prompt = await app.graphToPrompt();
-  let deps = undefined;
-
-  if (includeDeps) {
-    loadingDialog.showLoading("Fetching existing version");
-
-    const existing_workflow = await fetch(
-      endpoint + "/api/workflow/" + workflow_id,
-      {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + apiKey,
-        },
-      },
-    )
-      .then((x) => x.json())
-      .catch(() => {
-        return {};
-      });
-
-    loadingDialog.close();
-
-    loadingDialog.showLoading("Generating dependency graph");
-    deps = await generateDependencyGraph({
-      workflow_api: prompt.output,
-      snapshot: snapshot,
-      computeFileHash: async (file) => {
-        console.log(existing_workflow?.dependencies?.models);
-
-        // Match previous hash for models
-        if (reuseHash && existing_workflow?.dependencies?.models) {
-          const previousModelHash = Object.entries(
-            existing_workflow?.dependencies?.models,
-          ).flatMap(([key, value]) => {
-            return Object.values(value).map((x) => ({
-              ...x,
-              name: "models/" + key + "/" + x.name,
-            }));
-          });
-          console.log(previousModelHash);
-
-          const match = previousModelHash.find((x) => {
-            console.log(file, x.name);
-            return file == x.name;
-          });
-          console.log(match);
-          if (match && match.hash) {
-            console.log("cached hash used");
-            return match.hash;
-          }
-        }
-        console.log(file);
-        loadingDialog.showLoading("Generating hash", file);
-        const hash = await fetch(
-          `/comfyui-deploy/get-file-hash?file_path=${encodeURIComponent(
-            file,
-          )}`,
-        ).then((x) => x.json());
-        loadingDialog.showLoading("Generating hash", file);
-        console.log(hash);
-        return hash.file_hash;
-      },
-      handleFileUpload: async (file, hash, prevhash) => {
-        console.log("Uploading ", file);
-        loadingDialog.showLoading("Uploading file", file);
-        try {
-          const { download_url } = await fetch(
-            `/comfyui-deploy/upload-file`,
-            {
-              method: "POST",
-              body: JSON.stringify({
-                file_path: file,
-                token: apiKey,
-                url: endpoint + "/api/upload-url",
-              }),
-            },
-          )
-            .then((x) => x.json())
-            .catch(() => {
-              loadingDialog.close();
-              confirmDialog.confirm("Error", "Unable to upload file " + file);
-            });
-          loadingDialog.showLoading("Uploaded file", file);
-          console.log(download_url);
-          return download_url;
-        } catch (error) {
-          return undefined;
-        }
-      },
-      existingDependencies: existing_workflow.dependencies,
-    });
-
-    // Need to find a way to include this if this is not included in comfyui-json level
-    if (
-      !deps.custom_nodes["https://github.com/BennyKok/comfyui-deploy"] &&
-      !deps.custom_nodes["https://github.com/BennyKok/comfyui-deploy.git"]
-    )
-      deps.custom_nodes["https://github.com/BennyKok/comfyui-deploy"] = {
-        url: "https://github.com/BennyKok/comfyui-deploy",
-        install_type: "git-clone",
-        hash:
-          snapshot?.git_custom_nodes?.[
-            "https://github.com/BennyKok/comfyui-deploy"
-          ]?.hash ?? "HEAD",
-        name: "ComfyUI Deploy",
-      };
-
-    loadingDialog.close();
-
-    const depsOk = await confirmDialog.confirm(
-      "Check dependencies",
-      // JSON.stringify(deps, null, 2),
-      `
-      <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">${loadingIcon}</div>
-      <iframe 
-      style="z-index: 10; min-width: 600px; max-width: 1024px; min-height: 600px; border: none; background-color: transparent;"
-      src="https://www.comfydeploy.com/dependency-graph?deps=${encodeURIComponent(
-        JSON.stringify(deps),
-      )}" />`,
-      // createDynamicUIHtml(deps),
-    );
-    if (!depsOk) return;
-
-    console.log(deps);
-  }
-
-  loadingDialog.showLoading("Deploying...");
-
-  title.innerText = "Deploying...";
-  title.style.color = "orange";
-
-  // console.log(prompt);
-
-  // TODO trim the ending / from endpoint is there is
-  if (endpoint.endsWith("/")) {
-    endpoint = endpoint.slice(0, -1);
-  }
-
-  // console.log(prompt.workflow);
-
-  const apiRoute = endpoint + "/api/workflow";
-  // const userId = apiKey
-  try {
-    const body = {
-      workflow_name,
-      workflow_id,
-      workflow: prompt.workflow,
-      workflow_api: prompt.output,
-      snapshot: snapshot,
-      dependencies: deps,
-    };
-    console.log(body);
-    let data = await fetch(apiRoute, {
-      method: "POST",
-      body: JSON.stringify(body),
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: "Bearer " + apiKey,
-      },
-    });
-
-    console.log(data);
-
-    if (data.status !== 200) {
-      throw new Error(await data.text());
-    } else {
-      data = await data.json();
-    }
-
-    loadingDialog.close();
-
-    title.textContent = "Done";
-    title.style.color = "green";
-
-    deployMetaNode.widgets[1].value = data.workflow_id;
-    deployMetaNode.widgets[2].value = data.version;
-    graph.change();
-
-    infoDialog.show(
-      `<span style="color:green;">Deployed successfully!</span>  <a style="color:white;" target="_blank" href=${endpoint}/workflows/${data.workflow_id}>-> View here</a> <br/> <br/> Workflow ID: ${data.workflow_id} <br/> Workflow Name: ${workflow_name} <br/> Workflow Version: ${data.version} <br/>`,
-    );
-
-    setTimeout(() => {
-      title.textContent = "Deploy";
-      title.style.color = "white";
-    }, 1000);
-  } catch (e) {
-    loadingDialog.close();
-    app.ui.dialog.show(e);
-    console.error(e);
-    title.textContent = "Error";
-    title.style.color = "red";
-    setTimeout(() => {
-      title.textContent = "Deploy";
-      title.style.color = "white";
-    }, 1000);
-  }
-}
-
 function addButton() {
   const menu = document.querySelector(".comfy-menu");
 
   const deploy = document.createElement("button");
-  deploy.id = "deploy-button";
   deploy.style.position = "relative";
   deploy.style.display = "block";
   deploy.innerHTML = "<div id='button-title'>Deploy</div>";
   deploy.onclick = async () => {
-    await deployWorkflow()
+    /** @type {LGraph} */
+    const graph = app.graph;
+
+    const snapshot = await fetch("/snapshot/get_current").then((x) => x.json());
+    // console.log(snapshot);
+
+    if (!snapshot) {
+      showError(
+        "Error when deploying",
+        "Unable to generate snapshot, please install ComfyUI Manager",
+      );
+      return;
+    }
+
+    const title = deploy.querySelector("#button-title");
+
+    let deployMeta = graph.findNodesByType("ComfyDeploy");
+
+    if (deployMeta.length == 0) {
+      const text = await inputDialog.input(
+        "Create your deployment",
+        "Workflow name",
+      );
+      if (!text) return;
+      console.log(text);
+      app.graph.beforeChange();
+      var node = LiteGraph.createNode("ComfyDeploy");
+      node.configure({
+        widgets_values: [text],
+      });
+      node.pos = [0, 0];
+      app.graph.add(node);
+      app.graph.afterChange();
+      deployMeta = [node];
+    }
+
+    const deployMetaNode = deployMeta[0];
+
+    // console.log(deployMetaNode);
+
+    const workflow_name = deployMetaNode.widgets[0].value;
+    const workflow_id = deployMetaNode.widgets[1].value;
+
+    console.log(workflow_name, workflow_id);
+
+    const prompt = await app.graphToPrompt();
+    console.log(graph);
+    console.log(prompt);
+
+    // const endpoint = localStorage.getItem("endpoint") ?? "";
+    // const apiKey = localStorage.getItem("apiKey");
+
+    const { endpoint, apiKey, displayName } = getData();
+
+    if (!endpoint || !apiKey || apiKey === "" || endpoint === "") {
+      configDialog.show();
+      return;
+    }
+
+    const ok = await confirmDialog.confirm(
+      "Confirm deployment -> " + displayName,
+      "A new version will be deployed, are you conform?",
+    );
+    if (!ok) return;
+
+    title.innerText = "Deploying...";
+    title.style.color = "orange";
+
+    // console.log(prompt);
+
+    // TODO trim the ending / from endpoint is there is
+    if (endpoint.endsWith("/")) {
+      endpoint = endpoint.slice(0, -1);
+    }
+
+    const apiRoute = endpoint + "/api/workflow";
+    // const userId = apiKey
+    try {
+      const body = {
+        workflow_name,
+        workflow_id,
+        workflow: prompt.workflow,
+        workflow_api: prompt.output,
+        snapshot: snapshot,
+      };
+      console.log(body);
+      let data = await fetch(apiRoute, {
+        method: "POST",
+        body: JSON.stringify(body),
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + apiKey,
+        },
+      });
+
+      console.log(data);
+
+      if (data.status !== 200) {
+        throw new Error(await data.text());
+      } else {
+        data = await data.json();
+      }
+
+      title.textContent = "Done";
+      title.style.color = "green";
+
+      deployMetaNode.widgets[1].value = data.workflow_id;
+      deployMetaNode.widgets[2].value = data.version;
+      graph.change();
+
+      infoDialog.show(
+        `<span style="color:green;">Deployed successfully!</span>  <a style="color:white;" target="_blank" href=${endpoint}/workflows/${data.workflow_id}>-> View here</a> <br/> <br/> Workflow ID: ${data.workflow_id} <br/> Workflow Name: ${workflow_name} <br/> Workflow Version: ${data.version} <br/>`,
+      );
+
+      setTimeout(() => {
+        title.textContent = "Deploy";
+        title.style.color = "white";
+      }, 1000);
+    } catch (e) {
+      app.ui.dialog.show(e);
+      console.error(e);
+      title.textContent = "Error";
+      title.style.color = "red";
+      setTimeout(() => {
+        title.textContent = "Deploy";
+        title.style.color = "white";
+      }, 1000);
+    }
   };
 
   const config = document.createElement("img");
@@ -676,7 +370,7 @@ export class InfoDialog extends ComfyDialog {
 
   showMessage(title, message) {
     this.show(`
-      <div style="width: 100%; max-width: 600px; display: flex; gap: 18px; flex-direction: column; overflow: unset">
+      <div style="width: 400px; display: flex; gap: 18px; flex-direction: column; overflow: unset">
         <h3 style="margin: 0px;">${title}</h3>
         <label>
           ${message}
@@ -685,10 +379,12 @@ export class InfoDialog extends ComfyDialog {
       `);
   }
 
+  loadingIcon = `<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><g fill="none" stroke="#888888" stroke-linecap="round" stroke-width="2"><path stroke-dasharray="60" stroke-dashoffset="60" stroke-opacity=".3" d="M12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3Z"><animate fill="freeze" attributeName="stroke-dashoffset" dur="1.3s" values="60;0"/></path><path stroke-dasharray="15" stroke-dashoffset="15" d="M12 3C16.9706 3 21 7.02944 21 12"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="15;0"/><animateTransform attributeName="transform" dur="1.5s" repeatCount="indefinite" type="rotate" values="0 12 12;360 12 12"/></path></g></svg>`;
+
   showLoading(title, message) {
     this.show(`
       <div style="width: 400px; display: flex; gap: 18px; flex-direction: column; overflow: unset">
-        <h3 style="margin: 0px; display: flex; align-items: center; justify-content: center;">${title} ${loadingIcon}</h3>
+        <h3 style="margin: 0px; display: flex; align-items: center; justify-content: center;">${title} ${this.loadingIcon}</h3>
         <label>
           ${message}
         </label>
@@ -730,14 +426,7 @@ export class LoadingDialog extends ComfyDialog {
   showLoading(title, message) {
     this.show(`
       <div style="width: 400px; display: flex; gap: 18px; flex-direction: column; overflow: unset">
-        <h3 style="margin: 0px; display: flex; align-items: center; justify-content: center; gap: 12px;">${title} ${
+        <h3 style="margin: 0px; display: flex; align-items: center; justify-content: center; gap: 4px;">${title} ${this.loadingIcon}</h3>
-          this.loadingIcon
-        }</h3>
-          ${
-            message
-              ? `<label style="max-width: 100%; white-space: pre-wrap; word-wrap: break-word;">${message}</label>`
-              : ""
-          }
         </div>
       `);
   }
@@ -856,9 +545,11 @@ export class ConfirmDialog extends InfoDialog {
     return new Promise((resolve, reject) => {
       this.callback = resolve;
       this.show(`
-      <div style="width: 100%; max-width: 600px; display: flex; gap: 18px; flex-direction: column; overflow: unset; position: relative;">
+      <div style="width: 400px; display: flex; gap: 18px; flex-direction: column; overflow: unset">
         <h3 style="margin: 0px;">${title}</h3>
-        ${message}
+        <label>
+          ${message}
+        </label>
         </div>
       `);
     });
@@ -934,10 +625,7 @@ export class ConfigDialog extends ComfyDialog {
             justifyContent: "flex-end",
             width: "100%",
           },
-          onclick: () => {
+          onclick: () => this.save(),
-            this.save();
-            this.close();
-          },
         },
         [
           $el("button", {
@@ -948,10 +636,7 @@ export class ConfigDialog extends ComfyDialog {
           $el("button", {
             type: "button",
             textContent: "Save",
-            onclick: () => {
+            onclick: () => this.save(),
-              this.save();
-              this.close();
-            },
           }),
         ],
       ),
@@ -965,26 +650,20 @@ export class ConfigDialog extends ComfyDialog {
   }
 
   save(api_key, displayName) {
+    if (!displayName) displayName = getData().displayName;
+
     const deployOption = this.container.querySelector("#deployOption").value;
     localStorage.setItem("comfy_deploy_env", deployOption);
 
     const endpoint = this.container.querySelector("#endpoint").value;
     const apiKey = api_key ?? this.container.querySelector("#apiKey").value;
-
-    if (!displayName) {
-      if (apiKey != getData().apiKey) {
-        displayName = "Custom";
-      } else {
-        displayName = getData().displayName;
-      }
-    }
-
     saveData({
       endpoint,
       apiKey,
       displayName,
       environment: deployOption,
     });
+    this.close();
   }
 
   show() {
@@ -1003,31 +682,23 @@ export class ConfigDialog extends ComfyDialog {
     </label>
       <label style="color: white; width: 100%;">
         Endpoint:
-        <input id="endpoint" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="text" value="${
+        <input id="endpoint" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="text" value="${data.endpoint
-          data.endpoint
+      }">
-        }">
       </label>
-      <div style="color: white;">
+      <label style="color: white;">
-        API Key: User / Org <button style="font-size: 18px;">${
+        API Key: ${data.displayName ?? ""}
-          data.displayName ?? ""
+        <input id="apiKey" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="password" value="${data.apiKey
-        }</button>
+      }">
-        <input id="apiKey" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="password" value="${
-          data.apiKey
-        }">
         <button id="loginButton" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;">
-          ${
+          ${data.apiKey ? "Re-login with ComfyDeploy" : "Login with ComfyDeploy"
-            data.apiKey ? "Re-login with ComfyDeploy" : "Login with ComfyDeploy"
+      }
-          }
         </button>
-      </div>
+      </label>
       </div>
     `;
 
     const button = this.container.querySelector("#loginButton");
     button.onclick = () => {
-      this.save();
-      const data = getData();
-
       const uuid =
         Math.random().toString(36).substring(2, 15) +
         Math.random().toString(36).substring(2, 15);
@@ -1044,20 +715,17 @@ export class ConfigDialog extends ComfyDialog {
       this.poll = setInterval(() => {
         fetch(data.endpoint + "/api/auth-response/" + uuid)
           .then((response) => response.json())
-          .then(async (json) => {
+          .then((json) => {
             if (json.api_key) {
               this.save(json.api_key, json.name);
-              this.close();
               this.container.querySelector("#apiKey").value = json.api_key;
-              // infoDialog.show();
+              infoDialog.show();
               clearInterval(this.poll);
               clearTimeout(this.timeout);
-              // Refresh dialog
+              infoDialog.showMessage(
-              const a = await confirmDialog.confirm(
                 "Authenticated",
-                `<div>You will be able to upload workflow to <button style="font-size: 18px; width: fit;">${json.name}</button></div>`,
+                "You will be able to upload workflow to " + json.name,
               );
-              configDialog.show();
             }
           })
           .catch((error) => {

web/.env.example

@@ -20,3 +20,14 @@ PLAUSIBLE_DOMAIN=
 
 NEXT_PUBLIC_POSTHOG_KEY="your-api-key"
 NEXT_PUBLIC_POSTHOG_HOST="your-ph-address"
+
+NEXT_PUBLIC_CLERK_SIGN_IN_URL=/auth/sign-in
+NEXT_PUBLIC_CLERK_SIGN_UP_URL=/auth/sign-up
+NEXT_PUBLIC_CLERK_AFTER_SIGN_IN_URL=/
+NEXT_PUBLIC_CLERK_AFTER_SIGN_UP_URL=/
+
+STRIPE_API_KEY="sk_test_"
+STRIPE_PR_PRO="price_"
+STRIPE_PR_ENTERPRISE="price_"
+STRIPE_PR_API="price_"
+STRIPE_WEBHOOK_SECRET="whsec_"

web/drizzle/0035_fearless_golden_guardian.sql

@@ -0,0 +1,14 @@
+CREATE TABLE IF NOT EXISTS "comfyui_deploy"."user_usage" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"org_id" text,
+	"user_id" text NOT NULL,
+	"usage_time" real DEFAULT 0 NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"ended_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "comfyui_deploy"."user_usage" ADD CONSTRAINT "user_usage_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "comfyui_deploy"."users"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;

web/drizzle/0036_flippant_meltdown.sql

@@ -0,0 +1,22 @@
+DO $$ BEGIN
+ CREATE TYPE "subscription_plan" AS ENUM('basic', 'pro', 'enterprise');
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ CREATE TYPE "subscription_plan_status" AS ENUM('active', 'deleted', 'paused');
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "comfyui_deploy"."subscription_status" (
+	"stripe_customer_id" text PRIMARY KEY NOT NULL,
+	"user_id" text,
+	"org_id" text,
+	"plan" "subscription_plan" NOT NULL,
+	"status" "subscription_plan_status" NOT NULL,
+	"subscription_plan_id" text,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);

web/drizzle/0037_eager_cyclops.sql

@@ -0,0 +1,3 @@
+ALTER TABLE "comfyui_deploy"."subscription_status" RENAME COLUMN "subscription_plan_id" TO "subscription_id";--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."subscription_status" ADD COLUMN "subscription_item_plan_id" text;--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."subscription_status" ADD COLUMN "subscription_item_api_id" text;

web/drizzle/0038_yummy_darkhawk.sql

@@ -0,0 +1 @@
+ALTER TABLE "comfyui_deploy"."subscription_status" ADD COLUMN "cancel_at_period_end" boolean DEFAULT false;

web/drizzle/0039_nostalgic_lyja.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "comfyui_deploy"."workflow_runs" ADD COLUMN "user_id" text;--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."workflow_runs" ADD COLUMN "org_id" text;

web/drizzle/0040_salty_archangel.sql

@@ -0,0 +1 @@
+ALTER TABLE "comfyui_deploy"."workflow_runs" ADD COLUMN "gpu" "machine_gpu";

web/drizzle/0041_thick_norrin_radd.sql

@@ -0,0 +1 @@
+ALTER TABLE "comfyui_deploy"."workflow_runs" ADD COLUMN "machine_type" "machine_type";

web/drizzle/0042_windy_madelyne_pryor.sql

@@ -0,0 +1,64 @@
+DO $$ BEGIN
+ CREATE TYPE "model_upload_type" AS ENUM('civitai', 'huggingface', 'other');
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ CREATE TYPE "resource_upload" AS ENUM('started', 'success', 'failed');
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "comfyui_deploy"."checkpoints" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"user_id" text,
+	"org_id" text,
+	"description" text,
+	"checkpoint_volume_id" uuid NOT NULL,
+	"model_name" text,
+	"folder_path" text,
+	"civitai_id" text,
+	"civitai_version_id" text,
+	"civitai_url" text,
+	"civitai_download_url" text,
+	"civitai_model_response" jsonb,
+	"hf_url" text,
+	"s3_url" text,
+	"client_url" text,
+	"is_public" boolean DEFAULT false NOT NULL,
+	"status" "resource_upload" DEFAULT 'started' NOT NULL,
+	"upload_machine_id" text,
+	"upload_type" "model_upload_type" NOT NULL,
+	"error_log" text,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE IF NOT EXISTS "comfyui_deploy"."checkpoint_volume" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"user_id" text,
+	"org_id" text,
+	"volume_name" text NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL,
+	"disabled" boolean DEFAULT false NOT NULL
+);
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "comfyui_deploy"."checkpoints" ADD CONSTRAINT "checkpoints_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "comfyui_deploy"."users"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "comfyui_deploy"."checkpoints" ADD CONSTRAINT "checkpoints_checkpoint_volume_id_checkpoint_volume_id_fk" FOREIGN KEY ("checkpoint_volume_id") REFERENCES "comfyui_deploy"."checkpoint_volume"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "comfyui_deploy"."checkpoint_volume" ADD CONSTRAINT "checkpoint_volume_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "comfyui_deploy"."users"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;

web/drizzle/0043_wealthy_nicolaos.sql

@@ -0,0 +1,33 @@
+DO $$ BEGIN
+ CREATE TYPE "model_type" AS ENUM('checkpoint', 'lora', 'embedding', 'vae');
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."checkpoints" RENAME TO "models";--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."checkpoint_volume" RENAME TO "user_volume";--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."models" RENAME COLUMN "checkpoint_volume_id" TO "user_volume_id";--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."models" DROP CONSTRAINT "checkpoints_user_id_users_id_fk";
+--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."models" DROP CONSTRAINT "checkpoints_checkpoint_volume_id_checkpoint_volume_id_fk";
+--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."user_volume" DROP CONSTRAINT "checkpoint_volume_user_id_users_id_fk";
+--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."models" ADD COLUMN "model_type" "model_type" DEFAULT 'checkpoint' NOT NULL;--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "comfyui_deploy"."models" ADD CONSTRAINT "models_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "comfyui_deploy"."users"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "comfyui_deploy"."models" ADD CONSTRAINT "models_user_volume_id_user_volume_id_fk" FOREIGN KEY ("user_volume_id") REFERENCES "comfyui_deploy"."user_volume"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
+--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "comfyui_deploy"."user_volume" ADD CONSTRAINT "user_volume_user_id_users_id_fk" FOREIGN KEY ("user_id") REFERENCES "comfyui_deploy"."users"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;

web/drizzle/0044_panoramic_mister_fear.sql

@@ -0,0 +1 @@
+ALTER TABLE "comfyui_deploy"."models" ALTER COLUMN "is_public" SET DEFAULT true;

web/drizzle/0045_careful_cerise.sql

@@ -0,0 +1,3 @@
+ALTER TYPE "workflow_run_status" ADD VALUE 'started';--> statement-breakpoint
+ALTER TYPE "workflow_run_status" ADD VALUE 'queued';--> statement-breakpoint
+ALTER TABLE "comfyui_deploy"."workflow_runs" ADD COLUMN "queued_at" timestamp;

web/drizzle/0046_complex_mentallo.sql

@@ -0,0 +1 @@
+ALTER TYPE "model_upload_type" ADD VALUE 'download_url';

web/drizzle/0047_gifted_starbolt.sql

@@ -0,0 +1 @@
+ALTER TYPE "model_upload_type" ADD VALUE 'download-url';

web/drizzle/meta/0035_snapshot.json

@@ -0,0 +1,894 @@
+{
+  "id": "2b2a5d0a-2494-45ea-9d4a-58a70df97829",
+  "prevId": "8d654f92-7f7e-420f-bbd3-73b6b27adf35",
+  "version": "5",
+  "dialect": "pg",
+  "tables": {
+    "api_keys": {
+      "name": "api_keys",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "api_keys_user_id_users_id_fk": {
+          "name": "api_keys_user_id_users_id_fk",
+          "tableFrom": "api_keys",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "api_keys_key_unique": {
+          "name": "api_keys_key_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "key"
+          ]
+        }
+      }
+    },
+    "auth_requests": {
+      "name": "auth_requests",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "api_hash": {
+          "name": "api_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expired_date": {
+          "name": "expired_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "deployments": {
+      "name": "deployments",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_version_id": {
+          "name": "workflow_version_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "machine_id": {
+          "name": "machine_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "share_slug": {
+          "name": "share_slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "showcase_media": {
+          "name": "showcase_media",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "environment": {
+          "name": "environment",
+          "type": "deployment_environment",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "deployments_user_id_users_id_fk": {
+          "name": "deployments_user_id_users_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "deployments_workflow_version_id_workflow_versions_id_fk": {
+          "name": "deployments_workflow_version_id_workflow_versions_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "workflow_versions",
+          "columnsFrom": [
+            "workflow_version_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "deployments_workflow_id_workflows_id_fk": {
+          "name": "deployments_workflow_id_workflows_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "deployments_machine_id_machines_id_fk": {
+          "name": "deployments_machine_id_machines_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "machines",
+          "columnsFrom": [
+            "machine_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "deployments_share_slug_unique": {
+          "name": "deployments_share_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "share_slug"
+          ]
+        }
+      }
+    },
+    "machines": {
+      "name": "machines",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "endpoint": {
+          "name": "endpoint",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "disabled": {
+          "name": "disabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "auth_token": {
+          "name": "auth_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "machine_type",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'classic'"
+        },
+        "status": {
+          "name": "status",
+          "type": "machine_status",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'ready'"
+        },
+        "snapshot": {
+          "name": "snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "models": {
+          "name": "models",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "gpu": {
+          "name": "gpu",
+          "type": "machine_gpu",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "build_machine_instance_id": {
+          "name": "build_machine_instance_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "build_log": {
+          "name": "build_log",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "machines_user_id_users_id_fk": {
+          "name": "machines_user_id_users_id_fk",
+          "tableFrom": "machines",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user_usage": {
+      "name": "user_usage",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "usage_time": {
+          "name": "usage_time",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_usage_user_id_users_id_fk": {
+          "name": "user_usage_user_id_users_id_fk",
+          "tableFrom": "user_usage",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_run_outputs": {
+      "name": "workflow_run_outputs",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_run_outputs_run_id_workflow_runs_id_fk": {
+          "name": "workflow_run_outputs_run_id_workflow_runs_id_fk",
+          "tableFrom": "workflow_run_outputs",
+          "tableTo": "workflow_runs",
+          "columnsFrom": [
+            "run_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_runs": {
+      "name": "workflow_runs",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workflow_version_id": {
+          "name": "workflow_version_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_inputs": {
+          "name": "workflow_inputs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "machine_id": {
+          "name": "machine_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "origin": {
+          "name": "origin",
+          "type": "workflow_run_origin",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'api'"
+        },
+        "status": {
+          "name": "status",
+          "type": "workflow_run_status",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'not-started'"
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_runs_workflow_version_id_workflow_versions_id_fk": {
+          "name": "workflow_runs_workflow_version_id_workflow_versions_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "workflow_versions",
+          "columnsFrom": [
+            "workflow_version_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workflow_runs_workflow_id_workflows_id_fk": {
+          "name": "workflow_runs_workflow_id_workflows_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_runs_machine_id_machines_id_fk": {
+          "name": "workflow_runs_machine_id_machines_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "machines",
+          "columnsFrom": [
+            "machine_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflows": {
+      "name": "workflows",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflows_user_id_users_id_fk": {
+          "name": "workflows_user_id_users_id_fk",
+          "tableFrom": "workflows",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_versions": {
+      "name": "workflow_versions",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workflow": {
+          "name": "workflow",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_api": {
+          "name": "workflow_api",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "snapshot": {
+          "name": "snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_versions_workflow_id_workflows_id_fk": {
+          "name": "workflow_versions_workflow_id_workflows_id_fk",
+          "tableFrom": "workflow_versions",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {
+    "deployment_environment": {
+      "name": "deployment_environment",
+      "values": {
+        "staging": "staging",
+        "production": "production",
+        "public-share": "public-share"
+      }
+    },
+    "machine_gpu": {
+      "name": "machine_gpu",
+      "values": {
+        "T4": "T4",
+        "A10G": "A10G",
+        "A100": "A100"
+      }
+    },
+    "machine_status": {
+      "name": "machine_status",
+      "values": {
+        "ready": "ready",
+        "building": "building",
+        "error": "error"
+      }
+    },
+    "machine_type": {
+      "name": "machine_type",
+      "values": {
+        "classic": "classic",
+        "runpod-serverless": "runpod-serverless",
+        "modal-serverless": "modal-serverless",
+        "comfy-deploy-serverless": "comfy-deploy-serverless"
+      }
+    },
+    "workflow_run_origin": {
+      "name": "workflow_run_origin",
+      "values": {
+        "manual": "manual",
+        "api": "api",
+        "public-share": "public-share"
+      }
+    },
+    "workflow_run_status": {
+      "name": "workflow_run_status",
+      "values": {
+        "not-started": "not-started",
+        "running": "running",
+        "uploading": "uploading",
+        "success": "success",
+        "failed": "failed"
+      }
+    }
+  },
+  "schemas": {
+    "comfyui_deploy": "comfyui_deploy"
+  },
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}

web/drizzle/meta/0036_snapshot.json

@@ -0,0 +1,970 @@
+{
+  "id": "4db08fc3-2444-42da-b742-f1832ad8caf1",
+  "prevId": "2b2a5d0a-2494-45ea-9d4a-58a70df97829",
+  "version": "5",
+  "dialect": "pg",
+  "tables": {
+    "api_keys": {
+      "name": "api_keys",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "api_keys_user_id_users_id_fk": {
+          "name": "api_keys_user_id_users_id_fk",
+          "tableFrom": "api_keys",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "api_keys_key_unique": {
+          "name": "api_keys_key_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "key"
+          ]
+        }
+      }
+    },
+    "auth_requests": {
+      "name": "auth_requests",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "api_hash": {
+          "name": "api_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expired_date": {
+          "name": "expired_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "deployments": {
+      "name": "deployments",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_version_id": {
+          "name": "workflow_version_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "machine_id": {
+          "name": "machine_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "share_slug": {
+          "name": "share_slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "showcase_media": {
+          "name": "showcase_media",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "environment": {
+          "name": "environment",
+          "type": "deployment_environment",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "deployments_user_id_users_id_fk": {
+          "name": "deployments_user_id_users_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "deployments_workflow_version_id_workflow_versions_id_fk": {
+          "name": "deployments_workflow_version_id_workflow_versions_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "workflow_versions",
+          "columnsFrom": [
+            "workflow_version_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "deployments_workflow_id_workflows_id_fk": {
+          "name": "deployments_workflow_id_workflows_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "deployments_machine_id_machines_id_fk": {
+          "name": "deployments_machine_id_machines_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "machines",
+          "columnsFrom": [
+            "machine_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "deployments_share_slug_unique": {
+          "name": "deployments_share_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "share_slug"
+          ]
+        }
+      }
+    },
+    "machines": {
+      "name": "machines",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "endpoint": {
+          "name": "endpoint",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "disabled": {
+          "name": "disabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "auth_token": {
+          "name": "auth_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "machine_type",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'classic'"
+        },
+        "status": {
+          "name": "status",
+          "type": "machine_status",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'ready'"
+        },
+        "snapshot": {
+          "name": "snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "models": {
+          "name": "models",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "gpu": {
+          "name": "gpu",
+          "type": "machine_gpu",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "build_machine_instance_id": {
+          "name": "build_machine_instance_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "build_log": {
+          "name": "build_log",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "machines_user_id_users_id_fk": {
+          "name": "machines_user_id_users_id_fk",
+          "tableFrom": "machines",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "subscription_status": {
+      "name": "subscription_status",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plan": {
+          "name": "plan",
+          "type": "subscription_plan",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "subscription_plan_status",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "subscription_plan_id": {
+          "name": "subscription_plan_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user_usage": {
+      "name": "user_usage",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "usage_time": {
+          "name": "usage_time",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_usage_user_id_users_id_fk": {
+          "name": "user_usage_user_id_users_id_fk",
+          "tableFrom": "user_usage",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_run_outputs": {
+      "name": "workflow_run_outputs",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_run_outputs_run_id_workflow_runs_id_fk": {
+          "name": "workflow_run_outputs_run_id_workflow_runs_id_fk",
+          "tableFrom": "workflow_run_outputs",
+          "tableTo": "workflow_runs",
+          "columnsFrom": [
+            "run_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_runs": {
+      "name": "workflow_runs",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workflow_version_id": {
+          "name": "workflow_version_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_inputs": {
+          "name": "workflow_inputs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "machine_id": {
+          "name": "machine_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "origin": {
+          "name": "origin",
+          "type": "workflow_run_origin",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'api'"
+        },
+        "status": {
+          "name": "status",
+          "type": "workflow_run_status",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'not-started'"
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_runs_workflow_version_id_workflow_versions_id_fk": {
+          "name": "workflow_runs_workflow_version_id_workflow_versions_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "workflow_versions",
+          "columnsFrom": [
+            "workflow_version_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workflow_runs_workflow_id_workflows_id_fk": {
+          "name": "workflow_runs_workflow_id_workflows_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_runs_machine_id_machines_id_fk": {
+          "name": "workflow_runs_machine_id_machines_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "machines",
+          "columnsFrom": [
+            "machine_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflows": {
+      "name": "workflows",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflows_user_id_users_id_fk": {
+          "name": "workflows_user_id_users_id_fk",
+          "tableFrom": "workflows",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_versions": {
+      "name": "workflow_versions",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workflow": {
+          "name": "workflow",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_api": {
+          "name": "workflow_api",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "snapshot": {
+          "name": "snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_versions_workflow_id_workflows_id_fk": {
+          "name": "workflow_versions_workflow_id_workflows_id_fk",
+          "tableFrom": "workflow_versions",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {
+    "deployment_environment": {
+      "name": "deployment_environment",
+      "values": {
+        "staging": "staging",
+        "production": "production",
+        "public-share": "public-share"
+      }
+    },
+    "machine_gpu": {
+      "name": "machine_gpu",
+      "values": {
+        "T4": "T4",
+        "A10G": "A10G",
+        "A100": "A100"
+      }
+    },
+    "machine_status": {
+      "name": "machine_status",
+      "values": {
+        "ready": "ready",
+        "building": "building",
+        "error": "error"
+      }
+    },
+    "machine_type": {
+      "name": "machine_type",
+      "values": {
+        "classic": "classic",
+        "runpod-serverless": "runpod-serverless",
+        "modal-serverless": "modal-serverless",
+        "comfy-deploy-serverless": "comfy-deploy-serverless"
+      }
+    },
+    "subscription_plan": {
+      "name": "subscription_plan",
+      "values": {
+        "basic": "basic",
+        "pro": "pro",
+        "enterprise": "enterprise"
+      }
+    },
+    "subscription_plan_status": {
+      "name": "subscription_plan_status",
+      "values": {
+        "active": "active",
+        "deleted": "deleted",
+        "paused": "paused"
+      }
+    },
+    "workflow_run_origin": {
+      "name": "workflow_run_origin",
+      "values": {
+        "manual": "manual",
+        "api": "api",
+        "public-share": "public-share"
+      }
+    },
+    "workflow_run_status": {
+      "name": "workflow_run_status",
+      "values": {
+        "not-started": "not-started",
+        "running": "running",
+        "uploading": "uploading",
+        "success": "success",
+        "failed": "failed"
+      }
+    }
+  },
+  "schemas": {
+    "comfyui_deploy": "comfyui_deploy"
+  },
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}

web/drizzle/meta/0037_snapshot.json

@@ -0,0 +1,984 @@
+{
+  "id": "cde8f758-0055-4326-981d-293ac84db54a",
+  "prevId": "4db08fc3-2444-42da-b742-f1832ad8caf1",
+  "version": "5",
+  "dialect": "pg",
+  "tables": {
+    "api_keys": {
+      "name": "api_keys",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "api_keys_user_id_users_id_fk": {
+          "name": "api_keys_user_id_users_id_fk",
+          "tableFrom": "api_keys",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "api_keys_key_unique": {
+          "name": "api_keys_key_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "key"
+          ]
+        }
+      }
+    },
+    "auth_requests": {
+      "name": "auth_requests",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "api_hash": {
+          "name": "api_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expired_date": {
+          "name": "expired_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "deployments": {
+      "name": "deployments",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_version_id": {
+          "name": "workflow_version_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "machine_id": {
+          "name": "machine_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "share_slug": {
+          "name": "share_slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "showcase_media": {
+          "name": "showcase_media",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "environment": {
+          "name": "environment",
+          "type": "deployment_environment",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "deployments_user_id_users_id_fk": {
+          "name": "deployments_user_id_users_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "deployments_workflow_version_id_workflow_versions_id_fk": {
+          "name": "deployments_workflow_version_id_workflow_versions_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "workflow_versions",
+          "columnsFrom": [
+            "workflow_version_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "deployments_workflow_id_workflows_id_fk": {
+          "name": "deployments_workflow_id_workflows_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "deployments_machine_id_machines_id_fk": {
+          "name": "deployments_machine_id_machines_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "machines",
+          "columnsFrom": [
+            "machine_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "deployments_share_slug_unique": {
+          "name": "deployments_share_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "share_slug"
+          ]
+        }
+      }
+    },
+    "machines": {
+      "name": "machines",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "endpoint": {
+          "name": "endpoint",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "disabled": {
+          "name": "disabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "auth_token": {
+          "name": "auth_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "machine_type",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'classic'"
+        },
+        "status": {
+          "name": "status",
+          "type": "machine_status",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'ready'"
+        },
+        "snapshot": {
+          "name": "snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "models": {
+          "name": "models",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "gpu": {
+          "name": "gpu",
+          "type": "machine_gpu",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "build_machine_instance_id": {
+          "name": "build_machine_instance_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "build_log": {
+          "name": "build_log",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "machines_user_id_users_id_fk": {
+          "name": "machines_user_id_users_id_fk",
+          "tableFrom": "machines",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "subscription_status": {
+      "name": "subscription_status",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plan": {
+          "name": "plan",
+          "type": "subscription_plan",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "subscription_plan_status",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "subscription_id": {
+          "name": "subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "subscription_item_plan_id": {
+          "name": "subscription_item_plan_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "subscription_item_api_id": {
+          "name": "subscription_item_api_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user_usage": {
+      "name": "user_usage",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "usage_time": {
+          "name": "usage_time",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_usage_user_id_users_id_fk": {
+          "name": "user_usage_user_id_users_id_fk",
+          "tableFrom": "user_usage",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_run_outputs": {
+      "name": "workflow_run_outputs",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_run_outputs_run_id_workflow_runs_id_fk": {
+          "name": "workflow_run_outputs_run_id_workflow_runs_id_fk",
+          "tableFrom": "workflow_run_outputs",
+          "tableTo": "workflow_runs",
+          "columnsFrom": [
+            "run_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_runs": {
+      "name": "workflow_runs",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workflow_version_id": {
+          "name": "workflow_version_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_inputs": {
+          "name": "workflow_inputs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "machine_id": {
+          "name": "machine_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "origin": {
+          "name": "origin",
+          "type": "workflow_run_origin",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'api'"
+        },
+        "status": {
+          "name": "status",
+          "type": "workflow_run_status",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'not-started'"
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_runs_workflow_version_id_workflow_versions_id_fk": {
+          "name": "workflow_runs_workflow_version_id_workflow_versions_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "workflow_versions",
+          "columnsFrom": [
+            "workflow_version_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workflow_runs_workflow_id_workflows_id_fk": {
+          "name": "workflow_runs_workflow_id_workflows_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_runs_machine_id_machines_id_fk": {
+          "name": "workflow_runs_machine_id_machines_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "machines",
+          "columnsFrom": [
+            "machine_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflows": {
+      "name": "workflows",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflows_user_id_users_id_fk": {
+          "name": "workflows_user_id_users_id_fk",
+          "tableFrom": "workflows",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_versions": {
+      "name": "workflow_versions",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workflow": {
+          "name": "workflow",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_api": {
+          "name": "workflow_api",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "snapshot": {
+          "name": "snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_versions_workflow_id_workflows_id_fk": {
+          "name": "workflow_versions_workflow_id_workflows_id_fk",
+          "tableFrom": "workflow_versions",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {
+    "deployment_environment": {
+      "name": "deployment_environment",
+      "values": {
+        "staging": "staging",
+        "production": "production",
+        "public-share": "public-share"
+      }
+    },
+    "machine_gpu": {
+      "name": "machine_gpu",
+      "values": {
+        "T4": "T4",
+        "A10G": "A10G",
+        "A100": "A100"
+      }
+    },
+    "machine_status": {
+      "name": "machine_status",
+      "values": {
+        "ready": "ready",
+        "building": "building",
+        "error": "error"
+      }
+    },
+    "machine_type": {
+      "name": "machine_type",
+      "values": {
+        "classic": "classic",
+        "runpod-serverless": "runpod-serverless",
+        "modal-serverless": "modal-serverless",
+        "comfy-deploy-serverless": "comfy-deploy-serverless"
+      }
+    },
+    "subscription_plan": {
+      "name": "subscription_plan",
+      "values": {
+        "basic": "basic",
+        "pro": "pro",
+        "enterprise": "enterprise"
+      }
+    },
+    "subscription_plan_status": {
+      "name": "subscription_plan_status",
+      "values": {
+        "active": "active",
+        "deleted": "deleted",
+        "paused": "paused"
+      }
+    },
+    "workflow_run_origin": {
+      "name": "workflow_run_origin",
+      "values": {
+        "manual": "manual",
+        "api": "api",
+        "public-share": "public-share"
+      }
+    },
+    "workflow_run_status": {
+      "name": "workflow_run_status",
+      "values": {
+        "not-started": "not-started",
+        "running": "running",
+        "uploading": "uploading",
+        "success": "success",
+        "failed": "failed"
+      }
+    }
+  },
+  "schemas": {
+    "comfyui_deploy": "comfyui_deploy"
+  },
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {
+      "\"comfyui_deploy\".\"subscription_status\".\"subscription_plan_id\"": "\"comfyui_deploy\".\"subscription_status\".\"subscription_id\""
+    }
+  }
+}

web/drizzle/meta/0038_snapshot.json

@@ -0,0 +1,989 @@
+{
+  "id": "bd893271-b9ea-4832-a3e8-a6970b9f20d9",
+  "prevId": "cde8f758-0055-4326-981d-293ac84db54a",
+  "version": "5",
+  "dialect": "pg",
+  "tables": {
+    "api_keys": {
+      "name": "api_keys",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "revoked": {
+          "name": "revoked",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "api_keys_user_id_users_id_fk": {
+          "name": "api_keys_user_id_users_id_fk",
+          "tableFrom": "api_keys",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "api_keys_key_unique": {
+          "name": "api_keys_key_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "key"
+          ]
+        }
+      }
+    },
+    "auth_requests": {
+      "name": "auth_requests",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "api_hash": {
+          "name": "api_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expired_date": {
+          "name": "expired_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "deployments": {
+      "name": "deployments",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_version_id": {
+          "name": "workflow_version_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "machine_id": {
+          "name": "machine_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "share_slug": {
+          "name": "share_slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "showcase_media": {
+          "name": "showcase_media",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "environment": {
+          "name": "environment",
+          "type": "deployment_environment",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "deployments_user_id_users_id_fk": {
+          "name": "deployments_user_id_users_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "deployments_workflow_version_id_workflow_versions_id_fk": {
+          "name": "deployments_workflow_version_id_workflow_versions_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "workflow_versions",
+          "columnsFrom": [
+            "workflow_version_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "deployments_workflow_id_workflows_id_fk": {
+          "name": "deployments_workflow_id_workflows_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "deployments_machine_id_machines_id_fk": {
+          "name": "deployments_machine_id_machines_id_fk",
+          "tableFrom": "deployments",
+          "tableTo": "machines",
+          "columnsFrom": [
+            "machine_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "deployments_share_slug_unique": {
+          "name": "deployments_share_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "share_slug"
+          ]
+        }
+      }
+    },
+    "machines": {
+      "name": "machines",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "endpoint": {
+          "name": "endpoint",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "disabled": {
+          "name": "disabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "auth_token": {
+          "name": "auth_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "machine_type",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'classic'"
+        },
+        "status": {
+          "name": "status",
+          "type": "machine_status",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'ready'"
+        },
+        "snapshot": {
+          "name": "snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "models": {
+          "name": "models",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "gpu": {
+          "name": "gpu",
+          "type": "machine_gpu",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "build_machine_instance_id": {
+          "name": "build_machine_instance_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "build_log": {
+          "name": "build_log",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "machines_user_id_users_id_fk": {
+          "name": "machines_user_id_users_id_fk",
+          "tableFrom": "machines",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "subscription_status": {
+      "name": "subscription_status",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plan": {
+          "name": "plan",
+          "type": "subscription_plan",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "subscription_plan_status",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "subscription_id": {
+          "name": "subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "subscription_item_plan_id": {
+          "name": "subscription_item_plan_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "subscription_item_api_id": {
+          "name": "subscription_item_api_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancel_at_period_end": {
+          "name": "cancel_at_period_end",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user_usage": {
+      "name": "user_usage",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "usage_time": {
+          "name": "usage_time",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_usage_user_id_users_id_fk": {
+          "name": "user_usage_user_id_users_id_fk",
+          "tableFrom": "user_usage",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_run_outputs": {
+      "name": "workflow_run_outputs",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "run_id": {
+          "name": "run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_run_outputs_run_id_workflow_runs_id_fk": {
+          "name": "workflow_run_outputs_run_id_workflow_runs_id_fk",
+          "tableFrom": "workflow_run_outputs",
+          "tableTo": "workflow_runs",
+          "columnsFrom": [
+            "run_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_runs": {
+      "name": "workflow_runs",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workflow_version_id": {
+          "name": "workflow_version_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_inputs": {
+          "name": "workflow_inputs",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "machine_id": {
+          "name": "machine_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "origin": {
+          "name": "origin",
+          "type": "workflow_run_origin",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'api'"
+        },
+        "status": {
+          "name": "status",
+          "type": "workflow_run_status",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'not-started'"
+        },
+        "ended_at": {
+          "name": "ended_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_runs_workflow_version_id_workflow_versions_id_fk": {
+          "name": "workflow_runs_workflow_version_id_workflow_versions_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "workflow_versions",
+          "columnsFrom": [
+            "workflow_version_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "workflow_runs_workflow_id_workflows_id_fk": {
+          "name": "workflow_runs_workflow_id_workflows_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_runs_machine_id_machines_id_fk": {
+          "name": "workflow_runs_machine_id_machines_id_fk",
+          "tableFrom": "workflow_runs",
+          "tableTo": "machines",
+          "columnsFrom": [
+            "machine_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflows": {
+      "name": "workflows",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflows_user_id_users_id_fk": {
+          "name": "workflows_user_id_users_id_fk",
+          "tableFrom": "workflows",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "workflow_versions": {
+      "name": "workflow_versions",
+      "schema": "comfyui_deploy",
+      "columns": {
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "workflow": {
+          "name": "workflow",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "workflow_api": {
+          "name": "workflow_api",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "snapshot": {
+          "name": "snapshot",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_versions_workflow_id_workflows_id_fk": {
+          "name": "workflow_versions_workflow_id_workflows_id_fk",
+          "tableFrom": "workflow_versions",
+          "tableTo": "workflows",
+          "columnsFrom": [
+            "workflow_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {
+    "deployment_environment": {
+      "name": "deployment_environment",
+      "values": {
+        "staging": "staging",
+        "production": "production",
+        "public-share": "public-share"
+      }
+    },
+    "machine_gpu": {
+      "name": "machine_gpu",
+      "values": {
+        "T4": "T4",
+        "A10G": "A10G",
+        "A100": "A100"
+      }
+    },
+    "machine_status": {
+      "name": "machine_status",
+      "values": {
+        "ready": "ready",
+        "building": "building",
+        "error": "error"
+      }
+    },
+    "machine_type": {
+      "name": "machine_type",
+      "values": {
+        "classic": "classic",
+        "runpod-serverless": "runpod-serverless",
+        "modal-serverless": "modal-serverless",
+        "comfy-deploy-serverless": "comfy-deploy-serverless"
+      }
+    },
+    "subscription_plan": {
+      "name": "subscription_plan",
+      "values": {
+        "basic": "basic",
+        "pro": "pro",
+        "enterprise": "enterprise"
+      }
+    },
+    "subscription_plan_status": {
+      "name": "subscription_plan_status",
+      "values": {
+        "active": "active",
+        "deleted": "deleted",
+        "paused": "paused"
+      }
+    },
+    "workflow_run_origin": {
+      "name": "workflow_run_origin",
+      "values": {
+        "manual": "manual",
+        "api": "api",
+        "public-share": "public-share"
+      }
+    },
+    "workflow_run_status": {
+      "name": "workflow_run_status",
+      "values": {
+        "not-started": "not-started",
+        "running": "running",
+        "uploading": "uploading",
+        "success": "success",
+        "failed": "failed"
+      }
+    }
+  },
+  "schemas": {
+    "comfyui_deploy": "comfyui_deploy"
+  },
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}

web/drizzle/meta/_journal.json

@@ -246,6 +246,97 @@
       "when": 1705902960991,
       "tag": "0034_even_lady_ursula",
       "breakpoints": true
+    },
+    {
+      "idx": 35,
+      "version": "5",
+      "when": 1705981452482,
+      "tag": "0035_fearless_golden_guardian",
+      "breakpoints": true
+    },
+    {
+      "idx": 36,
+      "version": "5",
+      "when": 1706081335387,
+      "tag": "0036_flippant_meltdown",
+      "breakpoints": true
+    },
+    {
+      "idx": 37,
+      "version": "5",
+      "when": 1706086271525,
+      "tag": "0037_eager_cyclops",
+      "breakpoints": true
+    },
+    {
+      "idx": 38,
+      "version": "5",
+      "when": 1706095853896,
+      "tag": "0038_yummy_darkhawk",
+      "breakpoints": true
+    },
+    {
+      "idx": 39,
+      "version": "5",
+      "when": 1706109812261,
+      "tag": "0039_nostalgic_lyja",
+      "breakpoints": true
+    },
+    {
+      "idx": 40,
+      "version": "5",
+      "when": 1706110859352,
+      "tag": "0040_salty_archangel",
+      "breakpoints": true
+    },
+    {
+      "idx": 41,
+      "version": "5",
+      "when": 1706111421524,
+      "tag": "0041_thick_norrin_radd",
+      "breakpoints": true
+    },
+    {
+      "idx": 42,
+      "version": "5",
+      "when": 1706164614659,
+      "tag": "0042_windy_madelyne_pryor",
+      "breakpoints": true
+    },
+    {
+      "idx": 43,
+      "version": "5",
+      "when": 1706241449348,
+      "tag": "0043_wealthy_nicolaos",
+      "breakpoints": true
+    },
+    {
+      "idx": 44,
+      "version": "5",
+      "when": 1706317908300,
+      "tag": "0044_panoramic_mister_fear",
+      "breakpoints": true
+    },
+    {
+      "idx": 45,
+      "version": "5",
+      "when": 1706336448134,
+      "tag": "0045_careful_cerise",
+      "breakpoints": true
+    },
+    {
+      "idx": 46,
+      "version": "5",
+      "when": 1706383154642,
+      "tag": "0046_complex_mentallo",
+      "breakpoints": true
+    },
+    {
+      "idx": 47,
+      "version": "5",
+      "when": 1706384528895,
+      "tag": "0047_gifted_starbolt",
+      "breakpoints": true
     }
   ]
 }

web/package.json

@@ -19,23 +19,26 @@
     "@algolia/autocomplete-core": "^1.13.0",
     "@aws-sdk/client-s3": "^3.472.0",
     "@aws-sdk/s3-request-presigner": "^3.472.0",
-    "@clerk/nextjs": "^4.29.3",
+    "@clerk/nextjs": "4.29.5",
     "@headlessui/react": "^1.7.17",
     "@headlessui/tailwindcss": "^0.2.0",
     "@hono/swagger-ui": "^0.2.1",
     "@hono/zod-openapi": "^0.9.5",
     "@hono/zod-validator": "^0.1.11",
     "@hookform/resolvers": "^3.3.2",
+    "@lemonsqueezy/lemonsqueezy.js": "^1.2.5",
     "@mdx-js/loader": "^3.0.0",
     "@mdx-js/react": "^3.0.0",
     "@neondatabase/serverless": "^0.6.0",
     "@next/mdx": "^14.0.4",
     "@radix-ui/react-accordion": "^1.1.2",
+    "@radix-ui/react-alert-dialog": "^1.0.5",
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@radix-ui/react-label": "^2.0.2",
     "@radix-ui/react-popover": "^1.0.7",
+    "@radix-ui/react-progress": "^1.0.3",
     "@radix-ui/react-radio-group": "^1.1.3",
     "@radix-ui/react-scroll-area": "^1.0.5",
     "@radix-ui/react-select": "^2.0.0",
@@ -46,6 +49,7 @@
     "@radix-ui/react-toggle": "^1.0.3",
     "@radix-ui/react-tooltip": "^1.0.7",
     "@sindresorhus/slugify": "^2.2.1",
+    "@stripe/stripe-js": "^2.4.0",
     "@tailwindcss/typography": "^0.5.10",
     "@tanstack/react-table": "^8.10.7",
     "@tanstack/react-virtual": "beta",
@@ -94,6 +98,7 @@
     "shikiji": "^0.9.3",
     "simple-functional-loader": "^1.2.1",
     "sonner": "^1.2.4",
+    "stripe": "^14.13.0",
     "swagger-ui-react": "^5.11.0",
     "swr": "^2.2.4",
     "tailwind-merge": "^2.1.0",

web/src/app/(app)/api/stripe/callback/route.tsx

@@ -0,0 +1,175 @@
+import { auth, clerkClient } from "@clerk/nextjs";
+import { headers } from "next/headers";
+import { redirect } from "next/navigation";
+import { stripe } from "../../../../../server/stripe";
+import { NextResponse } from "next/server";
+import { db } from "@/db/db";
+import { subscriptionStatusTable } from "@/db/schema";
+import { eq } from "drizzle-orm";
+
+const secret = process.env.STRIPE_WEBHOOK_SECRET || "";
+
+export async function POST(req: Request) {
+  try {
+    const body = await req.text();
+
+    const signature = headers().get("stripe-signature");
+
+    if (!signature)
+      return new NextResponse("Signature not found.", {
+        status: 500,
+      });
+
+    const event = stripe.webhooks.constructEvent(body, signature, secret);
+
+    console.log(event);
+
+    if (event.type === "checkout.session.completed") {
+      if (!event.data.object.customer_details?.email) {
+        throw new Error(`missing user email, ${event.id}`);
+      }
+
+      const userId = event.data.object.metadata?.userId;
+      const plan = event.data.object.metadata?.plan;
+      if (!userId) {
+        throw new Error(`missing itinerary_id on metadata, ${event.id}`);
+      }
+      if (!plan) {
+        throw new Error(`missing plan on metadata, ${event.id}`);
+      }
+
+      const orgId = event.data.object.metadata?.orgId;
+
+      const customerId =
+        typeof event.data.object.customer == "string"
+          ? event.data.object.customer
+          : event.data.object.customer?.id;
+      const subscriptionId =
+        typeof event.data.object.subscription == "string"
+          ? event.data.object.subscription
+          : event.data.object.subscription?.id;
+
+      if (!customerId) {
+        throw new Error(`missing customerId, ${event.id}`);
+      }
+      if (!subscriptionId) {
+        throw new Error(`missing subscriptionId, ${event.id}`);
+      }
+
+      const items = await stripe.subscriptionItems.list({
+        subscription: subscriptionId,
+        limit: 5,
+      });
+
+      // getting the subscription item id for the api plan
+      const subscription_item_api_id = items.data.find(
+        (x) => x.price.id === process.env.STRIPE_PR_API,
+      )?.id;
+
+      // the plan could be either pro or enterprise
+      const subscription_item_plan_id =
+        items.data.find((x) => x.price.id === process.env.STRIPE_PR_PRO)?.id ??
+        items.data.find((x) => x.price.id === process.env.STRIPE_PR_ENTERPRISE)
+          ?.id;
+
+      if (!subscription_item_api_id) {
+        throw new Error(
+          `missing plan on subscription_item_api_id, ${event.id}`,
+        );
+      }
+      if (!subscription_item_plan_id) {
+        throw new Error(
+          `missing plan on subscription_item_plan_id, ${event.id}`,
+        );
+      }
+
+      console.log(items);
+
+      await db
+        .insert(subscriptionStatusTable)
+        .values({
+          stripe_customer_id: customerId,
+          org_id: orgId && orgId.length > 0 && orgId != "null" ? orgId : null,
+          user_id: userId,
+          subscription_id: subscriptionId,
+          plan: plan as "pro" | "enterprise" | "basic",
+          status: "active",
+          subscription_item_api_id: subscription_item_api_id,
+          subscription_item_plan_id: subscription_item_plan_id,
+        })
+        .onConflictDoNothing();
+
+      // updateDatabase(event.data.object.metadata.itinerary_id);
+      // sendEmail(event.data.object.customer_details.email);
+    } else if (event.type === "customer.subscription.paused") {
+      const customerId =
+        typeof event.data.object.customer == "string"
+          ? event.data.object.customer
+          : event.data.object.customer?.id;
+
+      if (!customerId) {
+        throw new Error(`missing customerId, ${event.id}`);
+      }
+
+      await db
+        .update(subscriptionStatusTable)
+        .set({ status: "paused" })
+        .where(eq(subscriptionStatusTable.stripe_customer_id, customerId));
+    } else if (event.type === "customer.subscription.resumed") {
+      const customerId =
+        typeof event.data.object.customer == "string"
+          ? event.data.object.customer
+          : event.data.object.customer?.id;
+
+      if (!customerId) {
+        throw new Error(`missing customerId, ${event.id}`);
+      }
+
+      await db
+        .update(subscriptionStatusTable)
+        .set({ status: "active" })
+        .where(eq(subscriptionStatusTable.stripe_customer_id, customerId));
+    } else if (event.type === "customer.subscription.deleted") {
+      const customerId =
+        typeof event.data.object.customer == "string"
+          ? event.data.object.customer
+          : event.data.object.customer?.id;
+
+      if (!customerId) {
+        throw new Error(`missing customerId, ${event.id}`);
+      }
+
+      await db
+        .update(subscriptionStatusTable)
+        .set({ status: "deleted" })
+        .where(eq(subscriptionStatusTable.stripe_customer_id, customerId));
+    } else if (event.type === "customer.subscription.updated") {
+      const customerId =
+        typeof event.data.object.customer == "string"
+          ? event.data.object.customer
+          : event.data.object.customer?.id;
+
+      if (!customerId) {
+        throw new Error(`missing customerId, ${event.id}`);
+      }
+
+      const cancel_at_period_end = event.data.object.cancel_at_period_end;
+
+      await db
+        .update(subscriptionStatusTable)
+        .set({ cancel_at_period_end: cancel_at_period_end })
+        .where(eq(subscriptionStatusTable.stripe_customer_id, customerId));
+    }
+
+    return NextResponse.json({ result: event, ok: true });
+  } catch (error) {
+    console.error(error);
+    return NextResponse.json(
+      {
+        message: `Something went wrong: ${error}`,
+        ok: false,
+      },
+      { status: 500 },
+    );
+  }
+}

web/src/app/(app)/api/stripe/checkout/route.tsx

@@ -0,0 +1,46 @@
+import { stripe } from "@/server/stripe";
+import { auth, clerkClient } from "@clerk/nextjs";
+import { redirect } from "next/navigation";
+import { getUrlServerSide } from "@/server/getUrlServerSide";
+
+export async function GET(req: Request) {
+  const { userId, orgId } = auth();
+
+  const plan = new URL(req.url).searchParams.get("plan");
+
+  if (!userId) return redirect("/");
+  if (!plan) return redirect("/pricing");
+
+  const user = await clerkClient.users.getUser(userId);
+
+  const mapping = {
+    pro: process.env.STRIPE_PR_PRO,
+    enterprise: process.env.STRIPE_PR_ENTERPRISE,
+  };
+
+  const api = process.env.STRIPE_PR_API;
+
+  const session = await stripe.checkout.sessions.create({
+    success_url: getUrlServerSide(),
+    line_items: [
+      {
+        price: mapping[plan as "pro" | "enterprise"],
+        quantity: 1,
+      },
+      {
+        price: api,
+      },
+    ],
+    metadata: {
+      userId: userId,
+      orgId: orgId ?? null,
+      plan: plan,
+    },
+    allow_promotion_codes: true,
+    client_reference_id: orgId ?? userId,
+    customer_email: user.emailAddresses[0].emailAddress,
+    mode: "subscription",
+  });
+
+  if (session.url) redirect(session.url);
+}

web/src/app/(app)/api/stripe/dashboard/route.tsx

@@ -0,0 +1,37 @@
+import { stripe } from "@/server/stripe";
+import { auth } from "@clerk/nextjs";
+import { redirect } from "next/navigation";
+import { getUrlServerSide } from "@/server/getUrlServerSide";
+import { getCurrentPlan } from "@/server/getCurrentPlan";
+
+export async function GET(req: Request) {
+  const { userId, orgId } = auth();
+
+  if (!userId) return redirect("/");
+
+  const change = new URL(req.url).searchParams.get("change");
+
+  const sub = await getCurrentPlan({
+    org_id: orgId,
+    user_id: userId,
+  });
+
+  if (!sub) return redirect("/pricing");
+
+  const session = await stripe.billingPortal.sessions.create({
+    customer: sub.stripe_customer_id,
+    return_url: getUrlServerSide() + "/pricing",
+    // flow_data:
+    //   change === "true" && sub.subscription_id
+    //     ? {
+    //         type: "subscription_update",
+    //         subscription_update: {
+    //           subscription: sub.subscription_id,
+    //         },
+    //       }
+    //     : undefined,
+  });
+
+  redirect(session.url);
+  // if (session.url) redirect(session.url);
+}

web/src/app/(app)/api/update-run/route.ts

@@ -1,56 +1,129 @@
 import { parseDataSafe } from "../../../../lib/parseDataSafe";
 import { db } from "@/db/db";
-import { workflowRunOutputs, workflowRunsTable } from "@/db/schema";
+import {
+  WorkflowRunStatusSchema,
+  userUsageTable,
+  workflowRunOutputs,
+  workflowRunsTable,
+  workflowTable,
+} from "@/db/schema";
+import { getCurrentPlan } from "@/server/getCurrentPlan";
+import { stripe } from "@/server/stripe";
 import { eq } from "drizzle-orm";
 import { NextResponse } from "next/server";
 import { z } from "zod";
 
 const Request = z.object({
   run_id: z.string(),
-  status: z
+  status: WorkflowRunStatusSchema.optional(),
-    .enum(["not-started", "running", "uploading", "success", "failed"])
+  time: z.coerce.date().optional(),
-    .optional(),
   output_data: z.any().optional(),
 });
 
 export async function POST(request: Request) {
-  const [data, error] = await parseDataSafe(Request, request);
+  try {
-  if (!data || error) return error;
+    const [data, error] = await parseDataSafe(Request, request);
 
-  const { run_id, status, output_data } = data;
+    if (!data || error) return error;
 
-  // console.log(run_id, status, output_data);
+    const { run_id, status, time, output_data } = data;
 
-  if (output_data) {
+    if (status == "started" && time != undefined) {
-    const workflow_run_output = await db.insert(workflowRunOutputs).values({
+      // It successfully started, update the started_at time
-      run_id: run_id,
+      await db
-      data: output_data,
+        .update(workflowRunsTable)
-    });
+        .set({
-  } else if (status) {
+          started_at: time,
-    // console.log("status", status);
+        })
-    const workflow_run = await db
+        .where(eq(workflowRunsTable.id, run_id));
-      .update(workflowRunsTable)
-      .set({
-        status: status,
-        ended_at:
-          status === "success" || status === "failed" ? new Date() : null,
-      })
-      .where(eq(workflowRunsTable.id, run_id))
-      .returning();
-  }
-
-  // const workflow_version = await db.query.workflowVersionTable.findFirst({
-  //   where: eq(workflowRunsTable.id, workflow_run[0].workflow_version_id),
-  // });
-
-  // revalidatePath(`./${workflow_version?.workflow_id}`);
-
-  return NextResponse.json(
-    {
-      message: "success",
-    },
-    {
-      status: 200,
     }
-  );
+
+    if (status == "queued" && time != undefined) {
+      // It successfully started, update the started_at time
+      await db
+        .update(workflowRunsTable)
+        .set({
+          queued_at: time,
+        })
+        .where(eq(workflowRunsTable.id, run_id));
+    }
+
+    if (output_data) {
+      const workflow_run_output = await db.insert(workflowRunOutputs).values({
+        run_id: run_id,
+        data: output_data,
+      });
+    } else if (status) {
+      const [workflow_run] = await db
+        .update(workflowRunsTable)
+        .set({
+          status: status,
+          ended_at:
+            status === "success" || status === "failed" ? new Date() : null,
+        })
+        .where(eq(workflowRunsTable.id, run_id))
+        .returning();
+
+      // Need to filter out only comfy deploy serverless
+      // Also multiply with the gpu selection
+      if (workflow_run.machine_type == "comfy-deploy-serverless") {
+        if (
+          (status === "success" || status === "failed") &&
+          workflow_run.user_id
+        ) {
+          const sub = await getCurrentPlan({
+            user_id: workflow_run.user_id,
+            org_id: workflow_run.org_id,
+          });
+
+          if (sub && sub.subscription_item_api_id && workflow_run.ended_at) {
+            let durationInSec = Math.abs(
+              (workflow_run.ended_at.getTime() -
+                workflow_run.created_at.getTime()) /
+                1000,
+            );
+            durationInSec = Math.ceil(durationInSec);
+            switch (workflow_run.gpu) {
+              case "A100":
+                durationInSec *= 7;
+                break;
+              case "A10G":
+                durationInSec *= 4;
+                break;
+            }
+            await stripe.subscriptionItems.createUsageRecord(
+              sub.subscription_item_api_id,
+              {
+                quantity: durationInSec,
+              },
+            );
+          }
+        }
+      }
+    }
+
+    return NextResponse.json(
+      {
+        message: "success",
+      },
+      {
+        status: 200,
+      },
+    );
+  } catch (error: unknown) {
+    console.log("An error here");
+
+    const errorMessage =
+      error instanceof Error ? error.message : "Unknown error";
+    console.log(errorMessage);
+
+    return NextResponse.json(
+      {
+        error: errorMessage,
+      },
+      {
+        status: 500,
+      },
+    );
+  }
 }

web/src/app/(app)/api/volume-upload/route.ts

@@ -0,0 +1,55 @@
+import { parseDataSafe } from "../../../../lib/parseDataSafe";
+import { db } from "@/db/db";
+import { modelTable } from "@/db/schema";
+import { eq } from "drizzle-orm";
+import { NextResponse } from "next/server";
+import { z } from "zod";
+
+const Request = z.object({
+  volume_id: z.string(),
+  model_id: z.string(),
+  folder_path: z.string().optional(),
+  status: z.enum(["success", "failed"]),
+  error_log: z.string().optional(),
+  timeout: z.number().optional(),
+});
+
+export async function POST(request: Request) {
+  const [data, error] = await parseDataSafe(Request, request);
+  if (!data || error) return error;
+
+  const { model_id, error_log, status, folder_path } = data;
+  console.log(model_id, error_log, status, folder_path);
+
+  if (status === "success") {
+    await db
+      .update(modelTable)
+      .set({
+        status: "success",
+        folder_path,
+        updated_at: new Date(),
+        // build_log: build_log,
+      })
+      .where(eq(modelTable.id, model_id));
+  } else {
+    await db
+      .update(modelTable)
+      .set({
+        status: "failed",
+        error_log,
+        updated_at: new Date(),
+        // status: "error",
+        // build_log: build_log,
+      })
+      .where(eq(modelTable.id, model_id));
+  }
+
+  return NextResponse.json(
+    {
+      message: "success",
+    },
+    {
+      status: 200,
+    },
+  );
+}

web/src/app/(app)/auth/sign-in/[[...sign-in]]/page.tsx

@@ -0,0 +1,9 @@
+import { SignIn } from "@clerk/nextjs";
+
+export default function Page() {
+  return (
+    <div className="w-full h-full items-center flex justify-center">
+      <SignIn />
+    </div>
+  );
+}

web/src/app/(app)/auth/sign-up/[[...sign-up]]/page.tsx

@@ -0,0 +1,9 @@
+import { SignUp } from "@clerk/nextjs";
+
+export default function Page() {
+  return (
+    <div className="w-full h-full items-center flex justify-center">
+      <SignUp />
+    </div>
+  );
+}

web/src/app/(app)/examples/page.tsx

@@ -1,117 +0,0 @@
-import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";
-import Image from "next/image";
-import Link from "next/link";
-
-export default function Page() {
-  return <Examples />;
-}
-
-
-type exampleWorkflow = {
-  title: string;
-  description: string;
-  previewURL: string;
-  image: {
-    src: string,
-    alt: string,
-  };
-};
-
-const exampleWorkflows: exampleWorkflow[] = [
-  {
-    title: "Txt2Img SDXL",
-    description: "The basic workflow, type a prompt and generate images based on that.",
-    previewURL: 'https://www.comfydeploy.com/share/comfy-deploy-example-txt2img-sdxl',
-    image: {
-      src: '/example-workflows/txt2img.webp',
-      alt: 'IPAdapter workflow',
-    }
-  },
-  {
-    title: "Txt2Img LCM SDXL",
-    description: "Images in a couple of seconds, increase the speed of each generation using LCM Lora.",
-    previewURL: 'https://www.comfydeploy.com/share/comfy-deploy-example-lcm-sdxl',
-    image: {
-      src: '/example-workflows/txt2img-lcm.webp',
-      alt: 'txt2img LCM SDXL',
-    }
-  },
-  {
-    title: "IPAdapter SDXL",
-    description: "Load images and use them as reference for new generations.",
-    previewURL: 'https://www.comfydeploy.com/share/comfy-deploy-example-ip-adapter-sdxl',
-    image: {
-      src: '/example-workflows/ipadapter.webp',
-      alt: 'IPAdapter workflow',
-    }
-  },
-  {
-    title: "Upscale and Add Detail SDXL",
-    description: "Upscale and Add Details to your creations.",
-    previewURL: 'https://www.comfydeploy.com/share/comfy-deploy-example-upscale-and-add-detail-sdxl',
-    image: {
-      src: '/example-workflows/upscale.webp',
-      alt: 'Upscale and Add Detail SDXL',
-    }
-  },
-  {
-    title: "Txt2Img SDXL Turbo",
-    description: "Try SDXL turbo and generate images since 1 step in seconds.",
-    previewURL: 'https://www.comfydeploy.com/share/comfy-deploy-example-txt2img-sdxl-turbo',
-    image: {
-      src: '/example-workflows/txt2img-sdxl-turbo.webp',
-      alt: 'Txt2Img SDXL Turbo',
-    }
-  },
-  {
-    title: "Img2Img SDXL Controlnet",
-    description: "This workflow uses canny. Generate lines of you original image and create variations.",
-    previewURL: 'https://www.comfydeploy.com/share/comfy-deploy-example-img2-img-sdxl-controlnet',
-    image: {
-      src: '/example-workflows/txt2img-controlnet.webp',
-      alt: 'Img2Img SDXL Controlnet',
-    }
-  },
-  {
-    title: "Automatic Inpainting (SEG)",
-    description: "Type what do you want to select and change that area with your prompt.",
-    previewURL: 'https://www.comfydeploy.com/share/comfy-deploy-example-automatic-inpainting-clip-seg',
-    image: {
-      src: '/example-workflows/automatic-inpainting-seg.webp',
-      alt: 'Img2Img SDXL Controlnet',
-    }
-  }
-];
-
-
-async function Examples() {
-  return (
-    <div className="w-full py-4">
-      <section className="mx-auto flex max-w-[980px] flex-col items-center gap-2 py-8 md:py-12 md:pb-8 lg:py-24 lg:pb-20">
-        <h1 className="scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl text-center">
-          Check out some examples
-        </h1>
-        <p className="max-w-[560px] text-center text-lg text-muted-foreground">Text to Image, Image to Image, IPAdapter, and more. Here are some examples that you can use to deploy your workflow.</p>
-      </section>
-      <section className="flex justify-center flex-wrap gap-5">
-        {exampleWorkflows.map(workflow => {
-          return <Card className="w-[350px]">
-            <CardHeader>
-              <CardTitle>{workflow.title}</CardTitle>
-              <CardDescription>{workflow.description}</CardDescription>
-            </CardHeader>
-            <CardContent>
-              <Image src={workflow.image.src} alt={workflow.image.alt} width={350} height={230} />
-            </CardContent>
-            <CardFooter className="flex justify-end gap-2">
-              <Button asChild>
-                <Link href={workflow.previewURL}>View Workflow</Link>
-              </Button>
-            </CardFooter>
-          </Card>;
-        })}
-      </section>
-    </div>
-  );
-}

web/src/app/(app)/globals.css

@@ -80,9 +80,7 @@
   /* @apply rounded-lg p-2 overflow-x-scroll */
   @apply  p-2 max-w-full overflow-auto w-full
 }
-.vsc-controller{
+ 
-  position: absolute;
-}
 @layer base {
   * {
     @apply border-border;

web/src/app/(app)/machines/page.tsx

@@ -2,6 +2,7 @@ import { AccessType } from "../../../lib/AccessType";
 import { MachineList } from "@/components/MachineList";
 import { db } from "@/db/db";
 import { machinesTable } from "@/db/schema";
+import { getCurrentPlanWithAuth } from "@/server/getCurrentPlan";
 import { auth } from "@clerk/nextjs";
 import { clerkClient } from "@clerk/nextjs/server";
 import { desc, eq, isNull, and } from "drizzle-orm";
@@ -19,6 +20,8 @@ async function MachineListServer() {
 
   const user = await clerkClient.users.getUser(userId);
 
+  const sub = await getCurrentPlanWithAuth();
+
   const machines = await db.query.machinesTable.findMany({
     orderBy: desc(machinesTable.updated_at),
     where:
@@ -31,6 +34,7 @@ async function MachineListServer() {
     <div className="w-full">
       {/* <div>Machines</div> */}
       <MachineList
+        sub={sub}
         data={machines}
         userMetadata={AccessType.parse(user.privateMetadata ?? {})}
       />

web/src/app/(app)/pricing/page.tsx

@@ -0,0 +1,9 @@
+import PricingList from "@/components/PricingPlan";
+
+export default function Home() {
+  return (
+    <div>
+      <PricingList />
+    </div>
+  );
+}

web/src/app/(app)/providers.tsx

@@ -1,19 +1,19 @@
 // app/providers.tsx
-'use client'
+"use client";
-import posthog from 'posthog-js'
+import posthog from "posthog-js";
-import { PostHogProvider } from 'posthog-js/react'
+import { PostHogProvider } from "posthog-js/react";
 
-if (typeof window !== 'undefined') {
+if (typeof window !== "undefined") {
   posthog.init(process.env.NEXT_PUBLIC_POSTHOG_KEY!, {
     api_host: process.env.NEXT_PUBLIC_POSTHOG_HOST,
-    capture_pageview: false // Disable automatic pageview capture, as we capture manually
+    capture_pageview: false, // Disable automatic pageview capture, as we capture manually
-  })
+  });
 }
 
 export function PHProvider({
   children,
 }: {
-  children: React.ReactNode
+  children: React.ReactNode;
 }) {
-  return <PostHogProvider client={posthog}>{children}</PostHogProvider>
+  return <PostHogProvider client={posthog}>{children}</PostHogProvider>;
 }

web/src/app/(app)/storage/loading.tsx

@@ -0,0 +1,9 @@
+"use client";
+
+import { LoadingPageWrapper } from "@/components/LoadingWrapper";
+import { usePathname } from "next/navigation";
+
+export default function Loading() {
+  const pathName = usePathname();
+  return <LoadingPageWrapper className="h-full" tag={pathName.toLowerCase()} />;
+}

web/src/app/(app)/storage/page.tsx

@@ -0,0 +1,35 @@
+import { setInitialUserData } from "../../../lib/setInitialUserData";
+import { auth } from "@clerk/nextjs";
+import { clerkClient } from "@clerk/nextjs/server";
+import { ModelList } from "@/components/ModelList";
+import { getAllUserModels } from "@/server/getAllUserModel";
+
+export default function Page() {
+  return <ModelListServer />;
+}
+
+async function ModelListServer() {
+  const { userId } = auth();
+
+  if (!userId) {
+    return <div>No auth</div>;
+  }
+
+  const user = await clerkClient.users.getUser(userId);
+
+  if (!user) {
+    await setInitialUserData(userId);
+  }
+
+  const models = await getAllUserModels();
+
+  if (!models) {
+    return <div>No models found</div>;
+  }
+
+  return (
+    <div className="w-full">
+      <ModelList data={models} />
+    </div>
+  );
+}

web/src/app/(app)/usage/loading.tsx

@@ -0,0 +1,9 @@
+"use client";
+
+import { LoadingPageWrapper } from "@/components/LoadingWrapper";
+import { usePathname } from "next/navigation";
+
+export default function Loading() {
+  const pathName = usePathname();
+  return <LoadingPageWrapper className="h-full" tag={pathName.toLowerCase()} />;
+}

web/src/app/(app)/usage/page.tsx

@@ -0,0 +1,57 @@
+import PricingList from "@/components/PricingPlan";
+import { Badge } from "@/components/ui/badge";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "@/components/ui/card";
+import { Progress } from "@/components/ui/progress";
+import { getCurrentPlanWithAuth } from "@/server/getCurrentPlan";
+import { stripe } from "@/server/stripe";
+
+const freeTierSeconds = 30000;
+
+export default async function Home() {
+  const sub = await getCurrentPlanWithAuth();
+
+  const data = sub?.subscription_item_api_id
+    ? await stripe.subscriptionItems.listUsageRecordSummaries(
+        sub?.subscription_item_api_id,
+      )
+    : null;
+
+  return (
+    <div className="mt-4 flex items-center justify-center">
+      <Card className="p-4 w-full max-w-[600px]">
+        <CardHeader>
+          <CardTitle>Account Usage</CardTitle>
+          <CardDescription>View you account usage</CardDescription>
+          <Badge className="w-fit">{sub?.plan}</Badge>
+        </CardHeader>
+        {data && (
+          <CardContent className="text-sm flex flex-col gap-2">
+            <div className="flex justify-between gap-2">
+              <span>Current free gpu usage:</span>
+              {
+                <div className="flex gap-2">
+                  <Badge>
+                    {data.data[0].total_usage}s /{Math.floor(freeTierSeconds)}s
+                  </Badge>
+                  <Badge>
+                    {Math.floor(data.data[0].total_usage / 60 / 60)}hr /
+                    {Math.floor(freeTierSeconds / 60 / 60)}hr
+                  </Badge>
+                </div>
+              }
+            </div>
+            <Progress
+              value={(data.data[0].total_usage / freeTierSeconds) * 100}
+            ></Progress>
+          </CardContent>
+        )}
+      </Card>
+    </div>
+  );
+}

web/src/app/(app)/workflows/[workflow_id]/@workflow/page.tsx

@@ -21,6 +21,8 @@ import { getRelativeTime } from "@/lib/getRelativeTime";
 import { getMachines } from "@/server/curdMachine";
 import { findFirstTableWithVersion } from "@/server/findFirstTableWithVersion";
 
+export const maxDuration = 300; // 5 minutes
+
 export default async function Page({
   params,
 }: {

web/src/app/(app)/workflows/[workflow_id]/layout.tsx

@@ -1,3 +1,5 @@
+export const maxDuration = 300; // 5 minutes
+
 export default async function Layout({
   children,
   deployment,

web/src/app/(app)/workflows/page.tsx

@@ -6,6 +6,8 @@ import { usersTable } from "@/db/schema";
 import { auth } from "@clerk/nextjs";
 import { eq } from "drizzle-orm";
 
+export const maxDuration = 300; // 5 minutes
+
 export default function Home() {
   return <WorkflowServer />;
 }

web/src/components/InsertModal.tsx

@@ -26,11 +26,11 @@ import type { UnknownKeysParam, ZodObject, ZodRawShape, z } from "zod";
 export function InsertModal<
   K extends ZodRawShape,
   Y extends UnknownKeysParam,
-  Z extends ZodObject<K, Y>
+  Z extends ZodObject<K, Y>,
 >(props: {
   tooltip?: string;
   disabled?: boolean;
-  title: string;
+  title: React.ReactNode;
   description: string;
   dialogClassName?: string;
   serverAction: (data: z.infer<Z>) => Promise<unknown>;
@@ -105,7 +105,7 @@ export function InsertModal<
 export function UpdateModal<
   K extends ZodRawShape,
   Y extends UnknownKeysParam,
-  Z extends ZodObject<K, Y>
+  Z extends ZodObject<K, Y>,
 >(props: {
   open?: boolean;
   setOpen?: (open: boolean) => void;
@@ -118,7 +118,7 @@ export function UpdateModal<
   serverAction: (
     data: z.infer<Z> & {
       id: string;
-    }
+    },
   ) => Promise<unknown>;
   formSchema: Z;
   fieldConfig?: FieldConfig<z.infer<Z>>;
@@ -165,7 +165,7 @@ export function UpdateModal<
               props.serverAction({
                 ...data,
                 id: props.data.id,
-              })
+              }),
             );
             setIsLoading(false);
             setOpen(false);

web/src/components/MachineBuildLog.tsx

@@ -6,6 +6,19 @@ import { getConnectionStatus } from "@/components/getConnectionStatus";
 import { useEffect, useState } from "react";
 import useWebSocket from "react-use-websocket";
 
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@/components/ui/alert-dialog"
+import { useRouter } from "next/navigation";
+
 export function MachineBuildLog({
   machine_id,
   endpoint,
@@ -17,6 +30,7 @@ export function MachineBuildLog({
 }) {
   const [logs, setLogs] = useState<LogsType>([]);
   const [finished, setFinished] = useState(false);
+  const [status, setStatus] = useState<"failed" | "succuss">();
 
   const wsEndpoint = endpoint.replace(/^http/, "ws");
   const query = { fly_instance_id: instance_id };
@@ -43,13 +57,59 @@ export function MachineBuildLog({
       setLogs((logs) => [...(logs ?? []), message.data]);
     } else if (message?.event === "FINISHED") {
       setFinished(true);
+      setStatus(message.data.status)
     }
   }, [lastMessage]);
 
+  const router = useRouter()
+
   return (
     <div>
       {connectionStatus}
       <LogsViewer logs={logs} />
+
+      <AlertDialog open={finished}>
+        <AlertDialogContent>
+          {
+            status == "succuss" ? (
+              <>
+                <AlertDialogHeader>
+                  <AlertDialogTitle>Machine Built</AlertDialogTitle>
+                  <AlertDialogDescription>
+                    Your machine is built, you can now integrate your API, or directly run to check this machines.
+                  </AlertDialogDescription>
+                </AlertDialogHeader>
+                <AlertDialogFooter>
+                  <AlertDialogAction onClick={() => {
+                    router.push("/workflows")
+                  }}>See Workflows</AlertDialogAction>
+                  <AlertDialogAction onClick={() => {
+                    router.push("/machines")
+                  }}>See All Machines</AlertDialogAction>
+                </AlertDialogFooter></>
+            ) : (
+              <>
+                <AlertDialogHeader>
+                  <AlertDialogTitle>Machine Failed</AlertDialogTitle>
+                  <AlertDialogDescription>
+                    Something went wrong with the machine build, please check the log.
+                    Possible cause could be conflits with custom nodes, build got stuck, timeout, or too many custom nodes installed.
+                    Please attempt a rebuild or remove some of the custom nodes.
+                  </AlertDialogDescription>
+                </AlertDialogHeader>
+                <AlertDialogFooter>
+                  <AlertDialogCancel>See logs</AlertDialogCancel>
+                  <AlertDialogAction onClick={() => {
+                    router.push("/machines")
+                  }}>Back to machines</AlertDialogAction>
+                </AlertDialogFooter></>
+            )
+          }
+
+
+        </AlertDialogContent>
+      </AlertDialog>
+
     </div>
   );
 }

web/src/components/MachineList.tsx

@@ -40,6 +40,8 @@ import {
   updateCustomMachine,
   updateMachine,
 } from "@/server/curdMachine";
+import { editWorkflowOnMachine } from "@/server/editWorkflowOnMachine";
+import { getCurrentPlanWithAuth } from "@/server/getCurrentPlan";
 import type {
   ColumnDef,
   ColumnFiltersState,
@@ -54,9 +56,10 @@ import {
   getSortedRowModel,
   useReactTable,
 } from "@tanstack/react-table";
-import { ArrowUpDown, MoreHorizontal } from "lucide-react";
+import { ArrowUpDown, Lock, MoreHorizontal, Plus } from "lucide-react";
 import * as React from "react";
 import { useState } from "react";
+import { toast } from "sonner";
 import type { z } from "zod";
 
 export type Machine = MachineType;
@@ -113,16 +116,18 @@ export const columns: ColumnDef<Machine>[] = [
               {row.original.status} <LoadingIcon />
             </Badge>
           )}
-          {!row.original.disabled && row.original.status && (
+          {!row.original.disabled &&
-            <Badge
+            row.original.status &&
-              variant={
+            row.original.status != "building" && (
-                row.original.status == "ready" ? "success" : "destructive"
+              <Badge
-              }
+                variant={
-              className="capitalize"
+                  row.original.status == "ready" ? "success" : "destructive"
-            >
+                }
-              {row.original.status}
+                className="capitalize"
-            </Badge>
+              >
-          )}
+                {row.original.status}
+              </Badge>
+            )}
         </div>
         // </a>
       );
@@ -192,7 +197,9 @@ export const columns: ColumnDef<Machine>[] = [
             <DropdownMenuItem
               className="text-destructive"
               onClick={async () => {
-                callServerPromise(deleteMachine(machine.id));
+                callServerPromise(deleteMachine(machine.id), {
+                  loadingText: "Deleting machine",
+                });
               }}
             >
               Delete Machine
@@ -200,7 +207,9 @@ export const columns: ColumnDef<Machine>[] = [
             {machine.disabled ? (
               <DropdownMenuItem
                 onClick={async () => {
-                  callServerPromise(enableMachine(machine.id));
+                  callServerPromise(enableMachine(machine.id), {
+                    loadingText: "Enabling machine",
+                  });
                 }}
               >
                 Enable Machine
@@ -209,7 +218,9 @@ export const columns: ColumnDef<Machine>[] = [
               <DropdownMenuItem
                 className="text-destructive"
                 onClick={async () => {
-                  callServerPromise(disableMachine(machine.id));
+                  callServerPromise(disableMachine(machine.id), {
+                    loadingText: "Disabling machine",
+                  });
                 }}
               >
                 Disable Machine
@@ -217,22 +228,33 @@ export const columns: ColumnDef<Machine>[] = [
             )}
             {machine.type === "comfy-deploy-serverless" && (
               <>
-                <DropdownMenuItem asChild>
+                <DropdownMenuItem
-                  <a
+                  onClick={async () => {
-                    target="_blank"
+                    const url = await callServerPromise(
-                    href={machine.endpoint.replace(
+                      editWorkflowOnMachine(machine.id),
-                      "comfyui-api",
+                      {
-                      "comfyui-app"
+                        loadingText: "Getting machine url...",
-                    )} rel="noreferrer"
+                      },
-                  >
+                    );
-                    Open ComfyUI
+                    if (url && typeof url !== "object") {
-                  </a>
+                      window.open(url, "_blank");
+                    } else if (url && typeof url === "object" && url.error) {
+                      console.error(url.error);
+                    }
+                  }}
+                >
+                  Open ComfyUI
                 </DropdownMenuItem>
                 <DropdownMenuItem
                   onClick={() => {
-                    buildMachine({
+                    callServerPromise(
-                      id: machine.id,
+                      buildMachine({
-                    });
+                        id: machine.id,
+                      }),
+                      {
+                        loadingText: "Starting machine build process",
+                      },
+                    );
                   }}
                 >
                   Rebuild
@@ -300,13 +322,15 @@ export const columns: ColumnDef<Machine>[] = [
 export function MachineList({
   data,
   userMetadata,
+  sub,
 }: {
   data: Machine[];
   userMetadata: z.infer<typeof AccessType>;
+  sub: Awaited<ReturnType<typeof getCurrentPlanWithAuth>>;
 }) {
   const [sorting, setSorting] = React.useState<SortingState>([]);
   const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
-    []
+    [],
   );
   const [columnVisibility, setColumnVisibility] =
     React.useState<VisibilityState>({});
@@ -331,6 +355,21 @@ export function MachineList({
     },
   });
 
+  let machineMaxCount = 2;
+
+  // Temp fixes for machine count
+  if (userMetadata.betaFeaturesAccess) machineMaxCount = 5;
+
+  if (sub?.plan == "pro") {
+    machineMaxCount = 10;
+  } else if (sub?.plan == "enterprise") {
+    machineMaxCount = 99;
+  }
+
+  const locked =
+    data.some((machine) => machine.type === "modal-serverless") &&
+    data.length >= machineMaxCount;
+
   return (
     <div className="w-full">
       <div className="flex items-center py-4">
@@ -345,17 +384,17 @@ export function MachineList({
         <div className="ml-auto flex gap-2">
           <InsertModal
             dialogClassName="sm:max-w-[600px]"
-            disabled={
+            disabled={locked}
-              data.some(
-                (machine) => machine.type === "comfy-deploy-serverless"
-              ) && !userMetadata.betaFeaturesAccess
-            }
             tooltip={
-              data.some((machine) => machine.type === "comfy-deploy-serverless")
+              locked
-                ? "Only one hosted machine at preview stage"
+                ? `Max ${machineMaxCount} ComfyUI machine for your account, upgrade to unlock more cnfiguration.`
-                : undefined
+                : `Max ${machineMaxCount} ComfyUI machine for your account`
+            }
+            title={
+              <>
+                New Machine {locked ? <Lock size={14} /> : <Plus size={14} />}
+              </>
             }
-            title="New Machine"
             description="Add custom ComfyUI machines to your account."
             serverAction={addCustomMachine}
             formSchema={addCustomMachineSchema}
@@ -410,7 +449,7 @@ export function MachineList({
                         ? null
                         : flexRender(
                             header.column.columnDef.header,
-                            header.getContext()
+                            header.getContext(),
                           )}
                     </TableHead>
                   );
@@ -429,7 +468,7 @@ export function MachineList({
                     <TableCell key={cell.id}>
                       {flexRender(
                         cell.column.columnDef.cell,
-                        cell.getContext()
+                        cell.getContext(),
                       )}
                     </TableCell>
                   ))}

web/src/components/ModelList.tsx

@@ -0,0 +1,412 @@
+"use client";
+
+import { getRelativeTime } from "../lib/getRelativeTime";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
+import { InsertModal } from "./InsertModal";
+import { Input } from "@/components/ui/input";
+import { ScrollArea } from "@/components/ui/scroll-area";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/ui/table";
+import type { getAllUserModels as getAllUserModels } from "@/server/getAllUserModel";
+import type {
+  ColumnDef,
+  ColumnFiltersState,
+  SortingState,
+  VisibilityState,
+} from "@tanstack/react-table";
+import {
+  flexRender,
+  getCoreRowModel,
+  getFilteredRowModel,
+  getPaginationRowModel,
+  getSortedRowModel,
+  useReactTable,
+} from "@tanstack/react-table";
+import { ArrowUpDown } from "lucide-react";
+import * as React from "react";
+import { addModel } from "@/server/curdModel";
+import { downloadUrlModelSchema } from "@/server/addCivitaiModelSchema";
+import { modelEnumType } from "@/db/schema";
+
+export type ModelItemList = NonNullable<
+  Awaited<ReturnType<typeof getAllUserModels>>
+>[0];
+
+export const columns: ColumnDef<ModelItemList>[] = [
+  {
+    accessorKey: "id",
+    id: "select",
+    header: ({ table }) => (
+      <Checkbox
+        checked={table.getIsAllPageRowsSelected() ||
+          (table.getIsSomePageRowsSelected() && "indeterminate")}
+        onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
+        aria-label="Select all"
+      />
+    ),
+    cell: ({ row }) => (
+      <Checkbox
+        checked={row.getIsSelected()}
+        onCheckedChange={(value) => row.toggleSelected(!!value)}
+        aria-label="Select row"
+      />
+    ),
+    enableSorting: false,
+    enableHiding: false,
+  },
+  {
+    accessorKey: "model_name",
+    header: ({ column }) => {
+      return (
+        <button
+          className="flex items-center hover:underline"
+          onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+        >
+          Model Name
+          <ArrowUpDown className="ml-2 h-4 w-4" />
+        </button>
+      );
+    },
+    cell: ({ row }) => {
+      const model = row.original;
+      return (
+        <>
+          {
+            /*<a
+          className="hover:underline flex gap-2"
+          href={`/storage/${model.id}`} // TODO
+        >*/
+          }
+          <span className="truncate max-w-[200px]">
+            {row.original.model_name}
+          </span>
+
+          {model.is_public ? <></> : <Badge variant="orange">Private</Badge>}
+        </>
+      );
+    },
+  },
+  {
+    accessorKey: "status",
+    header: ({ column }) => {
+      return (
+        <button
+          className="flex items-center hover:underline"
+          onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+        >
+          Status
+          <ArrowUpDown className="ml-2 h-4 w-4" />
+        </button>
+      );
+    },
+    cell: ({ row }) => {
+      return (
+        <Badge
+          variant={row.original.status === "failed"
+            ? "red"
+            : (row.original.status === "started" ? "yellow" : "green")}
+        >
+          {row.original.status}
+        </Badge>
+      );
+      // NOTE: retry downloads on failures
+      // const oneHourAgo = new Date(new Date().getTime() - (60 * 60 * 1000));
+      // const lastUpdated = new Date(row.original.updated_at);
+      // const canRefresh = row.original.status === "failed" && lastUpdated < oneHourAgo;
+      // const canRefresh = row.original.status === "failed" && lastUpdated < oneHourAgo;
+      // cell: ({ row }) => {
+      //   // const oneHourAgo = new Date(new Date().getTime() - (60 * 60 * 1000));
+      //   // const lastUpdated = new Date(row.original.updated_at);
+      //   // const canRefresh = row.original.status === "failed" && lastUpdated < oneHourAgo;
+      //   const canReDownload = true;
+      //
+      //   return (
+      //     <div className="flex items-center space-x-2">
+      //       <Badge
+      //         variant={row.original.status === "failed"
+      //           ? "red"
+      //           : row.original.status === "started"
+      //           ? "yellow"
+      //           : "green"}
+      //       >
+      //         {row.original.status}
+      //       </Badge>
+      //       {canReDownload && (
+      //         <RefreshCcw
+      //           onClick={() => {
+      //             redownloadCheckpoint(row.original);
+      //           }}
+      //           className="h-4 w-4 cursor-pointer" // Adjust the size with h-x and w-x classes
+      //         />
+      //       )}
+      //     </div>
+      //   );
+      // },
+    },
+  },
+  {
+    accessorKey: "upload_type",
+    header: ({ column }) => {
+      return (
+        <button
+          className="flex items-center hover:underline"
+          onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+        >
+          Source
+          <ArrowUpDown className="ml-2 h-4 w-4" />
+        </button>
+      );
+    },
+    cell: ({ row }) => {
+      return <Badge variant="cyan">{row.original.upload_type}</Badge>;
+    },
+  },
+  {
+    accessorKey: "model_type",
+    header: ({ column }) => {
+      return (
+        <button
+          className="flex items-center hover:underline"
+          onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+        >
+          Model Type
+          <ArrowUpDown className="ml-2 h-4 w-4" />
+        </button>
+      );
+    },
+    cell: ({ row }) => {
+      const model_type_map: Record<modelEnumType, any> = {
+        "checkpoint": "amber",
+        "lora": "green",
+        "embedding": "violet",
+        "vae": "teal",
+      };
+
+      function getBadgeColor(modelType: modelEnumType) {
+        return model_type_map[modelType] || "default";
+      }
+
+      const color = getBadgeColor(row.original.model_type);
+      return <Badge variant={color}>{row.original.model_type}</Badge>;
+    },
+  },
+  {
+    accessorKey: "date",
+    sortingFn: "datetime",
+    enableSorting: true,
+    header: ({ column }) => {
+      return (
+        <button
+          className="w-full flex items-center justify-end hover:underline truncate"
+          // variant="ghost"
+          onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
+        >
+          Update Date
+          <ArrowUpDown className="ml-2 h-4 w-4" />
+        </button>
+      );
+    },
+    cell: ({ row }) => (
+      <div className="w-full capitalize text-right truncate">
+        {getRelativeTime(row.original.updated_at)}
+      </div>
+    ),
+  },
+  // TODO: deletion and editing for future sprint
+  // {
+  //   id: "actions",
+  //   enableHiding: false,
+  //   cell: ({ row }) => {
+  //     const checkpoint = row.original;
+  //
+  //     return (
+  //       <DropdownMenu>
+  //         <DropdownMenuTrigger asChild>
+  //           <Button variant="ghost" className="h-8 w-8 p-0">
+  //             <span className="sr-only">Open menu</span>
+  //             <MoreHorizontal className="h-4 w-4" />
+  //           </Button>
+  //         </DropdownMenuTrigger>
+  //         <DropdownMenuContent align="end">
+  //           <DropdownMenuLabel>Actions</DropdownMenuLabel>
+  //           <DropdownMenuItem
+  //             className="text-destructive"
+  //             onClick={() => {
+  //               deleteWorkflow(checkpoint.id);
+  //             }}
+  //           >
+  //             Delete Workflow
+  //           </DropdownMenuItem>
+  //         </DropdownMenuContent>
+  //       </DropdownMenu>
+  //     );
+  //   },
+  // },
+];
+
+export function ModelList({ data }: { data: ModelItemList[] }) {
+  const [sorting, setSorting] = React.useState<SortingState>([]);
+  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
+    [],
+  );
+  const [columnVisibility, setColumnVisibility] = React.useState<
+    VisibilityState
+  >({});
+  const [rowSelection, setRowSelection] = React.useState({});
+
+  const table = useReactTable({
+    data,
+    columns,
+    onSortingChange: setSorting,
+    onColumnFiltersChange: setColumnFilters,
+    getCoreRowModel: getCoreRowModel(),
+    getPaginationRowModel: getPaginationRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+    getFilteredRowModel: getFilteredRowModel(),
+    onColumnVisibilityChange: setColumnVisibility,
+    onRowSelectionChange: setRowSelection,
+    state: {
+      sorting,
+      columnFilters,
+      columnVisibility,
+      rowSelection,
+    },
+  });
+
+  return (
+    <div className="grid grid-rows-[auto,1fr,auto] h-full">
+      <div className="flex flex-row w-full items-center py-4">
+        <Input
+          placeholder="Filter workflows..."
+          value={(table.getColumn("model_name")?.getFilterValue() as string) ??
+            ""}
+          onChange={(event) =>
+            table.getColumn("model_name")?.setFilterValue(event.target.value)}
+          className="max-w-sm"
+        />
+        <div className="ml-auto flex gap-2">
+          <InsertModal
+            dialogClassName="sm:max-w-[600px]"
+            disabled={
+              false // TODO: limitations based on plan
+            }
+            title="Add a Model"
+            description="using a link to a model"
+            serverAction={addModel}
+            formSchema={downloadUrlModelSchema}
+            fieldConfig={{
+              url: {
+                fieldType: "fallback",
+                inputProps: { required: true },
+                description: (
+                  <>
+                    Pick a model from{" "}
+                    <a
+                      href="https://www.civitai.com/models"
+                      target="_blank"
+                      className="underline text-blue-600 hover:text-blue-800 visited:text-purple-600"
+                    >
+                      civitai.com
+                    </a>{" "}
+                    or a url we can download a model from
+                  </>
+                ),
+              },
+              model_type: {
+                fieldType: "select",
+                inputProps: { required: true },
+                description: (
+                  <>
+                    We'll figure this out if you pick a civitai model
+                  </>
+                ), 
+              },
+            }}
+          />
+        </div>
+      </div>
+      <ScrollArea className="h-full w-full rounded-md border">
+        <Table>
+          <TableHeader className="bg-background top-0 sticky">
+            {table.getHeaderGroups().map((headerGroup) => (
+              <TableRow key={headerGroup.id}>
+                {headerGroup.headers.map((header) => {
+                  return (
+                    <TableHead key={header.id}>
+                      {header.isPlaceholder ? null : flexRender(
+                        header.column.columnDef.header,
+                        header.getContext(),
+                      )}
+                    </TableHead>
+                  );
+                })}
+              </TableRow>
+            ))}
+          </TableHeader>
+          <TableBody>
+            {table.getRowModel().rows?.length
+              ? (
+                table.getRowModel().rows.map((row) => (
+                  <TableRow
+                    key={row.id}
+                    data-state={row.getIsSelected() && "selected"}
+                  >
+                    {row.getVisibleCells().map((cell) => (
+                      <TableCell key={cell.id}>
+                        {flexRender(
+                          cell.column.columnDef.cell,
+                          cell.getContext(),
+                        )}
+                      </TableCell>
+                    ))}
+                  </TableRow>
+                ))
+              )
+              : (
+                <TableRow>
+                  <TableCell
+                    colSpan={columns.length}
+                    className="h-24 text-center"
+                  >
+                    No results.
+                  </TableCell>
+                </TableRow>
+              )}
+          </TableBody>
+        </Table>
+      </ScrollArea>
+      <div className="flex flex-row items-center justify-end space-x-2 py-4">
+        <div className="flex-1 text-sm text-muted-foreground">
+          {table.getFilteredSelectedRowModel().rows.length} of{" "}
+          {table.getFilteredRowModel().rows.length} row(s) selected.
+        </div>
+        <div className="space-x-2">
+          <Button
+            variant="outline"
+            size="sm"
+            onClick={() => table.previousPage()}
+            disabled={!table.getCanPreviousPage()}
+          >
+            Previous
+          </Button>
+          <Button
+            variant="outline"
+            size="sm"
+            onClick={() => table.nextPage()}
+            disabled={!table.getCanNextPage()}
+          >
+            Next
+          </Button>
+        </div>
+      </div>
+    </div>
+  );
+}

web/src/components/Navbar.tsx

@@ -22,6 +22,7 @@ import {
 } from "@clerk/nextjs";
 import { Github, Menu } from "lucide-react";
 import meta from "next-gen/config";
+import { useFeatureFlagEnabled } from "posthog-js/react";
 import { useEffect, useState } from "react";
 import { useMediaQuery } from "usehooks-ts";
 
@@ -29,15 +30,17 @@ export function Navbar() {
   const { organization } = useOrganization();
   const _isDesktop = useMediaQuery("(min-width: 1024px)");
   const [isDesktop, setIsDesktop] = useState(true);
-  const [isSheetOpen, setSheetOpen] = useState(false);
+
+
   useEffect(() => {
     setIsDesktop(_isDesktop);
   }, [_isDesktop]);
+
   return (
     <>
       <div className="flex flex-row items-center gap-4">
         {!isDesktop && (
-          <Sheet open={isSheetOpen} onOpenChange={(open) => setSheetOpen(open)}>
+          <Sheet>
             <SheetTrigger asChild>
               <button className="flex items-center justify-center w-8 h-8 p-2">
                 <Menu />
@@ -48,17 +51,7 @@ export function Navbar() {
                 <SheetTitle className="text-start">Comfy Deploy</SheetTitle>
               </SheetHeader>
               <div className="grid h-full grid-rows-[1fr_auto]">
-                <NavbarMenu
+                <NavbarMenu className=" h-full" />
-                  className=" h-full"
-                  closeSheet={() => setSheetOpen(false)}
-                />
-                {/* <OrganizationSwitcher
-                  appearance={{
-                    elements: {
-                      rootBox: "flex items-center justify-center  z-[50]",
-                    },
-                  }}
-                /> */}
                 <Popover>
                   <PopoverTrigger asChild>
                     <Button variant="outline">
@@ -89,20 +82,26 @@ export function Navbar() {
       </div>
       <div className="flex flex-row items-center gap-2">
         {isDesktop && <NavbarMenu />}
-        <Button
+        {/* <Button
           asChild
           variant="link"
           className="rounded-full aspect-square p-2 mr-4"
         >
           <a href="/docs">Docs</a>
-        </Button>
+        </Button> */}
-        <UserButton />
+        <UserButton
+          afterSignOutUrl="/"
+        />
         <Button
           asChild
           variant="outline"
           className="rounded-full aspect-square p-2"
         >
-          <a target="_blank" href="https://github.com/BennyKok/comfyui-deploy" rel="noreferrer">
+          <a
+            target="_blank"
+            href="https://github.com/BennyKok/comfyui-deploy"
+            rel="noreferrer"
+          >
             <Github />
           </a>
         </Button>

web/src/components/NavbarMenu.tsx

@@ -5,16 +5,12 @@ import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { cn } from "@/lib/utils";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
+import { useRouter } from "next/navigation";
+import { useFeatureFlagEnabled } from "posthog-js/react";
 import { useEffect, useState } from "react";
 import { useMediaQuery } from "usehooks-ts";
 
-export function NavbarMenu({
+export function NavbarMenu({ className }: { className?: string }) {
-  className,
-  closeSheet,
-}: {
-  className?: string;
-  closeSheet?: () => void;
-}) {
   const _isDesktop = useMediaQuery("(min-width: 1024px)");
   const [isDesktop, setIsDesktop] = useState(true);
   useEffect(() => {
@@ -24,6 +20,10 @@ export function NavbarMenu({
   const pathnames = usePathname();
   const pathname = `/${pathnames.split("/")[1]}`;
 
+  const router = useRouter();
+
+  const pricingPlanFlagEnable = useFeatureFlagEnabled("pricing-plan");
+
   const pages = [
     {
       name: "Workflows",
@@ -38,11 +38,27 @@ export function NavbarMenu({
       path: "/api-keys",
     },
     {
-      name: "Examples",
+      name: "Storage",
-      path: "/examples"
+      path: "/storage",
-    }
+    },
   ];
 
+  if (pricingPlanFlagEnable) {
+    pages.push({
+      name: "Pricing",
+      path: "/pricing",
+    })
+    pages.push({
+      name: "Usage",
+      path: "/usage",
+    })
+  }
+
+  pages.push({
+    name: "Docs",
+    path: "/docs",
+  })
+
   return (
     <div className={cn("mr-2", className)}>
       {/* <div className="w-full h-full absolute inset-x-0 top-0 flex items-center justify-center pointer-events-none"> */}
@@ -51,13 +67,16 @@ export function NavbarMenu({
           defaultValue={pathname}
           className="w-fit flex pointer-events-auto"
         >
-          <TabsList className="w-full">
+          <TabsList className=" w-full ">
             {pages.map((page) => (
               <TabsTrigger
                 key={page.name}
                 value={page.path}
+                onClick={() => {
+                  router.push(page.path);
+                }}
               >
-                <Link href={page.path}>{page.name}</Link>
+                {page.name}
               </TabsTrigger>
             ))}
           </TabsList>
@@ -72,9 +91,6 @@ export function NavbarMenu({
               <Link
                 key={page.name}
                 href={page.path}
-                onClick={() => {
-                  if (!!closeSheet) closeSheet();
-                }}
                 className="p-2 hover:bg-gray-100/20 hover:underline"
               >
                 {page.name}

web/src/components/OutputRender.tsx

@@ -5,20 +5,6 @@ export async function OutputRender(props: {
   run_id: string;
   filename: string;
 }) {
-  if (props.filename.endsWith(".mp4") || props.filename.endsWith(".webm")) {
-    const url = await getFileDownloadUrl(
-      `outputs/runs/${props.run_id}/${props.filename}`,
-    );
-
-    return (
-      <video controls autoPlay className="w-[400px]">
-        <source src={url} type="video/mp4" />
-        <source src={url} type="video/webm" />
-        Your browser does not support the video tag.
-      </video>
-    );
-  }
-
   if (
     props.filename.endsWith(".png") ||
     props.filename.endsWith(".gif") ||
@@ -26,13 +12,13 @@ export async function OutputRender(props: {
     props.filename.endsWith(".jpeg")
   ) {
     const url = await getFileDownloadUrl(
-      `outputs/runs/${props.run_id}/${props.filename}`,
+      `outputs/runs/${props.run_id}/${props.filename}`
     );
 
     return <img className="max-w-[200px]" alt={props.filename} src={url} />;
   } else {
     const url = await getFileDownloadUrl(
-      `outputs/runs/${props.run_id}/${props.filename}`,
+      `outputs/runs/${props.run_id}/${props.filename}`
     );
     // console.log(url);
 

web/src/components/PricingPlan.tsx

@@ -0,0 +1,411 @@
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
+import { Check, Info, Minus } from "lucide-react";
+
+import { Fragment } from "react";
+import { auth } from "@clerk/nextjs";
+import { getCurrentPlan } from "../server/getCurrentPlan";
+
+const tiers = [
+  {
+    name: "Basic",
+    id: "basic",
+    // href: "/api/checkout?plan=basic",
+    href: "/workflows",
+    priceMonthly: "$0",
+    description: "Instant Comfy UI API",
+    mostPopular: false,
+  },
+  {
+    name: "Pro",
+    id: "pro",
+    href: "/api/stripe/checkout?plan=pro",
+    priceMonthly: "$20",
+    description: "Accelerate Comfy UI",
+    mostPopular: false,
+  },
+  {
+    name: "Enterprise",
+    id: "enterprise",
+    href: "/api/stripe/checkout?plan=enterprise",
+    priceMonthly: "$100",
+    description: "Scale your Products",
+    mostPopular: true,
+  },
+];
+type TierFeature = {
+  Basic?: string | JSX.Element | boolean;
+  Pro?: string | JSX.Element | boolean;
+  Enterprise?: string | JSX.Element | boolean;
+};
+
+type Feature = {
+  name: string;
+  tiers: TierFeature;
+};
+
+type Section = {
+  name: string;
+  features: Feature[];
+};
+const sections: Section[] = [
+  {
+    name: "Features",
+    features: [
+      {
+        name: "GPU",
+        tiers: { Basic: "T4", Pro: "T4, A10G", Enterprise: "T4, A10G, A100" },
+      },
+      {
+        name: "Compute Credit",
+        tiers: {
+          Basic: (
+            <Tooltip>
+              <TooltipTrigger className="flex items-center justify-center gap-2">
+                30k secs free + usage <Info size={14} />
+              </TooltipTrigger>
+              <TooltipContent>
+                <ul className="flex flex-col items-start justify-start">
+                  GPU Price /s = $0.00015
+                  <li>- T4 Multiplier = x1</li>
+                </ul>
+              </TooltipContent>
+            </Tooltip>
+          ),
+          Pro: (
+            <Tooltip>
+              <TooltipTrigger className="flex items-center justify-center gap-2">
+                30k secs free + usage <Info size={14} />
+              </TooltipTrigger>
+              <TooltipContent>
+                <ul className="flex flex-col items-start justify-start">
+                  GPU Price /s = $0.00015
+                  <li>- T4 Multiplier = x1</li>
+                  <li>- A10G Multiplier = x4</li>
+                </ul>
+              </TooltipContent>
+            </Tooltip>
+          ),
+          Enterprise: (
+            <Tooltip>
+              <TooltipTrigger className="flex items-center justify-center gap-2">
+                30k secs free + usage <Info size={14} />
+              </TooltipTrigger>
+              <TooltipContent>
+                <ul className="flex flex-col items-start justify-start">
+                  GPU Price /s = $0.00015
+                  <li>- T4 Multiplier = x1</li>
+                  <li>- A10G Multiplier = x4</li>
+                  <li>- A100 Multiplier = x7</li>
+                </ul>
+              </TooltipContent>
+            </Tooltip>
+          ),
+        },
+      },
+      {
+        name: "Workflows",
+        tiers: { Basic: "2", Pro: "25", Enterprise: "Unlimited" },
+      },
+      {
+        name: "Serverless Machines",
+        tiers: { Basic: "2", Pro: "10", Enterprise: "Unlimited" },
+      },
+      {
+        name: "Outputs Storage",
+        tiers: { Basic: "2 GB", Pro: "10 GB", Enterprise: "Unlimited" },
+      },
+      {
+        name: "Dedicated Support",
+        tiers: { Enterprise: true },
+      },
+      {
+        name: "Private Model Hosting",
+        tiers: { Enterprise: "Coming Soon" },
+      },
+    ],
+  },
+];
+
+export default async function PricingList() {
+  const { userId, orgId } = auth();
+
+  if (!userId) {
+    return <>No user id</>;
+  }
+
+  const sub = await getCurrentPlan({ user_id: userId, org_id: orgId });
+
+  const getHrefFromTier = (tier: (typeof tiers)[0]) => {
+    if (sub?.status == "active") {
+      if (tier.id == sub?.plan) return "/api/stripe/dashboard";
+      // This is actually cancelled
+      if (sub.cancel_at_period_end) return tier.href;
+      return "/api/stripe/dashboard?change=true";
+    } else {
+      return tier.href;
+    }
+  };
+  const getNameFromTier = (tier: (typeof tiers)[0]) => {
+    if (tier.id == sub?.plan && sub.status == "active") {
+      return sub.cancel_at_period_end ? (
+        <>
+          Current <span className="text-2xs"> - Ending this period</span>
+        </>
+      ) : (
+        "Current"
+      );
+    }
+    if (sub?.status == "active") {
+      return "Get Started";
+    } else {
+      return "Get Started";
+    }
+  };
+
+  return (
+    <div className="bg-white py-24 sm:py-32">
+      <div className="mx-auto max-w-7xl px-6 lg:px-8">
+        <div className="mx-auto max-w-4xl text-center">
+          <h2 className="text-base font-semibold leading-7 text-indigo-600">
+            Pricing
+          </h2>
+          <p className="mt-2 text-4xl font-bold tracking-tight text-gray-900 sm:text-5xl">
+            Turn any workflow into API
+          </p>
+        </div>
+        <p className="mx-auto mt-6 max-w-2xl text-center text-lg leading-8 text-gray-600">
+          ComfyDeploy is now under technical preview.
+        </p>
+
+        {/* xs to lg */}
+        <div className="mx-auto mt-12 max-w-md space-y-8 sm:mt-16 lg:hidden">
+          {tiers.map((tier) => (
+            <section
+              key={tier.id}
+              className={cn(
+                tier.mostPopular
+                  ? "rounded-xl bg-gray-400/5 ring-1 ring-inset ring-gray-200"
+                  : "",
+                "p-8",
+              )}
+            >
+              <h3
+                id={tier.id}
+                className="text-sm font-semibold leading-6 text-gray-900"
+              >
+                {tier.name}
+              </h3>
+              <p className="mt-2 flex items-baseline gap-x-1 text-gray-900">
+                <span className="text-4xl font-bold">{tier.priceMonthly}</span>
+                <span className="text-sm font-semibold">/month</span>
+              </p>
+              <br></br>
+              <div className="text-xl font-semibold">{tier.description}</div>
+              <a
+                href={getHrefFromTier(tier)}
+                aria-describedby={tier.id}
+                className={cn(
+                  tier.mostPopular
+                    ? "bg-indigo-600 text-white hover:bg-indigo-500"
+                    : "text-indigo-600 ring-1 ring-inset ring-indigo-200 hover:ring-indigo-300",
+                  "mt-8 block rounded-md py-2 px-3 text-center text-sm font-semibold leading-6 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600",
+                )}
+              >
+                {getNameFromTier(tier)}
+              </a>
+              <ul
+                role="list"
+                className="mt-10 space-y-4 text-sm leading-6 text-gray-900"
+              >
+                {sections.map((section) => (
+                  <li key={section.name}>
+                    <ul role="list" className="space-y-4">
+                      {section.features.map((feature) =>
+                        feature.tiers[tier.name as keyof TierFeature] ? (
+                          <li key={feature.name} className="flex gap-x-3">
+                            <Check
+                              className="h-6 w-5 flex-none text-indigo-600"
+                              aria-hidden="true"
+                            />
+                            <span>
+                              {feature.name}{" "}
+                              {typeof feature.tiers[
+                                tier.name as keyof TierFeature
+                              ] === "string" ? (
+                                <span className="text-sm leading-6 text-gray-500">
+                                  (
+                                  {
+                                    feature.tiers[
+                                      tier.name as keyof TierFeature
+                                    ]
+                                  }
+                                  )
+                                </span>
+                              ) : null}
+                            </span>
+                          </li>
+                        ) : null,
+                      )}
+                    </ul>
+                  </li>
+                ))}
+              </ul>
+            </section>
+          ))}
+        </div>
+
+        {/* lg+ */}
+        <div className="isolate mt-20 hidden lg:block border-gray-100 border p-6 shadow-md rounded-lg">
+          <div className="relative -mx-8">
+            {tiers.some((tier) => tier.mostPopular) ? (
+              <div className="absolute inset-x-4 inset-y-0 -z-10 flex">
+                <div
+                  className="flex w-1/4 px-4"
+                  aria-hidden="true"
+                  style={{
+                    marginLeft: `${
+                      (tiers.findIndex((tier) => tier.mostPopular) + 1) * 25
+                    }%`,
+                  }}
+                >
+                  <div className="w-full rounded-t-xl border-x border-t border-gray-900/10 bg-gray-400/5" />
+                </div>
+              </div>
+            ) : null}
+            <table className="w-full table-fixed border-separate border-spacing-x-8 text-left">
+              <caption className="sr-only">Pricing plan comparison</caption>
+              <colgroup>
+                <col className="w-1/4" />
+                <col className="w-1/4" />
+                <col className="w-1/4" />
+                <col className="w-1/4" />
+              </colgroup>
+              <thead>
+                <tr>
+                  <td />
+                  {tiers.map((tier) => (
+                    <th
+                      key={tier.id}
+                      scope="col"
+                      className="px-6 pt-6 xl:px-8 xl:pt-8"
+                    >
+                      <div className="text-sm font-semibold leading-7 text-gray-900">
+                        {tier.name}
+                      </div>
+                    </th>
+                  ))}
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <th scope="row">
+                    <span className="sr-only">Price</span>
+                  </th>
+                  {tiers.map((tier) => (
+                    <td key={tier.id} className="px-6 pt-2 xl:px-8">
+                      <div className="flex items-baseline gap-x-1 text-gray-900">
+                        <span className="text-4xl font-bold">
+                          {tier.priceMonthly}
+                        </span>
+                        <span className="text-sm font-semibold leading-6">
+                          /month
+                        </span>
+                      </div>
+                      <br></br>
+                      <div className="text-md font-semibold">
+                        {tier.description}
+                      </div>
+                      <a
+                        href={getHrefFromTier(tier)}
+                        className={cn(
+                          tier.mostPopular
+                            ? "bg-indigo-600 text-white hover:bg-indigo-500"
+                            : "text-indigo-600 ring-1 ring-inset ring-indigo-200 hover:ring-indigo-300",
+                          "mt-8 block rounded-md py-2 px-3 text-center text-sm font-semibold leading-6 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600",
+                        )}
+                      >
+                        {getNameFromTier(tier)}
+                      </a>
+                    </td>
+                  ))}
+                </tr>
+                {sections.map((section, sectionIdx) => (
+                  <Fragment key={section.name}>
+                    <tr>
+                      <th
+                        scope="colgroup"
+                        colSpan={4}
+                        className={cn(
+                          sectionIdx === 0 ? "pt-8" : "pt-16",
+                          "pb-4 text-sm font-semibold leading-6 text-gray-900",
+                        )}
+                      >
+                        {section.name}
+                        <div className="absolute inset-x-8 mt-4 h-px bg-gray-900/10" />
+                      </th>
+                    </tr>
+                    {section.features.map((feature) => (
+                      <tr key={feature.name}>
+                        <th
+                          scope="row"
+                          className="py-4 text-sm font-normal leading-6 text-gray-900"
+                        >
+                          {feature.name}
+                          <div className="absolute inset-x-8 mt-4 h-px bg-gray-900/5" />
+                        </th>
+                        {tiers.map((tier) => (
+                          <td key={tier.id} className="px-6 py-4 xl:px-8">
+                            {typeof feature.tiers[
+                              tier.name as keyof TierFeature
+                            ] === "string" ||
+                            typeof feature.tiers[
+                              tier.name as keyof TierFeature
+                            ] === "object" ? (
+                              <div className="flex items-center justify-center text-center text-sm leading-6 text-gray-500">
+                                {feature.tiers[tier.name as keyof TierFeature]}
+                              </div>
+                            ) : (
+                              <>
+                                {feature.tiers[
+                                  tier.name as keyof TierFeature
+                                ] === true ? (
+                                  <Check
+                                    className="mx-auto h-5 w-5 text-indigo-600"
+                                    aria-hidden="true"
+                                  />
+                                ) : (
+                                  <Minus
+                                    className="mx-auto h-5 w-5 text-gray-400"
+                                    aria-hidden="true"
+                                  />
+                                )}
+
+                                <span className="sr-only">
+                                  {feature.tiers[
+                                    tier.name as keyof TierFeature
+                                  ] === true
+                                    ? "Included"
+                                    : "Not included"}{" "}
+                                  in {tier.name}
+                                </span>
+                              </>
+                            )}
+                          </td>
+                        ))}
+                      </tr>
+                    ))}
+                  </Fragment>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

web/src/components/RunDisplay.tsx

@@ -2,18 +2,18 @@ import { RunInputs } from "@/components/RunInputs";
 import { RunOutputs } from "@/components/RunOutputs";
 import { Badge } from "@/components/ui/badge";
 import {
-	Dialog,
+  Dialog,
-	DialogContent,
+  DialogContent,
-	DialogDescription,
+  DialogDescription,
-	DialogHeader,
+  DialogHeader,
-	DialogTitle,
+  DialogTitle,
-	DialogTrigger,
+  DialogTrigger,
 } from "@/components/ui/dialog";
 import { TableCell, TableRow } from "@/components/ui/table";
 import {
-	Tooltip,
+  Tooltip,
-	TooltipContent,
+  TooltipContent,
-	TooltipTrigger,
+  TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { getDuration, getRelativeTime } from "@/lib/getRelativeTime";
 import { type findAllRuns } from "@/server/findAllRuns";
@@ -21,54 +21,64 @@ import { Suspense } from "react";
 import { LiveStatus } from "./LiveStatus";
 
 export async function RunDisplay({
-	run,
+  run,
 }: {
-	run: Awaited<ReturnType<typeof findAllRuns>>[0];
+  run: Awaited<ReturnType<typeof findAllRuns>>[0];
 }) {
-	return (
+  return (
-		<Dialog>
+    <Dialog>
-			<DialogTrigger asChild className="appearance-none hover:cursor-pointer">
+      <DialogTrigger asChild className="appearance-none hover:cursor-pointer">
-				<TableRow>
+        <TableRow>
-					<TableCell>{run.number}</TableCell>
+          <TableCell>
-					<TableCell className="font-medium truncate">
+            <Tooltip>
-						{run.machine?.name}
+              <TooltipTrigger>{run.number}</TooltipTrigger>
-					</TableCell>
+              <TooltipContent>{run.id}</TooltipContent>
-					<TableCell className="truncate">
+            </Tooltip>
-						{getRelativeTime(run.created_at)}
+          </TableCell>
-					</TableCell>
+          <TableCell className="font-medium truncate">
-					<TableCell>{run.version?.version}</TableCell>
+            {run.machine?.name}
-					<TableCell>
+          </TableCell>
-						<Badge variant="outline" className="truncate">
+          <TableCell className="truncate">
-							{run.origin}
+            {getRelativeTime(run.created_at)}
-						</Badge>
+          </TableCell>
-					</TableCell>
+          <TableCell>{run.version?.version}</TableCell>
-					<TableCell className="truncate">
+          <TableCell>
-						<Tooltip>
+            <Badge variant="outline" className="truncate">
-							<TooltipTrigger>{getDuration(run.duration)}</TooltipTrigger>
+              {run.origin}
-							<TooltipContent>
+            </Badge>
-								<div>Cold start: {getDuration(run.cold_start_duration)}</div>
+          </TableCell>
-								<div>Run duration: {getDuration(run.run_duration)}</div>
+          <TableCell className="truncate">
-							</TooltipContent>
+            <Tooltip>
-						</Tooltip>
+              <TooltipTrigger>{getDuration(run.duration)}</TooltipTrigger>
-					</TableCell>
+              <TooltipContent>
-					<LiveStatus run={run} />
+                <div>
-				</TableRow>
+                  Serverless latency: {getDuration(run.comfy_deploy_cold_start)}
-			</DialogTrigger>
+                </div>
-			<DialogContent className="max-w-3xl">
+                <div>
-				<DialogHeader>
+                  GPU Cold start: {getDuration(run.cold_start_duration)}
-					<DialogTitle>Run outputs</DialogTitle>
+                </div>
-					<DialogDescription>
+                <div>Run duration: {getDuration(run.run_duration)}</div>
-						You can view your run&apos;s outputs here
+              </TooltipContent>
-					</DialogDescription>
+            </Tooltip>
-				</DialogHeader>
+          </TableCell>
-				<div className="max-h-96 overflow-y-scroll">
+          <LiveStatus run={run} />
-					<RunInputs run={run} />
+        </TableRow>
-					<Suspense>
+      </DialogTrigger>
-						<RunOutputs run_id={run.id} />
+      <DialogContent className="max-w-3xl">
-					</Suspense>
+        <DialogHeader>
-				</div>
+          <DialogTitle>Run outputs</DialogTitle>
-				{/* <div className="max-h-96 overflow-y-scroll">{view}</div> */}
+          <DialogDescription>
-			</DialogContent>
+            You can view your run&apos;s outputs here
-		</Dialog>
+          </DialogDescription>
-	);
+        </DialogHeader>
+        <div className="max-h-96 overflow-y-scroll">
+          <RunInputs run={run} />
+          <Suspense>
+            <RunOutputs run_id={run.id} />
+          </Suspense>
+        </div>
+        {/* <div className="max-h-96 overflow-y-scroll">{view}</div> */}
+      </DialogContent>
+    </Dialog>
+  );
 }

web/src/components/VersionSelect.tsx

@@ -60,7 +60,6 @@ import { callServerPromise } from "./callServerPromise";
 import fetcher from "./fetcher";
 import { ButtonAction } from "@/components/ButtonActionLoader";
 import { editWorkflowOnMachine } from "@/server/editWorkflowOnMachine";
-import { VisualizeImagesGrid } from "@/components/VisualizeImagesGrid";
 
 export function VersionSelect({
   workflow,
@@ -125,66 +124,30 @@ export function MachineSelect({
   );
 }
 
-type SelectedMachineStore = {
-  selectedMachine: string | undefined;
-  setSelectedMachine: (machine: string) => void;
-};
-
-export const selectedMachineStore = create<SelectedMachineStore>((set) => ({
-  selectedMachine: undefined,
-  setSelectedMachine: (machine) => set(() => ({ selectedMachine: machine })),
-}));
-
 export function useSelectedMachine(
   machines: Awaited<ReturnType<typeof getMachines>>,
-): [string, (v: string) => void] {
+) {
-  const { selectedMachine, setSelectedMachine } = selectedMachineStore();
+  const a = useQueryState("machine", {
-  return [selectedMachine ?? machines?.[0]?.id ?? "", setSelectedMachine];
+    defaultValue: machines?.[0]?.id ?? "",
+  });
 
-  // const searchParams = useSearchParams();
+  return a;
-  // const pathname = usePathname();
-  // const router = useRouter();
-
-  // const createQueryString = useCallback(
-  //   (name: string, value: string) => {
-  //     const params = new URLSearchParams(searchParams.toString());
-  //     params.set(name, value);
-
-  //     return params.toString();
-  //   },
-  //   [searchParams],
-  // );
-
-  // return [
-  //   searchParams.get("machine") ?? machines?.[0]?.id ?? "",
-  //   (v: string) => {
-  //     // window.history.pushState(
-  //     //   "new url",
-  //     //   "",
-  //     //   pathname + "?" + createQueryString("machine", v),
-  //     // );
-  //     // router.push(pathname + "?" + createQueryString("machine", v));
-  //     router.replace(pathname + "?" + createQueryString("machine", v));
-  //   },
-  // ];
 }
 
 type PublicRunStore = {
-  image: {
+  image: string;
-    url: string;
-  }[] | null;
   loading: boolean;
   runId: string;
   status: string;
 
-  setImage: (image: { url: string; }[]) => void;
+  setImage: (image: string) => void;
   setLoading: (loading: boolean) => void;
   setRunId: (runId: string) => void;
   setStatus: (status: string) => void;
 };
 
 export const publicRunStore = create<PublicRunStore>((set) => ({
-  image: null,
+  image: "",
   loading: false,
   runId: "",
   status: "",
@@ -208,10 +171,7 @@ export function PublicRunOutputs(props: {
         console.log(res?.status);
         if (res) setStatus(res.status);
         if (res && res.status === "success") {
-          const imageURLs = res.outputs[0]?.data.images.map((item: { url: string; }) => {
+          setImage(res.outputs[0]?.data.images[0].url);
-            return { url: item.url };
-          });
-          setImage(imageURLs);
           setLoading(false);
           clearInterval(interval);
         }
@@ -220,25 +180,30 @@ export function PublicRunOutputs(props: {
     return () => clearInterval(interval);
   }, [runId]);
 
-  if (loading) {
+  return (
-    return (
+    <div className="border border-gray-200 w-full square h-[400px] rounded-lg relative">
-      <div className="border border-gray-200 w-full h-[400px] square rounded-lg relative p-4 ">
+      {!loading && !image && props.preview && props.preview.length > 0 && (
+        <>
+          <img
+            className="w-full h-full object-contain"
+            src={props.preview[0]?.url}
+            alt="Generated image"
+          />
+        </>
+      )}
+      {!loading && image && (
+        <img
+          className="w-full h-full object-contain"
+          src={image}
+          alt="Generated image"
+        />
+      )}
+      {loading && (
         <div className="absolute top-0 left-0 w-full h-full flex items-center justify-center gap-2">
           {status} <LoadingIcon />
         </div>
-        <Skeleton className="w-full h-full" />
-      </div>
-    );
-  }
-
-  return (
-    <div className="border border-gray-200 w-full min-h-[400px] square rounded-lg relative p-4 ">
-      {!image && props.preview && props.preview.length > 0 &&
-        <VisualizeImagesGrid images={props.preview} />
-      }
-      {image && (
-        <VisualizeImagesGrid images={image} />
       )}
+      {loading && <Skeleton className="w-full h-full" />}
     </div>
   );
 }
@@ -329,7 +294,7 @@ export function RunWorkflowButton({
             className="px-1"
           >
             <div className="flex justify-end">
-              <AutoFormSubmit disabled={isLoading}>
+              <AutoFormSubmit>
                 Run
                 {isLoading ? <LoadingIcon /> : <Play size={14} />}
               </AutoFormSubmit>
@@ -437,7 +402,7 @@ export function OpenEditButton({
         onClick={async () => {
           setIsLoading(true);
           const url = await callServerPromise(
-            editWorkflowOnMachine(workflow_version_id, machine),
+            editWorkflowOnMachine(machine, workflow_version_id),
           );
           if (url && typeof url !== "object") {
             window.open(url, "_blank");

web/src/components/VisualizeImagesGrid.tsx

@@ -1,42 +0,0 @@
-type imagesType = {
-  url: string;
-  width?: number;
-  height?: number;
-};
-type VisualizeImagesGridProps = {
-  images: imagesType[];
-  layout?: 'justify-between' | 'justify-center' | 'justify-start' | 'justify-end';
-};
-export function VisualizeImagesGrid({ images, layout }: VisualizeImagesGridProps) {
-
-  return (
-    <div className={`flex gap-4 flex-wrap ${layout || 'justify-center'}`}>
-      <>
-        {images && images.length > 0 &&
-          images.map(item => {
-            if (!item) {
-              return;
-            }
-            if (item?.url.endsWith(".mp4") || item?.url.endsWith(".webm")) {
-              return (
-                <video key={item?.url} controls autoPlay className="rounded-xl" style={{ maxHeight: item.height || 370, maxWidth: item.width || "auto" }}>
-                  <source src={item?.url} type="video/mp4" />
-                  <source src={item?.url} type="video/webm" />
-                  Your browser does not support the video tag.
-                </video>
-              );
-            }
-            return <img
-              key={item?.url}
-              className="object-contain overflow-hidden rounded-xl"
-              src={item?.url}
-              alt="Generated image"
-              style={{ maxHeight: item.height || 370, maxWidth: item.width || "auto" }}
-            />;
-          })
-        }
-      </>
-    </div>
-  );
-
-}

web/src/components/callServerPromise.tsx

@@ -2,7 +2,13 @@
 
 import { toast } from "sonner";
 
-export async function callServerPromise<T>(result: Promise<T>) {
+export async function callServerPromise<T>(result: Promise<T>, props?: {
+  loadingText: string
+}) {
+  let id: string | number
+  if (props?.loadingText) {
+    id = toast.loading(props.loadingText)
+  }
   return result
     .then((x) => {
       if ((x as { message: string })?.message !== undefined) {
@@ -15,5 +21,8 @@ export async function callServerPromise<T>(result: Promise<T>) {
     .catch((error) => {
       toast.error(error.message);
       return null;
+    }).finally(() => {
+      if (id != undefined)
+        toast.dismiss(id)
     });
 }

web/src/components/custom-form/SnapshotPickerView.tsx

@@ -157,6 +157,7 @@ type CustomNodeList = {
     author: string;
     title: string;
     reference: string;
+    pip: string[];
     files: string[];
     install_type: string;
     description: string;
@@ -237,56 +238,12 @@ function CustomNodesSelector({
                     key={index}
                     value={framework.reference}
                     onSelect={async (currentValue) => {
-                      const repoName = extractRepoName(currentValue);
-
-                      console.log(repoName);
-
-                      const id = toast.loading(`Fetching repo info...`);
-                      // toast.info("hi");
-
-                      const repo = await fetch(
-                        `https://api.github.com/repos/${repoName}`
-                      )
-                        .then((x) => x.json())
-                        .then((x) => {
-                          console.log(x);
-                          return x;
-                        })
-                        .then((x) => RepoSchema.parse(x))
-                        .catch((e) => {
-                          console.error(e);
-                          toast.dismiss(id);
-                          toast.error(`Failed to fetch repo info ${e.message}`);
-                          return null;
-                        });
-
-                      if (!repo) return;
-
-                      const branch = repo.default_branch;
-
-                      const branchInfo = await fetch(
-                        `https://api.github.com/repos/${repoName}/branches/${branch}`
-                      )
-                        .then((x) => x.json())
-                        .then((x) => BranchInfoSchema.parse(x))
-                        .catch((e) => {
-                          console.error(e);
-                          toast.dismiss(id);
-                          toast.error(
-                            `Failed to fetch branch info ${e.message}`
-                          );
-                          return null;
-                        });
-
-                      toast.dismiss(id);
-
-                      if (!branchInfo) return;
-
                       let nodeList: Record<
                         string,
                         {
                           hash: string;
                           disabled: boolean;
+                          pip?: string[]
                         }
                       >;
                       const x = customNodeList;
@@ -296,10 +253,49 @@ function CustomNodesSelector({
                         delete newNodeList[currentValue];
                         nodeList = newNodeList;
                       } else {
+                        const repoName = extractRepoName(currentValue);
+                        const id = toast.loading(`Fetching repo info...`);
+                        const repo = await fetch(
+                          `https://api.github.com/repos/${repoName}`
+                        )
+                          .then((x) => x.json())
+                          .then((x) => {
+                            console.log(x);
+                            return x;
+                          })
+                          .then((x) => RepoSchema.parse(x))
+                          .catch((e) => {
+                            console.error(e);
+                            toast.dismiss(id);
+                            toast.error(`Failed to fetch repo info ${e.message}`);
+                            return null;
+                          });
+
+                        if (!repo) return;
+                        const branch = repo.default_branch;
+                        const branchInfo = await fetch(
+                          `https://api.github.com/repos/${repoName}/branches/${branch}`
+                        )
+                          .then((x) => x.json())
+                          .then((x) => BranchInfoSchema.parse(x))
+                          .catch((e) => {
+                            console.error(e);
+                            toast.dismiss(id);
+                            toast.error(
+                              `Failed to fetch branch info ${e.message}`
+                            );
+                            return null;
+                          });
+
+                        toast.dismiss(id);
+
+                        if (!branchInfo) return;
+
                         nodeList = {
                           [currentValue]: {
                             hash: branchInfo?.commit.sha,
                             disabled: false,
+                            pip: framework.pip
                           },
                           ...x,
                         };