Spaces:
Running on Zero
Running on Zero
Bobby commited on
Commit ·
01eb71c
1
Parent(s): 33304a1
Revert "Show Initializing GPU until the first GPU stage, then the progress bar"
Browse filesThis reverts commit 33304a12d5a2ceb1952f981433996309e1f8c3a3.
- app.py +6 -6
- progress_bar.js +1 -20
app.py
CHANGED
|
@@ -1647,14 +1647,14 @@ fallback_bridge = bridge_script(Path(__file__).with_name("fallback_bridge.js"))
|
|
| 1647 |
grant_bridge = bridge_script(Path(__file__).with_name("grant_bridge.js"))
|
| 1648 |
refund_bridge = bridge_script(Path(__file__).with_name("refund_bridge.js"))
|
| 1649 |
progress_bar_js = Path(__file__).with_name("progress_bar.js").read_text()
|
| 1650 |
-
GLB_PROGRESS_SECONDS = {512:
|
| 1651 |
|
| 1652 |
|
| 1653 |
-
def progress_bar(op: str, seconds: float, done: str, stages, source: str = ""
|
| 1654 |
return gr.HTML(
|
| 1655 |
value=(
|
| 1656 |
f'<div class="labs-progress" hidden data-op="{op}" data-seconds="{seconds}" data-done="{done}"'
|
| 1657 |
-
f' data-source="{source}" data-
|
| 1658 |
'<div class="labs-progress-label" aria-live="polite"></div>'
|
| 1659 |
f'<div class="labs-progress-track" role="progressbar" aria-label="{done}" aria-valuemin="0"'
|
| 1660 |
' aria-valuemax="100"><div class="labs-progress-fill"></div></div></div>'
|
|
@@ -1931,9 +1931,9 @@ with gr.Blocks(title="Pocket 3D AI | SkyeBrowse") as demo:
|
|
| 1931 |
interactive=False,
|
| 1932 |
)
|
| 1933 |
preview_progress = progress_bar(
|
| 1934 |
-
"preview",
|
| 1935 |
[[0, "Preparing image"], [15, "Generating 3D structure"], [60, "Rendering preview"]],
|
| 1936 |
-
source=".video-container .progress-level-inner",
|
| 1937 |
)
|
| 1938 |
access_notice = gr.HTML(value="", visible=False, elem_id="labs-access-notice")
|
| 1939 |
|
|
@@ -1971,7 +1971,7 @@ with gr.Blocks(title="Pocket 3D AI | SkyeBrowse") as demo:
|
|
| 1971 |
glb_progress = progress_bar(
|
| 1972 |
"glb", GLB_PROGRESS_SECONDS[GLB_EXPORT_TEXTURE_SIZE], "3D model ready",
|
| 1973 |
[[0, "Starting 3D model"], [10, "Texturing 3D model"], [80, "Packaging GLB"]],
|
| 1974 |
-
source="#glb-progress .progress-level-inner",
|
| 1975 |
)
|
| 1976 |
glb_button = gr.Button(
|
| 1977 |
"Generate 3D Model", interactive=False, size="lg", variant="primary",
|
|
|
|
| 1647 |
grant_bridge = bridge_script(Path(__file__).with_name("grant_bridge.js"))
|
| 1648 |
refund_bridge = bridge_script(Path(__file__).with_name("refund_bridge.js"))
|
| 1649 |
progress_bar_js = Path(__file__).with_name("progress_bar.js").read_text()
|
| 1650 |
+
GLB_PROGRESS_SECONDS = {512: 8, 1024: 9, 1536: 12, 2048: 16, 4096: 32}
|
| 1651 |
|
| 1652 |
|
| 1653 |
+
def progress_bar(op: str, seconds: float, done: str, stages, source: str = ""):
|
| 1654 |
return gr.HTML(
|
| 1655 |
value=(
|
| 1656 |
f'<div class="labs-progress" hidden data-op="{op}" data-seconds="{seconds}" data-done="{done}"'
|
| 1657 |
+
f' data-source="{source}" data-stages=\'{json.dumps(stages)}\'>'
|
| 1658 |
'<div class="labs-progress-label" aria-live="polite"></div>'
|
| 1659 |
f'<div class="labs-progress-track" role="progressbar" aria-label="{done}" aria-valuemin="0"'
|
| 1660 |
' aria-valuemax="100"><div class="labs-progress-fill"></div></div></div>'
|
|
|
|
| 1931 |
interactive=False,
|
| 1932 |
)
|
| 1933 |
preview_progress = progress_bar(
|
| 1934 |
+
"preview", 10, "Preview ready",
|
| 1935 |
[[0, "Preparing image"], [15, "Generating 3D structure"], [60, "Rendering preview"]],
|
| 1936 |
+
source=".video-container .progress-level-inner",
|
| 1937 |
)
|
| 1938 |
access_notice = gr.HTML(value="", visible=False, elem_id="labs-access-notice")
|
| 1939 |
|
|
|
|
| 1971 |
glb_progress = progress_bar(
|
| 1972 |
"glb", GLB_PROGRESS_SECONDS[GLB_EXPORT_TEXTURE_SIZE], "3D model ready",
|
| 1973 |
[[0, "Starting 3D model"], [10, "Texturing 3D model"], [80, "Packaging GLB"]],
|
| 1974 |
+
source="#glb-progress .progress-level-inner",
|
| 1975 |
)
|
| 1976 |
glb_button = gr.Button(
|
| 1977 |
"Generate 3D Model", interactive=False, size="lg", variant="primary",
|
progress_bar.js
CHANGED
|
@@ -11,8 +11,6 @@ let seconds = Number(root.dataset.seconds);
|
|
| 11 |
let shown = 0;
|
| 12 |
let floor = 0;
|
| 13 |
let stageLabel = null;
|
| 14 |
-
let waiting = false;
|
| 15 |
-
const WAITING_LABEL = "Initializing GPU…";
|
| 16 |
|
| 17 |
function serverProgress() {
|
| 18 |
const text = source ? document.querySelector(source)?.textContent || "" : "";
|
|
@@ -23,31 +21,16 @@ function serverProgress() {
|
|
| 23 |
return null;
|
| 24 |
}
|
| 25 |
|
| 26 |
-
function showWaiting() {
|
| 27 |
-
label.textContent = WAITING_LABEL;
|
| 28 |
-
track.hidden = true;
|
| 29 |
-
}
|
| 30 |
-
|
| 31 |
-
function beginGpuWork() {
|
| 32 |
-
waiting = false;
|
| 33 |
-
started = performance.now();
|
| 34 |
-
}
|
| 35 |
-
|
| 36 |
function draw(text, pct) {
|
| 37 |
-
track.hidden = false;
|
| 38 |
label.textContent = `${text} ${Math.floor(pct)}%`;
|
| 39 |
fill.style.width = `${pct}%`;
|
| 40 |
track.setAttribute("aria-valuenow", String(Math.floor(pct)));
|
| 41 |
}
|
| 42 |
|
| 43 |
function tick() {
|
| 44 |
-
const server = serverProgress();
|
| 45 |
-
if (waiting) {
|
| 46 |
-
if (!server) return showWaiting();
|
| 47 |
-
beginGpuWork();
|
| 48 |
-
}
|
| 49 |
const elapsed = (performance.now() - started) / 1000;
|
| 50 |
const estimate = 95 * (1 - Math.exp(-2 * elapsed / seconds));
|
|
|
|
| 51 |
if (server) stageLabel = server.name;
|
| 52 |
shown = Math.min(99, Math.max(shown, floor, estimate, server ? Math.min(server.pct, 95) : 0));
|
| 53 |
const fallback = stages.filter(([at]) => shown >= at).pop()[1];
|
|
@@ -67,14 +50,12 @@ const bar = {
|
|
| 67 |
started = performance.now();
|
| 68 |
shown = floor = 0;
|
| 69 |
stageLabel = null;
|
| 70 |
-
waiting = root.dataset.gpu === "1";
|
| 71 |
root.hidden = false;
|
| 72 |
tick();
|
| 73 |
timer = setInterval(tick, 200);
|
| 74 |
},
|
| 75 |
stage(name, pct) {
|
| 76 |
if (!timer) return;
|
| 77 |
-
if (waiting) beginGpuWork();
|
| 78 |
stageLabel = name;
|
| 79 |
floor = pct;
|
| 80 |
tick();
|
|
|
|
| 11 |
let shown = 0;
|
| 12 |
let floor = 0;
|
| 13 |
let stageLabel = null;
|
|
|
|
|
|
|
| 14 |
|
| 15 |
function serverProgress() {
|
| 16 |
const text = source ? document.querySelector(source)?.textContent || "" : "";
|
|
|
|
| 21 |
return null;
|
| 22 |
}
|
| 23 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 24 |
function draw(text, pct) {
|
|
|
|
| 25 |
label.textContent = `${text} ${Math.floor(pct)}%`;
|
| 26 |
fill.style.width = `${pct}%`;
|
| 27 |
track.setAttribute("aria-valuenow", String(Math.floor(pct)));
|
| 28 |
}
|
| 29 |
|
| 30 |
function tick() {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 31 |
const elapsed = (performance.now() - started) / 1000;
|
| 32 |
const estimate = 95 * (1 - Math.exp(-2 * elapsed / seconds));
|
| 33 |
+
const server = serverProgress();
|
| 34 |
if (server) stageLabel = server.name;
|
| 35 |
shown = Math.min(99, Math.max(shown, floor, estimate, server ? Math.min(server.pct, 95) : 0));
|
| 36 |
const fallback = stages.filter(([at]) => shown >= at).pop()[1];
|
|
|
|
| 50 |
started = performance.now();
|
| 51 |
shown = floor = 0;
|
| 52 |
stageLabel = null;
|
|
|
|
| 53 |
root.hidden = false;
|
| 54 |
tick();
|
| 55 |
timer = setInterval(tick, 200);
|
| 56 |
},
|
| 57 |
stage(name, pct) {
|
| 58 |
if (!timer) return;
|
|
|
|
| 59 |
stageLabel = name;
|
| 60 |
floor = pct;
|
| 61 |
tick();
|