[DYN-8392] Python dependencies in workspace references.

src/DynamoCore/Graph/Workspaces/WorkspaceModel.cs

@@ -24,6 +24,7 @@
 using Dynamo.Logging;
 using Dynamo.Models;
 using Dynamo.Properties;
+using Dynamo.PythonServices;
 using Dynamo.Scheduler;
 using Dynamo.Selection;
 using Dynamo.Utilities;
@@ -672,20 +673,19 @@ public HashSet<Guid> Dependencies
         }
 
         /// <summary>
-        /// Event requesting subscribers to return additional package dependencies for
-        /// current workspace.
+        /// Event requesting subscribers to return Python engine mapping for the current workspace nodes.
         /// </summary>
-        internal event Func<IEnumerable<INodeLibraryDependencyInfo>> RequestPackageDependencies;
+        internal event Func<Dictionary<Guid, String>> RequestPythonEngineMapping;
 
         /// <summary>
-        /// Raised when the workspace needs to request for additional package dependencies
+        /// Raised when the workspace needs to request for Python engine mapping
         /// that can be returned from other subscribers such as view extensions.
-        /// E.g. The PythonMigrationViewExtension returns additional package dependencies required for Python engines.
+        /// E.g. The PythonMigrationViewExtension computes additional package dependencies required for Python nodes.
         /// </summary>
         /// <returns></returns>
-        internal IEnumerable<INodeLibraryDependencyInfo> OnRequestPackageDependencies()
+        internal Dictionary<Guid, String> OnRequestPythonEngineMapping()
         {
-            return RequestPackageDependencies?.Invoke();
+            return RequestPythonEngineMapping?.Invoke();
         }
 
         /// <summary>
@@ -800,10 +800,44 @@ private List<INodeLibraryDependencyInfo> ComputeNodeLibraryDependencies()
         {
             var packageDependencies = new Dictionary<PackageInfo, PackageDependencyInfo>();
 
+            bool computePythonNodeMapping = true;
+            var pythonNodeMapping = new Dictionary<Guid, String>();
+
             foreach (var node in Nodes)
             {
                 var collected = GetNodePackage(node);
 
+                // Handle python nodes explicitly and use the collected node package for those node types.
+                if (node.ToString().Equals(PythonEngineManager.PythonNodeNamespace))
+                {
+                    // Compute the node - python engine mapping for all python workspace nodes at once, when a python node is detected.
+                    if (computePythonNodeMapping)
+                    {
+                        pythonNodeMapping = OnRequestPythonEngineMapping();
+                        computePythonNodeMapping = false;
+                    }
+
+                    var pythonEngine = pythonNodeMapping[node.GUID];
+
+                    // Since CPython3 is a default inbuilt python engine,no package dependency is set for that node.
+                    if (pythonEngine.Equals(PythonEngineManager.CPython3EngineName))
+                    {
+                        continue;
+                    }
+                    else if (collected != null)
+                    {
+                        if (!packageDependencies.ContainsKey(collected))
+                        {
+                            packageDependencies[collected] = new PackageDependencyInfo(collected);
+                        }
+                        packageDependencies[collected].AddDependent(node.GUID);
+                        packageDependencies[collected].State = PackageDependencyState.Loaded;
+
+                        nodePackageDictionary[node.GUID] = collected;
+                        continue;
+                    }
+                }
+
                 if (nodePackageDictionary.ContainsKey(node.GUID))
                 {
                     var saved = nodePackageDictionary[node.GUID];

src/Libraries/PythonNodeModels/PythonNode.cs

@@ -70,13 +70,10 @@ public string EngineName
         /// <returns>Assembly Name</returns>
         internal override AssemblyName GetNameOfAssemblyReferencedByNode()
         {
-            if (NameOfAssemblyReferencedByNode == null)
+            var pyEng = PythonEngineManager.Instance.AvailableEngines.Where(x => x.Name.Equals(this.EngineName)).FirstOrDefault();
+            if (pyEng != null)
             {
-                var pyEng = PythonEngineManager.Instance.AvailableEngines.Where(x => x.Name.Equals(this.EngineName)).FirstOrDefault();
-                if (pyEng != null)
-                {
-                    NameOfAssemblyReferencedByNode = pyEng.GetType().Assembly.GetName();
-                }
+                NameOfAssemblyReferencedByNode = pyEng.GetType().Assembly.GetName();
             }
 
             return NameOfAssemblyReferencedByNode;

src/NodeServices/PythonServices.cs

@@ -147,6 +147,8 @@ internal static readonly Lazy<PythonEngineManager>
         /// </summary>
         internal static readonly string CPython3EngineName = "CPython3";
 
+        internal static readonly string PythonNodeNamespace = "PythonNodeModels.PythonNode";
+
         /// <summary>
         /// IronPython2 Engine name
         /// </summary>

src/PythonMigrationViewExtension/GraphPythonDependencies.cs

@@ -96,6 +96,19 @@ internal IEnumerable<INodeLibraryDependencyInfo> AddPythonPackageDependency()
             return new[] { packageDependencyInfo };
         }
 
+        // Returns a dictionary of node and python engine mapping for the workspace python nodes.
+        internal Dictionary<Guid, String> GetPythonEngineMapping()
+        {
+            var pythonNodeMapping = new Dictionary<Guid, String>();
+
+            foreach (var node in workspace.Nodes.OfType<PythonNode>())
+            {
+                pythonNodeMapping.Add(node.GUID, node.EngineName);
+            }
+
+            return pythonNodeMapping;
+        }
+
         /// <summary>
         /// This recursive function returns true if any of the custom nodes in the input list has an IronPython dependency.
         /// Any custom nodes in the input list traversed during evaluation have their dependencies cached in <see cref="CustomNodePythonDependencyMap"/>.

src/PythonMigrationViewExtension/PythonMigrationViewExtension.cs

@@ -72,7 +72,7 @@ public void Loaded(ViewLoadedParams p)
             DynamoViewModel = LoadedParams.DynamoWindow.DataContext as DynamoViewModel;
             CurrentWorkspace = LoadedParams.CurrentWorkspaceModel as WorkspaceModel;
             CustomNodeManager = (CustomNodeManager)LoadedParams.StartupParams.CustomNodeManager;
-            CurrentWorkspace.RequestPackageDependencies += PythonDependencies.AddPythonPackageDependency;
+            CurrentWorkspace.RequestPythonEngineMapping += PythonDependencies.GetPythonEngineMapping;
             Dispatcher = Dispatcher.CurrentDispatcher;
 
             SubscribeToDynamoEvents();
@@ -181,7 +181,7 @@ private void SubscribeToWorkspaceEvents()
         {
             CurrentWorkspace.NodeAdded += OnNodeAdded;
             CurrentWorkspace.NodeRemoved += OnNodeRemoved;
-            CurrentWorkspace.RequestPackageDependencies += PythonDependencies.AddPythonPackageDependency;
+            CurrentWorkspace.RequestPythonEngineMapping += PythonDependencies.GetPythonEngineMapping;
         }
 
         private void SubscribeToPythonNodeEvents(PythonNodeBase node)
@@ -198,7 +198,7 @@ private void UnSubscribeWorkspaceEvents()
         {
             if (CurrentWorkspace != null)
             {
-                CurrentWorkspace.RequestPackageDependencies -= PythonDependencies.AddPythonPackageDependency;
+                CurrentWorkspace.RequestPythonEngineMapping -= PythonDependencies.GetPythonEngineMapping;
                 CurrentWorkspace.NodeAdded -= OnNodeAdded;
                 CurrentWorkspace.NodeRemoved -= OnNodeRemoved;
                 CurrentWorkspace.Nodes
@@ -220,7 +220,7 @@ private void UnsubscribeEvents()
 
             if (CurrentWorkspace  != null)
             {
-                CurrentWorkspace.RequestPackageDependencies -= PythonDependencies.AddPythonPackageDependency;
+                CurrentWorkspace.RequestPythonEngineMapping -= PythonDependencies.GetPythonEngineMapping;
             }
             UnSubscribeWorkspaceEvents();
         }

src/WorkspaceDependencyViewExtension/WorkspaceDependencyViewExtension.cs

@@ -187,10 +187,6 @@ internal void DependencyRegen(WorkspaceModel ws, bool forceCompute = false)
                 HasDependencyIssue = string.IsNullOrEmpty(info.Path);
             }
 
-            var pythonPackageDependencies = ws.OnRequestPackageDependencies();
-            if (pythonPackageDependencies != null)
-                packageDependencies.AddRange(pythonPackageDependencies);
-
             if (packageDependencies.Any(d => d.State != PackageDependencyState.Loaded))
             {
                 HasDependencyIssue = true;

test/DynamoCoreTests/PackageDependencyTests.cs

@@ -130,12 +130,18 @@ public void PythonEnginePackageDependencyIsCollectedAndSerialized()
             Assert.IsNotNull(pyNode);
             Assert.AreEqual(pyNode.EngineName, PythonEngineManager.CPython3EngineName);
             Assert.AreEqual(PythonEngineManager.Instance.AvailableEngines.Count, 2);
-            UpdatePythonEngineAndRun(pyNode, "PythonNet3");
+
             currentws.ForceComputeWorkspaceReferences = true;
+            var packageDependencies = currentws.NodeLibraryDependencies;
+            // Since Cpython is inbuilt and not loaded as a package, it shouldn't show up in package dependencies.
+            Assert.AreEqual(0, packageDependencies.Count);
 
+            // Change engine to PythonNet3, which is loaded as a package.
+            UpdatePythonEngineAndRun(pyNode, "PythonNet3");
+            currentws.ForceComputeWorkspaceReferences = true;
 
             //assert that python engine imported from a package gets added to NodeLibraryDependencies
-            var packageDependencies = currentws.NodeLibraryDependencies;
+            packageDependencies = currentws.NodeLibraryDependencies;
             Assert.AreEqual(1, packageDependencies.Count);
             var package = packageDependencies.First();
             Assert.AreEqual(new PackageDependencyInfo("TestCP311", new Version("1.0.8")), package);