refactor installation commands

Author: rycerzes

README.md

@@ -157,13 +157,14 @@ OpenEnv uses `pyproject.toml` as the primary dependency specification:
 
 ```bash
 # Install environment in editable mode
-pip install -e ./my_env
+cd my_env
+pip install -e .
 
 # Or using uv (faster)
-uv pip install -e ./my_env
+uv pip install -e .
 
 # Run server locally without Docker
-uv run --project ./my_env server --host 0.0.0.0 --port 8000
+uv run server --host 0.0.0.0 --port 8000
 ```
 
 **Benefits:**

src/openenv_cli/_validation.py

@@ -27,9 +27,6 @@ def validate_multi_mode_deployment(env_path: Path) -> tuple[bool, list[str]]:
     4. server/app.py has a main() function
     5. Required dependencies are present
 
-    Args:
-        env_path: Path to the environment directory
-
     Returns:
         Tuple of (is_valid, list of issues found)
     """
@@ -115,9 +112,6 @@ def get_deployment_modes(env_path: Path) -> dict[str, bool]:
     """
     Check which deployment modes are supported by the environment.
 
-    Args:
-        env_path: Path to the environment directory
-
     Returns:
         Dictionary with deployment mode names and whether they're supported
     """
@@ -146,11 +140,6 @@ def format_validation_report(env_name: str, is_valid: bool, issues: list[str]) -
     """
     Format a validation report for display.
 
-    Args:
-        env_name: Name of the environment
-        is_valid: Whether validation passed
-        issues: List of issues found
-
     Returns:
         Formatted report string
     """

src/openenv_cli/commands/build.py

@@ -338,20 +338,6 @@ def build(
             help="Build arguments (can be used multiple times, format: KEY=VALUE)",
         ),
     ] = None,
-    push: Annotated[
-        bool,
-        typer.Option(
-            "--push",
-            help="Push image to registry after building",
-        ),
-    ] = False,
-    registry: Annotated[
-        str | None,
-        typer.Option(
-            "--registry",
-            help="Registry to push to (e.g., docker.io/username)",
-        ),
-    ] = None,
 ) -> None:
     """
     Build Docker images for OpenEnv environments.
@@ -367,9 +353,6 @@ def build(
         # Build with custom tag
         $ openenv build -t my-custom-tag
 
-        # Build and push to registry
-        $ openenv build --push --registry myregistry.io
-
         # Build without cache
         $ openenv build --no-cache
 
@@ -448,15 +431,4 @@ def build(
         raise typer.Exit(1)
 
     console.print("[bold green]✓ Docker build successful[/bold green]")
-
-    # Push if requested
-    if push:
-        console.print()
-        tag_to_push = tag or f"openenv-{env_path_obj.name.replace('_env', '')}"
-        success = _push_docker_image(tag_to_push, registry)
-        if not success:
-            print("✗ Docker push failed", file=sys.stderr)
-            raise typer.Exit(1)
-        console.print("[bold green]✓ Docker push successful[/bold green]")
-
     console.print("\n[bold green]Done![/bold green]")

src/openenv_cli/commands/push.py

@@ -325,34 +325,37 @@ def push(
     ] = False,
 ) -> None:
     """
-    Push an OpenEnv environment to Hugging Face Spaces or a custom registry.
+    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. Prepares a custom build for deployment (optionally enables web interface)
-    3. Uploads to Hugging Face or custom registry
+    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 registry.
+    but disabled by default when pushing to a custom Docker registry.
 
     Examples:
-        # Push from current directory with web interface (default)
+        # Push to HuggingFace Spaces from current directory (web interface enabled)
         $ cd my_env
         $ openenv push
 
-        # Push without web interface
+        # Push to HuggingFace without web interface
         $ openenv push --no-interface
 
-        # Push to custom registry (web interface disabled by default)
+        # 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 docker.io/myuser --interface
+        $ openenv push --registry myregistry.io/path1/path2 --interface
 
         # Push to specific HuggingFace repo
         $ openenv push --repo-id my-org/my-env
         
-        # Push with custom base image and private
+        # Push privately with custom base image
         $ openenv push --private --base-image ghcr.io/meta-pytorch/openenv-base:latest
     """
     # Handle interface flag logic
@@ -402,49 +405,45 @@ def push(
 
     # Handle custom registry push
     if registry:
-        console.print("[bold cyan]Preparing files for custom registry deployment...[/bold cyan]")
+        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]")
 
-        with tempfile.TemporaryDirectory() as tmpdir:
-            staging_dir = Path(tmpdir) / "staging"
-            _prepare_staging_directory(
-                env_dir, env_name, staging_dir, 
-                base_image=base_image, 
-                enable_interface=enable_interface
-            )
-            
-            # Build Docker image from staging directory
-            tag = f"{registry}/{env_name}"
-            console.print(f"[bold cyan]Building Docker image: {tag}[/bold cyan]")
-            
-            # Use the build logic (could import from build.py or inline)
-            from .build import _build_docker_image
-            
-            success = _build_docker_image(
-                env_path=staging_dir,
-                tag=tag,
-                context_path=staging_dir / "server",
-            )
-            
-            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]")
-            from .build import _push_docker_image
-            
-            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"Image: {tag}")
+        # 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
 
     # Ensure authentication for HuggingFace