SynLayers commited on
Commit
1ac7ab9
·
verified ·
1 Parent(s): 331f981

Upload demo/app.py with huggingface_hub

Browse files
Files changed (1) hide show
  1. demo/app.py +32 -18
demo/app.py CHANGED
@@ -42,13 +42,13 @@ if str(PROJECT_ROOT) not in sys.path:
42
 
43
  from demo.real_world_pipeline import ( # noqa: E402
44
  DEFAULT_BBOX_MODEL,
45
- DEFAULT_MODEL_REPO_ID,
46
  DEFAULT_REAL_CONFIG_PATH,
47
  DEFAULT_RUN_NAME,
48
  DEFAULT_WORK_DIR,
49
  run_real_world_pipeline,
50
  )
51
- from demo.hf_repo_assets import ensure_repo_assets # noqa: E402
52
 
53
 
54
  DEFAULT_EXAMPLE_DIR = Path(
@@ -91,10 +91,10 @@ ZERO_GPU_DURATION = clamp(
91
 
92
  MODEL_PREFETCH_STATUS = {
93
  "enabled": os.environ.get("SYNLAYERS_DISABLE_PREFETCH", "0") != "1",
94
- "bbox_model": str(DEFAULT_BBOX_MODEL),
95
- "main_model": str(os.environ.get("SYNLAYERS_MODEL_REPO") or DEFAULT_MODEL_REPO_ID),
96
  "bbox_done": False,
97
- "main_done": False,
98
  "error": "",
99
  }
100
 
@@ -181,20 +181,28 @@ def prefetch_model_assets() -> None:
181
  if not MODEL_PREFETCH_STATUS["enabled"]:
182
  return
183
 
184
- main_model = os.environ.get("SYNLAYERS_MODEL_REPO") or DEFAULT_MODEL_REPO_ID
185
- bbox_ok = prefetch_one_model(DEFAULT_BBOX_MODEL, "bbox model")
186
- main_ok = prefetch_one_model(main_model, "main model")
 
 
 
 
 
 
 
 
187
 
188
  try:
189
- ensure_repo_assets(main_model)
190
  except Exception as exc:
191
  MODEL_PREFETCH_STATUS["error"] += (
192
- f"\n- Failed to prefetch runtime assets from `{main_model}`: {exc}"
193
  )
194
- main_ok = False
195
 
196
  MODEL_PREFETCH_STATUS["bbox_done"] = bool(bbox_ok)
197
- MODEL_PREFETCH_STATUS["main_done"] = bool(main_ok)
198
 
199
 
200
  # Run prefetch during Space startup, outside the ZeroGPU-decorated function.
@@ -252,7 +260,12 @@ def is_zero_gpu_space() -> bool:
252
  def get_runtime_status_markdown() -> str:
253
  accelerator = os.environ.get("ACCELERATOR", "unknown")
254
  space_id = os.environ.get("SPACE_ID", "local")
255
- model_repo = os.environ.get("SYNLAYERS_MODEL_REPO") or DEFAULT_MODEL_REPO_ID
 
 
 
 
 
256
  zero_gpu_enabled = is_zero_gpu_space()
257
 
258
  lines = [
@@ -260,14 +273,15 @@ def get_runtime_status_markdown() -> str:
260
  f"- `SPACE_ID`: `{space_id}`",
261
  f"- `ACCELERATOR`: `{accelerator}`",
262
  f"- `HF_HOME`: `{os.environ.get('HF_HOME', '')}`",
263
- f"- `SYNLAYERS_MODEL_REPO`: `{model_repo}`",
 
264
  "",
265
  "## Model Asset Prefetch",
266
  f"- `Prefetch enabled`: `{MODEL_PREFETCH_STATUS['enabled']}`",
267
- f"- `BBox model`: `{MODEL_PREFETCH_STATUS['bbox_model']}`",
268
- f"- `Main model`: `{MODEL_PREFETCH_STATUS['main_model']}`",
269
- f"- `BBox model files prefetched`: `{MODEL_PREFETCH_STATUS['bbox_done']}`",
270
- f"- `Main model files prefetched`: `{MODEL_PREFETCH_STATUS['main_done']}`",
271
  ]
272
 
273
  if MODEL_PREFETCH_STATUS["error"]:
 
42
 
43
  from demo.real_world_pipeline import ( # noqa: E402
44
  DEFAULT_BBOX_MODEL,
45
+ DEFAULT_STAGE2_MODEL_REPO_ID,
46
  DEFAULT_REAL_CONFIG_PATH,
47
  DEFAULT_RUN_NAME,
48
  DEFAULT_WORK_DIR,
49
  run_real_world_pipeline,
50
  )
51
+ from demo.hf_repo_assets import ensure_repo_assets, get_stage2_model_repo_id # noqa: E402
52
 
53
 
54
  DEFAULT_EXAMPLE_DIR = Path(
 
91
 
92
  MODEL_PREFETCH_STATUS = {
93
  "enabled": os.environ.get("SYNLAYERS_DISABLE_PREFETCH", "0") != "1",
94
+ "stage1_bbox_model": str(DEFAULT_BBOX_MODEL),
95
+ "stage2_model_repo": get_stage2_model_repo_id(),
96
  "bbox_done": False,
97
+ "stage2_done": False,
98
  "error": "",
99
  }
100
 
 
181
  if not MODEL_PREFETCH_STATUS["enabled"]:
182
  return
183
 
184
+ stage1_bbox_model = (
185
+ os.environ.get("SYNLAYERS_BBOX_MODEL")
186
+ or os.environ.get("SYNLAYERS_BBOX_MODEL_REPO")
187
+ or DEFAULT_BBOX_MODEL
188
+ )
189
+ stage2_model_repo = get_stage2_model_repo_id()
190
+ MODEL_PREFETCH_STATUS["stage1_bbox_model"] = str(stage1_bbox_model)
191
+ MODEL_PREFETCH_STATUS["stage2_model_repo"] = str(stage2_model_repo)
192
+
193
+ bbox_ok = prefetch_one_model(stage1_bbox_model, "Stage 1 bbox model")
194
+ stage2_ok = prefetch_one_model(stage2_model_repo, "Stage 2 model repo")
195
 
196
  try:
197
+ ensure_repo_assets(stage2_model_repo)
198
  except Exception as exc:
199
  MODEL_PREFETCH_STATUS["error"] += (
200
+ f"\n- Failed to prefetch Stage 2 runtime assets from `{stage2_model_repo}`: {exc}"
201
  )
202
+ stage2_ok = False
203
 
204
  MODEL_PREFETCH_STATUS["bbox_done"] = bool(bbox_ok)
205
+ MODEL_PREFETCH_STATUS["stage2_done"] = bool(stage2_ok)
206
 
207
 
208
  # Run prefetch during Space startup, outside the ZeroGPU-decorated function.
 
260
  def get_runtime_status_markdown() -> str:
261
  accelerator = os.environ.get("ACCELERATOR", "unknown")
262
  space_id = os.environ.get("SPACE_ID", "local")
263
+ stage1_bbox_model = (
264
+ os.environ.get("SYNLAYERS_BBOX_MODEL")
265
+ or os.environ.get("SYNLAYERS_BBOX_MODEL_REPO")
266
+ or DEFAULT_BBOX_MODEL
267
+ )
268
+ stage2_model_repo = get_stage2_model_repo_id()
269
  zero_gpu_enabled = is_zero_gpu_space()
270
 
271
  lines = [
 
273
  f"- `SPACE_ID`: `{space_id}`",
274
  f"- `ACCELERATOR`: `{accelerator}`",
275
  f"- `HF_HOME`: `{os.environ.get('HF_HOME', '')}`",
276
+ f"- `Stage 1 bbox repo/path`: `{stage1_bbox_model}`",
277
+ f"- `Stage 2 repo`: `{stage2_model_repo}`",
278
  "",
279
  "## Model Asset Prefetch",
280
  f"- `Prefetch enabled`: `{MODEL_PREFETCH_STATUS['enabled']}`",
281
+ f"- `Stage 1 bbox model`: `{MODEL_PREFETCH_STATUS['stage1_bbox_model']}`",
282
+ f"- `Stage 2 model repo`: `{MODEL_PREFETCH_STATUS['stage2_model_repo']}`",
283
+ f"- `Stage 1 files prefetched`: `{MODEL_PREFETCH_STATUS['bbox_done']}`",
284
+ f"- `Stage 2 assets prefetched`: `{MODEL_PREFETCH_STATUS['stage2_done']}`",
285
  ]
286
 
287
  if MODEL_PREFETCH_STATUS["error"]: