Merge branch 'pyrevitlabs:develop' into develop

Author: Wurschdhaud

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

@@ -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)
+

pyrevitlib/pyrevit/forms/ParameterItemStyle.xaml

@@ -20,6 +20,12 @@
         <Border x:Name="IsReadOnly" Background="{DynamicResource pyRevitAccentBrush}" Height="16" Margin="10,0,0,0" Padding="8,0,8,0" Visibility="Collapsed" CornerRadius="4">
             <TextBlock Text="Read-Only" Foreground="White" FontSize="10"/>
         </Border>
+        <Border x:Name="IsUnit" Background="DarkKhaki" Height="16" Margin="10,0,0,0" Padding="8,0,8,0" Visibility="Collapsed" CornerRadius="4">
+            <TextBlock Text="Unit" Foreground="White" FontSize="10"/>
+        </Border>
+        <Border x:Name="Storagetype" Background="PowderBlue" Height="16" Margin="10,0,0,0" Padding="8,0,8,0" Visibility="Visible" CornerRadius="4">
+            <TextBlock Text="{Binding storagetype}" Foreground="LightSlateGray" FontSize="10"/>
+        </Border>
     </WrapPanel>
     <ControlTemplate.Triggers>
         <DataTrigger Binding="{Binding Path=istype}" Value="True">
@@ -28,5 +34,8 @@
         <DataTrigger Binding="{Binding Path=isreadonly}" Value="True">
             <Setter TargetName="IsReadOnly" Property="Visibility" Value="Visible"/>
         </DataTrigger>
+        <DataTrigger Binding="{Binding Path=isunit}" Value="True">
+            <Setter TargetName="IsUnit" Property="Visibility" Value="Visible"/>
+        </DataTrigger>
     </ControlTemplate.Triggers>
 </ControlTemplate>

pyrevitlib/pyrevit/forms/__init__.py

@@ -70,14 +70,16 @@
 XAML_FILES_DIR = op.dirname(__file__)
 
 
-ParamDef = namedtuple("ParamDef", ["name", "istype", "definition", "isreadonly"])
+ParamDef = namedtuple("ParamDef", ["name", "istype", "definition", "isreadonly", "isunit", "storagetype"])
 """Parameter definition tuple.
 
 Attributes:
     name (str): parameter name
     istype (bool): true if type parameter, otherwise false
     definition (Autodesk.Revit.DB.Definition): parameter definition object
     isreadonly (bool): true if the parameter value can't be edited
+    isunit (bool): true if its ForgeTypeId is measurable
+    storagetype (Autodesk.Revit.DB.Storagetype): String, Integer, Double or ElementId
 """
 
 
@@ -1016,6 +1018,22 @@ def _get_active_ctx(self):
         else:
             return self._context
 
+    def _get_all_ctx(self):
+        """Get all context items across all groups"""
+        ctx = self._context
+        if ctx is None:
+            return
+
+        if isinstance(ctx, dict):
+            for group_items in ctx.values():
+                for item in group_items:
+                    yield item
+        elif isinstance(ctx, (list, tuple, set)):
+            for item in ctx:
+                yield item
+        else:
+            yield ctx
+
     def _list_options(self, option_filter=None):
         if option_filter:
             self.checkall_b.Content = "Check"
@@ -1062,12 +1080,12 @@ def _unwrap_options(options):
     def _get_options(self):
         if self.multiselect:
             if self.return_all:
-                return [x for x in self._get_active_ctx()]
+                return list(self._get_all_ctx())
             else:
                 return self._unwrap_options(
                     [
                         x
-                        for x in self._get_active_ctx()
+                        for x in self._get_all_ctx()
                         if x.state or x in self.list_lb.SelectedItems
                     ]
                 )
@@ -2735,6 +2753,12 @@ def select_parameters(
                     istype=False,
                     definition=x.Definition,
                     isreadonly=x.IsReadOnly,
+                    isunit=(
+                        DB.UnitUtils.IsMeasurableSpec(x.Definition.GetDataType())
+                        if HOST_APP.is_newer_than(2022, True)
+                        else False
+                    ),
+                    storagetype=x.StorageType,
                 )
                 for x in src_element.Parameters
                 if x.StorageType != non_storage_type
@@ -2752,6 +2776,12 @@ def select_parameters(
                         istype=True,
                         definition=x.Definition,
                         isreadonly=x.IsReadOnly,
+                        isunit=(
+                            DB.UnitUtils.IsMeasurableSpec(x.Definition.GetDataType())
+                            if HOST_APP.is_newer_than(2022, True)
+                            else False
+                        ),
+                        storagetype=x.StorageType,
                     )
                     for x in src_type.Parameters
                     if x.StorageType != non_storage_type

pyrevitlib/pyrevit/revit/db/ensure.py

@@ -1,19 +1,21 @@
 """Idempotent operations to ensure a database object exists."""
 import os.path as op
 
+from System import Int64
+
 from pyrevit import HOST_APP, DOCS, PyRevitException
 from pyrevit import coreutils
 from pyrevit.coreutils.logger import get_logger
 from pyrevit import DB
-from pyrevit.revit import db
+from pyrevit.compat import get_elementid_from_value_func
 from pyrevit.revit.db import query
 from pyrevit.revit.db import create
 from pyrevit.revit.db import transaction    #pylint: disable=E0611
 
 
 #pylint: disable=W0703,C0302,C0103
 mlogger = get_logger(__name__)
-
+get_elementid_from_value = get_elementid_from_value_func()
 
 def ensure_sharedparam(sparam_name, sparam_categories, sparam_group,
                        load_param=True, allow_vary_betwen_groups=False,
@@ -75,8 +77,8 @@ def ensure_element_ids(mixed_list):
             element_id_list.append(item.Id)
         elif hasattr(item, 'Id') and isinstance(item.Id, DB.ElementId):
             element_id_list.append(item.Id)
-        elif isinstance(item, int):
-            element_id_list.append(DB.ElementId(item))
+        elif isinstance(item, (int, Int64)):
+            element_id_list.append(get_elementid_from_value(item))
 
     return element_id_list
 

pyrevitlib/rpws/server.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 r"""Python wrapper for Autodesk Revit Server.
 
 Example:
@@ -21,6 +22,7 @@
 import uuid
 import getpass
 import socket
+import urllib
 
 # third party modules
 import requests
@@ -45,6 +47,14 @@
           "2016": "/RevitServerAdminRESTService2016/AdminRESTService.svc",
           "2017": "/RevitServerAdminRESTService2017/AdminRESTService.svc",
           "2018": "/RevitServerAdminRESTService2018/AdminRESTService.svc",
+          "2019": "/RevitServerAdminRESTService2019/AdminRESTService.svc",
+          "2020": "/RevitServerAdminRESTService2020/AdminRESTService.svc",
+          "2021": "/RevitServerAdminRESTService2021/AdminRESTService.svc",
+          "2022": "/RevitServerAdminRESTService2022/AdminRESTService.svc",
+          "2023": "/RevitServerAdminRESTService2023/AdminRESTService.svc",
+          "2024": "/RevitServerAdminRESTService2024/AdminRESTService.svc",
+          "2025": "/RevitServerAdminRESTService2025/AdminRESTService.svc",
+          "2026": "/RevitServerAdminRESTService2026/AdminRESTService.svc",
           }
 
 
@@ -154,7 +164,7 @@ def _httpmethod(self, http_method, command, node_uri=None, rootcmd=False):
         if rootcmd:
             req_url = self._base_uri + command
         else:
-            req_url = self._base_uri + '/' + self._api_path(node_uri) + command
+            req_url = self._base_uri + '/' + urllib.quote(self._api_path(node_uri).encode('utf-8')) + command
 
         # send to server
         try: