Merge pull request #14 from specklesystems/charles/differentIterator

fix(objects): more generic iteration of objects

main.py

@@ -2,13 +2,14 @@ from pydantic import Field
 from reportlab.platypus import SimpleDocTemplate
 from reportlab.platypus.tables import Table
 from reportlab.lib.pagesizes import letter
+from specklepy.objects import Base
 from speckle_automate import (
     AutomateBase,
     AutomationContext,
     execute_automate_function,
 )
 
-from typing import Dict, Generator, Any
+from typing import Dict, Generator, Any, Iterable
 
 from src.domain.carbon.databases.enums import (
     SteelDatabase,
@@ -403,13 +404,13 @@ class RevitCarbonAnalyzer:
             }
 
     @staticmethod
-    def iterate_elements(model_data) -> Generator[Dict, None, None]:
+    def iterate_elements(base: Base) -> Iterable[Base]:
         """Iterate through all elements in the model."""
-        for level in getattr(model_data, "elements", []):
+        elements = getattr(base, "elements", getattr(base, "@elements", None))
-            for type_group in getattr(level, "elements", []):
+        if elements is not None:
-                for element_group in getattr(type_group, "elements", []):
+            for element in elements:
-                    for element in getattr(element_group, "elements", []):
+                yield from RevitCarbonAnalyzer.iterate_elements(element)
-                        yield element
+        yield base
 
 
 def automate_function(
@@ -483,6 +484,14 @@ def automate_function(
             automate_context.mark_run_failed("Model must be from Revit")
             return
 
+        # Validate Next-Gen
+        if not _validate_next_gen(model_root):
+            automate_context.mark_run_failed(
+                "Revit model must be sent using the v3 connector (or adapt the "
+                "automation for v2)."
+            )
+            return
+
         # Run analysis - convert Speckle model to dict for processing
         results = analyzer.analyze_model(model_root)
 
@@ -497,6 +506,9 @@ def automate_function(
         for element in RevitCarbonAnalyzer.iterate_elements(model_root):
             if hasattr(element, "properties"):
                 element_properties = element["properties"]
+
+                # elementId became an issue for linked models. don't know why. lazy fix below. hackady-hack
+                if hasattr(element_properties, "elementId"):
                     element_id = element_properties["elementId"]
                     if "Embodied Carbon Calculation" in element_properties:
                         for key, value in element_properties[
@@ -590,6 +602,13 @@ def _validate_revit_source(commit_root: Any) -> bool:
     return source_app.startswith("revit")
 
 
+def _validate_next_gen(model_root: Any) -> bool:
+    """Validate that the model was sent using the v3 connector"""
+    if not getattr(model_root, "version", None) == 3:
+        return False
+    return True
+
+
 def _process_automation_results(
     automate_context: AutomationContext, results: dict
 ) -> None:

pyproject.toml

@@ -10,7 +10,7 @@ version = "0.1.0"
 pylint = "^3.3.4"
 python = "^3.11"
 reportlab = "^4.3.1"
-specklepy = "^2.21.0"
+specklepy = "^2.21.4"
 structlog = "^25.1.0"
 
 [tool.poetry.group.dev.dependencies]