fix port entry issue and refactor

Author: chubakueno

src/DynamoCore/Search/NodeAutocompleteSearch.cs

@@ -283,7 +283,7 @@ internal class ClusterResultItem
         internal string Description { get; set; }
 
         [DataMember(Name = "probability")]
-        internal string Probability { get; set; }
+        internal double Probability { get; set; }
 
         [DataMember(Name = "entryNodeIndex")]
         internal int EntryNodeIndex { get; set; }

src/NodeAutoCompleteViewExtension/ViewModels/DNADropdownViewModel.cs

@@ -1,4 +1,6 @@
+using System;
 using System.Windows.Media;
+using Dynamo.Search.SearchElements;
 
 namespace Dynamo.NodeAutoComplete.ViewModels
 {
@@ -7,5 +9,6 @@ public class DNADropdownViewModel
         public string Description { get; set; }
         public string Parameters { get; set; }
         public ImageSource SmallIcon { get; set; }
+        internal ClusterResultItem ClusterResultItem { get; set; }
     }
 }

src/NodeAutoCompleteViewExtension/ViewModels/NodeAutoCompleteBarViewModel.cs

@@ -48,7 +48,7 @@ public class NodeAutoCompleteBarViewModel : SearchViewModel
         private bool displayLowConfidence;
         private const string nodeAutocompleteMLEndpoint = "MLNodeAutocomplete";
         private const string nodeClusterAutocompleteMLEndpoint = "MLNodeClusterAutocomplete";
-        private const double minClusterConfidenceScore = 0.1;
+        private const double minClusterConfidenceScore = 0.001;
         private static Assembly dynamoCoreWpfAssembly;
 
         private bool _isSingleAutocomplete;
@@ -168,7 +168,7 @@ internal IEnumerable<ClusterResultItem> QualifiedResults
                 {
                     return null;
                 }
-                return FullResults.Results.Where(x => double.Parse(x.Probability) * 100 > minClusterConfidenceScore);
+                return FullResults.Results.Where(x => x.Probability > minClusterConfidenceScore);
             }
         }
 
@@ -381,7 +381,6 @@ public bool IsDNAClusterPlacementEnabled
         internal event Action<NodeModel> ParentNodeRemoved;
 
         internal MLNodeClusterAutoCompletionResponse FullResults { private set; get; }
-        internal List<SingleResultItem> FullSingleResults { set; get; }
         private Guid LastRequestGuid;
 
         /// <summary>
@@ -784,11 +783,7 @@ internal void AddCluster(int filterredIndex)
             var currentFilter = FilteredView.Cast<DNADropdownViewModel>().ToList();
             var currentItem = filterredIndex >= 0 && filterredIndex < currentFilter.Count ? currentFilter[filterredIndex] : null;
 
-            var realCluster = QualifiedResults.FirstOrDefault(x => x.Description.Equals(currentItem.Description));
-            if (realCluster != null)
-            {
-                AddCluster(realCluster);
-            }
+            AddCluster(currentItem.ClusterResultItem);
         }
 
         // Add Cluster from server result into the workspace
@@ -960,22 +955,7 @@ internal void PopulateAutoComplete()
                     {
                         Version = "0.0",
                         NumberOfResults = fullSingleResults.Count,
-                        Results = fullSingleResults.Select(x => new ClusterResultItem
-                        {
-                            Description = x.Description,
-                            Title = x.Description,  
-                            Probability = x.Score.ToString(),
-                            EntryNodeIndex = 0,
-                            EntryNodeInPort = PortViewModel.PortType == PortType.Output ? x.PortToConnect : -1,
-                            EntryNodeOutPort = PortViewModel.PortType == PortType.Input ? x.PortToConnect : -1,
-                            Topology = new TopologyItem
-                            {
-                                Nodes = new List<NodeItem> { new NodeItem {
-                                    Id = Guid.NewGuid().ToString(),
-                                    Type = new NodeType { Id = x.CreationName } } },
-                                Connections = new List<ConnectionItem>()
-                            }
-                        })
+                        Results = fullSingleResults,
                     };
                 }
                 else
@@ -998,15 +978,15 @@ internal void PopulateAutoComplete()
                         return;
                     }
 
-                    FullSingleResults = fullSingleResults ?? FullSingleResults;
                     FullResults = fullResults ?? FullResults;
 
                     IEnumerable<DNADropdownViewModel> comboboxResults;
                     if (IsSingleAutocomplete || !IsDisplayingMLRecommendation)
                     {
+                        var singleResults = FullResults.Results as List<SingleResultItem>;
                         //getting bitmaps from resources necessarily has to be done in the UI thread
                         Dictionary<string, ImageSource> dict = [];
-                        foreach (var singleResult in FullSingleResults)
+                        foreach (var singleResult in singleResults)
                         {
                             if (dict.ContainsKey(singleResult.CreationName))
                             {
@@ -1016,18 +996,20 @@ internal void PopulateAutoComplete()
                             SearchViewModelRequestBitmapSource(iconRequest);
                             dict[singleResult.CreationName] = iconRequest.Icon;
                         }
-                        comboboxResults = FullSingleResults.Where(x => x.Score * 100 > minClusterConfidenceScore).Select(x => new DNADropdownViewModel
+                        comboboxResults = QualifiedResults.Select(x => new DNADropdownViewModel
                         {
                             Description = x.Description,
-                            Parameters = x.Parameters,
-                            SmallIcon = dict[x.CreationName],
+                            Parameters = (x as SingleResultItem).Parameters,
+                            SmallIcon = dict[(x as SingleResultItem).CreationName],
+                            ClusterResultItem = x
                         });
                     }
                     else
                     {
                         comboboxResults = QualifiedResults.Select(x => new DNADropdownViewModel
                         {
-                            Description = x.Description
+                            Description = x.Description,
+                            ClusterResultItem = x
                             //default icon (cluster) is set in the xaml view
                         });
                     }

src/NodeAutoCompleteViewExtension/ViewModels/SingleResultItem.cs

@@ -1,9 +1,10 @@
+using System;
+using System.Collections.Generic;
 using Dynamo.Search.SearchElements;
-using Dynamo.Wpf.ViewModels;
 
 namespace Dynamo.NodeAutoComplete.ViewModels
 {
-    internal class SingleResultItem
+    internal class SingleResultItem : ClusterResultItem
     {
 
         public SingleResultItem(NodeSearchElement model, double score = 1.0)
@@ -13,28 +14,26 @@ public SingleResultItem(NodeSearchElement model, double score = 1.0)
             Description = model.Name;
             Parameters = model.Parameters;
             CreationName = model.CreationName;
-            PortToConnect = model.AutoCompletionNodeElementInfo.PortToConnect;
-            Score = score;
-        }
-
-        public SingleResultItem(NodeSearchElementViewModel x) : this(x.Model)
-        {
-            //Convert percent to probability
-            Score = x.AutoCompletionNodeMachineLearningInfo.ConfidenceScore / 100.0;
+            Probability = score;
+            Title = Description;
+            EntryNodeIndex = 0;
+            EntryNodeInPort = model.AutoCompletionNodeElementInfo.PortToConnect;
+            EntryNodeOutPort = model.AutoCompletionNodeElementInfo.PortToConnect;
+            Topology = new TopologyItem
+            {
+                Nodes = new List<NodeItem> { new NodeItem {
+                    Id = Guid.NewGuid().ToString(),
+                    Type = new NodeType { Id = CreationName } } },
+                Connections = new List<ConnectionItem>()
+            };
         }
 
         internal string Assembly { get; set; }
 
         internal string IconName { get; set; }
 
-        internal string Description { get; set; }
-
         internal string Parameters { get; set; }
 
         internal string CreationName { get; set; }
-
-        internal int PortToConnect { get; set; }
-
-        internal double Score { get; set; }
     }
 }

src/NodeAutoCompleteViewExtension/Views/NodeAutoCompletePanelView.xaml.cs

@@ -154,7 +154,7 @@ internal NodeAutocompleteCluster(ClusterResultItem result)
         /// <summary>
         /// confidence level
         /// </summary>
-        public string Probability => clusterResultItem.Probability;
+        public double Probability => clusterResultItem.Probability;
 
         /// <summary>
         /// Nodes in the node cluster