chipfoundry-cli 1.0.3__tar.gz → 1.0.4__tar.gz

{chipfoundry_cli-1.0.3 → chipfoundry_cli-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chipfoundry-cli
-Version: 1.0.3
+Version: 1.0.4
 Summary: CLI tool to automate ChipFoundry project submission to SFTP server
 Home-page: https://chipfoundry.io
 License: Apache-2.0
@@ -27,13 +27,13 @@ Description-Content-Type: text/markdown
 [![PyPI version](https://img.shields.io/pypi/v/chipfoundry-cli?color=blue)](https://badge.fury.io/py/chipfoundry-cli)
 [![PyPI downloads](https://img.shields.io/pypi/dm/chipfoundry-cli.svg)](https://pypi.org/project/chipfoundry-cli/)
 
-A command-line tool to automate the submission of ChipFoundry projects to the SFTP server.
+A command-line tool to automate the submission of ChipFoundry projects to the SFTP server and manage project results.
 
 ---
 
 ## Overview
 
-`cf-cli` is a user-friendly command-line tool for securely submitting your ChipFoundry project files to the official SFTP server. It automatically collects the required files, generates or updates your project configuration, and uploads everything to the correct location on the server.
+`cf-cli` is a user-friendly command-line tool for securely submitting your ChipFoundry project files to the official SFTP server and downloading project results. It automatically collects the required files, generates or updates your project configuration, uploads everything to the correct location on the server, and provides tools to view project results and reports.
 
 ---
 
@@ -72,6 +72,16 @@ cf --help
    cf push
    ```
 
+6. **Download results** (when available):
+   ```bash
+   cf pull
+   ```
+
+7. **View tapeout report**:
+   ```bash
+   cf view-tapeout-report
+   ```
+
 ---
 
 ## Project Structure Requirements
@@ -82,6 +92,7 @@ Your project directory **must** contain:
   - `user_project_wrapper.gds` (for digital projects)
   - `user_analog_project_wrapper.gds` (for analog projects)
   - `openframe_project_wrapper.gds` (for openframe projects)
+  - **Note**: Both compressed (`.gz`) and uncompressed (`.gds`) files are supported
 - `verilog/rtl/user_defines.v` (required for digital/analog)
 - `.cf/project.json` (optional; will be created/updated automatically)
 
@@ -180,15 +191,44 @@ cf push [OPTIONS]
 4. Uploads files to SFTP with progress bars
 5. Shows clean, informative output
 
-### Pull Results
+**GDS File Handling:**
+- **Both compressed (`.gz`) and uncompressed (`.gds`) files are supported**
+- **No automatic compression** - files are uploaded as-is
+- **Only one version allowed** - you cannot have both compressed and uncompressed versions of the same file
+- **Prefers uncompressed files** when available
+- **Falls back to compressed files** if no uncompressed version is available
+
+### Pull Results (Download)
 
 ```bash
 cf pull [--project-name NAME]
 ```
 
-- Downloads project results from SFTP
+- Downloads project results from SFTP server
 - Saves to `sftp-output/<project_name>/`
-- Shows download progress for each file
+- **Automatically updates** your local `.cf/project.json` with the pulled version
+- Creates the expected directory structure:
+  ```
+  sftp-output/
+  └── <project_name>/
+      ├── config/
+      │   └── project.json
+      └── consolidated_reports/
+          └── consolidated_report.html
+  ```
+
+### View Tapeout Report
+
+```bash
+cf view-tapeout-report [--project-name NAME] [--report-path PATH]
+```
+
+- Opens the consolidated tapeout report in your default browser
+- **Auto-detects project name** from `.cf/project.json` if available
+- Looks for report at `sftp-output/<project_name>/consolidated_reports/consolidated_report.html`
+- **Options:**
+  - `--project-name`: Specify project name manually
+  - `--report-path`: Provide direct path to HTML report file
 
 ### Check Status
 
@@ -217,6 +257,7 @@ cf status
 1. **File Collection:**
    - Checks for required GDS and Verilog files
    - Auto-detects project type (digital, analog, openframe) based on GDS file name
+   - **Supports both compressed and uncompressed GDS files**
 
 2. **Configuration:**
    - Creates or updates `.cf/project.json`
@@ -233,6 +274,26 @@ cf status
 
 ---
 
+## What Happens When You Run `cf pull`?
+
+1. **Connection:**
+   - Connects to SFTP server securely
+   - Shows clean connection status
+
+2. **Download:**
+   - Downloads all project results recursively
+   - Shows professional download progress
+   - Saves to `sftp-output/<project_name>/`
+
+3. **Config Update:**
+   - **Automatically updates** your local `.cf/project.json` with the pulled version
+   - No manual steps required
+
+4. **Success:**
+   - Shows confirmation of downloaded files and updated config
+
+---
+
 ## Examples
 
 ### Basic Workflow
@@ -258,6 +319,17 @@ cf push
 # Uploading project.json ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100%
 # Uploading user_project_wrapper.gds ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100%
 # ✓ Uploaded to incoming/projects/my_awesome_project
+
+# Later, download results
+cf pull
+# ✓ Connected to sftp.chipfoundry.io
+# Downloading project results from outgoing/results/my_awesome_project...
+# ✓ All files downloaded to sftp-output/my_awesome_project
+# ✓ Project config automatically updated
+
+# View the tapeout report
+cf view-tapeout-report
+# ✓ Opened tapeout report in browser: sftp-output/my_awesome_project/consolidated_reports/consolidated_report.html
 ```
 
 ### Advanced Usage
@@ -272,10 +344,33 @@ cf push --force-overwrite
 # Use different project root
 cf push --project-root /path/to/project
 
+# Pull results for specific project
+cf pull --project-name other_project
+
+# View report for specific project
+cf view-tapeout-report --project-name other_project
+
+# View custom report file
+cf view-tapeout-report --report-path /path/to/custom_report.html
+
 # Check project status
 cf status
 ```
 
+### GDS File Examples
+
+```bash
+# Uncompressed GDS file (preferred)
+gds/user_project_wrapper.gds
+
+# Compressed GDS file (also supported)
+gds/user_project_wrapper.gds.gz
+
+# ❌ INVALID: Both files exist - this will cause an error
+gds/user_project_wrapper.gds      # ← Choose ONE version only
+gds/user_project_wrapper.gds.gz   # ← Remove this one
+```
+
 ---
 
 ## Troubleshooting
@@ -294,6 +389,13 @@ cf status
 
 - **Project type detection:**
   - Only one of the recognized GDS files should be present in your `gds/` directory
+  - Both compressed and uncompressed versions of the same type are supported
+  - **Important**: You cannot have both compressed (`.gz`) and uncompressed (`.gds`) versions of the same file - the tool will error out and ask you to remove one
+
+- **Report viewing errors:**
+  - Ensure you've run `cf pull` first to download the report
+  - Check that the report exists at the expected location
+  - Use `--report-path` to specify a custom report location
 
 - **ModuleNotFoundError:**
   - Upgrade the CLI: `pip install --upgrade chipfoundry-cli`

{chipfoundry_cli-1.0.3 → chipfoundry_cli-1.0.4}/README.md

@@ -3,13 +3,13 @@
 [![PyPI version](https://img.shields.io/pypi/v/chipfoundry-cli?color=blue)](https://badge.fury.io/py/chipfoundry-cli)
 [![PyPI downloads](https://img.shields.io/pypi/dm/chipfoundry-cli.svg)](https://pypi.org/project/chipfoundry-cli/)
 
-A command-line tool to automate the submission of ChipFoundry projects to the SFTP server.
+A command-line tool to automate the submission of ChipFoundry projects to the SFTP server and manage project results.
 
 ---
 
 ## Overview
 
-`cf-cli` is a user-friendly command-line tool for securely submitting your ChipFoundry project files to the official SFTP server. It automatically collects the required files, generates or updates your project configuration, and uploads everything to the correct location on the server.
+`cf-cli` is a user-friendly command-line tool for securely submitting your ChipFoundry project files to the official SFTP server and downloading project results. It automatically collects the required files, generates or updates your project configuration, uploads everything to the correct location on the server, and provides tools to view project results and reports.
 
 ---
 
@@ -48,6 +48,16 @@ cf --help
    cf push
    ```
 
+6. **Download results** (when available):
+   ```bash
+   cf pull
+   ```
+
+7. **View tapeout report**:
+   ```bash
+   cf view-tapeout-report
+   ```
+
 ---
 
 ## Project Structure Requirements
@@ -58,6 +68,7 @@ Your project directory **must** contain:
   - `user_project_wrapper.gds` (for digital projects)
   - `user_analog_project_wrapper.gds` (for analog projects)
   - `openframe_project_wrapper.gds` (for openframe projects)
+  - **Note**: Both compressed (`.gz`) and uncompressed (`.gds`) files are supported
 - `verilog/rtl/user_defines.v` (required for digital/analog)
 - `.cf/project.json` (optional; will be created/updated automatically)
 
@@ -156,15 +167,44 @@ cf push [OPTIONS]
 4. Uploads files to SFTP with progress bars
 5. Shows clean, informative output
 
-### Pull Results
+**GDS File Handling:**
+- **Both compressed (`.gz`) and uncompressed (`.gds`) files are supported**
+- **No automatic compression** - files are uploaded as-is
+- **Only one version allowed** - you cannot have both compressed and uncompressed versions of the same file
+- **Prefers uncompressed files** when available
+- **Falls back to compressed files** if no uncompressed version is available
+
+### Pull Results (Download)
 
 ```bash
 cf pull [--project-name NAME]
 ```
 
-- Downloads project results from SFTP
+- Downloads project results from SFTP server
 - Saves to `sftp-output/<project_name>/`
-- Shows download progress for each file
+- **Automatically updates** your local `.cf/project.json` with the pulled version
+- Creates the expected directory structure:
+  ```
+  sftp-output/
+  └── <project_name>/
+      ├── config/
+      │   └── project.json
+      └── consolidated_reports/
+          └── consolidated_report.html
+  ```
+
+### View Tapeout Report
+
+```bash
+cf view-tapeout-report [--project-name NAME] [--report-path PATH]
+```
+
+- Opens the consolidated tapeout report in your default browser
+- **Auto-detects project name** from `.cf/project.json` if available
+- Looks for report at `sftp-output/<project_name>/consolidated_reports/consolidated_report.html`
+- **Options:**
+  - `--project-name`: Specify project name manually
+  - `--report-path`: Provide direct path to HTML report file
 
 ### Check Status
 
@@ -193,6 +233,7 @@ cf status
 1. **File Collection:**
    - Checks for required GDS and Verilog files
    - Auto-detects project type (digital, analog, openframe) based on GDS file name
+   - **Supports both compressed and uncompressed GDS files**
 
 2. **Configuration:**
    - Creates or updates `.cf/project.json`
@@ -209,6 +250,26 @@ cf status
 
 ---
 
+## What Happens When You Run `cf pull`?
+
+1. **Connection:**
+   - Connects to SFTP server securely
+   - Shows clean connection status
+
+2. **Download:**
+   - Downloads all project results recursively
+   - Shows professional download progress
+   - Saves to `sftp-output/<project_name>/`
+
+3. **Config Update:**
+   - **Automatically updates** your local `.cf/project.json` with the pulled version
+   - No manual steps required
+
+4. **Success:**
+   - Shows confirmation of downloaded files and updated config
+
+---
+
 ## Examples
 
 ### Basic Workflow
@@ -234,6 +295,17 @@ cf push
 # Uploading project.json ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100%
 # Uploading user_project_wrapper.gds ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 100%
 # ✓ Uploaded to incoming/projects/my_awesome_project
+
+# Later, download results
+cf pull
+# ✓ Connected to sftp.chipfoundry.io
+# Downloading project results from outgoing/results/my_awesome_project...
+# ✓ All files downloaded to sftp-output/my_awesome_project
+# ✓ Project config automatically updated
+
+# View the tapeout report
+cf view-tapeout-report
+# ✓ Opened tapeout report in browser: sftp-output/my_awesome_project/consolidated_reports/consolidated_report.html
 ```
 
 ### Advanced Usage
@@ -248,10 +320,33 @@ cf push --force-overwrite
 # Use different project root
 cf push --project-root /path/to/project
 
+# Pull results for specific project
+cf pull --project-name other_project
+
+# View report for specific project
+cf view-tapeout-report --project-name other_project
+
+# View custom report file
+cf view-tapeout-report --report-path /path/to/custom_report.html
+
 # Check project status
 cf status
 ```
 
+### GDS File Examples
+
+```bash
+# Uncompressed GDS file (preferred)
+gds/user_project_wrapper.gds
+
+# Compressed GDS file (also supported)
+gds/user_project_wrapper.gds.gz
+
+# ❌ INVALID: Both files exist - this will cause an error
+gds/user_project_wrapper.gds      # ← Choose ONE version only
+gds/user_project_wrapper.gds.gz   # ← Remove this one
+```
+
 ---
 
 ## Troubleshooting
@@ -270,6 +365,13 @@ cf status
 
 - **Project type detection:**
   - Only one of the recognized GDS files should be present in your `gds/` directory
+  - Both compressed and uncompressed versions of the same type are supported
+  - **Important**: You cannot have both compressed (`.gz`) and uncompressed (`.gds`) versions of the same file - the tool will error out and ask you to remove one
+
+- **Report viewing errors:**
+  - Ensure you've run `cf pull` first to download the report
+  - Check that the report exists at the expected location
+  - Use `--report-path` to specify a custom report location
 
 - **ModuleNotFoundError:**
   - Upgrade the CLI: `pip install --upgrade chipfoundry-cli`

{chipfoundry_cli-1.0.3 → chipfoundry_cli-1.0.4}/chipfoundry_cli/main.py

@@ -2,8 +2,9 @@ import click
 import getpass
 from chipfoundry_cli.utils import (
     collect_project_files, ensure_cf_directory, update_or_create_project_json,
-    sftp_connect, upload_with_progress, sftp_ensure_dirs,
-    get_config_path, load_user_config, save_user_config, GDS_TYPE_MAP
+    sftp_connect, upload_with_progress, sftp_ensure_dirs, sftp_download_recursive,
+    get_config_path, load_user_config, save_user_config, GDS_TYPE_MAP,
+    open_html_in_browser, download_with_progress
 )
 import os
 from pathlib import Path
@@ -268,6 +269,10 @@ def push(project_root, sftp_host, sftp_username, sftp_key, project_id, project_n
         if candidate.exists():
             found_types.append(gds_type)
             gds_file_path = str(candidate)
+    
+    # Remove duplicates (compressed and uncompressed files of same type)
+    found_types = list(set(found_types))
+    
     if project_type:
         detected_type = project_type
     else:
@@ -351,6 +356,7 @@ def push(project_root, sftp_host, sftp_username, sftp_key, project_id, project_n
                     force_overwrite=force_overwrite
                 )
         console.print(f"[green]✓ Uploaded to {sftp_base}[/green]")
+        
     except Exception as e:
         console.print(f"[red]Upload failed: {e}[/red]")
         raise click.Abort()
@@ -374,11 +380,13 @@ def pull(project_name, output_dir, sftp_host, sftp_username, sftp_key):
     if not project_name:
         console.print("[bold red]No project name specified and no .cf/project.json found in current directory. Please provide --project-name.[/bold red]")
         raise click.Abort()
+    
+    # Load user config for defaults
     config = load_user_config()
     if not sftp_username:
         sftp_username = config.get("sftp_username")
         if not sftp_username:
-            console.print("[bold red]No SFTP username provided and not found in config. Please run 'chipfoundry config' or provide --sftp-username.[/bold red]")
+            console.print("[bold red]No SFTP username provided and not found in config. Please run 'cf config' or provide --sftp-username.[/bold red]")
             raise click.Abort()
     if not sftp_key:
         sftp_key = config.get("sftp_key")
@@ -394,7 +402,8 @@ def pull(project_name, output_dir, sftp_host, sftp_username, sftp_key):
         console.print("[yellow]Please run 'cf keygen' to generate a key or 'cf config' to set a custom key path.[/yellow]")
         raise click.Abort()
 
-    console.print(f"Connecting to {sftp_host}...")
+    # Connect to SFTP
+    console.print(f"[cyan]Connecting to {sftp_host}...[/cyan]")
     transport = None
     try:
         sftp, transport = sftp_connect(
@@ -402,48 +411,57 @@ def pull(project_name, output_dir, sftp_host, sftp_username, sftp_key):
             username=sftp_username,
             key_path=key_path
         )
+        console.print(f"[green]✓ Connected to {sftp_host}[/green]")
     except Exception as e:
         console.print(f"[red]Failed to connect to SFTP: {e}[/red]")
         raise click.Abort()
+    
     try:
         remote_dir = f"outgoing/results/{project_name}"
         output_dir = os.path.join(os.getcwd(), "sftp-output", project_name)
-        os.makedirs(output_dir, exist_ok=True)
+        
+        # Check if remote directory exists
         try:
-            files = sftp.listdir(remote_dir)
+            sftp.stat(remote_dir)
         except Exception:
             console.print(f"[yellow]No results found for project '{project_name}' on SFTP server.[/yellow]")
             return
-        if not files:
-            console.print(f"[yellow]No files to download for project '{project_name}'.[/yellow]")
-            return
-        with Progress(
-            TextColumn("[progress.description]{task.description}"),
-            BarColumn(),
-            TaskProgressColumn(),
-            TextColumn("{task.percentage:>3.0f}%"),
-            TextColumn("•"),
-            TextColumn("{task.completed}/{task.total} bytes"),
-            TimeElapsedColumn(),
-        ) as progress:
-            for fname in files:
-                remote_path = f"{remote_dir}/{fname}"
-                local_path = os.path.join(output_dir, fname)
+        
+        # Create output directory
+        os.makedirs(output_dir, exist_ok=True)
+        
+        # Download with progress tracking
+        console.print(f"[bold cyan]Downloading project results from {remote_dir}...[/bold cyan]")
+        
+        try:
+            # Use recursive download function with console for clean logging
+            sftp_download_recursive(sftp, remote_dir, output_dir, console=console)
+            console.print(f"[green]✓ All files downloaded to {output_dir}[/green]")
+            
+            # Automatically update local project config if available
+            pulled_config_path = os.path.join(output_dir, "config", "project.json")
+            if os.path.exists(pulled_config_path):
+                local_config_path = os.path.join(".cf", "project.json")
+                os.makedirs(".cf", exist_ok=True)
+                
                 try:
-                    file_size = sftp.stat(remote_path).st_size
-                    task = progress.add_task(f"Downloading {fname}", total=file_size)
-                    with open(local_path, "wb") as f:
-                        def callback(bytes_transferred, total=file_size):
-                            progress.update(task, completed=bytes_transferred)
-                        sftp.getfo(remote_path, f, callback=callback)
-                    progress.update(task, completed=file_size)
+                    import shutil
+                    shutil.copy2(pulled_config_path, local_config_path)
+                    console.print(f"[green]✓ Project config automatically updated[/green]")
                 except Exception as e:
-                    console.print(f"[red]Failed to download {fname}: {e}[/red]")
-        console.print(f"[green]All files downloaded to {output_dir}[/green]")
+                    console.print(f"[yellow]Warning: Failed to update project config: {e}[/yellow]")
+            else:
+                console.print(f"[dim]Note: No project config found in pulled results[/dim]")
+                
+        except Exception as e:
+            console.print(f"[red]Failed to download project results: {e}[/red]")
+            raise click.Abort()
+            
     finally:
         if transport:
             sftp.close()
             transport.close()
+            console.print(f"[dim]Disconnected from {sftp_host}[/dim]")
 
 @main.command('status')
 @click.option('--sftp-host', default=DEFAULT_SFTP_HOST, show_default=True, help='SFTP server hostname.')
@@ -483,11 +501,15 @@ def status(sftp_host, sftp_username, sftp_key):
         console.print(f"[red]Failed to connect to SFTP: {e}[/red]")
         raise click.Abort()
     try:
-        # List projects in incoming/projects/ and outgoing/results/
+        # List projects in incoming/projects/, outgoing/results/, and archive/
         incoming_projects_dir = f"incoming/projects"
         outgoing_results_dir = f"outgoing/results"
+        archive_dir = f"archive"
+        
         projects = []
         results = []
+        archived_projects = []
+        
         try:
             projects = sftp.listdir(incoming_projects_dir)
         except Exception:
@@ -496,23 +518,257 @@ def status(sftp_host, sftp_username, sftp_key):
             results = sftp.listdir(outgoing_results_dir)
         except Exception:
             pass
+        try:
+            archived_items = sftp.listdir(archive_dir)
+            # Filter for project directories and parse timestamps
+            for item in archived_items:
+                if '_' in item and len(item.split('_')) >= 3:
+                    # Try to parse timestamp from format like "serial_example_20250813_150354"
+                    parts = item.split('_')
+                    if len(parts) >= 3:
+                        # Check if the last two parts look like date and time
+                        date_part = parts[-2]
+                        time_part = parts[-1]
+                        if len(date_part) == 8 and len(time_part) == 6 and date_part.isdigit() and time_part.isdigit():
+                            # This looks like a timestamped archive
+                            project_name = '_'.join(parts[:-2])  # Everything except date and time
+                            timestamp_str = f"{date_part}_{time_part}"
+                            archived_projects.append((project_name, timestamp_str, item))
+        except Exception:
+            pass
+        
+        # Create main status table
         table = Table(title=f"SFTP Status for {sftp_username}")
         table.add_column("Project Name", style="cyan", no_wrap=True)
         table.add_column("Has Input", style="yellow")
         table.add_column("Has Output", style="green")
-        all_projects = set(projects) | set(results)
-        for proj in sorted(all_projects):
-            has_input = "Yes" if proj in projects else "No"
-            has_output = "Yes" if proj in results else "No"
-            table.add_row(proj, has_input, has_output)
-        if all_projects:
+        table.add_column("Last Tapeout Run", style="blue")
+        
+        # Find the most recent archived project (latest tapeout)
+        latest_tapeout = None
+        if archived_projects:
+            # Sort by timestamp to find the most recent
+            archived_projects.sort(key=lambda x: x[1], reverse=True)  # Sort by timestamp descending
+            latest_tapeout = archived_projects[0]
+            
+            # Parse timestamp to human-readable format
+            try:
+                # timestamp format is "20250813_150354"
+                date_part, time_part = latest_tapeout[1].split('_')
+                year = date_part[:4]
+                month = date_part[4:6]
+                day = date_part[6:8]
+                hour = time_part[:2]
+                minute = time_part[2:4]
+                second = time_part[4:6]
+                
+                formatted_time = f"{year}-{month}-{day} {hour}:{minute}:{second}"
+            except:
+                formatted_time = latest_tapeout[1]
+            
+            # Show only the latest tapeout run
+            # Check if this project has input and output files
+            has_input = "Yes" if latest_tapeout[0] in projects else "No"
+            has_output = "Yes" if latest_tapeout[0] in results else "No"
+            table.add_row(latest_tapeout[0], has_input, has_output, formatted_time)
+        else:
+            # No tapeout runs yet, show active projects with their status
+            all_projects = set(projects) | set(results)
+            for proj in sorted(all_projects):
+                has_input = "Yes" if proj in projects else "No"
+                has_output = "Yes" if proj in results else "No"
+                last_tapeout = "No tapeout yet"
+                table.add_row(proj, has_input, has_output, last_tapeout)
+        
+        if table.row_count > 0:
             console.print(table)
         else:
             console.print("[yellow]No projects or results found on SFTP server.[/yellow]")
+            
+        # Add informative message about tapeout status
+        if not archived_projects and all_projects:
+            console.print("\n[cyan]Note: No tapeout runs have started yet. Your projects are waiting in the queue.[/cyan]")
+        elif not archived_projects and not all_projects:
+            console.print("\n[cyan]Note: No projects found and no tapeout runs have started yet.[/cyan]")
     finally:
         if transport:
             sftp.close()
             transport.close()
 
+@main.command('tapeout-history')
+@click.option('--sftp-host', default=DEFAULT_SFTP_HOST, show_default=True, help='SFTP server hostname.')
+@click.option('--sftp-username', required=False, help='SFTP username (defaults to config).')
+@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)
+@click.option('--limit', default=50, help='Maximum number of tapeouts to show (default: 50)')
+@click.option('--days', default=None, help='Show tapeouts from last N days only')
+def tapeouts(sftp_host, sftp_username, sftp_key, limit, days):
+    """Show all tapeout runs (archived projects) with their timestamps."""
+    config = load_user_config()
+    if not sftp_username:
+        sftp_username = config.get("sftp_username")
+        if not sftp_username:
+            console.print("[red]No SFTP username provided and not found in config. Please run 'cf config' or provide --sftp-username.[/red]")
+            raise click.Abort()
+    if not sftp_key:
+        sftp_key = config.get("sftp_key")
+    
+    # Always resolve key_path to absolute path if set
+    if sftp_key:
+        key_path = os.path.abspath(os.path.expanduser(sftp_key))
+    else:
+        key_path = DEFAULT_SSH_KEY
+    
+    if not os.path.exists(key_path):
+        console.print(f"[red]SFTP key file not found: {key_path}[/red]")
+        console.print("[yellow]Please run 'cf keygen' to generate a key or 'cf config' to set a custom key path.[/yellow]")
+        raise click.Abort()
+
+    console.print(f"Connecting to {sftp_host}...")
+    transport = None
+    try:
+        sftp, transport = sftp_connect(
+            host=sftp_host,
+            username=sftp_username,
+            key_path=key_path
+        )
+    except Exception as e:
+        console.print(f"[red]Failed to connect to SFTP: {e}[/red]")
+        raise click.Abort()
+    
+    try:
+        # List archived projects
+        archive_dir = f"archive"
+        archived_projects = []
+        
+        try:
+            archived_items = sftp.listdir(archive_dir)
+            # Filter for project directories and parse timestamps
+            for item in archived_items:
+                if '_' in item and len(item.split('_')) >= 3:
+                    # Try to parse timestamp from format like "serial_example_20250813_150354"
+                    parts = item.split('_')
+                    if len(parts) >= 3:
+                        # Check if the last two parts look like date and time
+                        date_part = parts[-2]
+                        time_part = parts[-1]
+                        if len(date_part) == 8 and len(time_part) == 6 and date_part.isdigit() and time_part.isdigit():
+                            # This looks like a timestamped archive
+                            project_name = '_'.join(parts[:-2])  # Everything except date and time
+                            timestamp_str = f"{date_part}_{time_part}"
+                            archived_projects.append((project_name, timestamp_str, item))
+        except Exception as e:
+            console.print(f"[yellow]Could not access archive directory: {e}[/yellow]")
+            return
+        
+        if not archived_projects:
+            console.print("[yellow]No tapeout runs found in archive.[/yellow]")
+            return
+        
+        # Sort by timestamp (most recent first)
+        archived_projects.sort(key=lambda x: x[1], reverse=True)
+        
+        # Apply day filter if specified
+        if days:
+            from datetime import datetime, timedelta
+            cutoff_date = datetime.now() - timedelta(days=days)
+            filtered_projects = []
+            for proj_name, timestamp, archive_path in archived_projects:
+                try:
+                    date_part, time_part = timestamp.split('_')
+                    year = int(date_part[:4])
+                    month = int(date_part[4:6])
+                    day = int(date_part[6:8])
+                    hour = int(time_part[:2])
+                    minute = int(time_part[2:4])
+                    second = int(time_part[4:6])
+                    
+                    archive_datetime = datetime(year, month, day, hour, minute, second)
+                    if archive_datetime >= cutoff_date:
+                        filtered_projects.append((proj_name, timestamp, archive_path))
+                except:
+                    # If parsing fails, include it anyway
+                    filtered_projects.append((proj_name, timestamp, archive_path))
+            
+            archived_projects = filtered_projects
+            if archived_projects:
+                console.print(f"[cyan]Showing tapeouts from last {days} days[/cyan]")
+        
+        # Apply limit
+        if len(archived_projects) > limit:
+            console.print(f"[cyan]Showing {limit} most recent tapeouts (use --limit to see more)[/cyan]")
+            archived_projects = archived_projects[:limit]
+        
+        # Create tapeout history table
+        table = Table(title=f"Tapeout History for {sftp_username}")
+        table.add_column("Project Name", style="cyan", no_wrap=True)
+        table.add_column("Tapeout Started", style="green")
+        
+        for proj_name, timestamp, archive_path in archived_projects:
+            # Parse timestamp to human-readable format
+            try:
+                # timestamp format is "20250813_150354"
+                date_part, time_part = timestamp.split('_')
+                year = date_part[:4]
+                month = date_part[4:6]
+                day = date_part[6:8]
+                hour = time_part[:2]
+                minute = time_part[2:4]
+                second = time_part[4:6]
+                
+                formatted_time = f"{year}-{month}-{day} {hour}:{minute}:{second}"
+            except:
+                formatted_time = timestamp
+            
+            table.add_row(proj_name, formatted_time)
+        
+        console.print(table)
+        
+        # Show summary
+        total_archived = len(archived_projects)
+        if total_archived > 0:
+            console.print(f"\n[cyan]Total tapeouts shown: {total_archived}[/cyan]")
+    
+    finally:
+        if transport:
+            sftp.close()
+            transport.close()
+
+@main.command("view-tapeout-report")
+@click.option("--project-name", required=False, help="Project name to view tapeout report for (defaults to value in .cf/project.json if present).")
+@click.option("--report-path", type=click.Path(exists=True, file_okay=True, dir_okay=False), help="Direct path to the HTML report file.")
+def view_tapeout_report(project_name, report_path):
+    """View the consolidated tapeout report from the pulled sftp-output directory."""
+    if report_path:
+        # Use the directly specified report path
+        html_path = report_path
+    else:
+        # Try to find the report based on project name
+        if not project_name:
+            # Try to get project name from .cf/project.json
+            _, cwd_project_name = get_project_json_from_cwd()
+            if cwd_project_name:
+                project_name = cwd_project_name
+            else:
+                console.print("[bold red]No project name specified and no .cf/project.json found in current directory. Please provide --project-name or --report-path.[/bold red]")
+                raise click.Abort()
+        
+        # Look for the consolidated report in the expected location
+        expected_report_path = os.path.join("sftp-output", project_name, "consolidated_reports", "consolidated_report.html")
+        
+        if not os.path.exists(expected_report_path):
+            console.print(f"[yellow]Tapeout report not found at expected location: {expected_report_path}[/yellow]")
+            console.print(f"[cyan]Try running 'cf pull --project-name {project_name}' first to download the report.[/cyan]")
+            raise click.Abort()
+        
+        html_path = expected_report_path
+    
+    # Open the HTML report in the default browser
+    try:
+        open_html_in_browser(html_path)
+        console.print(f"[green]Opened tapeout report in browser: {html_path}[/green]")
+    except Exception as e:
+        console.print(f"[red]Failed to open tapeout report in browser: {e}[/red]")
+        raise click.Abort()
+
 if __name__ == "__main__":
     main() 

{chipfoundry_cli-1.0.3 → chipfoundry_cli-1.0.4}/chipfoundry_cli/utils.py

@@ -13,11 +13,14 @@ REQUIRED_FILES = {
     "verilog/rtl/user_defines.v": True,
 }
 
-# GDS files for different project types
+# GDS files for different project types (both compressed and uncompressed)
 GDS_TYPE_MAP = {
     'user_project_wrapper.gds': 'digital',
+    'user_project_wrapper.gds.gz': 'digital',
     'user_analog_project_wrapper.gds': 'analog',
+    'user_analog_project_wrapper.gds.gz': 'analog',
     'openframe_project_wrapper.gds': 'openframe',
+    'openframe_project_wrapper.gds.gz': 'openframe',
 }
 
 def collect_project_files(project_root: str) -> Dict[str, Optional[str]]:
@@ -50,12 +53,58 @@ def collect_project_files(project_root: str) -> Dict[str, Optional[str]]:
         
         if len(found_gds_files) == 0:
             raise FileNotFoundError(f"No GDS file found in {gds_dir}. Expected one of: {list(GDS_TYPE_MAP.keys())}")
-        elif len(found_gds_files) > 1:
-            found_names = [name for name, _ in found_gds_files]
-            raise FileNotFoundError(f"Multiple GDS files found: {found_names}. Only one project type is allowed per project.")
-        else:
-            gds_name, gds_path = found_gds_files[0]
-            collected[f"gds/{gds_name}"] = gds_path
+        
+        # Group by project type
+        project_type_files = {}
+        for gds_name, gds_path in found_gds_files:
+            project_type = GDS_TYPE_MAP[gds_name]
+            if project_type not in project_type_files:
+                project_type_files[project_type] = []
+            project_type_files[project_type].append((gds_name, gds_path))
+        
+        if len(project_type_files) > 1:
+            found_types = list(project_type_files.keys())
+            raise FileNotFoundError(f"Multiple project types found: {found_types}. Only one project type is allowed per project.")
+        
+        # For the single project type, check if both compressed and uncompressed versions exist
+        project_type = list(project_type_files.keys())[0]
+        type_files = project_type_files[project_type]
+        
+        # Check for both compressed and uncompressed versions of the same file
+        compressed_files = [f for f in type_files if f[0].endswith('.gz')]
+        uncompressed_files = [f for f in type_files if not f[0].endswith('.gz')]
+        
+        if len(compressed_files) > 0 and len(uncompressed_files) > 0:
+            # Find the base name without extension to show which file has both versions
+            base_names = set()
+            for gds_name, _ in type_files:
+                base_name = gds_name.replace('.gz', '')
+                base_names.add(base_name)
+            
+            if len(base_names) == 1:
+                # Same base file has both compressed and uncompressed versions
+                base_name = list(base_names)[0]
+                compressed_name = f"{base_name}.gz"
+                uncompressed_name = base_name
+                raise FileNotFoundError(
+                    f"Both compressed and uncompressed versions of the same GDS file found: "
+                    f"'{compressed_name}' and '{uncompressed_name}'. "
+                    f"Please remove one of them and keep only one version."
+                )
+        
+        # Find uncompressed file first, then fall back to compressed
+        gds_file_to_use = None
+        for gds_name, gds_path in type_files:
+            if not gds_name.endswith('.gz'):
+                gds_file_to_use = (gds_name, gds_path)
+                break
+        
+        # If no uncompressed file found, use the first available (compressed)
+        if not gds_file_to_use:
+            gds_file_to_use = type_files[0]
+        
+        gds_name, gds_path = gds_file_to_use
+        collected[f"gds/{gds_name}"] = gds_path
     
     return collected
 
@@ -220,6 +269,103 @@ def upload_with_progress(sftp, local_path, remote_path, force_overwrite=False):
         progress.update(task, completed=file_size)
         return result 
 
+
+
+def download_with_progress(sftp, remote_path, local_path, console=None):
+    """
+    Download a file with a rich progress bar.
+    """
+    try:
+        remote_stat = sftp.stat(remote_path)
+        file_size = remote_stat.st_size
+        
+        with Progress(
+            TextColumn("[progress.description]{task.description}"),
+            BarColumn(),
+            TaskProgressColumn(),
+            TextColumn("{task.percentage:>3.0f}%"),
+            TextColumn("•"),
+            TextColumn("{task.completed}/{task.total} bytes"),
+            TimeElapsedColumn(),
+        ) as progress:
+            task = progress.add_task(f"Downloading {os.path.basename(remote_path)}", total=file_size)
+            
+            def progress_cb(bytes_transferred, total):
+                progress.update(task, completed=bytes_transferred)
+            
+            # Ensure local directory exists
+            os.makedirs(os.path.dirname(local_path), exist_ok=True)
+            
+            # Download file with progress
+            with open(local_path, "wb") as f:
+                def callback(bytes_transferred, total=file_size):
+                    progress_cb(bytes_transferred, total)
+                sftp.getfo(remote_path, f, callback=callback)
+            
+            progress.update(task, completed=file_size)
+            return True
+            
+    except Exception as e:
+        if console:
+            console.print(f"[red]Failed to download {os.path.basename(remote_path)}: {e}[/red]")
+        raise
+
+def sftp_download_recursive(sftp, remote_path: str, local_path: str, progress_cb=None, console=None):
+    """
+    Recursively download files and directories from SFTP server.
+    
+    Args:
+        sftp: SFTP client
+        remote_path: Remote path on SFTP server
+        local_path: Local path to save to
+        progress_cb: Optional progress callback function(bytes_transferred, total_bytes)
+        console: Optional rich console for logging
+    """
+    try:
+        # Get remote file/directory stats
+        remote_stat = sftp.stat(remote_path)
+        
+        if remote_stat.st_mode & 0o40000:  # Directory
+            # Create local directory
+            os.makedirs(local_path, exist_ok=True)
+            if console:
+                console.print(f"[dim]Creating directory: {os.path.basename(local_path)}[/dim]")
+            
+            # List contents and download recursively
+            try:
+                remote_contents = sftp.listdir(remote_path)
+                if console:
+                    console.print(f"[dim]Found {len(remote_contents)} items in {os.path.basename(remote_path)}[/dim]")
+                for item in remote_contents:
+                    remote_item_path = f"{remote_path}/{item}"
+                    local_item_path = os.path.join(local_path, item)
+                    sftp_download_recursive(sftp, remote_item_path, local_item_path, progress_cb, console)
+            except Exception as e:
+                if console:
+                    console.print(f"[yellow]Warning: Could not list directory {os.path.basename(remote_path)}: {e}[/yellow]")
+                
+        else:  # File
+            # Ensure local directory exists
+            os.makedirs(os.path.dirname(local_path), exist_ok=True)
+            
+            if console:
+                console.print(f"[dim]Downloading: {os.path.basename(remote_path)} ({remote_stat.st_size:,} bytes)[/dim]")
+            
+            # Download file with progress if callback provided
+            if progress_cb:
+                file_size = remote_stat.st_size
+                with open(local_path, "wb") as f:
+                    def callback(bytes_transferred, total=file_size):
+                        progress_cb(bytes_transferred, total)
+                    sftp.getfo(remote_path, f, callback=callback)
+            else:
+                sftp.get(remote_path, local_path)
+                
+    except Exception as e:
+        if console:
+            console.print(f"[red]Error downloading {os.path.basename(remote_path)}: {e}[/red]")
+        raise
+
 def get_config_path() -> Path:
     return Path.home() / ".chipfoundry-cli" / "config.toml"
 
@@ -233,4 +379,21 @@ def save_user_config(config: dict):
     config_path = get_config_path()
     config_path.parent.mkdir(parents=True, exist_ok=True)
     with open(config_path, 'w') as f:
-        toml.dump(config, f) 
+        toml.dump(config, f)
+
+def open_html_in_browser(html_path: str):
+    """
+    Open an HTML file in the default browser.
+    
+    Args:
+        html_path: Path to the HTML file to open
+    """
+    import webbrowser
+    import urllib.parse
+    
+    # Convert to absolute path and file URL
+    abs_path = os.path.abspath(html_path)
+    file_url = f"file://{urllib.parse.quote(abs_path)}"
+    
+    # Open in default browser
+    webbrowser.open(file_url) 

{chipfoundry_cli-1.0.3 → chipfoundry_cli-1.0.4}/pyproject.toml

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