Structure validation on create

griptapecli/commands/skatepark.py

@@ -104,7 +104,7 @@ def register(
     try:
         response.raise_for_status()
     except requests.exceptions.HTTPError as e:
-        click.echo(f"HTTP Error: {e}")
+        click.echo(f"HTTP Error: {e.response.json().get('detail')}")
         return
 
     structure_id = response.json()["structure_id"]

griptapecli/core/models.py

@@ -110,11 +110,20 @@ class Status(Enum):
     output: Optional[dict] = Field(default=None)
 
 
+class StructureInput(BaseModel):
+    directory: str
+    structure_config_file: str
+    env: dict = Field(default_factory=lambda: {})
+
+
 class Structure(BaseModel):
     directory: str = Field()
     structure_config_file: str = Field()
     env: dict = Field(default_factory=lambda: {})
 
+    def model_post_init(self, __context):
+        self._validate_structure()
+
     @computed_field
     @property
     def structure_id(self) -> str:
@@ -129,6 +138,12 @@ def structure_config(self) -> StructureConfig:
         with open(config_path, "r") as config_file:
             return StructureConfig(**yaml.safe_load(config_file))
 
+    def _validate_structure(self):
+        try:
+            self.structure_config
+        except Exception as e:
+            raise ValueError(f"Invalid structure config: {e}")
+
 
 class ListStructuresResponseModel(BaseModel):
     structures: list[Structure] = Field(default_factory=lambda: [])

griptapecli/core/skatepark.py

@@ -19,6 +19,7 @@
     ListStructuresResponseModel,
     Log,
     Structure,
+    StructureInput,
     StructureRun,
     StructureRunInput,
 )
@@ -35,7 +36,12 @@
 
 
 @app.post("/api/structures", status_code=status.HTTP_201_CREATED)
-def create_structure(structure: Structure) -> Structure:
+def create_structure(structureInput: StructureInput) -> Structure:
+    try:
+        structure = Structure(**structureInput.model_dump())
+    except Exception as e:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))
+
     logger.info(f"Creating structure: {structure}")
 
     state.register_structure(structure)

tests/unit/core/test_models.py

@@ -1,3 +1,5 @@
+import os
+
 from griptapecli.core.models import Event, Structure, StructureRun
 
 
@@ -10,6 +12,8 @@ def test_run_model_init(self):
 
     def test_structure_model_init(self):
         assert Structure(
-            directory="directory",
-            structure_config_file="structure_config.yaml",
+            directory=os.getcwd(),
+            structure_config_file=os.path.join(
+                "tests", "unit", "core", "utils", "structure_config.yaml"
+            ),
         )

tests/unit/core/utils/structure_config.yaml

@@ -0,0 +1,11 @@
+version: 1.0
+runtime: python3
+runtime_version: 3.11
+build:
+  requirements_file: src/requirements.txt
+  cache_build_dependencies:
+    enabled: true
+    watched_files:
+      - requirements.txt
+run:
+  main_file: src/app.py