Update simple_app.py
Browse files- simple_app.py +10 -17
simple_app.py
CHANGED
@@ -16,9 +16,11 @@ def infer(prompt, progress=gr.Progress(track_tqdm=True)):
|
|
16 |
irrelevant_steps = 4
|
17 |
relevant_steps = total_process_steps - irrelevant_steps # 7 steps
|
18 |
|
|
|
19 |
overall_bar = tqdm(total=relevant_steps, desc="Overall Process", position=1, dynamic_ncols=True, leave=True)
|
20 |
processed_steps = 0
|
21 |
|
|
|
22 |
progress_pattern = re.compile(r"(\d+)%\|.*\| (\d+)/(\d+)")
|
23 |
gen_progress_bar = None
|
24 |
|
@@ -42,14 +44,13 @@ def infer(prompt, progress=gr.Progress(track_tqdm=True)):
|
|
42 |
bufsize=1 # line-buffered
|
43 |
)
|
44 |
|
45 |
-
last_msg = ""
|
46 |
-
|
47 |
for line in iter(process.stdout.readline, ''):
|
48 |
stripped_line = line.strip()
|
49 |
if not stripped_line:
|
50 |
continue
|
51 |
|
52 |
-
#
|
53 |
progress_match = progress_pattern.search(stripped_line)
|
54 |
if progress_match:
|
55 |
current = int(progress_match.group(2))
|
@@ -60,29 +61,21 @@ def infer(prompt, progress=gr.Progress(track_tqdm=True)):
|
|
60 |
gen_progress_bar.refresh()
|
61 |
continue
|
62 |
|
63 |
-
#
|
64 |
if "INFO:" in stripped_line:
|
65 |
parts = stripped_line.split("INFO:", 1)
|
66 |
msg = parts[1].strip() if len(parts) > 1 else ""
|
67 |
-
|
68 |
-
|
69 |
-
tqdm.write(f"Extracted INFO message: '{msg}'")
|
70 |
-
|
71 |
-
# Skip first three steps
|
72 |
if processed_steps < irrelevant_steps:
|
73 |
processed_steps += 1
|
74 |
else:
|
75 |
overall_bar.update(1)
|
76 |
percentage = (overall_bar.n / overall_bar.total) * 100
|
77 |
-
last_msg = msg
|
78 |
-
|
79 |
-
|
80 |
-
tqdm.write(f"Updating description: Overall Process - {percentage:.1f}% | {last_msg}")
|
81 |
-
|
82 |
-
# Update progress bar description with INFO message
|
83 |
-
overall_bar.set_description(f"Overall Process - {percentage:.1f}% | {last_msg}")
|
84 |
overall_bar.refresh()
|
85 |
-
|
86 |
else:
|
87 |
tqdm.write(stripped_line)
|
88 |
|
|
|
16 |
irrelevant_steps = 4
|
17 |
relevant_steps = total_process_steps - irrelevant_steps # 7 steps
|
18 |
|
19 |
+
# Create an overall progress bar.
|
20 |
overall_bar = tqdm(total=relevant_steps, desc="Overall Process", position=1, dynamic_ncols=True, leave=True)
|
21 |
processed_steps = 0
|
22 |
|
23 |
+
# Regex for progress lines (e.g. "10%|...| 5/50")
|
24 |
progress_pattern = re.compile(r"(\d+)%\|.*\| (\d+)/(\d+)")
|
25 |
gen_progress_bar = None
|
26 |
|
|
|
44 |
bufsize=1 # line-buffered
|
45 |
)
|
46 |
|
47 |
+
last_msg = ""
|
|
|
48 |
for line in iter(process.stdout.readline, ''):
|
49 |
stripped_line = line.strip()
|
50 |
if not stripped_line:
|
51 |
continue
|
52 |
|
53 |
+
# Check for video generation progress lines.
|
54 |
progress_match = progress_pattern.search(stripped_line)
|
55 |
if progress_match:
|
56 |
current = int(progress_match.group(2))
|
|
|
61 |
gen_progress_bar.refresh()
|
62 |
continue
|
63 |
|
64 |
+
# Process INFO lines.
|
65 |
if "INFO:" in stripped_line:
|
66 |
parts = stripped_line.split("INFO:", 1)
|
67 |
msg = parts[1].strip() if len(parts) > 1 else ""
|
68 |
+
# Print the log line.
|
69 |
+
tqdm.write(stripped_line)
|
|
|
|
|
|
|
70 |
if processed_steps < irrelevant_steps:
|
71 |
processed_steps += 1
|
72 |
else:
|
73 |
overall_bar.update(1)
|
74 |
percentage = (overall_bar.n / overall_bar.total) * 100
|
75 |
+
last_msg = msg
|
76 |
+
# Instead of set_description(), try set_description_str()
|
77 |
+
overall_bar.set_description_str(f"Overall Process - {percentage:.1f}% | {last_msg}")
|
|
|
|
|
|
|
|
|
78 |
overall_bar.refresh()
|
|
|
79 |
else:
|
80 |
tqdm.write(stripped_line)
|
81 |
|