DynamoDS
diff --git a/‎src/DynamoCore/Graph/Nodes/NodeModel.cs
Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions b/‎src/DynamoCore/Graph/Nodes/NodeModel.cs
Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions
diff --git a/‎src/DynamoCore/Graph/Nodes/ZeroTouch/DSFunctionBase.cs
Copy file name to clipboard
+20-1Lines changed: 20 additions & 1 deletion b/‎src/DynamoCore/Graph/Nodes/ZeroTouch/DSFunctionBase.cs
Copy file name to clipboard
+20-1Lines changed: 20 additions & 1 deletion
diff --git a/‎src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/DynamoPackages/PackageManagerExtension.cs
Copy file name to clipboard
+46Lines changed: 46 additions & 0 deletions b/‎src/DynamoPackages/PackageManagerExtension.cs
Copy file name to clipboard
+46Lines changed: 46 additions & 0 deletions
diff --git a/‎src/Libraries/PythonNodeModels/PythonNode.cs
Copy file name to clipboard
+19-1Lines changed: 19 additions & 1 deletion b/‎src/Libraries/PythonNodeModels/PythonNode.cs
Copy file name to clipboard
+19-1Lines changed: 19 additions & 1 deletion
diff --git a/‎test/DynamoCoreTests/PackageDependencyTests.cs
Copy file name to clipboard
+67Lines changed: 67 additions & 0 deletions b/‎test/DynamoCoreTests/PackageDependencyTests.cs
Copy file name to clipboard
+67Lines changed: 67 additions & 0 deletions
diff --git a/‎test/core/packageDependencyTests/PythonDependency.dyn
Copy file name to clipboard
+106Lines changed: 106 additions & 0 deletions b/‎test/core/packageDependencyTests/PythonDependency.dyn
Copy file name to clipboard
+106Lines changed: 106 additions & 0 deletions
diff --git a/‎test/core/packageDependencyTests/PythonEnginePackage/bin/DSPythonNet3Empty.dll
Copy file name to clipboard
14.3 KB b/‎test/core/packageDependencyTests/PythonEnginePackage/bin/DSPythonNet3Empty.dll
Copy file name to clipboard
14.3 KB
diff --git a/‎test/core/packageDependencyTests/PythonEnginePackage/extra/DSPythonNet3.dll
Copy file name to clipboard
39.3 KB b/‎test/core/packageDependencyTests/PythonEnginePackage/extra/DSPythonNet3.dll
Copy file name to clipboard
39.3 KB
diff --git a/‎test/core/packageDependencyTests/PythonEnginePackage/extra/DSPythonNet3Extension.dll
Copy file name to clipboard
18.8 KB b/‎test/core/packageDependencyTests/PythonEnginePackage/extra/DSPythonNet3Extension.dll
Copy file name to clipboard
18.8 KB
@@ -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
 
@@ -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,24 @@ public override IdentifierNode GetAstIdentifierForOutputIndex(int outputIndex)
             }
         }
 
+        /// <summary>
+        /// The method returns the assembly name from which the node originated.
+        /// Only if the node was added from a package
+        /// </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 +377,4 @@ protected override AssociativeNode GetFunctionApplication(NodeModel model, List<
             return rhs;
         }
     }
-}
+}
@@ -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);
 
@@ -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,49 @@ 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)
+            {
+                try
+                {
+                    var assem = e.NewItems[0]?.GetType().Assembly;
+                    if (assem == null) return;
+
+                    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)));
+                        }
+                    }
+                }
+                catch(Exception ex)
+                {
+                    OnMessageLogged(LogMessage.Info("Error occurred while recording python engine and package mapping. " + ex.Message));
+                }
+            }
+        }
+
         private PackageInfo handleCustomNodeOwnerQuery(Guid customNodeFunctionID)
         {
             return GetCustomNodePackageFromID(customNodeFunctionID);
@@ -180,6 +225,7 @@ public void Ready(ReadyParams sp)
 
         public void Shutdown()
         {
+            PythonServices.PythonEngineManager.Instance.AvailableEngines.CollectionChanged -= PythonEngineAdded;
             //this.Dispose();
         }
 
 
@@ -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>
 
@@ -6,10 +6,12 @@
 using Dynamo.Graph.Workspaces;
 using Dynamo.Interfaces;
 using Dynamo.Models;
+using Dynamo.PythonServices;
 using Dynamo.Scheduler;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
+using PythonNodeModels;
 
 namespace Dynamo.Tests
 {
@@ -22,9 +24,17 @@ protected override void GetLibrariesToPreload(List<string> libraries)
             libraries.Add("ProtoGeometry.dll");
             libraries.Add("DesignScriptBuiltin.dll");
             libraries.Add("DSCoreNodes.dll");
+            libraries.Add("DSCPython.dll");
             base.GetLibrariesToPreload(libraries);
         }
 
+        private void UpdatePythonEngineAndRun(PythonNode pythonNode, string pythonEngineVersion)
+        {
+            pythonNode.EngineName = pythonEngineVersion;
+            //to kick off a run node modified must be called
+            pythonNode.OnNodeModified();
+        }
+
         private PackageDependencyInfo GetPackageInfo(string packageName)
         {
             var loader = GetPackageLoader();
@@ -94,6 +104,63 @@ public void ZeroTouchPackageDependencyIsCollectedAndSerialized()
             Assert.AreEqual(package.Nodes.Select(n => n.ToString("N")), nodes);
         }
 
+        [Test]
+        public void PythonEnginePackageDependencyIsCollectedAndSerialized()
+        {
+            // Load JSON file graph
+            string path = Path.Combine(TestDirectory, @"core\packageDependencyTests\PythonDependency.dyn");
+
+            // Assert package dependency is not already serialized to .dyn
+            using (StreamReader file = new StreamReader(path))
+            {
+                var data = file.ReadToEnd();
+                var json = (JObject)JsonConvert.DeserializeObject(data);
+                Assert.IsEmpty(json[WorkspaceReadConverter.NodeLibraryDependenciesPropString]);
+            }
+
+            string packageDirectory = Path.Combine(TestDirectory, @"core\packageDependencyTests\PythonEnginePackage");
+            LoadPackage(packageDirectory);
+
+            OpenModel(path);
+
+            //TO-DO: Force load binaries or mock the python engine instead of loading a package
+            //assert that default python engine was selected, and 2 different engines are loaded
+            var currentws = CurrentDynamoModel.CurrentWorkspace;
+            var pyNode = currentws.Nodes.OfType<PythonNode>().FirstOrDefault();
+            Assert.IsNotNull(pyNode);
+            Assert.AreEqual(pyNode.EngineName, PythonEngineManager.CPython3EngineName);
+            Assert.AreEqual(PythonEngineManager.Instance.AvailableEngines.Count, 2);
+            UpdatePythonEngineAndRun(pyNode, "PythonNet3");
+            currentws.ForceComputeWorkspaceReferences = true;
+
+
+            //assert that python engine imported from a package gets added to NodeLibraryDependencies
+            var packageDependencies = currentws.NodeLibraryDependencies;
+            Assert.AreEqual(1, packageDependencies.Count);
+            var package = packageDependencies.First();
+            Assert.AreEqual(new PackageDependencyInfo("TestCP311", new Version("1.0.8")), package);
+            Assert.AreEqual(1, package.Nodes.Count);
+
+            Assert.IsTrue(package.IsLoaded);
+            if (package is PackageDependencyInfo)
+            {
+                var packageDependencyState = ((PackageDependencyInfo)package).State;
+                Assert.AreEqual(PackageDependencyState.Loaded, packageDependencyState);
+            }
+
+            // Assert package dependency is serialized
+            var ToJson = currentws.ToJson(CurrentDynamoModel.EngineController);
+            var JObject = (JObject)JsonConvert.DeserializeObject(ToJson);
+            var deserializedPackageDependencies = JObject[WorkspaceReadConverter.NodeLibraryDependenciesPropString];
+            Assert.AreEqual(1, deserializedPackageDependencies.Count());
+            var name = deserializedPackageDependencies.First()[NodeLibraryDependencyConverter.NamePropString].Value<string>();
+            Assert.AreEqual(package.Name, name);
+            var version = deserializedPackageDependencies.First()[NodeLibraryDependencyConverter.VersionPropString].Value<string>();
+            Assert.AreEqual(package.Version.ToString(), version);
+            var nodes = deserializedPackageDependencies.First()[NodeLibraryDependencyConverter.NodesPropString].Values<string>();
+            Assert.AreEqual(package.Nodes.Select(n => n.ToString("N")), nodes);
+        }
+
         [Test]
         public void CustomNodePackageDependencyIsCollected()
         {
 
@@ -0,0 +1,106 @@
+{
+  "Uuid": "0760a737-55e1-4e89-a175-e10147e36042",
+  "IsCustomNode": false,
+  "Description": "",
+  "Name": "PythonDependency",
+  "ElementResolver": {
+    "ResolutionMap": {}
+  },
+  "Inputs": [],
+  "Outputs": [],
+  "Nodes": [
+    {
+      "ConcreteType": "PythonNodeModels.PythonNode, PythonNodeModels",
+      "Code": "# Load the Python Standard and DesignScript Libraries\r\nimport sys\r\nimport clr\r\nclr.AddReference('ProtoGeometry')\r\nfrom Autodesk.DesignScript.Geometry import *\r\n\r\n# The inputs to this node will be stored as a list in the IN variables.\r\ndataEnteringNode = IN\r\n\r\n# Place your code below this line\r\n\r\n# Assign your output to the OUT variable.\r\nOUT = 0",
+      "Engine": "CPython3",
+      "VariableInputPorts": true,
+      "Id": "eea559999b3e43e18488b587b1218082",
+      "NodeType": "PythonScriptNode",
+      "Inputs": [
+        {
+          "Id": "0898a31365ca449fb054872d1f2a81d1",
+          "Name": "IN[0]",
+          "Description": "Input #0",
+          "UsingDefaultValue": false,
+          "Level": 2,
+          "UseLevels": false,
+          "KeepListStructure": false
+        }
+      ],
+      "Outputs": [
+        {
+          "Id": "5bc0033faea34070897bc93a50cfaa15",
+          "Name": "OUT",
+          "Description": "Result of the python script",
+          "UsingDefaultValue": false,
+          "Level": 2,
+          "UseLevels": false,
+          "KeepListStructure": false
+        }
+      ],
+      "Replication": "Disabled",
+      "Description": "Runs an embedded Python script."
+    }
+  ],
+  "Connectors": [],
+  "Dependencies": [],
+  "NodeLibraryDependencies": [],
+  "EnableLegacyPolyCurveBehavior": null,
+  "Thumbnail": "",
+  "GraphDocumentationURL": null,
+  "ExtensionWorkspaceData": [
+    {
+      "ExtensionGuid": "28992e1d-abb9-417f-8b1b-05e053bee670",
+      "Name": "Properties",
+      "Version": "3.4",
+      "Data": {}
+    }
+  ],
+  "Author": "",
+  "Linting": {
+    "activeLinter": "None",
+    "activeLinterId": "7b75fb44-43fd-4631-a878-29f4d5d8399a",
+    "warningCount": 0,
+    "errorCount": 0
+  },
+  "Bindings": [],
+  "View": {
+    "Dynamo": {
+      "ScaleFactor": 1.0,
+      "HasRunWithoutCrash": true,
+      "IsVisibleInDynamoLibrary": true,
+      "Version": "3.4.0.6124",
+      "RunType": "Automatic",
+      "RunPeriod": "1000"
+    },
+    "Camera": {
+      "Name": "_Background Preview",
+      "EyeX": -17.0,
+      "EyeY": 24.0,
+      "EyeZ": 50.0,
+      "LookX": 12.0,
+      "LookY": -13.0,
+      "LookZ": -58.0,
+      "UpX": 0.0,
+      "UpY": 1.0,
+      "UpZ": 0.0
+    },
+    "ConnectorPins": [],
+    "NodeViews": [
+      {
+        "Id": "eea559999b3e43e18488b587b1218082",
+        "Name": "Python Script",
+        "IsSetAsInput": false,
+        "IsSetAsOutput": false,
+        "Excluded": false,
+        "ShowGeometry": true,
+        "X": 341.0,
+        "Y": 287.0
+      }
+    ],
+    "Annotations": [],
+    "X": 0.0,
+    "Y": 0.0,
+    "Zoom": 1.0
+  }
+}
Original file line number	Diff line number	Diff line change
`@@ -2174,7 +2174,7 @@ internal PackageInfo GetNodePackage(NodeModel node)`
`2174`	`2174`	`throw new Exception("There are multiple subscribers to Workspace.CollectingNodePackageDependencies. " +`
`2175`	`2175`	`"Only PackageManagerExtension should subscribe to this event.");`
`2176`	`2176`	`}`
`2177`		`- var assemblyName = GetNameOfAssemblyReferencedByNode(node);`
	`2177`	`+ var assemblyName = node.GetNameOfAssemblyReferencedByNode();`
`2178`	`2178`	`if (assemblyName != null)`
`2179`	`2179`	`{`
`2180`	`2180`	`return CollectingNodePackageDependencies(assemblyName);`