added ipm and removed user_defines.v from openframe

Author: marwaneltoukhy

chipfoundry_cli/main.py

@@ -1313,9 +1313,10 @@ 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,
-        "verilog/rtl/user_defines.v": collected["verilog/rtl/user_defines.v"],
     }
-    
+    if detected_type != "openframe":
+        upload_map["verilog/rtl/user_defines.v"] = collected.get("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/"):

chipfoundry_cli/utils.py

@@ -30,21 +30,12 @@ def collect_project_files(project_root: str) -> Dict[str, Optional[str]]:
     Collect required project files from the given project_root.
     Returns a dict mapping logical names to absolute file paths (or None if not found and optional).
     Raises FileNotFoundError if any required file is missing.
+    Openframe projects do not require user_defines.v.
     """
     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():
-            collected[rel_path] = str(abs_path)
-        elif required:
-            raise FileNotFoundError(f"Required file not found: {abs_path}")
-        else:
-            collected[rel_path] = None
-    
-    # Collect GDS file based on what exists
+
+    # Collect GDS file first to determine project type (affects whether user_defines.v is required)
     gds_dir = project_root / 'gds'
     if gds_dir.exists():
         found_gds_files = []
@@ -107,7 +98,22 @@ def collect_project_files(project_root: str) -> Dict[str, Optional[str]]:
 
         gds_name, gds_path = gds_file_to_use
         collected[f"gds/{gds_name}"] = gds_path
-    
+
+        # Collect standard required files (user_defines.v not required for openframe)
+        cf_json_path = project_root / ".cf" / "project.json"
+        collected[".cf/project.json"] = str(cf_json_path) if cf_json_path.exists() else None
+
+        user_defines_path = project_root / "verilog" / "rtl" / "user_defines.v"
+        if project_type == "openframe":
+            collected["verilog/rtl/user_defines.v"] = None  # openframe does not use user_defines.v
+        else:
+            if user_defines_path.exists():
+                collected["verilog/rtl/user_defines.v"] = str(user_defines_path)
+            else:
+                raise FileNotFoundError(f"Required file not found: {user_defines_path}")
+    else:
+        raise FileNotFoundError(f"No GDS directory found at {gds_dir}. Expected one of: {list(GDS_TYPE_MAP.keys())}")
+
     return collected
 
 def ensure_cf_directory(target_dir: str):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "chipfoundry-cli"
-version = "1.4.1"
+version = "1.4.2"
 description = "CLI tool to automate ChipFoundry project submission to SFTP server"
 authors = ["ChipFoundry <marwan.abbas@chipfoundry.io>"]
 readme = "README.md"
@@ -17,6 +17,7 @@ paramiko = ">=3.0.0,<4"
 toml = ">=0.10,<1.0"
 httpx = ">=0.24.0,<1.0"
 textual = ">=0.40.0,<1"
+cf-ipm = "*"
 
 [tool.poetry.group.dev.dependencies]
 wheel = "*"

tests/test_utils.py

@@ -139,6 +139,18 @@ def test_collect_rejects_compressed_and_uncompressed(self, temp_project_dir):
             collect_project_files(temp_project_dir)
         assert 'compressed and uncompressed' in str(exc_info.value).lower()
 
+    def test_collect_openframe_without_user_defines_v(self, temp_project_dir):
+        """Test that openframe projects do not require user_defines.v."""
+        project_root = Path(temp_project_dir)
+        gds_dir = project_root / 'gds'
+        gds_dir.mkdir(parents=True, exist_ok=True)
+        (gds_dir / 'openframe_project_wrapper.gds').write_text('gds')
+        # No verilog/rtl/user_defines.v
+
+        collected = collect_project_files(temp_project_dir)
+        assert 'gds/openframe_project_wrapper.gds' in collected
+        assert collected['verilog/rtl/user_defines.v'] is None
+
 
 class TestEnsureCfDirectory:
     """Test ensure_cf_directory function."""