Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dyn 5427 confidence threshold autocomplete ml #13562

Merged
merged 12 commits into from
Nov 23, 2022
Merged

Dyn 5427 confidence threshold autocomplete ml #13562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6659c71
Hide Nodes
jesusalvino Nov 21, 2022
161d759
Update UI with Expander
jesusalvino Nov 21, 2022
481501f
Node Autocomplete Section Done
jesusalvino Nov 22, 2022
482aa90
Set default number of results as 10
jesusalvino Nov 23, 2022
087cd15
Mergin to Master
jesusalvino Nov 23, 2022
8cb1302
restoring version
jesusalvino Nov 23, 2022
de2368b
restoring entire file
jesusalvino Nov 23, 2022
f1c22ea
Connect the confidence level and nuber of result settings
jesusalvino Nov 23, 2022
efd5370
Fix
jesusalvino Nov 23, 2022
17cdba8
Labels
jesusalvino Nov 23, 2022
3ff139f
Naming changes
jesusalvino Nov 23, 2022
e3f3919
Updating the Settings properties for copy test
jesusalvino Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/DynamoCore/Configuration/PreferenceSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,21 @@ public string PythonTemplateFilePath
/// </summary>
public bool EnableNodeAutoComplete { get; set; }

/// <summary>
/// This defines if user wants to hide the nodes below a specific confidenc level.
/// </summary>
public bool HideNodesBelowSpecificConfidenceLevel { get; set; }

/// <summary>
/// This defines the level of confidence related to the ML recommendation.
/// </summary>
public int MLRecommendationConfidenceLevel { get; set; }

/// <summary>
/// This defines the number of results of the ML recommendation
/// </summary>
public int MLRecommendationNumberOfResults { get; set; }

/// <summary>
/// This defines if user wants to see the enabled Dynamo Notification Center.
/// </summary>
Expand Down Expand Up @@ -736,6 +751,9 @@ public PreferenceSettings()
IsIronPythonDialogDisabled = false;
ShowTabsAndSpacesInScriptEditor = false;
EnableNodeAutoComplete = true;
HideNodesBelowSpecificConfidenceLevel = false;
MLRecommendationConfidenceLevel = 10;
MLRecommendationNumberOfResults = 10;
EnableNotificationCenter = true;
isStaticSplashScreenEnabled = true;
DefaultPythonEngine = string.Empty;
Expand Down
2 changes: 1 addition & 1 deletion src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
<Grid.ContextMenu>
<ContextMenu Name="SuggestionsContextMenu"
Style="{StaticResource ContextMenuStyle}">
<MenuItem Header="{x:Static p:Resources.MachineLearning}"
<MenuItem Header="{x:Static p:Resources.RecommendedNodes}"
x:Name="miMLRecommendation"
Click="OnSuggestion_Click"
IsCheckable="True"
Expand Down
62 changes: 49 additions & 13 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 19 additions & 6 deletions src/DynamoCoreWpf/Properties/Resources.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2262,7 +2262,7 @@ Uninstall the following packages: {0}?</value>
<comment>Preferences | Features | Python | Default Python Engine</comment>
</data>
<data name="PreferencesViewEnableNodeAutoComplete" xml:space="preserve">
<value>Node Autocomplete</value>
<value>Enable Node Autocomplete</value>
<comment>Preferences | Features | Experimental | Enable Node Auto Complete</comment>
</data>
<data name="ErrorLoadingIcon" xml:space="preserve">
Expand Down Expand Up @@ -2321,15 +2321,15 @@ Uninstall the following packages: {0}?</value>
<comment>Label used in the general tab</comment>
</data>
<data name="PreferencesNodeAutocompleteMethod" xml:space="preserve">
<value>Default method</value>
<value>Default Ranking Method</value>
<comment>Label used in the features tab</comment>
</data>
<data name="ObjectType" xml:space="preserve">
<value>Object type</value>
<value>Node Type Match</value>
<comment>Label used in the features tab</comment>
</data>
<data name="MachineLearning" xml:space="preserve">
<value>ML Recommendation</value>
<data name="RecommendedNodes" xml:space="preserve">
<value>Recommended Nodes</value>
reddyashish marked this conversation as resolved.
Show resolved Hide resolved
<comment>Label used in the features tab</comment>
</data>
<data name="DynamoViewExtensionsMenu" xml:space="preserve">
Expand Down Expand Up @@ -3316,6 +3316,19 @@ You can manage this in Preferences -&gt; Security.</value>
<value>You can import custom settings here, which will overwrite your current settings. If you'd like to preserve a copy of your current settings, export them before importing new settings. Settings not shown in the Preferences panel will be applied once Dynamo and any host program restarts.</value>
<comment>Import Preferences Info.</comment>
</data>
<data name="PreferencesViewNodeAutocomplete" xml:space="preserve">
<value>Node Autocomplete</value>
<comment>Preferences | Features | Node Autocomplete</comment>
</data>
<data name="HideNodesBelowSpecificConfidenceLevel" xml:space="preserve">
<value>Hide nodes below a specified confidence level</value>
</data>
<data name="HideNodesBelowSpecificConfidenceLevelInfo" xml:space="preserve">
<value>Confidence level appears next to each recommended node and represents estimated probability that the node is a good choice. When toggled on, this setting hides recommended nodes that don’t meet the specified confidence level. You can click the Low Confidence header to show the nodes.</value>
</data>
<data name="MLRecommendationNumberOfResults" xml:space="preserve">
<value>Numbers of results</value>
</data>
<data name="ImportPreferencesText" xml:space="preserve">
<value>Import</value>
<comment>Import Preferences Text.</comment>
Expand Down Expand Up @@ -3472,4 +3485,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
<data name="PreferencesWindowShowPreviewBubblesTooltip" xml:space="preserve">
<value>When toggled on, a preview of the node’s output will be displayed when hovering over the bottom of a node.</value>
</data>
</root>
</root>
25 changes: 19 additions & 6 deletions src/DynamoCoreWpf/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2482,7 +2482,7 @@ Uninstall the following packages: {0}?</value>
<comment>Preferences | Features | Python | Default Python Engine</comment>
</data>
<data name="PreferencesViewEnableNodeAutoComplete" xml:space="preserve">
<value>Node Autocomplete</value>
<value>Enable Node Autocomplete</value>
<comment>Preferences | Features | Experimental | Enable Node Auto Complete</comment>
</data>
<data name="ErrorLoadingIcon" xml:space="preserve">
Expand Down Expand Up @@ -2537,15 +2537,15 @@ Uninstall the following packages: {0}?</value>
<comment>Label used in the general tab</comment>
</data>
<data name="PreferencesNodeAutocompleteMethod" xml:space="preserve">
<value>Default method</value>
<value>Default Ranking Method</value>
<comment>Label used in the features tab</comment>
</data>
<data name="ObjectType" xml:space="preserve">
<value>Object type</value>
<value>Node Type Match</value>
reddyashish marked this conversation as resolved.
Show resolved Hide resolved
<comment>Label used in the features tab</comment>
</data>
<data name="MachineLearning" xml:space="preserve">
<value>ML Recommendation</value>
<data name="RecommendedNodes" xml:space="preserve">
<value>Recommended Nodes</value>
<comment>Label used in the features tab</comment>
</data>
<data name="DynamoViewExtensionsMenu" xml:space="preserve">
Expand Down Expand Up @@ -3303,6 +3303,19 @@ You can manage this in Preferences -&gt; Security.</value>
<value>You can import custom settings here, which will overwrite your current settings. If you'd like to preserve a copy of your current settings, export them before importing new settings. Settings not shown in the Preferences panel will be applied once Dynamo and any host program restarts.</value>
<comment>Import Preferences Info.</comment>
</data>
<data name="PreferencesViewNodeAutocomplete" xml:space="preserve">
<value>Node Autocomplete</value>
<comment>Preferences | Features | Node Autocomplete</comment>
</data>
<data name="HideNodesBelowSpecificConfidenceLevel" xml:space="preserve">
<value>Hide nodes below a specified confidence level</value>
</data>
<data name="HideNodesBelowSpecificConfidenceLevelInfo" xml:space="preserve">
<value>Confidence level appears next to each recommended node and represents estimated probability that the node is a good choice. When toggled on, this setting hides recommended nodes that don’t meet the specified confidence level. You can click the Low Confidence header to show the nodes.</value>
</data>
<data name="MLRecommendationNumberOfResults" xml:space="preserve">
<value>Numbers of results</value>
</data>
<data name="ImportPreferencesText" xml:space="preserve">
<value>Import</value>
<comment>Import Preferences Text.</comment>
Expand Down Expand Up @@ -3459,4 +3472,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
<data name="PreferencesWindowShowPreviewBubblesTooltip" xml:space="preserve">
<value>When toggled on, a preview of the node’s output will be displayed when hovering over the bottom of a node.</value>
</data>
</root>
</root>
Loading