Skip to content

move generate + image format/base64 encoding into new function #1417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Korsar13 wants to merge 1 commit into from
Closed

move generate + image format/base64 encoding into new function #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 2 additions & 43 deletions examples/server/async_jobs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,51 +155,10 @@ bool execute_img_gen_job(ServerRuntime& runtime,
std::string& error_message) {
sd_img_gen_params_t params = job.img_gen.to_sd_img_gen_params_t();

SDImageVec results;
int num_results = 0;

{
std::lock_guard<std::mutex> lock(*runtime.sd_ctx_mutex);
sd_image_t* raw_results = generate_image(runtime.sd_ctx, &params);
num_results = params.batch_count;
results.adopt(raw_results, num_results);
}

if (results.empty() || num_results <= 0) {
error_message = "generate_image returned no results";
output_images = generate_and_encode(runtime, job.img_gen, error_message);
if (!error_message.empty()) {
return false;
}

EncodedImageFormat encoded_format = EncodedImageFormat::PNG;
if (job.img_gen.output_format == "jpeg") {
encoded_format = EncodedImageFormat::JPEG;
} else if (job.img_gen.output_format == "webp") {
encoded_format = EncodedImageFormat::WEBP;
}

for (int i = 0; i < num_results; ++i) {
if (results[i].data == nullptr) {
continue;
}

const std::string metadata = job.img_gen.gen_params.embed_image_metadata
? get_image_params(*runtime.ctx_params,
job.img_gen.gen_params,
job.img_gen.gen_params.seed + i)
: "";
auto image_bytes = encode_image_to_vector(encoded_format,
results[i].data,
results[i].width,
results[i].height,
results[i].channel,
metadata,
job.img_gen.output_compression);
if (image_bytes.empty()) {
continue;
}
output_images.push_back(base64_encode(image_bytes));
}

if (output_images.empty()) {
error_message = "generate_image returned empty encoded outputs";
return false;
Expand Down
2 changes: 1 addition & 1 deletion examples/server/frontend
Open in desktop
Submodule frontend updated from 740475 to 1a3417
61 changes: 10 additions & 51 deletions examples/server/routes_openai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ void register_openai_api_endpoints(httplib::Server& svr, ServerRuntime& rt) {

LOG_DEBUG("%s\n", request.gen_params.to_string().c_str());

SDImageVec results;
if (!execute_sync_img_gen_request(*runtime, request, results, error_message)) {
auto strings = generate_and_encode(*runtime, request, error_message);
if (!error_message.empty()) {
res.status = 500;
res.set_content(json({{"error", error_message}}).dump(), "application/json");
return;
Expand All @@ -274,35 +274,10 @@ void register_openai_api_endpoints(httplib::Server& svr, ServerRuntime& rt) {
out["created"] = static_cast<long long>(std::time(nullptr));
out["data"] = json::array();
out["output_format"] = request.output_format;

for (int i = 0; i < request.gen_params.batch_count; ++i) {
if (results[i].data == nullptr) {
continue;
}
std::string params = request.gen_params.embed_image_metadata
? get_image_params(*runtime->ctx_params,
request.gen_params,
request.gen_params.seed + i)
: "";
auto image_bytes = encode_image_to_vector(request.output_format == "jpeg"
? EncodedImageFormat::JPEG
: request.output_format == "webp"
? EncodedImageFormat::WEBP
: EncodedImageFormat::PNG,
results[i].data,
results[i].width,
results[i].height,
results[i].channel,
params,
request.output_compression);
if (image_bytes.empty()) {
LOG_ERROR("write image to mem failed");
continue;
}

for (auto& str: strings) {
json item;
item["b64_json"] = base64_encode(image_bytes);
out["data"].push_back(item);
item["b64_json"] = std::move(str);
out["data"].push_back(std::move(item));
}

res.set_content(out.dump(), "application/json");
Expand All @@ -329,8 +304,8 @@ void register_openai_api_endpoints(httplib::Server& svr, ServerRuntime& rt) {

LOG_DEBUG("%s\n", request.gen_params.to_string().c_str());

SDImageVec results;
if (!execute_sync_img_gen_request(*runtime, request, results, error_message)) {
auto strings = generate_and_encode(*runtime, request, error_message);
if (!error_message.empty()) {
res.status = 500;
res.set_content(json({{"error", error_message}}).dump(), "application/json");
return;
Expand All @@ -340,26 +315,10 @@ void register_openai_api_endpoints(httplib::Server& svr, ServerRuntime& rt) {
out["created"] = static_cast<long long>(std::time(nullptr));
out["data"] = json::array();
out["output_format"] = request.output_format;

for (int i = 0; i < request.gen_params.batch_count; ++i) {
if (results[i].data == nullptr) {
continue;
}
std::string params = request.gen_params.embed_image_metadata
? get_image_params(*runtime->ctx_params,
request.gen_params,
request.gen_params.seed + i)
: "";
auto image_bytes = encode_image_to_vector(request.output_format == "jpeg" ? EncodedImageFormat::JPEG : EncodedImageFormat::PNG,
results[i].data,
results[i].width,
results[i].height,
results[i].channel,
params,
request.output_compression);
for (auto& str: strings) {
json item;
item["b64_json"] = base64_encode(image_bytes);
out["data"].push_back(item);
item["b64_json"] = std::move(str);
out["data"].push_back(std::move(item));
}

res.set_content(out.dump(), "application/json");
Expand Down
46 changes: 5 additions & 41 deletions examples/server/routes_sdapi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,52 +258,16 @@ void register_sdapi_endpoints(httplib::Server& svr, ServerRuntime& rt) {

LOG_DEBUG("%s\n", request.gen_params.to_string().c_str());

sd_img_gen_params_t img_gen_params = request.to_sd_img_gen_params_t();
SDImageVec results;
int num_results = 0;

{
std::lock_guard<std::mutex> lock(*runtime->sd_ctx_mutex);
sd_image_t* raw_results = generate_image(runtime->sd_ctx, &img_gen_params);
num_results = request.gen_params.batch_count;
results.adopt(raw_results, num_results);
}

if (results.empty()) {
res.status = 500;
res.set_content(R"({"error":"generate_image returned no results"})", "application/json");
return;
}
std::string error_str;
auto strings = generate_and_encode(*runtime, request, error_str);
if (!error_str.empty())
throw std::runtime_error(error_str);

json out;
out["images"] = json::array();
out["parameters"] = j;
out["info"] = "";

for (int i = 0; i < num_results; ++i) {
if (results[i].data == nullptr) {
continue;
}

std::string params = request.gen_params.embed_image_metadata
? get_image_params(*runtime->ctx_params,
request.gen_params,
request.gen_params.seed + i)
: "";
auto image_bytes = encode_image_to_vector(EncodedImageFormat::PNG,
results[i].data,
results[i].width,
results[i].height,
results[i].channel,
params);

if (image_bytes.empty()) {
LOG_ERROR("write image to mem failed");
continue;
}

out["images"].push_back(base64_encode(image_bytes));
}
out["images"] = std::move(strings);

res.set_content(out.dump(), "application/json");
res.status = 200;
Expand Down
46 changes: 46 additions & 0 deletions examples/server/runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include "common/common.h"
#include "common/log.h"
#include "common/media_io.h"

namespace fs = std::filesystem;

Expand Down Expand Up @@ -184,3 +185,48 @@ int64_t unix_timestamp_now() {
std::chrono::system_clock::now().time_since_epoch())
.count();
}

std::vector<std::string> generate_and_encode(ServerRuntime& runtime, ImgGenJobRequest& request, std::string& error_message) {
std::vector<std::string> strings;

sd_img_gen_params_t img_gen_params = request.to_sd_img_gen_params_t();
SDImageVec results;
int num_results = 0;
{
std::lock_guard<std::mutex> lock(*runtime.sd_ctx_mutex);
sd_image_t* raw_results = generate_image(runtime.sd_ctx, &img_gen_params);
num_results = request.gen_params.batch_count;
results.adopt(raw_results, num_results);
}
if (results.empty()) {
error_message = "generate_image returned no results";
} else {
for (int i = 0; i < request.gen_params.batch_count; ++i) {
if (results[i].data == nullptr) {
continue;
}
std::string params = request.gen_params.embed_image_metadata
? get_image_params(*runtime.ctx_params,
request.gen_params,
request.gen_params.seed + i)
: "";
auto image_bytes = encode_image_to_vector(request.output_format == "jpeg"
? EncodedImageFormat::JPEG
: request.output_format == "webp"
? EncodedImageFormat::WEBP
: EncodedImageFormat::PNG,
results[i].data,
results[i].width,
results[i].height,
results[i].channel,
params,
request.output_compression);
if (image_bytes.empty()) {
LOG_ERROR("write image to mem failed");
continue;
}
strings.push_back(base64_encode(image_bytes));
}
}
return strings;
}
2 changes: 2 additions & 0 deletions examples/server/runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,5 @@ bool assign_output_options(ImgGenJobRequest& request,
void refresh_lora_cache(ServerRuntime& rt);
std::string get_lora_full_path(ServerRuntime& rt, const std::string& path);
int64_t unix_timestamp_now();

std::vector<std::string> generate_and_encode(ServerRuntime& runtime, ImgGenJobRequest& request, std::string& error_message);
Loading