[FE] Supports to look up other results
This commit is contained in:
parent
1992a96771
commit
3f10b966fe
|
|
@ -126,6 +126,15 @@ def get_jobs():
|
|||
|
||||
return jsonify({"jobs": jobs})
|
||||
|
||||
@app.route("/random_jobs", methods=["GET"])
|
||||
def random_jobs():
|
||||
# define max number of jobs to fetch from db
|
||||
job_count_limit = 20
|
||||
|
||||
jobs = database.get_random_jobs(limit_count=job_count_limit)
|
||||
|
||||
return jsonify({"jobs": jobs})
|
||||
|
||||
|
||||
@app.route("/")
|
||||
def index():
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ def delete_jobs(c, job_uuid="", username=""):
|
|||
"""Delete the job with the given uuid, or ignore the operation if the uuid does not exist"""
|
||||
if username:
|
||||
c.execute(
|
||||
"SELECT img, ref_img FROM history WHERE apikey=(SELECT apikey FROM users WHERE username=?)",
|
||||
"SELECT img, ref_img, mask_img FROM history WHERE apikey=(SELECT apikey FROM users WHERE username=?)",
|
||||
(username,),
|
||||
)
|
||||
rows = c.fetchall()
|
||||
|
|
@ -152,7 +152,7 @@ def delete_jobs(c, job_uuid="", username=""):
|
|||
print(f"removed {c.rowcount} entries")
|
||||
elif job_uuid:
|
||||
c.execute(
|
||||
"SELECT img, ref_img FROM history WHERE uuid=?",
|
||||
"SELECT img, ref_img, mask_img FROM history WHERE uuid=?",
|
||||
(job_uuid,),
|
||||
)
|
||||
result = c.fetchone()
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@
|
|||
data-zh_CN="这张图..">This image is..</label>
|
||||
<input class="form-control" id="prompt" aria-describedby="promptHelp">
|
||||
</div>
|
||||
<div id="promptHelp" class="form-text"
|
||||
data-en_XX="Describe your image. Example: photo of a cat, cute, black and white. Use () to emphasize."
|
||||
data-zh_CN="形容这张图。比如：一张猫的照片，可爱，黑白色。用括号（）强调重要性。">Describe your image. Example: photo of a cat,
|
||||
<div id="promptHelp" class="form-text" data-en_XX="Describe your image. Example: photo of a cat, cute, black and white. Use () to
|
||||
emphasize." data-zh_CN="形容这张图。比如：一张猫的照片，可爱，黑白色。用括号（）强调重要性。">Describe your image. Example: photo
|
||||
of a cat,
|
||||
cute, black and white. Use () to emphasize.</div>
|
||||
</div>
|
||||
<div class="row mb-3">
|
||||
|
|
@ -352,6 +352,8 @@
|
|||
<input type="text" class="form-control" id="lookupUUID" value="">
|
||||
<button id="getJobHistory" class="btn btn-primary" data-en_XX="Get Job(s)" data-zh_CN="搜索历史">Get
|
||||
Job(s)</button>
|
||||
<button id="feelingLucky" class="btn btn-outline-secondary" data-en_XX="I'm Feeling Lucky"
|
||||
data-zh_CN="看看别人的结果">I'm Feeling Lucky</button>
|
||||
</div>
|
||||
<div id="joblist"></div>
|
||||
</div>
|
||||
|
|
@ -508,8 +510,8 @@
|
|||
(response.jobs[i].img ? ("<img src='" + response.jobs[i].img + "' class='card-img-top'><div class='card-body'>") : "") +
|
||||
"<ul class='list-group list-group-flush'>" +
|
||||
"<li class='list-group-item'>status: " + response.jobs[i].status + "</li>" +
|
||||
"<li class='list-group-item'>prompt: " + truncateText(response.jobs[i].prompt, 200) + "</li>" +
|
||||
"<li class='list-group-item'>neg prompt: " + truncateText(response.jobs[i].neg_prompt, 200) + "</li>" +
|
||||
"<li class='list-group-item'>prompt: " + truncateText(response.jobs[i].prompt, 300) + "</li>" +
|
||||
"<li class='list-group-item'>neg prompt: " + truncateText(response.jobs[i].neg_prompt, 300) + "</li>" +
|
||||
"<li class='list-group-item'>seed: " + response.jobs[i].seed + "</li>" +
|
||||
"<li class='list-group-item'>uuid: " + response.jobs[i].uuid + "</li>" +
|
||||
"<li class='list-group-item'>w x h: " + response.jobs[i].width + " x " + response.jobs[i].height + "</li>" +
|
||||
|
|
@ -532,9 +534,63 @@
|
|||
$('#joblist').html("found nothing");
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
function shuffle(arr) {
|
||||
var j, x, index;
|
||||
for (index = arr.length - 1; index > 0; index--) {
|
||||
j = Math.floor(Math.random() * (index + 1));
|
||||
x = arr[index];
|
||||
arr[index] = arr[j];
|
||||
arr[j] = x;
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
$('#feelingLucky').click(function () {
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: '/random_jobs',
|
||||
contentType: 'application/json; charset=utf-8',
|
||||
dataType: 'json',
|
||||
success: function (response) {
|
||||
var jobsLength = response.jobs.length;
|
||||
if (jobsLength == 0) {
|
||||
$('#joblist').html("found nothing");
|
||||
return;
|
||||
}
|
||||
var shuffled = response.jobs.map(value => ({ value, sort: Math.random() })).sort((a, b) => a.sort - b.sort).map(({ value }) => value)
|
||||
|
||||
var $joblist = $('#joblist');
|
||||
var $grid = $('<div class="row"></div>');
|
||||
$joblist.html($grid);
|
||||
for (var i = 0; i < jobsLength; i++) {
|
||||
var element = ("<div class='col col-sm-1 col-md-3 col-lg-4 mb-3'><div class='card'>" +
|
||||
(shuffled[i].img ? ("<img src='" + shuffled[i].img + "' class='card-img-top'><div class='card-body'>") : "") +
|
||||
"<ul class='list-group list-group-flush'>" +
|
||||
"<li class='list-group-item'>prompt: " + truncateText(shuffled[i].prompt, 200) + "</li>" +
|
||||
"<li class='list-group-item'>neg prompt: " + truncateText(shuffled[i].neg_prompt, 200) + "</li>" +
|
||||
"<li class='list-group-item'>seed: " + shuffled[i].seed + "</li>" +
|
||||
"<li class='list-group-item'>w x h: " + shuffled[i].width + " x " + shuffled[i].height + "</li>" +
|
||||
"</ul>" +
|
||||
"</div></div></div>")
|
||||
$grid.append(element);
|
||||
};
|
||||
$grid.imagesLoaded().progress(function () {
|
||||
$grid.masonry({
|
||||
itemSelector: '.col',
|
||||
columnWidth: '.col',
|
||||
percentPosition: true
|
||||
});
|
||||
});
|
||||
|
||||
},
|
||||
error: function (xhr, status, error) {
|
||||
// Handle error response
|
||||
console.log(xhr.responseText);
|
||||
$('#joblist').html("found nothing");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$("#upload-img").click(function () {
|
||||
var input = $("<input type='file' accept='image/*'>");
|
||||
|
|
|
|||
|
|
@ -94,6 +94,15 @@ OUTPUT_ONLY_KEYS = [
|
|||
KEY_JOB_STATUS, # str
|
||||
]
|
||||
|
||||
ANONYMOUS_KEYS = [
|
||||
KEY_PROMPT,
|
||||
KEY_NEG_PROMPT,
|
||||
KEY_SEED,
|
||||
KEY_WIDTH,
|
||||
KEY_HEIGHT,
|
||||
BASE64IMAGE,
|
||||
]
|
||||
|
||||
# -- internal
|
||||
KEY_BASE_MODEL = "base_model"
|
||||
INTERNAL_KEYS = [
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ from utilities.constants import VALUE_JOB_DONE
|
|||
from utilities.constants import LOCK_FILEPATH
|
||||
|
||||
from utilities.constants import OUTPUT_ONLY_KEYS
|
||||
from utilities.constants import ANONYMOUS_KEYS
|
||||
from utilities.constants import OPTIONAL_KEYS
|
||||
from utilities.constants import REQUIRED_KEYS
|
||||
from utilities.constants import INTERNAL_KEYS
|
||||
|
|
@ -127,6 +128,29 @@ class Database:
|
|||
result = c.execute(query_string, query_args).fetchone()
|
||||
return result[0]
|
||||
|
||||
def get_random_jobs(self, limit_count=0) -> list:
|
||||
query = f"SELECT {', '.join(ANONYMOUS_KEYS)} FROM {HISTORY_TABLE_NAME} WHERE {KEY_JOB_STATUS} = '{VALUE_JOB_DONE}' AND RANDOM() <= .3 LIMIT {limit_count}"
|
||||
|
||||
# execute the query and return the results
|
||||
c = self.get_cursor()
|
||||
rows = c.execute(query).fetchall()
|
||||
|
||||
jobs = []
|
||||
for row in rows:
|
||||
job = {
|
||||
ANONYMOUS_KEYS[i]: row[i]
|
||||
for i in range(len(ANONYMOUS_KEYS))
|
||||
if row[i] is not None
|
||||
}
|
||||
# load image to job if has one
|
||||
for key in [BASE64IMAGE, REFERENCE_IMG, MASK_IMG]:
|
||||
if key in job and "base64" not in job[key]:
|
||||
data = load_image(job[key], to_base64=True)
|
||||
job[key] = data if data else IMAGE_NOT_FOUND_BASE64
|
||||
jobs.append(job)
|
||||
|
||||
return jobs
|
||||
|
||||
def get_jobs(self, job_uuid="", apikey="", job_status="", limit_count=0) -> list:
|
||||
"""
|
||||
Get a list of jobs from the HISTORY_TABLE_NAME table based on optional filters.
|
||||
|
|
|
|||
Loading…
Reference in New Issue