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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chipfoundry-cli
-Version: 1.0.2
+Version: 1.0.3
 Summary: CLI tool to automate ChipFoundry project submission to SFTP server
 Home-page: https://chipfoundry.io
 License: Apache-2.0

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

@@ -3,7 +3,7 @@ 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
+    get_config_path, load_user_config, save_user_config, GDS_TYPE_MAP
 )
 import os
 from pathlib import Path
@@ -20,12 +20,6 @@ import sys
 DEFAULT_SSH_KEY = os.path.expanduser('~/.ssh/chipfoundry-key')
 DEFAULT_SFTP_HOST = 'sftp.chipfoundry.io'
 
-GDS_TYPE_MAP = {
-    'user_project_wrapper.gds': 'digital',
-    'user_analog_project_wrapper.gds': 'analog',
-    'openframe_project_wrapper.gds': 'openframe',
-}
-
 console = Console()
 
 def get_project_json_from_cwd():
@@ -186,12 +180,7 @@ def init(project_root):
     # Auto-detect project type from GDS file name
     gds_dir = Path(project_root) / 'gds'
     gds_type = None
-    gds_type_map = {
-        'user_project_wrapper.gds': 'digital',
-        'user_analog_project_wrapper.gds': 'analog',
-        'openframe_project_wrapper.gds': 'openframe',
-    }
-    for gds_name, gtype in gds_type_map.items():
+    for gds_name, gtype in GDS_TYPE_MAP.items():
         if (gds_dir / gds_name).exists():
             gds_type = gtype
             break
@@ -291,10 +280,6 @@ def push(project_root, sftp_host, sftp_username, sftp_key, project_id, project_n
         else:
             detected_type = found_types[0]
     
-    # Use the detected GDS file for upload and hash
-    if gds_file_path:
-        collected['gds/user_project_wrapper.gds'] = gds_file_path
-    
     # Prepare CLI overrides for project.json
     cli_overrides = {
         "project_id": project_id,
@@ -303,9 +288,16 @@ def push(project_root, sftp_host, sftp_username, sftp_key, project_id, project_n
         "sftp_username": sftp_username,
     }
     cf_dir = ensure_cf_directory(project_root)
+    
+    # Find the GDS file path for hash calculation
+    gds_path = None
+    for gds_key, gds_path in collected.items():
+        if gds_key.startswith("gds/"):
+            break
+    
     project_json_path = update_or_create_project_json(
         cf_dir=str(cf_dir),
-        gds_path=collected["gds/user_project_wrapper.gds"],
+        gds_path=gds_path,
         cli_overrides=cli_overrides,
         existing_json_path=collected.get(".cf/project.json")
     )
@@ -317,10 +309,14 @@ def push(project_root, sftp_host, sftp_username, sftp_key, project_id, project_n
     sftp_base = f"incoming/projects/{final_project_name}"
     upload_map = {
         ".cf/project.json": project_json_path,
-        "gds/user_project_wrapper.gds": collected["gds/user_project_wrapper.gds"],
         "verilog/rtl/user_defines.v": collected["verilog/rtl/user_defines.v"],
     }
     
+    # Add the appropriate GDS file based on what was collected
+    for gds_key, gds_path in collected.items():
+        if gds_key.startswith("gds/"):
+            upload_map[gds_key] = gds_path
+    
     if dry_run:
         console.print("[bold]Files to upload:[/bold]")
         for rel_path, local_path in upload_map.items():

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

@@ -10,10 +10,16 @@ import toml
 
 REQUIRED_FILES = {
     ".cf/project.json": False,  # Optional, may not exist
-    "gds/user_project_wrapper.gds": True,
     "verilog/rtl/user_defines.v": True,
 }
 
+# GDS files for different project types
+GDS_TYPE_MAP = {
+    'user_project_wrapper.gds': 'digital',
+    'user_analog_project_wrapper.gds': 'analog',
+    'openframe_project_wrapper.gds': 'openframe',
+}
+
 def collect_project_files(project_root: str) -> Dict[str, Optional[str]]:
     """
     Collect required project files from the given project_root.
@@ -22,6 +28,8 @@ def collect_project_files(project_root: str) -> Dict[str, Optional[str]]:
     """
     project_root = Path(project_root)
     collected = {}
+    
+    # Collect standard required files
     for rel_path, required in REQUIRED_FILES.items():
         abs_path = project_root / rel_path
         if abs_path.exists():
@@ -30,6 +38,25 @@ def collect_project_files(project_root: str) -> Dict[str, Optional[str]]:
             raise FileNotFoundError(f"Required file not found: {abs_path}")
         else:
             collected[rel_path] = None
+    
+    # Collect GDS file based on what exists
+    gds_dir = project_root / 'gds'
+    if gds_dir.exists():
+        found_gds_files = []
+        for gds_name in GDS_TYPE_MAP.keys():
+            gds_path = gds_dir / gds_name
+            if gds_path.exists():
+                found_gds_files.append((gds_name, str(gds_path)))
+        
+        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
+    
     return collected
 
 def ensure_cf_directory(target_dir: str):

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

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