File size: 24,572 Bytes
0f6657d | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 | # Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.
"""Push an OpenEnv environment to Hugging Face Spaces."""
from __future__ import annotations
import shutil
import sys
import tempfile
from fnmatch import fnmatch
from pathlib import Path
from typing import Annotated
import typer
import yaml
from huggingface_hub import HfApi, login, whoami
from .._cli_utils import console, validate_env_structure
app = typer.Typer(help="Push an OpenEnv environment to Hugging Face Spaces")
DEFAULT_PUSH_IGNORE_PATTERNS = [".*", "__pycache__", "*.pyc"]
def _path_matches_pattern(relative_path: Path, pattern: str) -> bool:
"""Return True if a relative path matches an exclude pattern."""
normalized_pattern = pattern.strip()
if normalized_pattern.startswith("!"):
return False
while normalized_pattern.startswith("./"):
normalized_pattern = normalized_pattern[2:]
if normalized_pattern.startswith("/"):
normalized_pattern = normalized_pattern[1:]
if not normalized_pattern:
return False
posix_path = relative_path.as_posix()
pattern_candidates = [normalized_pattern]
if normalized_pattern.startswith("**/"):
# Gitignore-style "**/" can also match directly at the root.
pattern_candidates.append(normalized_pattern[3:])
# Support directory patterns such as "artifacts/" and "**/outputs/".
if normalized_pattern.endswith("/"):
dir_pattern_candidates: list[str] = []
for candidate in pattern_candidates:
base = candidate.rstrip("/")
if not base:
continue
dir_pattern_candidates.extend([base, f"{base}/*"])
return any(
fnmatch(posix_path, candidate) for candidate in dir_pattern_candidates
)
# Match both full relative path and basename for convenience.
return any(
fnmatch(posix_path, candidate) for candidate in pattern_candidates
) or any(fnmatch(relative_path.name, candidate) for candidate in pattern_candidates)
def _should_exclude_path(relative_path: Path, ignore_patterns: list[str]) -> bool:
"""Return True when the path should be excluded from staging/upload."""
return any(
_path_matches_pattern(relative_path, pattern) for pattern in ignore_patterns
)
def _read_ignore_file(ignore_path: Path) -> tuple[list[str], int]:
"""Read ignore patterns from a file and return (patterns, ignored_negations)."""
patterns: list[str] = []
ignored_negations = 0
for line in ignore_path.read_text().splitlines():
stripped = line.strip()
if not stripped or stripped.startswith("#"):
continue
if stripped.startswith("!"):
ignored_negations += 1
continue
patterns.append(stripped)
return patterns, ignored_negations
def _load_ignore_patterns(env_dir: Path, exclude_file: str | None) -> list[str]:
"""Load ignore patterns from defaults and an optional ignore file."""
patterns = list(DEFAULT_PUSH_IGNORE_PATTERNS)
ignored_negations = 0
def _merge_ignore_file(ignore_path: Path, *, source_label: str) -> None:
nonlocal ignored_negations
file_patterns, skipped_negations = _read_ignore_file(ignore_path)
patterns.extend(file_patterns)
ignored_negations += skipped_negations
console.print(
f"[bold green]β[/bold green] Loaded {len(file_patterns)} ignore patterns from {source_label}: {ignore_path}"
)
# Optional source: explicit exclude file from CLI.
if exclude_file:
ignore_path = Path(exclude_file)
if not ignore_path.is_absolute():
ignore_path = env_dir / ignore_path
ignore_path = ignore_path.resolve()
if not ignore_path.exists() or not ignore_path.is_file():
raise typer.BadParameter(
f"Exclude file not found or not a file: {ignore_path}"
)
_merge_ignore_file(ignore_path, source_label="--exclude")
# Keep stable order while removing duplicates.
patterns = list(dict.fromkeys(patterns))
if ignored_negations > 0:
console.print(
f"[bold yellow]β [/bold yellow] Skipped {ignored_negations} negated ignore patterns ('!') because negation is not supported for push excludes"
)
return patterns
def _copytree_ignore_factory(env_dir: Path, ignore_patterns: list[str]):
"""Build a shutil.copytree ignore callback from path-based patterns."""
def _ignore(path: str, names: list[str]) -> set[str]:
current_dir = Path(path)
ignored: set[str] = set()
for name in names:
candidate = current_dir / name
try:
relative_path = candidate.relative_to(env_dir)
except ValueError:
# candidate is not under env_dir (e.g. symlink or
# copytree root differs from env_dir); skip filtering.
continue
if _should_exclude_path(relative_path, ignore_patterns):
ignored.add(name)
return ignored
return _ignore
def _validate_openenv_directory(directory: Path) -> tuple[str, dict]:
"""
Validate that the directory is an OpenEnv environment.
Returns:
Tuple of (env_name, manifest_data)
"""
# Use the comprehensive validation function
try:
warnings = validate_env_structure(directory)
for warning in warnings:
console.print(f"[bold yellow]β [/bold yellow] {warning}")
except FileNotFoundError as e:
raise typer.BadParameter(f"Invalid OpenEnv environment structure: {e}") from e
# Load and validate manifest
manifest_path = directory / "openenv.yaml"
try:
with open(manifest_path, "r") as f:
manifest = yaml.safe_load(f)
except Exception as e:
raise typer.BadParameter(f"Failed to parse openenv.yaml: {e}") from e
if not isinstance(manifest, dict):
raise typer.BadParameter("openenv.yaml must be a YAML dictionary")
env_name = manifest.get("name")
if not env_name:
raise typer.BadParameter("openenv.yaml must contain a 'name' field")
return env_name, manifest
def _ensure_hf_authenticated() -> str:
"""
Ensure user is authenticated with Hugging Face.
Returns:
Username of authenticated user
"""
try:
# Try to get current user
user_info = whoami()
# Handle both dict and object return types
if isinstance(user_info, dict):
username = (
user_info.get("name")
or user_info.get("fullname")
or user_info.get("username")
)
else:
# If it's an object, try to get name attribute
username = (
getattr(user_info, "name", None)
or getattr(user_info, "fullname", None)
or getattr(user_info, "username", None)
)
if not username:
raise ValueError("Could not extract username from whoami response")
console.print(f"[bold green]β[/bold green] Authenticated as: {username}")
return username
except Exception:
# Not authenticated, prompt for login
console.print(
"[bold yellow]Not authenticated with Hugging Face. Please login...[/bold yellow]"
)
try:
login()
# Verify login worked
user_info = whoami()
# Handle both dict and object return types
if isinstance(user_info, dict):
username = (
user_info.get("name")
or user_info.get("fullname")
or user_info.get("username")
)
else:
username = (
getattr(user_info, "name", None)
or getattr(user_info, "fullname", None)
or getattr(user_info, "username", None)
)
if not username:
raise ValueError("Could not extract username from whoami response")
console.print(f"[bold green]β[/bold green] Authenticated as: {username}")
return username
except Exception as e:
raise typer.BadParameter(
f"Hugging Face authentication failed: {e}. Please run login manually."
) from e
def _prepare_staging_directory(
env_dir: Path,
env_name: str,
staging_dir: Path,
ignore_patterns: list[str],
base_image: str | None = None,
enable_interface: bool = True,
) -> None:
"""
Prepare files for deployment.
This includes:
- Copying necessary files
- Modifying Dockerfile to optionally enable web interface and update base image
- Ensuring README has proper HF frontmatter (if interface enabled)
"""
# Create staging directory structure
staging_dir.mkdir(parents=True, exist_ok=True)
# Copy all files from env directory
copy_ignore = _copytree_ignore_factory(env_dir, ignore_patterns)
for item in env_dir.iterdir():
relative_path = item.relative_to(env_dir)
if _should_exclude_path(relative_path, ignore_patterns):
continue
dest = staging_dir / item.name
if item.is_dir():
shutil.copytree(item, dest, dirs_exist_ok=True, ignore=copy_ignore)
else:
shutil.copy2(item, dest)
# Dockerfile must be at repo root for Hugging Face. Prefer root if present
# (it was copied there); otherwise move server/Dockerfile to root.
dockerfile_server_path = staging_dir / "server" / "Dockerfile"
dockerfile_root_path = staging_dir / "Dockerfile"
dockerfile_path: Path | None = None
if dockerfile_root_path.exists():
dockerfile_path = dockerfile_root_path
elif dockerfile_server_path.exists():
dockerfile_server_path.rename(dockerfile_root_path)
console.print(
"[bold cyan]Moved Dockerfile to repository root for deployment[/bold cyan]"
)
dockerfile_path = dockerfile_root_path
# Modify Dockerfile to optionally enable web interface and update base image
if dockerfile_path and dockerfile_path.exists():
dockerfile_content = dockerfile_path.read_text()
lines = dockerfile_content.split("\n")
new_lines = []
cmd_found = False
base_image_updated = False
web_interface_env_exists = "ENABLE_WEB_INTERFACE" in dockerfile_content
last_instruction = None
for line in lines:
stripped = line.strip()
token = stripped.split(maxsplit=1)[0] if stripped else ""
current_instruction = token.upper()
is_healthcheck_continuation = last_instruction == "HEALTHCHECK"
# Update base image if specified
if base_image and stripped.startswith("FROM") and not base_image_updated:
new_lines.append(f"FROM {base_image}")
base_image_updated = True
last_instruction = "FROM"
continue
if (
stripped.startswith("CMD")
and not cmd_found
and not web_interface_env_exists
and enable_interface
and not is_healthcheck_continuation
):
new_lines.append("ENV ENABLE_WEB_INTERFACE=true")
cmd_found = True
new_lines.append(line)
if current_instruction:
last_instruction = current_instruction
if not cmd_found and not web_interface_env_exists and enable_interface:
new_lines.append("ENV ENABLE_WEB_INTERFACE=true")
if base_image and not base_image_updated:
new_lines.insert(0, f"FROM {base_image}")
dockerfile_path.write_text("\n".join(new_lines))
changes = []
if base_image and base_image_updated:
changes.append("updated base image")
if enable_interface and not web_interface_env_exists:
changes.append("enabled web interface")
if changes:
console.print(
f"[bold green]β[/bold green] Updated Dockerfile: {', '.join(changes)}"
)
else:
console.print(
"[bold yellow]β [/bold yellow] No Dockerfile at server/ or repo root"
)
# Ensure README has proper HF frontmatter (only if interface enabled)
if enable_interface:
readme_path = staging_dir / "README.md"
if readme_path.exists():
readme_content = readme_path.read_text()
if "base_path: /web" not in readme_content:
# Check if frontmatter exists
if readme_content.startswith("---"):
# Add base_path to existing frontmatter
lines = readme_content.split("\n")
new_lines = []
_in_frontmatter = True
for i, line in enumerate(lines):
new_lines.append(line)
if line.strip() == "---" and i > 0:
# End of frontmatter, add base_path before this line
if "base_path:" not in "\n".join(new_lines):
new_lines.insert(-1, "base_path: /web")
_in_frontmatter = False
readme_path.write_text("\n".join(new_lines))
else:
# No frontmatter, add it
frontmatter = f"""---
title: {env_name.replace("_", " ").title()} Environment Server
emoji: π
colorFrom: '#00C9FF'
colorTo: '#1B2845'
sdk: docker
pinned: false
app_port: 8000
base_path: /web
tags:
- openenv
---
"""
readme_path.write_text(frontmatter + readme_content)
console.print(
"[bold green]β[/bold green] Updated README with HF Space frontmatter"
)
else:
console.print("[bold yellow]β [/bold yellow] No README.md found")
def _create_hf_space(
repo_id: str,
api: HfApi,
private: bool = False,
) -> None:
"""Create a Hugging Face Space if it doesn't exist."""
console.print(f"[bold cyan]Creating/verifying space: {repo_id}[/bold cyan]")
try:
api.create_repo(
repo_id=repo_id,
repo_type="space",
space_sdk="docker",
private=private,
exist_ok=True,
)
console.print(f"[bold green]β[/bold green] Space {repo_id} is ready")
except Exception as e:
# Space might already exist, which is okay with exist_ok=True
# But if there's another error, log it
console.print(f"[bold yellow]β [/bold yellow] Space creation: {e}")
def _upload_to_hf_space(
repo_id: str,
staging_dir: Path,
api: HfApi,
ignore_patterns: list[str],
private: bool = False,
create_pr: bool = False,
commit_message: str | None = None,
) -> None:
"""Upload files to Hugging Face Space."""
if create_pr:
console.print(
f"[bold cyan]Uploading files to {repo_id} (will open a Pull Request)...[/bold cyan]"
)
else:
console.print(f"[bold cyan]Uploading files to {repo_id}...[/bold cyan]")
upload_kwargs: dict = {
"folder_path": str(staging_dir),
"repo_id": repo_id,
"repo_type": "space",
"create_pr": create_pr,
"ignore_patterns": ignore_patterns,
}
if commit_message:
upload_kwargs["commit_message"] = commit_message
try:
result = api.upload_folder(**upload_kwargs)
console.print("[bold green]β[/bold green] Upload completed successfully")
if create_pr and result is not None and hasattr(result, "pr_url"):
console.print(f"[bold]Pull request:[/bold] {result.pr_url}")
console.print(
f"[bold]Space URL:[/bold] https://huggingface.co/spaces/{repo_id}"
)
except Exception as e:
console.print(f"[bold red]β[/bold red] Upload failed: {e}")
raise typer.Exit(1) from e
@app.command()
def push(
directory: Annotated[
str | None,
typer.Argument(
help="Directory containing the OpenEnv environment (default: current directory)"
),
] = None,
repo_id: Annotated[
str | None,
typer.Option(
"--repo-id",
"-r",
help="Repository ID in format 'username/repo-name' (defaults to 'username/env-name' from openenv.yaml)",
),
] = None,
base_image: Annotated[
str | None,
typer.Option(
"--base-image",
"-b",
help="Base Docker image to use (overrides Dockerfile FROM)",
),
] = None,
interface: Annotated[
bool,
typer.Option(
"--interface",
help="Enable web interface (default: True if no registry specified)",
),
] = None,
no_interface: Annotated[
bool,
typer.Option(
"--no-interface",
help="Disable web interface",
),
] = False,
registry: Annotated[
str | None,
typer.Option(
"--registry",
help="Custom registry URL (e.g., docker.io/username). Disables web interface by default.",
),
] = None,
private: Annotated[
bool,
typer.Option(
"--private",
help="Deploy the space as private",
),
] = False,
create_pr: Annotated[
bool,
typer.Option(
"--create-pr",
help="Create a Pull Request instead of pushing to the default branch",
),
] = False,
exclude: Annotated[
str | None,
typer.Option(
"--exclude",
help="Optional additional ignore file with newline-separated glob patterns to exclude from Hugging Face uploads",
),
] = None,
) -> None:
"""
Push an OpenEnv environment to Hugging Face Spaces or a custom Docker registry.
This command:
1. Validates that the directory is an OpenEnv environment (openenv.yaml present)
2. Builds and pushes to Hugging Face Spaces or custom Docker registry
3. Optionally enables web interface for deployment
The web interface is enabled by default when pushing to HuggingFace Spaces,
but disabled by default when pushing to a custom Docker registry.
Examples:
# Push to HuggingFace Spaces from current directory (web interface enabled)
$ cd my_env
$ openenv push
# Push to HuggingFace repo and open a Pull Request
$ openenv push my-org/my-env --create-pr
$ openenv push --repo-id my-org/my-env --create-pr
# Push to HuggingFace without web interface
$ openenv push --no-interface
# Push to Docker Hub
$ openenv push --registry docker.io/myuser
# Push to GitHub Container Registry
$ openenv push --registry ghcr.io/myorg
# Push to custom registry with web interface
$ openenv push --registry myregistry.io/path1/path2 --interface
# Push to specific HuggingFace repo
$ openenv push --repo-id my-org/my-env
# Push privately with custom base image
$ openenv push --private --base-image ghcr.io/meta-pytorch/openenv-base:latest
"""
# Handle interface flag logic
if no_interface and interface:
console.print(
"[bold red]Error:[/bold red] Cannot specify both --interface and --no-interface",
file=sys.stderr,
)
raise typer.Exit(1)
# Determine if web interface should be enabled
if no_interface:
enable_interface = False
elif interface is not None:
enable_interface = interface
elif registry is not None:
# Custom registry: disable interface by default
enable_interface = False
else:
# HuggingFace: enable interface by default
enable_interface = True
# Determine directory
if directory:
env_dir = Path(directory).resolve()
else:
env_dir = Path.cwd().resolve()
if not env_dir.exists() or not env_dir.is_dir():
raise typer.BadParameter(f"Directory does not exist: {env_dir}")
# Check for openenv.yaml to confirm this is an environment directory
openenv_yaml = env_dir / "openenv.yaml"
if not openenv_yaml.exists():
console.print(
f"[bold red]Error:[/bold red] Not an OpenEnv environment directory (missing openenv.yaml): {env_dir}",
)
console.print(
"[yellow]Hint:[/yellow] Run this command from the environment root directory",
)
raise typer.Exit(1)
# Validate OpenEnv environment
console.print(
f"[bold cyan]Validating OpenEnv environment in {env_dir}...[/bold cyan]"
)
env_name, manifest = _validate_openenv_directory(env_dir)
console.print(f"[bold green]β[/bold green] Found OpenEnv environment: {env_name}")
# Handle custom registry push
if registry:
console.print("[bold cyan]Preparing to push to custom registry...[/bold cyan]")
if enable_interface:
console.print("[bold cyan]Web interface will be enabled[/bold cyan]")
# Import build functions
from .build import _build_docker_image, _push_docker_image
# Prepare build args for custom registry deployment
build_args = {}
if enable_interface:
build_args["ENABLE_WEB_INTERFACE"] = "true"
# Build Docker image from the environment directory
tag = f"{registry}/{env_name}"
console.print(f"[bold cyan]Building Docker image: {tag}[/bold cyan]")
success = _build_docker_image(
env_path=env_dir,
tag=tag,
build_args=build_args if build_args else None,
)
if not success:
console.print("[bold red]β Docker build failed[/bold red]")
raise typer.Exit(1)
console.print("[bold green]β Docker build successful[/bold green]")
# Push to registry
console.print(f"[bold cyan]Pushing to registry: {registry}[/bold cyan]")
success = _push_docker_image(
tag, registry=None
) # Tag already includes registry
if not success:
console.print("[bold red]β Docker push failed[/bold red]")
raise typer.Exit(1)
console.print("\n[bold green]β Deployment complete![/bold green]")
console.print(f"[bold]Image:[/bold] {tag}")
return
ignore_patterns = _load_ignore_patterns(env_dir, exclude)
# Ensure authentication for HuggingFace
username = _ensure_hf_authenticated()
# Determine repo_id
if not repo_id:
repo_id = f"{username}/{env_name}"
# Validate repo_id format
if "/" not in repo_id or repo_id.count("/") != 1:
raise typer.BadParameter(
f"Invalid repo-id format: {repo_id}. Expected format: 'username/repo-name'"
)
# Initialize Hugging Face API
api = HfApi()
# Prepare staging directory
deployment_type = (
"with web interface" if enable_interface else "without web interface"
)
console.print(
f"[bold cyan]Preparing files for Hugging Face deployment ({deployment_type})...[/bold cyan]"
)
with tempfile.TemporaryDirectory() as tmpdir:
staging_dir = Path(tmpdir) / "staging"
_prepare_staging_directory(
env_dir,
env_name,
staging_dir,
ignore_patterns=ignore_patterns,
base_image=base_image,
enable_interface=enable_interface,
)
# Create/verify space (no-op if exists; needed when pushing to own new repo)
if not create_pr:
_create_hf_space(repo_id, api, private=private)
# When create_pr we rely on upload_folder to create branch and PR
# Upload files
_upload_to_hf_space(
repo_id,
staging_dir,
api,
private=private,
create_pr=create_pr,
ignore_patterns=ignore_patterns,
)
console.print("\n[bold green]β Deployment complete![/bold green]")
console.print(f"Visit your space at: https://huggingface.co/spaces/{repo_id}")
|