fix: move enums to parser, simplify code by removing wraps

Author: romangolev

bin/netfx/engines/pyRevitLoaderLight.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+#pylint: disable=C0103,W1401,E0401,E0602
+"""
+   ██▓███▓██   ██▓ ██▀███  ▓█████ ██▒   █▓ ██▓▄▄▄█████▓
+  ▓██░  ██▒██  ██▒▓██ ▒ ██▒▓█   ▀▓██░   █▒▓██▒▓  ██▒ ▓▒
+  ▓██░ ██▓▒▒██ ██░▓██ ░▄█ ▒▒███   ▓██  █▒░▒██▒▒ ▓██░ ▒░
+  ▒██▄█▓▒ ▒░ ▐██▓░▒██▀▀█▄  ▒▓█  ▄  ▒██ █░░░██░░ ▓██▓ ░
+  ▒██▒ ░  ░░ ██▒▓░░██▓ ▒██▒░▒████▒  ▒▀█░  ░██░  ▒██▒ ░
+  ▒▓▒░ ░  ░ ██▒▒▒ ░ ▒▓ ░▒▓░░░ ▒░ ░  ░ ▐░  ░▓    ▒ ░░
+  ░▒ ░    ▓██ ░▒░   ░▒ ░ ▒░ ░ ░  ░  ░ ░░   ▒ ░    ░
+  ░░      ▒ ▒ ░░    ░░   ░    ░       ░░   ▒ ░  ░
+          ░ ░        ░        ░  ░     ░   ░
+          ░ ░                         ░
+This is the starting point for pyRevit. At Revit loads the PyRevitLoader.dll
+ addon at startup. This dll then creates an ironpython engine and runs
+ pyRevitLoader.py (this script). It's the job of this script to setup the
+ environment for the pyrevit module (pyrevitlib\pyrevit) and load a new pyRevit
+ session. This script needs to add the directory path of the pyrevit lib folder
+ so the pyrevit module can be imported and used.
+"""
+
+import sys
+import os.path as op
+
+# add the library location to the system search paths
+repo_path = op.dirname(op.dirname(op.dirname(op.dirname(__file__))))
+sys.path.append(op.join(repo_path, 'pyrevitlib'))
+
+# now pyrevit can be imported
+from pyrevit.loader import sessionmgr
+
+# ask sessionmgr to start a new session
+sessionmgr.load_session(light=True)

dev/pyRevitLoader/Source/PyRevitLoaderApplication.cs

@@ -72,8 +72,8 @@ private static void LoadAssembliesInFolder(string folder)
         private static Result ExecuteStartupScript(UIControlledApplication uiControlledApplication)
         {
             //TODO: Implement a switcher here to be able to switch between Python/C# loaders
-            return ExecuteStartUpPython(uiControlledApplication);
-            //return ExecuteStartUpCsharp(uiControlledApplication);
+            //return ExecuteStartUpPython(uiControlledApplication);
+            return ExecuteStartUpCsharp(uiControlledApplication);
         }
 
         public static Result ExecuteStartUpPython(UIControlledApplication uiControlledApplication)

dev/pyRevitLoader/pyRevitAssemblyBuilder/AssemblyMaker/AssemblyBuilderService.cs

@@ -6,6 +6,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using pyRevitAssemblyBuilder.SessionManager;
 using System.Reflection;
+using pyRevitExtensionParser;
 
 namespace pyRevitAssemblyBuilder.AssemblyMaker
 {
@@ -20,7 +21,7 @@ public AssemblyBuilderService(CommandTypeGenerator typeGenerator, string revitVe
             _revitVersion = revitVersion ?? throw new ArgumentNullException(nameof(revitVersion));
         }
 
-        public ExtensionAssemblyInfo BuildExtensionAssembly(WrappedExtension extension)
+        public ExtensionAssemblyInfo BuildExtensionAssembly(ParsedExtension extension)
         {
             string extensionHash = GetStableHash(extension.GetHash() + _revitVersion).Substring(0, 16);
             string fileName = $"pyRevit_{_revitVersion}_{extensionHash}_{extension.Name}.dll";

dev/pyRevitLoader/pyRevitAssemblyBuilder/AssemblyMaker/CommandTypeGenerator.cs

@@ -1,21 +1,19 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Text;
-using System.Linq;
-using pyRevitAssemblyBuilder.SessionManager;
-using Autodesk.Revit.Attributes;
+using pyRevitExtensionParser;
+using System.Collections.Generic;
 
 namespace pyRevitAssemblyBuilder.AssemblyMaker
 {
     public class CommandTypeGenerator
     {
-        public string GenerateExtensionCode(WrappedExtension extension)
+        public string GenerateExtensionCode(ParsedExtension extension)
         {
             var sb = new StringBuilder();
             sb.AppendLine("#nullable disable");
             sb.AppendLine("using Autodesk.Revit.Attributes;");
             sb.AppendLine("using PyRevitLabs.PyRevit.Runtime;");
-            foreach (var cmd in extension.GetAllCommands())
+            foreach (var cmd in CollectCommandComponents(extension.Children))
             {
                 // Replace invalid characters with underscores for valid C# identifiers
                 string safeClassName = SanitizeClassName(cmd.UniqueId);
@@ -60,7 +58,20 @@ public string GenerateExtensionCode(WrappedExtension extension)
             }
             return sb.ToString();
         }
+        private IEnumerable<ParsedComponent> CollectCommandComponents(IEnumerable<ParsedComponent> components)
+        {
+            foreach (var component in components)
+            {
+                if (!string.IsNullOrEmpty(component.ScriptPath))
+                    yield return component;
 
+                if (component.Children != null)
+                {
+                    foreach (var child in CollectCommandComponents(component.Children))
+                        yield return child;
+                }
+            }
+        }
         private static string SanitizeClassName(string name)
         {
             var sb = new StringBuilder();

dev/pyRevitLoader/pyRevitAssemblyBuilder/SessionManager/ExtensionManagerService.cs

@@ -6,50 +6,26 @@ namespace pyRevitAssemblyBuilder.SessionManager
 {
     public class ExtensionManagerService
     {
-        public IEnumerable<WrappedExtension> GetInstalledExtensions()
+        public IEnumerable<ParsedExtension> GetInstalledExtensions()
         {
             var installedExtensions = ExtensionParser.ParseInstalledExtensions();
+
             foreach (var parsedExtension in installedExtensions)
             {
-                var pushbuttonCommands = CollectCommandComponents(parsedExtension.Children)
-                    .Select(ConvertComponent)
-                    .ToList();
-
-                yield return new WrappedExtension(
-                    name: parsedExtension.Name,
-                    path: parsedExtension.Directory,
-                    commands: pushbuttonCommands,
-                    children: parsedExtension.Children.Select(ConvertComponent).ToList(),
-                    metadata: parsedExtension.Metadata
-                );
+                // Populate tooltip, UniqueId, etc., if needed (e.g., add validation or enrichment)
+                FlattenAndEnrich(parsedExtension.Children);
+                yield return parsedExtension;
             }
         }
-        private IEnumerable<ParsedComponent> CollectCommandComponents(IEnumerable<ParsedComponent> components)
+
+        private void FlattenAndEnrich(IEnumerable<ParsedComponent> components)
         {
             foreach (var component in components)
             {
-                if (!string.IsNullOrEmpty(component.ScriptPath))
-                    yield return component;
-
+                // Custom logic if needed, e.g., enrich tooltip or validate UniqueId
                 if (component.Children != null)
-                {
-                    foreach (var child in CollectCommandComponents(component.Children))
-                        yield return child;
-                }
+                    FlattenAndEnrich(component.Children);
             }
         }
-        private FileCommandComponent ConvertComponent(ParsedComponent parsed)
-        {
-            return new FileCommandComponent
-            {
-                Name = parsed.Name,
-                ScriptPath = parsed.ScriptPath,
-                Tooltip = parsed.Tooltip,
-                UniqueId = parsed.UniqueId,
-                ExtensionName = parsed.UniqueId.Split('.')[0],
-                Type = parsed.Type,
-                Children = parsed.Children?.Select(ConvertComponent).Cast<object>().ToList() ?? new List<object>()
-            };
-        }
     }
 }

dev/pyRevitLoader/pyRevitAssemblyBuilder/SessionManager/FileCommandComponent.cs

@@ -1,4 +1,5 @@
-using System;
+using pyRevitExtensionParser;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -7,7 +8,7 @@ namespace pyRevitAssemblyBuilder.SessionManager
 {
     public class HookManager
     {
-        public void RegisterHooks(WrappedExtension extension)
+        public void RegisterHooks(ParsedExtension extension)
         {
             if (extension == null)
                 return;
@@ -28,15 +29,15 @@ public void RegisterHooks(WrappedExtension extension)
             // Future: implement actual execution logic for scripts if needed
         }
 
-        private IEnumerable<string> GetHookScripts(WrappedExtension extension)
+        private IEnumerable<string> GetHookScripts(ParsedExtension extension)
         {
             var hooksPath = Path.Combine(extension.Directory, "hooks");
             return Directory.Exists(hooksPath)
                 ? Directory.GetFiles(hooksPath)
                 : Enumerable.Empty<string>();
         }
 
-        private IEnumerable<string> GetCheckScripts(WrappedExtension extension)
+        private IEnumerable<string> GetCheckScripts(ParsedExtension extension)
         {
             var checksPath = Path.Combine(extension.Directory, "checks");
             return Directory.Exists(checksPath)

dev/pyRevitLoader/pyRevitAssemblyBuilder/SessionManager/HookManager.cs

@@ -1,10 +1,9 @@
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Autodesk.Revit.UI;
+using pyRevitExtensionParser;
 using pyRevitAssemblyBuilder.AssemblyMaker;
-using pyRevitAssemblyBuilder.Shared;
 
 namespace pyRevitAssemblyBuilder.SessionManager
 {
@@ -17,60 +16,48 @@ public UIManagerService(UIApplication uiApp)
             _uiApp = uiApp;
         }
 
-        public void BuildUI(WrappedExtension extension, ExtensionAssemblyInfo assemblyInfo)
+        public void BuildUI(ParsedExtension extension, ExtensionAssemblyInfo assemblyInfo)
         {
             if (extension?.Children == null)
                 return;
 
-            foreach (var obj in extension.Children as IEnumerable<object> ?? Enumerable.Empty<object>())
-                RecursivelyBuildUI(obj, null, null, extension.Name, assemblyInfo);
+            foreach (var component in extension.Children)
+                RecursivelyBuildUI(component, null, null, extension.Name, assemblyInfo);
         }
 
-        private void RecursivelyBuildUI(object obj, object parentComponent, RibbonPanel parentPanel, string tabName, ExtensionAssemblyInfo assemblyInfo)
+        private void RecursivelyBuildUI(ParsedComponent component, ParsedComponent parentComponent, RibbonPanel parentPanel, string tabName, ExtensionAssemblyInfo assemblyInfo)
         {
-            var component = obj as FileCommandComponent;
-            if (component == null)
-                return;
-
-            var type = CommandComponentTypeExtensions.FromExtension(component.Type);
-
-            switch (type)
+            switch (component.Type)
             {
                 case CommandComponentType.Tab:
                     try { _uiApp.CreateRibbonTab(component.Name); } catch { }
-                    foreach (var child in component.Children ?? Enumerable.Empty<object>())
+                    foreach (var child in component.Children ?? Enumerable.Empty<ParsedComponent>())
                         RecursivelyBuildUI(child, component, null, component.Name, assemblyInfo);
                     break;
 
                 case CommandComponentType.Panel:
                     var panel = _uiApp.GetRibbonPanels(tabName).FirstOrDefault(p => p.Name == component.Name)
                              ?? _uiApp.CreateRibbonPanel(tabName, component.Name);
-                    foreach (var child in component.Children ?? Enumerable.Empty<object>())
+                    foreach (var child in component.Children ?? Enumerable.Empty<ParsedComponent>())
                         RecursivelyBuildUI(child, component, panel, tabName, assemblyInfo);
                     break;
 
                 case CommandComponentType.Stack:
                     var itemDataList = new List<RibbonItemData>();
-                    var originalItems = new List<FileCommandComponent>();
+                    var originalItems = new List<ParsedComponent>();
 
-                    foreach (var child in component.Children as IEnumerable<object> ?? Enumerable.Empty<object>())
+                    foreach (var child in component.Children ?? Enumerable.Empty<ParsedComponent>())
                     {
-                        var subCmd = child as FileCommandComponent;
-                        if (subCmd == null)
-                            continue;
-
-                        var subType = CommandComponentTypeExtensions.FromExtension(subCmd.Type);
-
-                        if (subType == CommandComponentType.PushButton)
+                        if (child.Type == CommandComponentType.PushButton)
                         {
-                            itemDataList.Add(CreatePushButton(subCmd, assemblyInfo));
-                            originalItems.Add(subCmd);
+                            itemDataList.Add(CreatePushButton(child, assemblyInfo));
+                            originalItems.Add(child);
                         }
-                        else if (subType == CommandComponentType.PullDown)
+                        else if (child.Type == CommandComponentType.PullDown)
                         {
-                            var pdData = new PulldownButtonData(subCmd.UniqueId, subCmd.Name);
+                            var pdData = new PulldownButtonData(child.UniqueId, child.Name);
                             itemDataList.Add(pdData);
-                            originalItems.Add(subCmd);
+                            originalItems.Add(child);
                         }
                     }
 
@@ -91,12 +78,11 @@ private void RecursivelyBuildUI(object obj, object parentComponent, RibbonPanel
 
                                 if (ribbonItem is PulldownButton pdBtn)
                                 {
-                                    foreach (var child in origComponent.Children ?? Enumerable.Empty<object>())
+                                    foreach (var sub in origComponent.Children ?? Enumerable.Empty<ParsedComponent>())
                                     {
-                                        if (child is FileCommandComponent subCmd &&
-                                            CommandComponentTypeExtensions.FromExtension(subCmd.Type) == CommandComponentType.PushButton)
+                                        if (sub.Type == CommandComponentType.PushButton)
                                         {
-                                            var subData = CreatePushButton(subCmd, assemblyInfo);
+                                            var subData = CreatePushButton(sub, assemblyInfo);
                                             pdBtn.AddPushButton(subData);
                                         }
                                     }
@@ -124,12 +110,11 @@ private void RecursivelyBuildUI(object obj, object parentComponent, RibbonPanel
                     var splitBtn = parentPanel?.AddItem(splitData) as SplitButton;
                     if (splitBtn == null) return;
 
-                    foreach (var child in component.Children ?? Enumerable.Empty<object>())
+                    foreach (var sub in component.Children ?? Enumerable.Empty<ParsedComponent>())
                     {
-                        if (child is FileCommandComponent subCmd &&
-                            CommandComponentTypeExtensions.FromExtension(subCmd.Type) == CommandComponentType.PushButton)
+                        if (sub.Type == CommandComponentType.PushButton)
                         {
-                            var subData = CreatePushButton(subCmd, assemblyInfo);
+                            var subData = CreatePushButton(sub, assemblyInfo);
                             splitBtn.AddPushButton(subData);
                         }
                     }
@@ -138,7 +123,7 @@ private void RecursivelyBuildUI(object obj, object parentComponent, RibbonPanel
         }
 
         private PulldownButtonData CreatePulldown(
-            FileCommandComponent component,
+            ParsedComponent component,
             RibbonPanel parentPanel,
             string tabName,
             ExtensionAssemblyInfo assemblyInfo,
@@ -153,26 +138,25 @@ private PulldownButtonData CreatePulldown(
             if (pdBtn == null)
                 return null;
 
-            foreach (var child in component.Children ?? Enumerable.Empty<object>())
+            foreach (var sub in component.Children ?? Enumerable.Empty<ParsedComponent>())
             {
-                if (child is FileCommandComponent subCmd &&
-                    CommandComponentTypeExtensions.FromExtension(subCmd.Type) == CommandComponentType.PushButton)
+                if (sub.Type == CommandComponentType.PushButton)
                 {
-                    var subData = CreatePushButton(subCmd, assemblyInfo);
+                    var subData = CreatePushButton(sub, assemblyInfo);
                     pdBtn.AddPushButton(subData);
                 }
             }
 
             return pdData;
         }
 
-        private PushButtonData CreatePushButton(FileCommandComponent command, ExtensionAssemblyInfo assemblyInfo)
+        private PushButtonData CreatePushButton(ParsedComponent component, ExtensionAssemblyInfo assemblyInfo)
         {
             return new PushButtonData(
-                command.UniqueId,
-                command.Name,
+                component.UniqueId,
+                component.Name,
                 assemblyInfo.Location,
-                command.UniqueId
+                component.UniqueId
             );
         }
     }