Skip to content

Commit a343f5a

Browse files
committed
also remove legacy sapi v1 while i'm at it
this is the old one that wasn't support anymore already anyway
1 parent 89b2ed9 commit a343f5a

File tree

8 files changed

+5
-263
lines changed

8 files changed

+5
-263
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ This project:
146146
- can automatically install [insightface](https://github.com/deepinsight/insightface) (MIT) for `IP Adapter - Face` support
147147
- uses [JSON.NET](https://github.com/JamesNK/Newtonsoft.Json) (MIT), [FreneticUtilities](https://github.com/FreneticLLC/FreneticUtilities) (MIT), [LiteDB](https://github.com/mbdavid/LiteDB) (MIT), [ImageSharp](https://github.com/SixLabors/ImageSharp/) (Apache2 under open-source Split License)
148148
- embeds copies of web assets from [BootStrap](https://getbootstrap.com/) (MIT), [Select2](https://select2.org/) (MIT), [JQuery](https://jquery.com/) (MIT), [exifr](https://github.com/MikeKovarik/exifr) (MIT).
149-
- has the option to connect to remote servers to use [the Stability AI API](https://platform.stability.ai/) as a backend.
150149
- supports user-built extensions which may have their own licenses or legal conditions.
151150

152151
SwarmUI itself is under the MIT license, however some usages may be affected by the GPL variant licenses of connected projects list above, and note that any models used have their own licenses.

docs/Motivations.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ It is also hoped that building Stable Diffusion tools in C# will enable a wider
1212

1313
## Modularity
1414

15-
The project was designed to be heavily modular, such that backends are fully separated from the middle-layer which is fully separated from the frontend UI, and all components are interswappable. This is to enable extensibility and customization. For example, an extension can easily provide alternative backend generators (this project comes with several built-in, such as ComfyUI, Auto WebUI, StabilityAPI, ...) without having to edit anything else to work.
15+
The project was designed to be heavily modular, such that backends are fully separated from the middle-layer which is fully separated from the frontend UI, and all components are interswappable. This is to enable extensibility and customization. For example, an extension can easily provide alternative backend generators (this project comes with several built-in, such as ComfyUI, Auto WebUI, ...) without having to edit anything else to work.
1616

17-
The limitation of this approach is some tools may not easily be intercompatible, eg the StabilityAPI backend has only a select few limited inputs, vs the local backends that have a wider range, and many parameters don't work with StabilityAPI.
17+
The limitation of this approach is some tools may not easily be intercompatible, limiting power users to only the most well supported tools.
1818

1919
## Comfy
2020

@@ -24,6 +24,7 @@ For the goal of maximizing capabilities, a 'main' backend needed to be chosen to
2424
- The code inside is extremely clean and well written.
2525
- It provides bonus features that other UIs can't match (ie: the workflow node editor).
2626
- The lead developer of Comfy was hired to Stability, and was able to directly help in ensuring the SwarmUI-ComfyUI integration works as best it can.
27+
- (June 2024 note: we now continue to work together in the independent [Comfy Org](https://www.comfy.org/))
2728

2829
## Web Frontend
2930

src/BuiltinExtensions/StabilityAPI/README.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/BuiltinExtensions/StabilityAPI/StabilityAPIBackend.cs

Lines changed: 0 additions & 198 deletions
This file was deleted.

src/BuiltinExtensions/StabilityAPI/StabilityAPIExtension.cs

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/Pages/Install.cshtml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,14 +195,6 @@
195195
<a href="#" onclick="javascript:$('#gpu_check_modal').modal('show')">Do I?</a> You can learn more about <a href="https://github.com/comfyanonymous/ComfyUI">ComfyUI here</a>.
196196
</div>
197197
</div>
198-
<div class="form-check">
199-
<input class="form-check-input" type="radio" name="backend_radio" id="backend_radio_stabilityapi" value="stabilityapi">
200-
<label class="form-check-label" for="backend_radio_stabilityapi">Stability API (Remote)</label>
201-
<div class="install_hint">The Stability API powers DreamStudio and services like it. If you don't have a powerful local PC, you can use the Stability API to power your generations.
202-
You must have a valid API key to use this. <a href="https://platform.stability.ai/docs/getting-started/authentication" target="_blank" rel="noopener noreferrer">Click Here for info about the Stability API and how to get an API key.</a>
203-
</div>
204-
<input type="password" id="stability_api_key" name="Stability API Key" placeholder="Stability API Key">
205-
</div>
206198
<hr>
207199
<h3>For Experienced Users: Skip Backend Install</h3>
208200
<div class="install_hint">You can configure custom backends post-install.</div>
@@ -217,7 +209,7 @@
217209

218210
<div id="installer_section_models" style="display: none;">
219211
<div class="install_q_head">Download Models</div>
220-
<div class="install_hint">You can select models to automatically download for local running here. If you selected 'Stability API' on the previous page, you can skip this page.</div>
212+
<div class="install_hint">You can select models to automatically download for local running here.</div>
221213
Note: by downloading Stable Diffusion models, you agree to the terms of <a href="https://github.com/Stability-AI/stablediffusion/blob/main/LICENSE-MODEL" target="_blank" rel="noopener noreferrer">The CreativeML Open RAIL++-M License</a>.
222214
<br>
223215
<fieldset class="form-group" id="models_fieldset">
@@ -243,7 +235,7 @@
243235
</div>
244236
</fieldset>
245237
<label>Or community models!</label>
246-
<div class="install_hint">You can download an endless variety of community-made models from online sites such as <a href="https://huggingface.co/spaces/huggingface-projects/diffusers-gallery" target="_blank" rel="noopener noreferrer">HuggingFace</a> or <a href="https://civitai.com/" target="_blank" rel="noopener noreferrer">Civitai</a>. (NOTICE: These are examples of third-party websites featuring user-submitted models, Stability.AI offers no guarantees about what content may exist there, browse with caution.) Remember to only download '.safetensors' files, never '.ckpt' ones.</div>
238+
<div class="install_hint">You can download an endless variety of community-made models from online sites such as <a href="https://huggingface.co/spaces/huggingface-projects/diffusers-gallery" target="_blank" rel="noopener noreferrer">HuggingFace</a> or <a href="https://civitai.com/" target="_blank" rel="noopener noreferrer">Civitai</a>. (NOTICE: These are examples of third-party websites featuring user-submitted models, We offer no guarantees about what content may exist there, browse with caution.) Remember to only download '.safetensors' files, never '.ckpt' ones.</div>
247239
</div>
248240

249241
<div id="installer_section_end" style="display: none;">

src/WebAPI/BasicAPIFeatures.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -256,16 +256,6 @@ void moveFolder()
256256
Program.Backends.AddNewOfType(Program.Backends.BackendTypes["comfyui_selfstart"], new ComfyUISelfStartBackend.ComfyUISelfStartSettings() { StartScript = path, GPU_ID = gpu, ExtraArgs = extraArgs.Trim() });
257257
break;
258258
}
259-
case "stabilityapi":
260-
if (string.IsNullOrWhiteSpace(stability_api_key))
261-
{
262-
await output($"Invalid stability API key!");
263-
await socket.SendJson(new JObject() { ["error"] = $"Invalid stability API key!" }, API.WebsocketTimeout);
264-
return null;
265-
}
266-
File.WriteAllText("Data/sapi_key.dat", stability_api_key);
267-
Program.Backends.AddNewOfType(Program.Backends.BackendTypes["stability_api"]);
268-
break;
269259
case "none":
270260
await output("Not installing any backend.");
271261
break;

src/wwwroot/js/installer.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ class InstallerClass {
9797
if (backend == null) {
9898
return false;
9999
}
100-
if (backend == 'stabilityapi') {
101-
return getRequiredElementById('stability_api_key').value != '';
102-
}
103100
return true;
104101
case 'models':
105102
return true;

0 commit comments

Comments
 (0)