chipfoundry-cli 2.4.5__tar.gz → 2.4.9__tar.gz

{chipfoundry_cli-2.4.5 → chipfoundry_cli-2.4.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chipfoundry-cli
-Version: 2.4.5
+Version: 2.4.9
 Summary: CLI tool to automate ChipFoundry project submission to SFTP server
 Home-page: https://chipfoundry.io
 License: Apache-2.0
@@ -681,6 +681,10 @@ cf pull [--project-name NAME]
 **Prerequisites:** `cf login`, `cf link` (or `cf init`), `cf config`
 
 - Downloads project results from SFTP server
+- **Resolves the remote results directory by `platform_project_id` (UUID), not by project name** — survives case changes (e.g. `kyttar` → `Kyttar`) and renames on the platform without manual intervention
+  - First asks the platform API for the canonical project name and tries `outgoing/results/<canonical_name>`
+  - If that path is missing, falls back to scanning `outgoing/results/*/config/project.json` for a matching `platform_project_id`
+  - Pass `--project-name NAME` to bypass UUID resolution and force a literal directory lookup (debugging / unlinked legacy use)
 - Saves to `sftp-output/<project_name>/`
 - **Automatically updates** your local `.cf/project.json` with the pulled version (preserving the platform link)
 - **Syncs with the platform** and displays admin review notes if your project has been reviewed
@@ -885,20 +889,26 @@ The CLI tracks your project submission state through the `submission_state` fiel
    - Connects to SFTP server securely
    - Shows clean connection status
 
-2. **Download:**
+2. **Resolve remote directory by UUID:**
+   - Looks up the canonical project name from the platform via `platform_project_id`
+   - Tries `outgoing/results/<canonical_name>` first
+   - If that path is missing, scans `outgoing/results/*/config/project.json` for a directory whose embedded `platform_project_id` matches yours
+   - Warns if your local project name differs from the canonical platform name (the local copy is corrected automatically in step 4)
+
+3. **Download:**
    - Downloads all project results recursively
    - Shows professional download progress
    - Saves to `sftp-output/<project_name>/`
 
-3. **Config Update:**
+4. **Config Update:**
    - **Automatically merges** the pulled `project.json` with your local version (preserving the platform link)
 
-4. **Platform Sync:**
+5. **Platform Sync:**
    - Sends the updated `project.json` to the platform
    - Records the pull timestamp on the platform
    - Fetches and displays any admin review notes
 
-5. **Success:**
+6. **Success:**
    - Shows confirmation of downloaded files, sync status, and review notes
 
 ---

{chipfoundry_cli-2.4.5 → chipfoundry_cli-2.4.9}/README.md

@@ -655,6 +655,10 @@ cf pull [--project-name NAME]
 **Prerequisites:** `cf login`, `cf link` (or `cf init`), `cf config`
 
 - Downloads project results from SFTP server
+- **Resolves the remote results directory by `platform_project_id` (UUID), not by project name** — survives case changes (e.g. `kyttar` → `Kyttar`) and renames on the platform without manual intervention
+  - First asks the platform API for the canonical project name and tries `outgoing/results/<canonical_name>`
+  - If that path is missing, falls back to scanning `outgoing/results/*/config/project.json` for a matching `platform_project_id`
+  - Pass `--project-name NAME` to bypass UUID resolution and force a literal directory lookup (debugging / unlinked legacy use)
 - Saves to `sftp-output/<project_name>/`
 - **Automatically updates** your local `.cf/project.json` with the pulled version (preserving the platform link)
 - **Syncs with the platform** and displays admin review notes if your project has been reviewed
@@ -859,20 +863,26 @@ The CLI tracks your project submission state through the `submission_state` fiel
    - Connects to SFTP server securely
    - Shows clean connection status
 
-2. **Download:**
+2. **Resolve remote directory by UUID:**
+   - Looks up the canonical project name from the platform via `platform_project_id`
+   - Tries `outgoing/results/<canonical_name>` first
+   - If that path is missing, scans `outgoing/results/*/config/project.json` for a directory whose embedded `platform_project_id` matches yours
+   - Warns if your local project name differs from the canonical platform name (the local copy is corrected automatically in step 4)
+
+3. **Download:**
    - Downloads all project results recursively
    - Shows professional download progress
    - Saves to `sftp-output/<project_name>/`
 
-3. **Config Update:**
+4. **Config Update:**
    - **Automatically merges** the pulled `project.json` with your local version (preserving the platform link)
 
-4. **Platform Sync:**
+5. **Platform Sync:**
    - Sends the updated `project.json` to the platform
    - Records the pull timestamp on the platform
    - Fetches and displays any admin review notes
 
-5. **Success:**
+6. **Success:**
    - Shows confirmation of downloaded files, sync status, and review notes
 
 ---

{chipfoundry_cli-2.4.5 → chipfoundry_cli-2.4.9}/chipfoundry_cli/__init__.py

@@ -1,2 +1,2 @@
 """ChipFoundry CLI package: Automate project submission to SFTP."""
-__version__ = "2.4.1"
+__version__ = "2.4.6"

{chipfoundry_cli-2.4.5 → chipfoundry_cli-2.4.9}/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')
@@ -2078,6 +2169,9 @@ def push(project_root, sftp_host, sftp_username, sftp_key, project_id, project_n
 @click.option('--sftp-key', type=click.Path(exists=True, dir_okay=False), help='Path to SFTP private key file (defaults to config).', default=None, show_default=False)
 def pull(project_name, output_dir, sftp_host, sftp_username, sftp_key):
     """Download results/artifacts from SFTP output dir to local sftp-output/<project_name>."""
+    # Track whether the user explicitly passed --project-name (overrides
+    # canonical-name resolution via the platform API below).
+    explicit_project_name = project_name
     # If .cf/project.json exists in cwd, use its project name as default
     _, cwd_project_name = get_project_json_from_cwd()
     if not project_name and cwd_project_name:
@@ -2142,16 +2236,67 @@ def pull(project_name, output_dir, sftp_host, sftp_username, sftp_key):
         raise click.Abort()
     
     try:
+        # Resolve the remote results directory.
+        #
+        # Priority:
+        #   1. If the user passed --project-name explicitly, honor that name
+        #      verbatim (escape hatch / debugging).
+        #   2. Otherwise, ask the platform API for the canonical project name
+        #      via the platform_project_id (UUID) and try that name first.
+        #   3. If that directory does not exist on SFTP (e.g. the platform was
+        #      renamed but the old export directory still has the previous
+        #      name), scan `outgoing/results/*/config/project.json` and match
+        #      on `platform_project_id`. This is the authoritative UUID match
+        #      and survives case changes and renames.
+        if explicit_project_name:
+            resolved_name = explicit_project_name
+            try:
+                sftp.stat(f"outgoing/results/{resolved_name}")
+            except Exception:
+                console.print(f"[yellow]No results found for project '{resolved_name}' on SFTP server.[/yellow]")
+                return
+        else:
+            try:
+                platform_proj = _api_get(f"/projects/{platform_id}")
+            except SystemExit:
+                console.print(f"[red]Could not resolve canonical project name for platform_project_id={platform_id} from the platform API.[/red]")
+                raise click.Abort()
+            canonical_name = platform_proj.get("name") if isinstance(platform_proj, dict) else None
+            if not canonical_name:
+                console.print(f"[red]Platform did not return a name for project {platform_id}; cannot resolve SFTP directory.[/red]")
+                raise click.Abort()
+
+            try:
+                sftp.stat(f"outgoing/results/{canonical_name}")
+                resolved_name = canonical_name
+                if cwd_project_name and cwd_project_name != canonical_name:
+                    console.print(
+                        f"[yellow]Local project name '{cwd_project_name}' does not match the platform "
+                        f"name '{canonical_name}'. Using the platform name; your local .cf/project.json "
+                        f"will be updated after the pull completes.[/yellow]"
+                    )
+            except Exception:
+                console.print(
+                    f"[yellow]'outgoing/results/{canonical_name}' not found on SFTP. "
+                    f"Searching by project UUID ({platform_id})...[/yellow]"
+                )
+                matched_dir = _find_remote_results_dir_by_uuid(sftp, platform_id)
+                if matched_dir is None:
+                    console.print(
+                        f"[yellow]No results found for project '{canonical_name}' (UUID {platform_id}) on SFTP server.[/yellow]"
+                    )
+                    return
+                resolved_name = matched_dir
+                console.print(
+                    f"[yellow]Found a results directory matching this project's UUID at "
+                    f"'outgoing/results/{matched_dir}'. The directory name on SFTP differs from the "
+                    f"platform name '{canonical_name}' — using the SFTP directory.[/yellow]"
+                )
+
+        project_name = resolved_name
         remote_dir = f"outgoing/results/{project_name}"
         output_dir = os.path.join(os.getcwd(), "sftp-output", project_name)
-        
-        # Check if remote directory exists
-        try:
-            sftp.stat(remote_dir)
-        except Exception:
-            console.print(f"[yellow]No results found for project '{project_name}' on SFTP server.[/yellow]")
-            return
-        
+
         # Create output directory
         os.makedirs(output_dir, exist_ok=True)
         
@@ -4735,6 +4880,34 @@ def _load_project_platform_id(project_root: str):
     return data.get('project', {}).get('platform_project_id')
 
 
+def _find_remote_results_dir_by_uuid(sftp, platform_id: str) -> Optional[str]:
+    """Scan outgoing/results/*/config/project.json for a directory whose embedded
+    platform_project_id matches `platform_id`. Returns the bare directory name
+    (not the full path) of the first match, or None if no match is found.
+
+    Used by `cf pull` as a UUID-based fallback when the canonical project
+    name from the platform does not resolve to an SFTP directory (e.g. the
+    project was renamed on the platform but the old SFTP results directory
+    still has the previous name on disk).
+    """
+    try:
+        dirs = sftp.listdir("outgoing/results")
+    except Exception:
+        return None
+
+    for d in dirs:
+        cfg_path = f"outgoing/results/{d}/config/project.json"
+        try:
+            with sftp.open(cfg_path, "r") as f:
+                data = json.loads(f.read().decode("utf-8"))
+        except Exception:
+            continue
+        proj = data.get("project", {}) if isinstance(data, dict) else {}
+        if isinstance(proj, dict) and proj.get("platform_project_id") == platform_id:
+            return d
+    return None
+
+
 def _save_platform_id(project_root: str, platform_id: str, project_name: str = None):
     """Write platform_project_id (and optionally project name) into .cf/project.json."""
     pj = Path(project_root) / '.cf' / 'project.json'

{chipfoundry_cli-2.4.5 → chipfoundry_cli-2.4.9}/pyproject.toml

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