fips-agents-cli 0.1.8__tar.gz → 0.2.0__tar.gz

{fips_agents_cli-0.1.8 → fips_agents_cli-0.2.0}/.github/workflows/test.yml

@@ -3,6 +3,8 @@ name: Tests
 on:
   push:
     branches: [ main ]
+    tags:
+      - 'v*.*.*'
   pull_request:
     branches: [ main ]
 

{fips_agents_cli-0.1.8 → fips_agents_cli-0.2.0}/.github/workflows/workflow.yaml

@@ -21,7 +21,7 @@ jobs:
         uses: lewagon/wait-on-check-action@v1.3.1
         with:
           ref: ${{ github.ref }}
-          check-name: 'Tests Status'
+          check-regexp: 'Test on Python'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           wait-interval: 10
 

{fips_agents_cli-0.1.8 → fips_agents_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fips-agents-cli
-Version: 0.1.8
+Version: 0.2.0
 Summary: CLI tool for creating and managing FIPS-compliant AI agent projects
 Project-URL: Homepage, https://github.com/rdwj/fips-agents-cli
 Project-URL: Repository, https://github.com/rdwj/fips-agents-cli
@@ -528,6 +528,29 @@ MIT License - see LICENSE file for details
 
 ## Changelog
 
+### Version 0.2.0
+
+- Feature: GitHub integration for `create mcp-server` command
+- Feature: New `--github` flag to create GitHub repository and push code
+- Feature: New `--local` flag to skip GitHub and create local-only project
+- Feature: Non-interactive mode (`--yes`) for agent/CI workflows
+- Feature: New `--private` flag to create private GitHub repositories
+- Feature: New `--org` option to create repositories in GitHub organizations
+- Feature: New `--description` option for GitHub repository descriptions
+- Feature: New `--remote-only` flag to create GitHub repo without local clone
+- Feature: Added missing `patch build` subcommand for updating build/deployment files
+- Feature: GitHub metadata tracking in `.template-info` file
+- Feature: New git utilities for remote management (`add_remote`, `push_to_remote`)
+- Improvement: Auto-detects `gh` CLI and prompts user when available
+- Improvement: Clean git history - customizes project before initial push
+
+### Version 0.1.9
+
+- Feature: Added `.fips-agents-cli` directory to ModelCar projects with generation metadata
+- Feature: ModelCar projects now include `info.json` with source, destination, and generator info
+- Feature: ModelCar projects now include `CLAUDE.md` with project-specific Claude Code instructions
+- Improvement: Consistent project metadata structure between MCP server and ModelCar projects
+
 ### Version 0.1.8
 
 - Feature: Added GitHub Copilot agent template support

{fips_agents_cli-0.1.8 → fips_agents_cli-0.2.0}/README.md

@@ -495,6 +495,29 @@ MIT License - see LICENSE file for details
 
 ## Changelog
 
+### Version 0.2.0
+
+- Feature: GitHub integration for `create mcp-server` command
+- Feature: New `--github` flag to create GitHub repository and push code
+- Feature: New `--local` flag to skip GitHub and create local-only project
+- Feature: Non-interactive mode (`--yes`) for agent/CI workflows
+- Feature: New `--private` flag to create private GitHub repositories
+- Feature: New `--org` option to create repositories in GitHub organizations
+- Feature: New `--description` option for GitHub repository descriptions
+- Feature: New `--remote-only` flag to create GitHub repo without local clone
+- Feature: Added missing `patch build` subcommand for updating build/deployment files
+- Feature: GitHub metadata tracking in `.template-info` file
+- Feature: New git utilities for remote management (`add_remote`, `push_to_remote`)
+- Improvement: Auto-detects `gh` CLI and prompts user when available
+- Improvement: Clean git history - customizes project before initial push
+
+### Version 0.1.9
+
+- Feature: Added `.fips-agents-cli` directory to ModelCar projects with generation metadata
+- Feature: ModelCar projects now include `info.json` with source, destination, and generator info
+- Feature: ModelCar projects now include `CLAUDE.md` with project-specific Claude Code instructions
+- Improvement: Consistent project metadata structure between MCP server and ModelCar projects
+
 ### Version 0.1.8
 
 - Feature: Added GitHub Copilot agent template support

{fips_agents_cli-0.1.8 → fips_agents_cli-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "fips-agents-cli"
-version = "0.1.8"
+version = "0.2.0"
 description = "CLI tool for creating and managing FIPS-compliant AI agent projects"
 readme = "README.md"
 requires-python = ">=3.10"

fips_agents_cli-0.2.0/src/fips_agents_cli/commands/create.py

@@ -0,0 +1,447 @@
+"""Create command for generating new projects from templates."""
+
+import sys
+
+import click
+from rich.console import Console
+from rich.panel import Panel
+from rich.progress import Progress, SpinnerColumn, TextColumn
+
+from fips_agents_cli.commands.model_car import model_car
+from fips_agents_cli.tools.filesystem import resolve_target_path, validate_target_directory
+from fips_agents_cli.tools.git import (
+    add_remote,
+    clone_template,
+    init_repository,
+    is_git_installed,
+    push_to_remote,
+)
+from fips_agents_cli.tools.github import (
+    check_gh_prerequisites,
+    create_github_repo,
+    get_github_username,
+    is_gh_authenticated,
+    is_gh_installed,
+)
+from fips_agents_cli.tools.project import (
+    cleanup_template_files,
+    to_module_name,
+    update_project_name,
+    validate_project_name,
+    write_template_info,
+)
+
+console = Console()
+
+# Template URL for MCP server projects
+MCP_SERVER_TEMPLATE_URL = "https://github.com/rdwj/mcp-server-template"
+
+
+@click.group()
+def create():
+    """Create new projects from templates."""
+    pass
+
+
+# Register subcommands
+create.add_command(model_car)
+
+
+@create.command("mcp-server")
+@click.argument("project_name")
+@click.option(
+    "--target-dir",
+    "-t",
+    default=None,
+    help="Target directory for the project (default: current directory)",
+)
+@click.option(
+    "--no-git",
+    is_flag=True,
+    default=False,
+    help="Skip git repository initialization",
+)
+@click.option(
+    "--github",
+    "use_github",
+    is_flag=True,
+    default=False,
+    help="Create GitHub repository and push code",
+)
+@click.option(
+    "--local",
+    "use_local",
+    is_flag=True,
+    default=False,
+    help="Create local project only (skip GitHub)",
+)
+@click.option(
+    "--yes",
+    "-y",
+    is_flag=True,
+    default=False,
+    help="Non-interactive mode (use defaults, skip prompts)",
+)
+@click.option(
+    "--private",
+    is_flag=True,
+    default=False,
+    help="Make GitHub repository private (default: public)",
+)
+@click.option(
+    "--org",
+    default=None,
+    help="GitHub organization to create repository in",
+)
+@click.option(
+    "--description",
+    "-d",
+    "repo_description",
+    default=None,
+    help="GitHub repository description",
+)
+@click.option(
+    "--remote-only",
+    is_flag=True,
+    default=False,
+    help="Create GitHub repo only, don't clone locally",
+)
+def mcp_server(
+    project_name: str,
+    target_dir: str | None,
+    no_git: bool,
+    use_github: bool,
+    use_local: bool,
+    yes: bool,
+    private: bool,
+    org: str | None,
+    repo_description: str | None,
+    remote_only: bool,
+):
+    """
+    Create a new MCP server project from template.
+
+    PROJECT_NAME must start with a lowercase letter and contain only
+    lowercase letters, numbers, hyphens, and underscores.
+
+    By default, if GitHub CLI (gh) is installed and authenticated, prompts
+    to create a GitHub repository. Use --local to skip this, or --github
+    to require it. Use --yes for non-interactive mode (agents/CI).
+
+    Examples:
+
+        fips-agents create mcp-server my-mcp-server
+
+        fips-agents create mcp-server my-mcp-server --github --private
+
+        fips-agents create mcp-server my-mcp-server --local
+
+        fips-agents create mcp-server my-mcp-server --yes  # Non-interactive
+    """
+    try:
+        # Step 1: Validate options
+        if use_github and use_local:
+            console.print("[red]✗[/red] Cannot use --github and --local together")
+            sys.exit(1)
+
+        if remote_only and use_local:
+            console.print("[red]✗[/red] Cannot use --remote-only with --local")
+            sys.exit(1)
+
+        # Step 2: Validate project name
+        console.print("\n[bold cyan]Creating MCP Server Project[/bold cyan]\n")
+
+        is_valid, error_msg = validate_project_name(project_name)
+        if not is_valid:
+            console.print(f"[red]✗[/red] Invalid project name: {error_msg}")
+            sys.exit(1)
+
+        console.print(f"[green]✓[/green] Project name '{project_name}' is valid")
+
+        # Step 3: Determine mode (GitHub or local)
+        create_github = _determine_github_mode(use_github, use_local, yes)
+
+        # Step 4: Check prerequisites
+        if not is_git_installed():
+            console.print(
+                "[yellow]⚠[/yellow] Git is not installed. This is required for cloning templates."
+            )
+            console.print("[yellow]Hint:[/yellow] Install git from https://git-scm.com/downloads")
+            sys.exit(1)
+
+        if create_github:
+            ready, error_msg = check_gh_prerequisites()
+            if not ready:
+                console.print(f"[red]✗[/red] {error_msg}")
+                sys.exit(1)
+
+        # Step 5: Resolve and validate target directory (skip for remote-only)
+        target_path = None
+        if not remote_only:
+            target_path = resolve_target_path(project_name, target_dir)
+
+            is_valid, error_msg = validate_target_directory(target_path, allow_existing=False)
+            if not is_valid:
+                console.print(f"[red]✗[/red] {error_msg}")
+                console.print(
+                    "\n[yellow]Hint:[/yellow] Choose a different name or remove the existing "
+                    "directory"
+                )
+                sys.exit(1)
+
+            console.print(f"[green]✓[/green] Target directory: {target_path}")
+
+        # Step 6: Create GitHub repo first (if GitHub mode)
+        github_repo = None
+        github_url = None
+        if create_github:
+            success, github_url, error_msg = create_github_repo(
+                name=project_name,
+                private=private,
+                org=org,
+                description=repo_description,
+            )
+            if not success:
+                console.print(f"[red]✗[/red] {error_msg}")
+                sys.exit(1)
+
+            # Construct repo identifier
+            owner = org if org else get_github_username()
+            github_repo = f"{owner}/{project_name}"
+
+        # Step 7: Handle remote-only mode
+        if remote_only:
+            _show_remote_only_success(project_name, github_url, github_repo)
+            return
+
+        # Step 8: Clone template repository
+        template_commit = None
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            console=console,
+        ) as progress:
+            progress.add_task(description="Cloning template repository...", total=None)
+            try:
+                template_commit = clone_template(MCP_SERVER_TEMPLATE_URL, target_path)
+            except Exception as e:
+                console.print("\n[red]✗[/red] Failed to clone template repository")
+                console.print(f"[red]Error:[/red] {e}")
+                console.print(
+                    f"\n[yellow]Hint:[/yellow] Check your internet connection and verify "
+                    f"the template URL is accessible:\n{MCP_SERVER_TEMPLATE_URL}"
+                )
+                sys.exit(1)
+
+        # Step 9: Customize project
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            console=console,
+        ) as progress:
+            progress.add_task(description="Customizing project...", total=None)
+            try:
+                update_project_name(target_path, project_name)
+                cleanup_template_files(target_path)
+                if template_commit:
+                    write_template_info(
+                        target_path,
+                        project_name,
+                        MCP_SERVER_TEMPLATE_URL,
+                        template_commit,
+                        github_repo=github_repo,
+                        github_url=github_url,
+                    )
+            except Exception as e:
+                console.print("\n[red]✗[/red] Failed to customize project")
+                console.print(f"[red]Error:[/red] {e}")
+                sys.exit(1)
+
+        # Step 10: Initialize git repository
+        if not no_git:
+            with Progress(
+                SpinnerColumn(),
+                TextColumn("[progress.description]{task.description}"),
+                console=console,
+            ) as progress:
+                progress.add_task(description="Initializing git repository...", total=None)
+                try:
+                    init_repository(target_path, initial_commit=True)
+                except Exception as e:
+                    console.print("\n[yellow]⚠[/yellow] Failed to initialize git repository")
+                    console.print(f"[yellow]Warning:[/yellow] {e}")
+                    console.print(
+                        "[yellow]You can initialize git manually later with:[/yellow] git init"
+                    )
+
+        # Step 11: Push to GitHub (if GitHub mode)
+        if create_github and not no_git:
+            try:
+                add_remote(target_path, "origin", github_url)
+                push_success = push_to_remote(target_path, "origin", "main")
+                if not push_success:
+                    console.print(
+                        "\n[yellow]⚠[/yellow] Failed to push to GitHub. "
+                        "You can push manually with: git push -u origin main"
+                    )
+            except Exception as e:
+                console.print(f"\n[yellow]⚠[/yellow] Failed to set up GitHub remote: {e}")
+                console.print("[yellow]You can add the remote manually with:[/yellow]")
+                console.print(f"  git remote add origin {github_url}")
+                console.print("  git push -u origin main")
+
+        # Step 12: Success message
+        _show_success_message(
+            project_name=project_name,
+            target_path=target_path,
+            github_url=github_url,
+            github_repo=github_repo,
+        )
+
+    except KeyboardInterrupt:
+        console.print("\n[yellow]⚠[/yellow] Operation cancelled by user")
+        sys.exit(130)
+    except Exception as e:
+        console.print(f"\n[red]✗[/red] Unexpected error: {e}")
+        sys.exit(1)
+
+
+def _determine_github_mode(use_github: bool, use_local: bool, yes: bool) -> bool:
+    """
+    Determine whether to create a GitHub repository.
+
+    Args:
+        use_github: --github flag was set
+        use_local: --local flag was set
+        yes: --yes flag was set (non-interactive mode)
+
+    Returns:
+        bool: True if GitHub repository should be created
+    """
+    # Explicit flags take precedence
+    if use_local:
+        console.print("[dim]Mode: Local only (--local)[/dim]")
+        return False
+
+    if use_github:
+        console.print("[dim]Mode: GitHub (--github)[/dim]")
+        return True
+
+    # Check if gh is available
+    if not is_gh_installed():
+        console.print("[dim]Mode: Local only (GitHub CLI not installed)[/dim]")
+        return False
+
+    if not is_gh_authenticated():
+        console.print("[dim]Mode: Local only (GitHub CLI not authenticated)[/dim]")
+        return False
+
+    # gh is available - decide based on interactive mode
+    if yes:
+        # Non-interactive: default to GitHub
+        console.print("[dim]Mode: GitHub (--yes with gh available)[/dim]")
+        return True
+
+    # Interactive: prompt user
+    console.print("[cyan]GitHub CLI detected and authenticated.[/cyan]")
+    return click.confirm("Create GitHub repository?", default=True)
+
+
+def _show_success_message(
+    project_name: str,
+    target_path,
+    github_url: str | None,
+    github_repo: str | None,
+) -> None:
+    """Display success message with next steps."""
+    module_name = to_module_name(project_name)
+
+    # Build project details section
+    details = f"""  • Name: {project_name}
+  • Module: {module_name}
+  • Location: {target_path}"""
+
+    if github_url:
+        details += f"\n  • GitHub: {github_url}"
+
+    # Build next steps based on mode
+    if github_url:
+        next_steps = f"""
+  1. Navigate to your project:
+     [dim]cd {target_path.name}[/dim]
+
+  2. Create and activate a virtual environment:
+     [dim]python -m venv venv[/dim]
+     [dim]source venv/bin/activate[/dim]  # On Windows: venv\\Scripts\\activate
+
+  3. Install the project in editable mode:
+     [dim]pip install -e .[dev][/dim]
+
+  4. Start developing your MCP server!
+     [dim]Your code is already pushed to GitHub[/dim]
+
+  5. Run tests:
+     [dim]pytest[/dim]"""
+    else:
+        next_steps = f"""
+  1. Navigate to your project:
+     [dim]cd {target_path.name}[/dim]
+
+  2. Create and activate a virtual environment:
+     [dim]python -m venv venv[/dim]
+     [dim]source venv/bin/activate[/dim]  # On Windows: venv\\Scripts\\activate
+
+  3. Install the project in editable mode:
+     [dim]pip install -e .[dev][/dim]
+
+  4. Start developing your MCP server!
+     [dim]Edit src/ files to add your functionality[/dim]
+
+  5. Run tests:
+     [dim]pytest[/dim]"""
+
+    success_message = f"""
+[bold green]✓ Successfully created MCP server project![/bold green]
+
+[bold cyan]Project Details:[/bold cyan]
+{details}
+
+[bold cyan]Next Steps:[/bold cyan]
+{next_steps}
+
+[bold cyan]Documentation:[/bold cyan]
+  • Check the README.md in your project for detailed instructions
+  • MCP Protocol docs: https://modelcontextprotocol.io/
+"""
+
+    console.print(Panel(success_message, border_style="green", padding=(1, 2)))
+
+
+def _show_remote_only_success(
+    project_name: str,
+    github_url: str,
+    github_repo: str,
+) -> None:
+    """Display success message for remote-only mode."""
+    success_message = f"""
+[bold green]✓ Successfully created GitHub repository![/bold green]
+
+[bold cyan]Repository Details:[/bold cyan]
+  • Name: {project_name}
+  • GitHub: {github_url}
+
+[bold cyan]Next Steps:[/bold cyan]
+
+  1. Clone the repository:
+     [dim]git clone {github_url}[/dim]
+     [dim]cd {project_name}[/dim]
+
+  2. The repository contains the MCP server template.
+     Customize it for your project.
+
+[bold cyan]Note:[/bold cyan]
+  The repository contains the raw template.
+  You may want to customize project names and paths.
+"""
+
+    console.print(Panel(success_message, border_style="green", padding=(1, 2)))

{fips_agents_cli-0.1.8 → fips_agents_cli-0.2.0}/src/fips_agents_cli/commands/model_car.py

@@ -536,22 +536,85 @@ serving.knative.dev/progress-deadline: 30m
 """
 
 
+def generate_modelcar_claude_md(hf_repo_id: str, model_name: str, quay_uri: str) -> str:
+    """Generate CLAUDE.md content for ModelCar projects."""
+    return f"""# CLAUDE.md - ModelCar Project
+
+This file provides guidance to Claude Code when working with this ModelCar project.
+
+## Project Overview
+
+This is a **ModelCar** project for packaging the **{model_name}** model from HuggingFace
+into a container image for deployment on OpenShift AI.
+
+## Source Information
+
+- **HuggingFace Repository:** [{hf_repo_id}](https://huggingface.co/{hf_repo_id})
+- **Container Registry:** `{quay_uri}`
+
+## Important Notes
+
+1. **This is a temporary workspace** - do NOT commit model files to git
+2. **Source of truth:** The HuggingFace repository
+3. **Delete after use:** This directory should be deleted after pushing to registry
+
+## Workflow
+
+1. **Download:** `./download.sh` - Downloads model from HuggingFace
+2. **Build & Push:** `./build-and-push.sh` - Creates and pushes container image
+3. **Cleanup:** Delete this directory after successful push
+
+## Files
+
+| File | Purpose |
+|------|---------|
+| `download.sh` | Downloads model from HuggingFace |
+| `build-and-push.sh` | Builds container and pushes to registry |
+| `cleanup.sh` | Deletes local model files |
+| `cleanup-old-images.sh` | Removes old ModelCar images from Podman |
+| `Containerfile` | Container build instructions |
+
+## OpenShift AI Deployment
+
+Deploy using:
+- **Runtime:** vLLM ServingRuntime
+- **Source type:** OCI - v1
+- **URI:** `oci://{quay_uri}`
+
+## Generation Info
+
+This project was generated using `fips-agents create model-car`.
+See `.fips-agents-cli/info.json` for full generation metadata.
+"""
+
+
 def write_modelcar_info(
     project_path,
     hf_repo_id: str,
     quay_uri: str,
     project_name: str,
+    model_name: str,
 ) -> None:
     """
-    Write ModelCar generation metadata to .template-info file.
+    Write ModelCar generation metadata to .fips-agents-cli directory.
+
+    Creates:
+    - .fips-agents-cli/info.json - Generation metadata
+    - .fips-agents-cli/CLAUDE.md - Claude Code instructions
 
     Args:
         project_path: Path to the project root directory
         hf_repo_id: HuggingFace repository ID (e.g., openai/gpt-oss-20b)
         quay_uri: Full Quay container registry URI with tag
         project_name: Name of the generated project directory
+        model_name: Display name of the model
     """
     try:
+        # Create .fips-agents-cli directory
+        fips_dir = project_path / ".fips-agents-cli"
+        fips_dir.mkdir(parents=True, exist_ok=True)
+
+        # Write info.json
         modelcar_info = {
             "generator": {
                 "tool": "fips-agents-cli",
@@ -574,12 +637,18 @@ def write_modelcar_info(
             },
         }
 
-        info_file = project_path / ".template-info"
+        info_file = fips_dir / "info.json"
         with open(info_file, "w") as f:
             json.dump(modelcar_info, f, indent=2)
             f.write("\n")  # Add trailing newline
 
-        console.print("[green]✓[/green] Created project metadata file")
+        # Write CLAUDE.md
+        claude_md_file = fips_dir / "CLAUDE.md"
+        claude_md_content = generate_modelcar_claude_md(hf_repo_id, model_name, quay_uri)
+        with open(claude_md_file, "w") as f:
+            f.write(claude_md_content)
+
+        console.print("[green]✓[/green] Created .fips-agents-cli/ with project metadata")
 
     except Exception as e:
         # Don't fail the entire operation if this fails
@@ -713,8 +782,8 @@ print("Next step: Run ./build-and-push.sh to build and push the container")
 
             console.print(f"  [green]✓[/green] Created {filename}")
 
-        # Write project metadata
-        write_modelcar_info(target_path, hf_repo_id, quay_uri, project_name)
+        # Write project metadata to .fips-agents-cli directory
+        write_modelcar_info(target_path, hf_repo_id, quay_uri, project_name, model_name)
 
         # Step 8: Success message with instructions
         success_message = f"""

{fips_agents_cli-0.1.8 → fips_agents_cli-0.2.0}/src/fips_agents_cli/commands/patch.py

@@ -119,6 +119,21 @@ def docs(dry_run: bool):
     _patch_category("docs", dry_run)
 
 
+@patch.command("build")
+@click.option(
+    "--dry-run",
+    is_flag=True,
+    help="Show what would be updated without making changes",
+)
+def build(dry_run: bool):
+    """
+    Update build and deployment files (Makefile, Containerfile, etc).
+
+    Shows diffs and asks for confirmation before applying changes.
+    """
+    _patch_category("build", dry_run)
+
+
 @patch.command("all")
 @click.option(
     "--dry-run",