Commit
·
bfba916
1
Parent(s):
67d9b2f
Fix colorize pipeline call and fallback storage directories
Browse files- app/colorize_model.py +4 -2
- app/main.py +24 -4
app/colorize_model.py
CHANGED
|
@@ -230,9 +230,11 @@ class ColorizeModel:
|
|
| 230 |
else:
|
| 231 |
# Use pipeline directly
|
| 232 |
result = self.pipe(
|
| 233 |
-
control_image,
|
| 234 |
prompt=prompt,
|
| 235 |
-
|
|
|
|
|
|
|
|
|
|
| 236 |
)
|
| 237 |
|
| 238 |
if isinstance(result, dict) and "images" in result:
|
|
|
|
| 230 |
else:
|
| 231 |
# Use pipeline directly
|
| 232 |
result = self.pipe(
|
|
|
|
| 233 |
prompt=prompt,
|
| 234 |
+
image=control_image,
|
| 235 |
+
negative_prompt=negative_prompt,
|
| 236 |
+
num_inference_steps=num_inference_steps,
|
| 237 |
+
guidance_scale=guidance_scale
|
| 238 |
)
|
| 239 |
|
| 240 |
if isinstance(result, dict) and "images" in result:
|
app/main.py
CHANGED
|
@@ -63,10 +63,30 @@ else:
|
|
| 63 |
|
| 64 |
# Always use /data in Spaces (writable). Allow override via env.
|
| 65 |
DATA_ROOT = Path(os.getenv("DATA_DIR", "/data"))
|
| 66 |
-
|
| 67 |
-
|
| 68 |
-
|
| 69 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 70 |
logger.info("Storage directories -> uploads: %s, results: %s", str(UPLOAD_DIR), str(RESULT_DIR))
|
| 71 |
|
| 72 |
# Mount static files for serving results from resolved directories
|
|
|
|
| 63 |
|
| 64 |
# Always use /data in Spaces (writable). Allow override via env.
|
| 65 |
DATA_ROOT = Path(os.getenv("DATA_DIR", "/data"))
|
| 66 |
+
|
| 67 |
+
|
| 68 |
+
def _ensure_dir(preferred: Path, fallback: Path) -> Path:
|
| 69 |
+
try:
|
| 70 |
+
preferred.mkdir(parents=True, exist_ok=True)
|
| 71 |
+
return preferred
|
| 72 |
+
except Exception as exc:
|
| 73 |
+
logger.warning("Failed to create directory %s: %s. Falling back to %s", preferred, exc, fallback)
|
| 74 |
+
try:
|
| 75 |
+
fallback.mkdir(parents=True, exist_ok=True)
|
| 76 |
+
return fallback
|
| 77 |
+
except Exception as fallback_exc:
|
| 78 |
+
logger.error("Could not create fallback directory %s: %s", fallback, fallback_exc)
|
| 79 |
+
raise
|
| 80 |
+
|
| 81 |
+
|
| 82 |
+
UPLOAD_DIR = _ensure_dir(
|
| 83 |
+
Path(os.getenv("UPLOAD_DIR", str(DATA_ROOT / "uploads"))),
|
| 84 |
+
Path("/tmp/colorize_uploads")
|
| 85 |
+
)
|
| 86 |
+
RESULT_DIR = _ensure_dir(
|
| 87 |
+
Path(os.getenv("RESULT_DIR", str(DATA_ROOT / "results"))),
|
| 88 |
+
Path("/tmp/colorize_results")
|
| 89 |
+
)
|
| 90 |
logger.info("Storage directories -> uploads: %s, results: %s", str(UPLOAD_DIR), str(RESULT_DIR))
|
| 91 |
|
| 92 |
# Mount static files for serving results from resolved directories
|