DYN-7535 Record python engine package information in graphs when using engines served from them

src/DynamoCore/Graph/Nodes/NodeModel.cs

@@ -1222,6 +1222,20 @@ protected NodeModel(IEnumerable<PortModel> inPorts, IEnumerable<PortModel> outPo
             RaisesModificationEvents = true;
         }
 
+        /// <summary>
+        /// The method returns the assembly name from which the node originated.
+        /// </summary>
+        /// <returns>Assembly Name</returns>
+        internal virtual AssemblyName GetNameOfAssemblyReferencedByNode()
+        {
+            AssemblyName assemblyName = null;
+
+            var assembly = this.GetType().Assembly;
+            assemblyName = AssemblyName.GetAssemblyName(assembly.Location);
+
+            return assemblyName;
+        }
+
         /// <summary>
         /// Here we try to find the correct port names and tooltips.
         /// ideally we'd use the runtime information to correctly update or localize

src/DynamoCore/Graph/Nodes/ZeroTouch/DSFunctionBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Xml;
 using Dynamo.Engine;
 using Dynamo.Engine.CodeGeneration;
@@ -76,6 +77,23 @@ public override IdentifierNode GetAstIdentifierForOutputIndex(int outputIndex)
             }
         }
 
+        /// <summary>
+        /// The method returns the assembly name from which the node originated.
+        /// </summary>
+        /// <returns>Assembly Name</returns>
+        internal override AssemblyName GetNameOfAssemblyReferencedByNode()
+        {
+            AssemblyName assemblyName = null;
+
+            var descriptor = this.Controller.Definition;
+            if (descriptor.IsPackageMember)
+            {
+                assemblyName = AssemblyName.GetAssemblyName(descriptor.Assembly);
+            }
+
+            return assemblyName;
+        }
+
         /// <summary>
         ///     Copy command will call it to serialize this node to xml data.
         /// </summary>
@@ -358,4 +376,4 @@ protected override AssociativeNode GetFunctionApplication(NodeModel model, List<
             return rhs;
         }
     }
-}
+}

src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs

@@ -2174,7 +2174,7 @@ internal PackageInfo GetNodePackage(NodeModel node)
                         throw new Exception("There are multiple subscribers to Workspace.CollectingNodePackageDependencies. " +
                             "Only PackageManagerExtension should subscribe to this event.");
                     }
-                    var assemblyName = GetNameOfAssemblyReferencedByNode(node);
+                    var assemblyName = node.GetNameOfAssemblyReferencedByNode();
                     if (assemblyName != null)
                     {
                         return CollectingNodePackageDependencies(assemblyName);

src/DynamoPackages/PackageManagerExtension.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Reflection;
 using Dynamo.Extensions;
@@ -145,6 +146,7 @@ public void Startup(StartupParams startupParams)
             PackageLoader.PackagesLoaded += LoadPackagesHandler;
             PackageLoader.RequestLoadNodeLibrary += RequestLoadNodeLibraryHandler;
             PackageLoader.RequestLoadCustomNodeDirectory += RequestLoadCustomNodeDirectoryHandler;
+            PythonServices.PythonEngineManager.Instance.AvailableEngines.CollectionChanged += PythonEngineAdded;
 
             var dirBuilder = new PackageDirectoryBuilder(
                 new MutatingFileSystem(),
@@ -163,6 +165,40 @@ public void Startup(StartupParams startupParams)
             noNetworkMode = startupParams.NoNetworkMode;
         }
 
+        /// <summary>
+        /// When a new engine is added from a package, add its dependency to the respective package in the dictionary.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        internal void PythonEngineAdded(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                var assem = e.NewItems[0].GetType().Assembly;
+                var assemLoc = assem.Location;
+                foreach (var pkg in PackageLoader.LocalPackages)
+                {
+                    if (assemLoc.StartsWith(pkg.RootDirectory))
+                    {
+                        if (NodePackageDictionary.ContainsKey(assem.FullName))
+                        {
+                            var assemName = AssemblyName.GetAssemblyName(assem.Location);
+                            OnMessageLogged(LogMessage.Info(
+                                string.Format("{0} contains the python engine library {1}, which has already been loaded " +
+                                "by another package. This may cause inconsistent results when determining which " +
+                                "python engine the nodes are dependent on.", pkg.Name, assemName.Name)
+                                ));
+                        }
+                        else
+                        {
+                            NodePackageDictionary[assem.FullName] = new List<PackageInfo>();
+                        }
+                        NodePackageDictionary[assem.FullName].Add(new PackageInfo(pkg.Name, new Version(pkg.VersionName)));
+                    }
+                }
+            }
+        }
+
         private PackageInfo handleCustomNodeOwnerQuery(Guid customNodeFunctionID)
         {
             return GetCustomNodePackageFromID(customNodeFunctionID);

src/Libraries/PythonNodeModels/PythonNode.cs

@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Xml;
 using System.Xml.Serialization;
 using Autodesk.DesignScript.Runtime;
@@ -59,8 +60,25 @@ public string EngineName
                 {
                     engine = value;
                     RaisePropertyChanged(nameof(EngineName));
-                }
+                }   
+            }
+        }
+
+        /// <summary>
+        /// The method returns the assembly name from which the node originated.
+        /// </summary>
+        /// <returns>Assembly Name</returns>
+        internal override AssemblyName GetNameOfAssemblyReferencedByNode()
+        {
+            AssemblyName assemblyName = null;
+
+            var pyEng = PythonEngineManager.Instance.AvailableEngines.Where(x => x.Name.Equals(this.EngineName)).FirstOrDefault();
+            if (pyEng != null)
+            {
+                assemblyName = AssemblyName.GetAssemblyName(pyEng.GetType().Assembly.Location);
             }
+
+            return assemblyName;
         }
 
         /// <summary>