Add Python dependency info to packages and display it in DPM UI (#11731)

zeusongit · web-flow · commit ee4113dac7c8 · 2021-06-16T12:04:01.000-04:00
* DYN-3643 Add Python dep info
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -73,6 +73,10 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="ProtoGeometry, Version=2.12.0.5056, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\DynamoVisualProgramming.LibG_227_0_0.2.12.0.5056\lib\net48\ProtoGeometry.dll</HintPath>
+      <Private>False</Private>
+	</Reference>
     <Reference Include="ProtoGeometry, Version=2.12.0.5264, Culture=neutral, processorArchitecture=AMD64">
       <HintPath>..\packages\DynamoVisualProgramming.LibG_227_0_0.2.12.0.5264\lib\net48\ProtoGeometry.dll</HintPath>
         <Private>False</Private>
@@ -1255,6 +1259,11 @@
       <Project>{6e0a079e-85f1-45a1-ad5b-9855e4344809}</Project>
       <Name>Units</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Libraries\PythonNodeModels\PythonNodeModels.csproj">
+      <Project>{8872CA17-C10D-43B9-8393-5C5A57065EB0}</Project>
+      <Name>PythonNodeModels</Name>
+	  <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Libraries\VMDataBridge\VMDataBridge.csproj">
       <Project>{ccb6e56b-2da1-4eba-a1f9-e8510e129d12}</Project>
       <Name>VMDataBridge</Name>
diff --git a/src/DynamoCoreWpf/UI/Converters.cs b/src/DynamoCoreWpf/UI/Converters.cs
@@ -36,7 +36,7 @@ public class TooltipLengthTruncater : IValueConverter
     {
         private const int MaxChars = 100;
         private const double MinFontFactor = 7.0;
-        
+
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var tooltip = value as string;
@@ -77,6 +77,67 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         }
     }
 
+    /// <summary>
+    /// Converts the list of package dependencies to a string
+    /// </summary>
+    public class DependencyListToStringConverter : IValueConverter
+    {
+        private readonly string[] PythonEngineList = { PythonNodeModels.PythonEngineVersion.CPython3.ToString(), PythonNodeModels.PythonEngineVersion.IronPython2.ToString() };
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            string depString = string.Empty;
+            bool flag = false;
+            if (value != null)
+            {
+                List<string> depList = (List<string>)value;
+                foreach (var dep in depList)
+                {
+                    if (PythonEngineList.IndexOf(dep) != -1)
+                    {
+                        depString += dep + ", ";
+                        flag = true;
+                    }
+                }
+                return flag ? depString.Remove(depString.Length - 2) : null;
+            }
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return null;
+        }
+    }
+    /// <summary>
+    /// Controls the visibility of tooltip that displays python dependency in Package manager for each package version
+    /// </summary>
+    public class EmptyDepStringToCollapsedConverter : IValueConverter
+    {
+        private readonly string[] PythonEngineList = { PythonNodeModels.PythonEngineVersion.CPython3.ToString(), PythonNodeModels.PythonEngineVersion.IronPython2.ToString() };
+        public object Convert(object value, Type targetType, object parameter,
+          CultureInfo culture)
+        {
+            if (value != null)
+            {
+                List<string> depList = (List<string>)value;
+                foreach (var dep in depList)
+                {
+                    if (PythonEngineList.IndexOf(dep) != -1)
+                    {
+                        return Visibility.Visible;
+                    }
+                }
+            }
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter,
+          CultureInfo culture)
+        {
+            return null;
+        }
+    }
+
     public class PackageSearchStateToStringConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter,
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -17,6 +17,7 @@
 using Dynamo.Wpf.Properties;
 using Greg.Requests;
 using Microsoft.Practices.Prism.Commands;
+using PythonNodeModels;
 using Double = System.Double;
 using NotificationObject = Microsoft.Practices.Prism.ViewModel.NotificationObject;
 using String = System.String;
@@ -839,24 +840,49 @@ private IEnumerable<CustomNodeDefinition> AllFuncDefs()
             return AllDependentFuncDefs().Union(CustomNodeDefinitions).Distinct();
         }
 
-        private IEnumerable<string> GetAllUnqualifiedFiles()
+        private enum GetFunctionDefinition
+        {
+            AllDependentFuncDefs,
+            AllFuncDefs
+        }
+        private List<CustomNodeWorkspaceModel> GetFunctionDefinitionWS(GetFunctionDefinition gfd)
         {
-            // get all function defs
-            var allFuncs = AllFuncDefs();
-
-            // all workspaces
             var workspaces = new List<CustomNodeWorkspaceModel>();
-            foreach (var def in allFuncs)
+            if (gfd == GetFunctionDefinition.AllDependentFuncDefs)
             {
-                CustomNodeWorkspaceModel ws;
-                if (dynamoViewModel.Model.CustomNodeManager.TryGetFunctionWorkspace(
-                    def.FunctionId,
-                    DynamoModel.IsTestMode,
-                    out ws))
+                foreach (var def in AllDependentFuncDefs())
+                {
+                    CustomNodeWorkspaceModel ws;
+                    if (dynamoViewModel.Model.CustomNodeManager.TryGetFunctionWorkspace(
+                        def.FunctionId,
+                        DynamoModel.IsTestMode,
+                        out ws))
+                    {
+                        workspaces.Add(ws);
+                    }
+                }
+            }
+            else if (gfd == GetFunctionDefinition.AllFuncDefs)
+            {
+                foreach (var def in AllFuncDefs())
                 {
-                    workspaces.Add(ws);
+                    CustomNodeWorkspaceModel ws;
+                    if (dynamoViewModel.Model.CustomNodeManager.TryGetFunctionWorkspace(
+                        def.FunctionId,
+                        DynamoModel.IsTestMode,
+                        out ws))
+                    {
+                        workspaces.Add(ws);
+                    }
                 }
             }
+            return workspaces;
+        }
+
+        private IEnumerable<string> GetAllUnqualifiedFiles()
+        {
+            // all workspaces
+            var workspaces = GetFunctionDefinitionWS(GetFunctionDefinition.AllFuncDefs);
 
             var pmExtension = dynamoViewModel.Model.GetPackageManagerExtension();
 
@@ -876,23 +902,9 @@ private IEnumerable<string> GetAllUnqualifiedFiles()
 
         internal IEnumerable<string> GetAllFiles()
         {
-            // get all function defs
-            var allFuncs = AllFuncDefs().ToList();
-
             // all workspaces
-            var workspaces = new List<CustomNodeWorkspaceModel>();
-            foreach (var def in allFuncs)
-            {
-                CustomNodeWorkspaceModel ws;
-                if (dynamoViewModel.Model.CustomNodeManager.TryGetFunctionWorkspace(
-                    def.FunctionId,
-                    DynamoModel.IsTestMode,
-                    out ws))
-                {
-                    workspaces.Add(ws);
-                }
-            }
-            
+            var workspaces = GetFunctionDefinitionWS(GetFunctionDefinition.AllFuncDefs);
+
             // make sure workspaces are saved
             var unsavedWorkspaceNames =
                 workspaces.Where(ws => ws.HasUnsavedChanges || ws.FileName == null).Select(ws => ws.Name).ToList();
@@ -932,18 +944,7 @@ private IEnumerable<PackageDependency> GetAllDependencies()
             var pkgLoader = pmExtension.PackageLoader;
 
             // all workspaces
-            var workspaces = new List<CustomNodeWorkspaceModel>();
-            foreach (var def in AllDependentFuncDefs())
-            {
-                CustomNodeWorkspaceModel ws;
-                if (dynamoViewModel.Model.CustomNodeManager.TryGetFunctionWorkspace(
-                    def.FunctionId,
-                    DynamoModel.IsTestMode,
-                    out ws))
-                {
-                    workspaces.Add(ws);
-                }
-            }
+            var workspaces = GetFunctionDefinitionWS(GetFunctionDefinition.AllDependentFuncDefs);
 
             // get all of dependencies from custom nodes and additional files
             var allFilePackages =
@@ -957,18 +958,7 @@ private IEnumerable<PackageDependency> GetAllDependencies()
                     .Distinct()
                     .Select(x => new PackageDependency(x.Name, x.VersionName));
 
-            workspaces = new List<CustomNodeWorkspaceModel>();
-            foreach (var def in AllFuncDefs())
-            {
-                CustomNodeWorkspaceModel ws;
-                if (dynamoViewModel.Model.CustomNodeManager.TryGetFunctionWorkspace(
-                    def.FunctionId,
-                    DynamoModel.IsTestMode,
-                    out ws))
-                {
-                    workspaces.Add(ws);
-                }
-            }
+            workspaces = GetFunctionDefinitionWS(GetFunctionDefinition.AllFuncDefs);
 
             // get all of the dependencies from types
             var allTypePackages = workspaces
@@ -996,23 +986,46 @@ private IEnumerable<PackageDependency> GetAllDependencies()
 
         }
 
+        private List<string> GetPythonDependency()
+        {
+            var pmExtension = dynamoViewModel.Model.GetPackageManagerExtension();
+            var pkgLoader = pmExtension.PackageLoader;
+
+            var workspaces = GetFunctionDefinitionWS(GetFunctionDefinition.AllDependentFuncDefs);
+
+            // get python engine from custom nodes and their dependent packages
+            var allDepPackagesPythonEngine =
+                workspaces
+                    .Select(x => x.FileName)
+                    .Union(AdditionalFiles)
+                    .Where(pkgLoader.IsUnderPackageControl)
+                    .Select(pkgLoader.GetOwnerPackage)
+                    .Where(x => x != null)
+                    .Where(x => (x.Name != Name)).Distinct()
+                    .Select(x => x.HostDependencies)
+                    .SelectMany(x => x)
+                    .Distinct();
+
+            workspaces = GetFunctionDefinitionWS(GetFunctionDefinition.AllFuncDefs);
+
+            // get python engine from custom nodes that include python scripts
+            var pythonEngineDirectDep = workspaces
+                .SelectMany(x => x.Nodes)
+                .Where(x => x is PythonNode)
+                .Select(x => ((PythonNode)x).Engine)
+                .Distinct()
+                .Select(x => x.ToString());
+
+            return pythonEngineDirectDep.Union(allDepPackagesPythonEngine).ToList();
+
+        }
+
         private IEnumerable<Tuple<string, string>> GetAllNodeNameDescriptionPairs()
         {
             var pmExtension = dynamoViewModel.Model.GetPackageManagerExtension();
             var pkgLoader = pmExtension.PackageLoader;
 
-            var workspaces = new List<CustomNodeWorkspaceModel>();
-            foreach (var def in AllFuncDefs())
-            {
-                CustomNodeWorkspaceModel ws;
-                if (dynamoViewModel.Model.CustomNodeManager.TryGetFunctionWorkspace(
-                    def.FunctionId,
-                    DynamoModel.IsTestMode,
-                    out ws))
-                {
-                    workspaces.Add(ws);
-                }
-            }
+            var workspaces = GetFunctionDefinitionWS(GetFunctionDefinition.AllFuncDefs);
 
             // collect the name-description pairs for every custom node
             return
@@ -1349,14 +1362,23 @@ private IEnumerable<string> BuildPackage()
                 Package.Keywords = KeywordList;
                 Package.License = License;
                 Package.SiteUrl = SiteUrl;
-                Package.RepositoryUrl = RepositoryUrl;
-                Package.HostDependencies = SelectedHosts;
+                Package.RepositoryUrl = RepositoryUrl;                
 
                 AppendPackageContents();
 
                 Package.Dependencies.Clear();
                 GetAllDependencies().ToList().ForEach(Package.Dependencies.Add);
 
+                Package.HostDependencies = Enumerable.Empty<string>();
+                Package.HostDependencies = SelectedHosts;
+                foreach (var py in GetPythonDependency()) 
+                {
+                    if (!Package.HostDependencies.Contains(py)) 
+                    {
+                        Package.HostDependencies = Package.HostDependencies.Concat(new[] { py });
+                    }
+                }                                
+
                 var files = GetAllFiles().ToList();
                 var pmExtension = dynamoViewModel.Model.GetPackageManagerExtension();
 
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
@@ -91,10 +91,22 @@
                 </Setter>
             </Style>
 
+            <Style x:Key="DependencyTooltip" TargetType="ToolTip">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="ToolTip">
+                            <ContentPresenter />
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+            
             <controls:EmptyStringToCollapsedConverter x:Key="EmptyStringToCollapsedConverter" />
             <controls:BoolToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
             <controls:PrettyDateConverter x:Key="PrettyDateConverter" />
-
+            <controls:DependencyListToStringConverter x:Key="DependencyListToStringConverter" />
+            <controls:EmptyDepStringToCollapsedConverter x:Key="EmptyDepStringToCollapsedConverter" />
+            
             <ResourceDictionary.MergedDictionaries>
                 <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoModernDictionaryUri}" />
                 <ui:SharedResourceDictionary Source="{x:Static ui:SharedDictionaryManager.DynamoConvertersDictionaryUri}"/>
@@ -288,13 +300,20 @@
                                     <StackPanel Orientation="Vertical">
                                         <StackPanel Orientation="Horizontal">
                                             <Button Style="{StaticResource FlatButton}" Command="{Binding ToggleIsExpandedCommand }" Background="#333">
-
                                                 <StackPanel Orientation="Vertical" Width="340" IsHitTestVisible="True" >
                                                    <StackPanel Orientation="Horizontal">
                                                       <TextBlock Width ="Auto" MinWidth="235" FontSize="14"  Name="name" Text="{Binding Path=Model.Name}" Margin="5,0,0,0" HorizontalAlignment="Left" Foreground="WhiteSmoke" />
-                                                      <TextBlock Width ="90" FontSize="10"  Name="HostDependency" Text="{Binding Path=Model.HostsString}" Margin="5,0,0,0" HorizontalAlignment="Right" Foreground="LightBlue" 
-                                                                 VerticalAlignment="Center" ToolTip="{x:Static p:Resources.PackageHostDependencyTooltip}"/>
-                                                   </StackPanel>
+                                                        <TextBlock Width ="90" FontSize="12"  Name="HostDependency" Margin="5,0,0,0" HorizontalAlignment="Right" VerticalAlignment="Center"  Visibility="{Binding Path=Model.HostsString, Converter={StaticResource EmptyStringToCollapsedConverter}}">
+                                                            <TextBlock.ToolTip>
+                                                                <ToolTip Style="{StaticResource DependencyTooltip}">
+                                                                    <StackPanel Background="#535353" Height="Auto" Width="100" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" >
+                                                                        <TextBlock TextWrapping="Wrap" Padding="8" FontSize="12" Foreground="WhiteSmoke" Text="{Binding Path=Model.HostsString}"/>
+                                                                    </StackPanel>
+                                                                </ToolTip>
+                                                            </TextBlock.ToolTip>
+                                                            <Hyperlink Foreground="LightBlue">Dependencies</Hyperlink>
+                                                        </TextBlock>
+                                                    </StackPanel>
                                                    <StackPanel Orientation="Horizontal" Margin="0,6,0,2">
 
                                                         <StackPanel Orientation="Horizontal" Margin="5" Width="100">
@@ -361,7 +380,7 @@
                                                 <DataTemplate>
                                                     <StackPanel Orientation="Horizontal">
                                                         <TextBlock Text="{Binding Path=Item1.version}" MinWidth="50" Margin="5"  Foreground="WhiteSmoke" />
-                                                        <TextBlock Text="{Binding Path=Item1.created, Converter={StaticResource PrettyDateConverter}}" MinWidth="100" Margin="24,5,5,5"  Foreground="DarkGray" />
+                                                        <TextBlock Text="{Binding Path=Item1.created, Converter={StaticResource PrettyDateConverter}}" MinWidth="100" Margin="24,5,5,5"  Foreground="DarkGray" /> 
 
                                                         <Border Background="#000000" Margin="3">
                                                             <StackPanel Orientation="Horizontal">
@@ -388,9 +407,8 @@
                                                                 </Button>
                                                             </StackPanel>
                                                         </Border>
-
-
-                                                    </StackPanel>
+                                                        <TextBlock FontSize="14" FontWeight="Bold" Text="ⓘ    " Foreground="WhiteSmoke" MinWidth="50" Margin="5 10 5 5" Visibility="{Binding Path=Item1.host_dependencies, Converter={StaticResource EmptyDepStringToCollapsedConverter}}" ToolTip="{Binding Path=Item1.host_dependencies, Converter={StaticResource DependencyListToStringConverter}}" />
+                                                        </StackPanel>
                                                 </DataTemplate>
                                             </ItemsControl.ItemTemplate>
 
diff --git a/src/DynamoPackages/PackageManagerSearchElement.cs b/src/DynamoPackages/PackageManagerSearchElement.cs
