Merge branch 'develop' into patch-2

Author: jmcouffin

.github/workflows/docs.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Prepare Python 3.10
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.10'
 

.github/workflows/main.yml

@@ -52,7 +52,7 @@ jobs:
           submodules: recursive
 
       - name: Prepare Python 3.10
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.10'
 
@@ -63,12 +63,12 @@ jobs:
 
       # needed for MahApps XamlColorSchemeGenerator
       - name: Prepare .NET 3.1
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 3.1.x
 
       - name: Prepare .NET 8.0
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: 8.0.x
 

.github/workflows/stale-issues.yml

@@ -10,7 +10,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           days-before-issue-stale: 60
           days-before-issue-close: 14

Pipfile.lock

@@ -226,6 +226,19 @@
             "website": "",
             "image": "",
             "dependencies": []
+        },
+        {
+            "builtin": "False",
+            "type": "extension",
+            "rocket_mode_compatible": "False",
+            "name": "Revitesse",
+            "description": "A set of useful tools for eliminating redundancy.",
+            "author": "Ramy Maher",
+            "author_profile": "https://de.linkedin.com/in/ramyamaher",
+            "url": "https://github.com/ramyamaher/Revitesse.git",
+            "website": "https://revitesse.com/",
+            "image": "",
+            "dependencies": []
         }
     ]
 }

extensions/extensions.json

@@ -7,26 +7,67 @@
 from pyrevit import labs
 from pyrevit import forms
 from pyrevit import script
+from rpw.ui.forms.flexform import FlexForm, Label, Button, CheckBox
 
 
 logger = script.get_logger()
 output = script.get_output()
 
-
-ASSMS = [
+RVT_ASSMS = [
     'RevitAPI',
-    'RevitAPIUI',
+    'RevitAPIUI'
+]
+DYN_ASSMS = [
+    'DynamoServices',
+    'DynamoCore',
+    'DynamoApplications',
+    'DSCoreNodes',
+    'RevitServices',
+    'RevitNodes',
+    # 'ProtoGeometry',
     # 'UIFramework',
     # 'Adwindows',
+]
+PYR_ASSMS = [
     'pyRevitLabs.Common',
     'pyRevitLabs.TargetApps.Revit',
-    'pyRevitLabs.PyRevit',
+    'pyRevitLabs.PyRevit'
 ]
 
+def flexform_select():
+    components = [
+        Label('Select Assembly Group to Generate Stubs:'),
+        CheckBox('Revit', 'Revit Assemblies', default=True),
+        CheckBox('Dynamo', 'Dynamo Assemblies', default=False),
+        CheckBox('pyRevit', 'pyRevit Assemblies', default=False),
+        Button('Pick Destination Folder and Continue'),
+    ]
+    form = FlexForm('Generate API Stubs', components)
+    form.show()
+    selected = []
+    if form.values.get('Revit'):
+        selected.extend(RVT_ASSMS)
+    if form.values.get('Dynamo'):
+        selected.extend(DYN_ASSMS)
+    if form.values.get('pyRevit'):
+        selected.extend(PYR_ASSMS)
+    return selected
+
+ASSMS = flexform_select()
+if not ASSMS:
+    print("No assembly group selected. Exiting...")
+    script.exit()
+
 dest_path = forms.pick_folder()
 
 if dest_path:
     for assm_name in ASSMS:
+        print('Processing assembly: {}'.format(assm_name))
+        try:
+            load_assm = assmutils.load_asm(assm_name)
+            print('Loaded assembly: {}'.format(assm_name))
+        except Exception as ldEx:
+            print('Error loading assembly {} | {}'.format(assm_name, ldEx))
         assm = assmutils.find_loaded_asm(assm_name)
         if assm:
             try:
@@ -37,3 +78,4 @@
                 print('Generated stubs for %s -> %s' % (assm_name, stubs_path))
             except Exception as sgEx:
                 logger.error('Failed generating stubs for %s', assm_name)
+

extensions/pyRevitDevTools.extension/pyRevitDev.tab/Developer Tools.panel/Generate API Stubs.pushbutton/script.py

@@ -1,84 +1,109 @@
 from pyrevit import revit, script, DB
 
 doc = revit.doc
-# currView = revit.active_view
-
-# Get the output window
 output = script.get_output()
 output.close_others()
 
-
-# Get Elements of the FamilyInstance Class
 elements = (
     DB.FilteredElementCollector(doc)
     .OfClass(DB.FamilyInstance)
     .WhereElementIsNotElementType()
     .ToElements()
 )
 
-grand_total = []
-table_data = []
-elements_name = []
-elements_count = []
-elements_category = []
-elements_type = []
+# Setup options for each detail level
+opt_coarse = DB.Options()
+opt_coarse.DetailLevel = DB.ViewDetailLevel.Coarse
+
+opt_medium = DB.Options()
+opt_medium.DetailLevel = DB.ViewDetailLevel.Medium
 
-opt = DB.Options()
+opt_fine = DB.Options()
+opt_fine.DetailLevel = DB.ViewDetailLevel.Fine
+
+# Storage
+processed_types = {}  # typeId: {name, coarse, medium, fine}
 
 for element in elements:
-    total_triangles = []
     typeId = element.GetTypeId()
-    if typeId not in elements_type:
-        elements_type.append(typeId)
-        geometry_set = element.get_Geometry(opt)
-        try:
-            for geometry in geometry_set:
-                if isinstance(geometry, DB.Solid) and geometry.Faces.Size > 0:
-                    nbrtriangle = sum(
-                        [
-                            f.Triangulate().NumTriangles
-                            for f in geometry.Faces
-                            if f.Triangulate() is not None
-                        ]
-                    )
-                    total_triangles.append(nbrtriangle)
-                elif isinstance(geometry, DB.GeometryInstance):
-                    for instObj in geometry.SymbolGeometry:
-                        if isinstance(instObj, DB.Solid) and instObj.Faces.Size > 0:
-                            nbrtriangle = sum(
-                                [
-                                    f.Triangulate().NumTriangles
-                                    for f in instObj.Faces
-                                    if f.Triangulate() is not None
-                                ]
-                            )
-                            total_triangles.append(nbrtriangle)
-                else:
-                    pass
-            geometry_set.Dispose()
-            total_triangles = sum(total_triangles)
-            if total_triangles != 0:
-                elements_count.append(total_triangles)
-                elements_name.append(
-                    output.linkify(element.Id)
-                    + "**"
-                    + element.Name
-                    + "** (*Category*: "
-                    + element.Category.Name
-                    + ")"
-                )
-                grand_total.append(total_triangles)
-        except:
-            pass
-
-# adding grand total and making a dictionary out of it
-elements_count.append(sum(grand_total))
-elements_name.append("Grand Total")
-my_dict = dict(zip(elements_name, elements_count))
-
-# output as a table
+
+    if typeId not in processed_types:
+        element_name = (
+            output.linkify(element.Id)
+            + "**"
+            + element.Name
+            + "** (*Category*: "
+            + element.Category.Name
+            + ")"
+        )
+
+        # Process each detail level
+        counts = {}
+        for level_name, opt in [
+            ("coarse", opt_coarse),
+            ("medium", opt_medium),
+            ("fine", opt_fine),
+        ]:
+            total_triangles = []
+            geometry_set = element.get_Geometry(opt)
+
+            try:
+                for geometry in geometry_set:
+                    if isinstance(geometry, DB.Solid) and geometry.Faces.Size > 0:
+                        nbrtriangle = sum(
+                            [
+                                f.Triangulate().NumTriangles
+                                for f in geometry.Faces
+                                if f.Triangulate() is not None
+                            ]
+                        )
+                        total_triangles.append(nbrtriangle)
+                    elif isinstance(geometry, DB.GeometryInstance):
+                        for instObj in geometry.SymbolGeometry:
+                            if isinstance(instObj, DB.Solid) and instObj.Faces.Size > 0:
+                                nbrtriangle = sum(
+                                    [
+                                        f.Triangulate().NumTriangles
+                                        for f in instObj.Faces
+                                        if f.Triangulate() is not None
+                                    ]
+                                )
+                                total_triangles.append(nbrtriangle)
+
+                geometry_set.Dispose()
+                counts[level_name] = sum(total_triangles)
+            except Exception:
+                counts[level_name] = 0
+
+        # Only add if at least one level has triangles
+        if any(counts.values()):
+            processed_types[typeId] = {
+                "name": element_name,
+                "coarse": counts["coarse"],
+                "medium": counts["medium"],
+                "fine": counts["fine"],
+            }
+
+# Prepare table data
+table_data = []
+for type_info in processed_types.values():
+    table_data.append(
+        [type_info["name"], type_info["coarse"], type_info["medium"], type_info["fine"]]
+    )
+
+# Add grand totals
+if table_data:
+    grand_coarse = sum([row[1] for row in table_data])
+    grand_medium = sum([row[2] for row in table_data])
+    grand_fine = sum([row[3] for row in table_data])
+
+    table_data.append(["Grand Total", grand_coarse, grand_medium, grand_fine])
+
+# Sort by fine detail count (or change to coarse/medium as needed)
+table_data_sorted = sorted(table_data[:-1], key=lambda x: x[3]) + [table_data[-1]]
+
 output.print_table(
-    sorted(my_dict.items(), key=lambda item: item[1]),
-    ["Name", "Count"],
+    table_data_sorted,
+    ["Name", "Coarse", "Medium", "Fine"],
     last_line_style="color:white;font-weight: bolder; background-color: gray;",
 )

extensions/pyRevitTools.extension/pyRevit.tab/Analysis.panel/Tools.stack/Inspect.pulldown/Count Faces.pushbutton/script.py

@@ -3,6 +3,7 @@
 import os
 import math
 import tempfile
+from collections import defaultdict
 from pyrevit import revit, forms, script, DB, HOST_APP
 
 output = script.get_output()
@@ -15,6 +16,7 @@
 save_as_options = DB.SaveAsOptions()
 save_as_options.OverwriteExistingFile = True
 
+
 def convert_size(size_bytes):
     if not size_bytes:
         return "N/A"
@@ -75,7 +77,7 @@ def print_sorted(families, group_by):
                 key=lambda fam_item: fam_item.get(sort_by),
                 reverse=False
             )
-        
+
         for fam_item in sorted_families:
             group_by_value = fam_item[group_by]
             if group_by_value not in families_grouped:
@@ -86,7 +88,7 @@ def print_sorted(families, group_by):
         if group_by in ["Creator", "Category"]:
             output.print_md("---")
             output.print_md("## {}: {}".format(group_by, group_value))
-        
+
         # Prepare table data
         table_data = []
         for fam_item in families_grouped[group_value]:
@@ -100,19 +102,21 @@ def print_sorted(families, group_by):
                 else:
                     row.append(str(value))
             table_data.append(row)
-        
+
         # Print table using output.print_table()
         output.print_table(
             table_data,
             columns=fields_sorted
         )
-        
+
         print_totals(families_grouped[group_value])
 
+
 # main logic
 # ask use to choose sort option
-sort_by = forms.CommandSwitchWindow.show(FIELDS,
-     message='Sorting options:',
+sort_by = forms.CommandSwitchWindow.show(
+    FIELDS,
+    message="Sorting options:",
 )
 if not sort_by:
     script.exit()
@@ -131,12 +135,6 @@ def print_sorted(families, group_by):
                         .ToElements()
 
 # Create a dictionary to count instances per family
-family_instance_counts = {}
-for instance in all_family_instances:
-    try:
-        if instance.Symbol:
-            family_name = instance.Symbol.Family.Name
-            family_instance_counts[family_name] = \
 family_instance_counts = defaultdict(int)
 for instance in all_family_instances:
     try:
@@ -172,10 +170,10 @@ def print_sorted(families, group_by):
                                                                   fam.Id).Creator
                 if fam_path and os.path.exists(fam_path):
                     fam_size = os.path.getsize(fam_path)
-                
+
                 # Get instance count for this family
                 fam_count = family_instance_counts.get(fam.Name, 0)
-                
+
                 all_family_items.append({"Size": fam_size,
                                          "Creator": fam_creator,
                                          "Category": fam_category,