chipfoundry-cli 2.4.6__tar.gz → 2.4.10__tar.gz

{chipfoundry_cli-2.4.6 → chipfoundry_cli-2.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chipfoundry-cli
-Version: 2.4.6
+Version: 2.4.10
 Summary: CLI tool to automate ChipFoundry project submission to SFTP server
 Home-page: https://chipfoundry.io
 License: Apache-2.0
@@ -598,7 +598,7 @@ cf push [OPTIONS]
 **Options:**
 - `--project-root`: Specify project directory
 - `--force-overwrite`: Overwrite existing files on SFTP (SFTP mode only)
-- `--submit`: Submit the project for review after upload
+- `--submit`: Submit the project for review after upload (shortcut for `cf push` + `cf submit`)
 - `--dry-run`: Preview what would be uploaded
 - `--sftp-username`: Override configured username (SFTP mode only)
 - `--sftp-key`: Override configured key path (SFTP mode only)
@@ -659,6 +659,15 @@ What happens:
 4. Staged S3 objects are deleted on success; any leftovers are expired by the bucket lifecycle after 7 days.
 5. `--submit` submits for review on success.
 
+### Submit a Project for Review (No Re-upload)
+
+```bash
+cf submit [--project-root PATH]
+```
+
+Use this when your latest `cf push` already uploaded the files you want reviewed.  
+`cf submit` moves the platform project into review without requiring another upload.
+
 > [!TIP]
 > Try modes in this order: `cf push` → `cf push --remote` → `cf push --https`.
 > The SFTP mode is fastest when unrestricted, `--remote` is the best HTTPS

{chipfoundry_cli-2.4.6 → chipfoundry_cli-2.4.10}/README.md

@@ -572,7 +572,7 @@ cf push [OPTIONS]
 **Options:**
 - `--project-root`: Specify project directory
 - `--force-overwrite`: Overwrite existing files on SFTP (SFTP mode only)
-- `--submit`: Submit the project for review after upload
+- `--submit`: Submit the project for review after upload (shortcut for `cf push` + `cf submit`)
 - `--dry-run`: Preview what would be uploaded
 - `--sftp-username`: Override configured username (SFTP mode only)
 - `--sftp-key`: Override configured key path (SFTP mode only)
@@ -633,6 +633,15 @@ What happens:
 4. Staged S3 objects are deleted on success; any leftovers are expired by the bucket lifecycle after 7 days.
 5. `--submit` submits for review on success.
 
+### Submit a Project for Review (No Re-upload)
+
+```bash
+cf submit [--project-root PATH]
+```
+
+Use this when your latest `cf push` already uploaded the files you want reviewed.  
+`cf submit` moves the platform project into review without requiring another upload.
+
 > [!TIP]
 > Try modes in this order: `cf push` → `cf push --remote` → `cf push --https`.
 > The SFTP mode is fastest when unrestricted, `--remote` is the best HTTPS

{chipfoundry_cli-2.4.6 → chipfoundry_cli-2.4.10}/chipfoundry_cli/main.py

@@ -389,6 +389,59 @@ def _prompt_with_default(label: str, current: Optional[str], detected: Optional[
     return raw
 
 
+def _shuttle_sort_key(shuttle: dict) -> str:
+    """Sort shuttles by date while handling null/missing dates safely."""
+    tapeout_date = shuttle.get("tapeout_date")
+    if isinstance(tapeout_date, str) and tapeout_date.strip():
+        return tapeout_date
+    return "9999-12-31"
+
+
+def _confirm_new_project_creation() -> bool:
+    """Ask for explicit confirmation before creating a new platform project."""
+    return click.confirm(
+        "Create a NEW platform project now? "
+        "(Select 'No' if you intended to link an existing project with `cf link`.)",
+        default=False,
+    )
+
+
+def _prompt_init_platform_action() -> str:
+    """Ask whether init should link to an existing project or create a new one."""
+    console.print("\n[bold]Platform action[/bold]")
+    console.print("  [cyan]1[/cyan]. Link to an existing platform project")
+    console.print("  [cyan]2[/cyan]. Create a new platform project")
+    choice = console.input("Select option [1/2, default 1]: ").strip()
+    if choice in ("", "1"):
+        return "link"
+    if choice == "2":
+        return "create"
+    console.print("[yellow]Invalid selection — defaulting to linking an existing project.[/yellow]")
+    return "link"
+
+
+def _choose_platform_project(projects: List[dict]) -> Optional[dict]:
+    """Show a numbered project list and return the selected project, if any."""
+    console.print("\n[bold]Your platform projects:[/bold]")
+    for i, p in enumerate(projects, 1):
+        status_str = p.get('status', 'unknown')
+        shuttle_str = f" — {p.get('shuttle_name', '')}" if p.get('shuttle_name') else ""
+        console.print(f"  [cyan]{i}[/cyan]. {p['name']}{shuttle_str} [{status_str}]")
+    console.print(f"  [cyan]{len(projects) + 1}[/cyan]. Create a new platform project")
+
+    choice = console.input("\nSelect project number: ").strip()
+    try:
+        idx = int(choice) - 1
+        if 0 <= idx < len(projects):
+            return projects[idx]
+        if idx == len(projects):
+            return None
+    except ValueError:
+        pass
+    console.print("[red]Invalid selection.[/red]")
+    return None
+
+
 @main.command('init')
 @click.option('--project-root', required=False, type=click.Path(file_okay=False), help='Project directory (defaults to current directory).')
 @click.option('--shuttle', default=None, help='Shuttle name or ID to associate with the project.')
@@ -539,12 +592,43 @@ def init(project_root, shuttle, description):
         console.print(f"  Portal:  {portal_url}/projects/{platform_id}")
         return
 
+    if api_key:
+        try:
+            projects = _api_get("/projects/me")
+        except SystemExit:
+            projects = []
+        if projects:
+            action = _prompt_init_platform_action()
+            if action == "link":
+                selected = _choose_platform_project(projects)
+                if selected:
+                    proj['platform_project_id'] = selected['id']
+                    if selected.get('name'):
+                        old_name = proj.get('name')
+                        proj['name'] = selected['name']
+                        if old_name and old_name != selected['name']:
+                            console.print(
+                                f"[yellow]Updated project name: '{old_name}' → '{selected['name']}' "
+                                "(synced from platform)[/yellow]"
+                            )
+                    with open(project_json_path, 'w') as f:
+                        json.dump(data, f, indent=2)
+                    portal_url = _get_portal_url()
+                    console.print(f"\n[green]✓ Linked to existing platform project[/green]")
+                    console.print(f"  Name:    {selected['name']}")
+                    console.print(f"  ID:      {selected['id']}")
+                    if github_repo_url:
+                        console.print(f"  GitHub:  {github_repo_url}")
+                    console.print(f"  Portal:  {portal_url}/projects/{selected['id']}")
+                    return
+                console.print("[dim]Continuing with new project creation.[/dim]")
+
     shuttle_id = shuttle
     if not shuttle_id:
         try:
             shuttles = _api_get("/shuttles/available")
             if shuttles:
-                shuttles.sort(key=lambda s: s.get('tapeout_date', '9999-12-31'))
+                shuttles.sort(key=_shuttle_sort_key)
                 console.print("\n[bold]Available shuttles:[/bold]")
                 for i, s in enumerate(shuttles, 1):
                     deadline = s.get('tapeout_date', '')
@@ -571,6 +655,13 @@ def init(project_root, shuttle, description):
     if github_repo_url:
         create_data["github_repo_url"] = github_repo_url
 
+    if not _confirm_new_project_creation():
+        with open(project_json_path, 'w') as f:
+            json.dump(data, f, indent=2)
+        console.print("[yellow]Skipped platform project creation.[/yellow]")
+        console.print("[dim]Tip: Run [bold]cf link[/bold] to select an existing platform project.[/dim]")
+        return
+
     try:
         project_resp = _api_post("/projects", create_data)
         new_id = project_resp.get('id')
@@ -2769,6 +2860,45 @@ def view_tapeout_report(project_name, report_path):
         console.print(f"[red]Failed to open tapeout report in browser: {e}[/red]")
         raise click.Abort()
 
+@main.command("submit")
+@click.option(
+    "--project-root",
+    required=False,
+    type=click.Path(exists=True, file_okay=False),
+    help="Path to the local ChipFoundry project directory (defaults to current directory if .cf/project.json exists).",
+)
+def submit(project_root):
+    """Submit a project for admin review without uploading files again."""
+    cwd_root, _ = get_project_json_from_cwd()
+    if not project_root and cwd_root:
+        project_root = cwd_root
+    if not project_root:
+        console.print(
+            "[red]No project root specified and no .cf/project.json found in current directory.[/red]"
+        )
+        console.print("Provide --project-root or run from a linked project.")
+        raise click.Abort()
+
+    project_root = str(Path(project_root).resolve())
+    platform_id = _load_project_platform_id(project_root)
+    if not platform_id:
+        console.print("[red]Project is not linked to the platform.[/red]")
+        console.print(
+            "Run [bold]cf link[/bold] to connect this project, or [bold]cf init[/bold] to create a new one."
+        )
+        raise click.Abort()
+
+    config = load_user_config()
+    if not config.get("api_key"):
+        console.print("[red]Not logged in.[/red] Run [bold]cf login[/bold] before submitting.")
+        raise click.Abort()
+
+    try:
+        _api_post(f"/projects/{platform_id}/submit", {})
+        console.print("[green]✓ Project submitted for review[/green]")
+    except SystemExit:
+        raise click.Abort()
+
 @main.command('confirm')
 @click.option('--project-root', required=False, type=click.Path(exists=True, file_okay=False), help='Path to the local ChipFoundry project directory (defaults to current directory if .cf/project.json exists).')
 @click.option('--sftp-host', default=DEFAULT_SFTP_HOST, show_default=True, help='SFTP server hostname.')

{chipfoundry_cli-2.4.6 → chipfoundry_cli-2.4.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "chipfoundry-cli"
-version = "2.4.6"
+version = "2.4.10"
 description = "CLI tool to automate ChipFoundry project submission to SFTP server"
 authors = ["ChipFoundry <marwan.abbas@chipfoundry.io>"]
 readme = "README.md"