DynamoDS
diff --git a/‎LICENSE.txt
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎LICENSE.txt
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎doc/distrib/License.rtf
Copy file name to clipboard
+152-134Lines changed: 152 additions & 134 deletions b/‎doc/distrib/License.rtf
Copy file name to clipboard
+152-134Lines changed: 152 additions & 134 deletions
diff --git a/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+15-134Lines changed: 15 additions & 134 deletions b/‎src/DynamoCore/Models/DynamoModel.cs
Copy file name to clipboard
+15-134Lines changed: 15 additions & 134 deletions
diff --git a/‎src/DynamoCore/Models/DynamoModelEvents.cs
Copy file name to clipboard
+132Lines changed: 132 additions & 0 deletions b/‎src/DynamoCore/Models/DynamoModelEvents.cs
Copy file name to clipboard
+132Lines changed: 132 additions & 0 deletions
diff --git a/‎src/DynamoCore/Properties/AssemblyInfo.cs
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎src/DynamoCore/Properties/AssemblyInfo.cs
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
@@ -75,6 +75,11 @@ https://github.com/dotnet/ILMerge
 https://github.com/dotnet/ILMerge/blob/master/LICENSE
   (MIT License)
 
+### IPython (autoreload.py)
+https://github.com/ipython/ipython/blob/master/IPython/extensions/autoreload.py
+https://github.com/ipython/ipython/blob/master/LICENSE
+  (BSD-3-Clause License)
+
 ### libiconv
 https://www.gnu.org/software/libiconv/
 https://www.gnu.org/software/gettext/manual/html_node/GNU-LGPL.html#GNU-LGPL
 
@@ -119,125 +119,6 @@ public partial class DynamoModel : IDynamoModel, IDisposable, IEngineControllerM
 
         #endregion
 
-        #region events
-
-        internal delegate void FunctionNamePromptRequestHandler(object sender, FunctionNamePromptEventArgs e);
-        internal event FunctionNamePromptRequestHandler RequestsFunctionNamePrompt;
-        internal void OnRequestsFunctionNamePrompt(Object sender, FunctionNamePromptEventArgs e)
-        {
-            if (RequestsFunctionNamePrompt != null)
-                RequestsFunctionNamePrompt(this, e);
-        }
-
-        internal event Action<PresetsNamePromptEventArgs> RequestPresetsNamePrompt;
-        internal void OnRequestPresetNamePrompt(PresetsNamePromptEventArgs e)
-        {
-            if (RequestPresetsNamePrompt != null)
-                RequestPresetsNamePrompt(e);
-        }
-
-        /// <summary>
-        /// Occurs when a workspace is saved to a file.
-        /// </summary>
-        public event WorkspaceHandler WorkspaceSaved;
-        internal void OnWorkspaceSaved(WorkspaceModel workspace)
-        {
-            if (WorkspaceSaved != null)
-            {
-                WorkspaceSaved(workspace);
-            }
-        }
-
-        /// <summary>
-        /// Occurs when a workspace is about to be saved to a file.
-        /// </summary>
-        public event WorkspaceSaveHandler WorkspaceSaving;
-        internal void OnWorkspaceSaving(WorkspaceModel workspace, SaveContext saveContext)
-        {
-            if (WorkspaceSaving != null)
-            {
-                WorkspaceSaving(workspace, saveContext);
-                if (workspace is HomeWorkspaceModel hws) 
-                    HandleStorageExtensionsOnWorkspaceSaving(hws, saveContext);
-            }
-        }
-
-        /// <summary>
-        /// Occurs when a workspace is scheduled to be saved to a backup file.
-        /// </summary>
-        public event Action<string, bool> RequestWorkspaceBackUpSave;
-        internal void OnRequestWorkspaceBackUpSave(string path, bool isBackUp)
-        {
-            if (RequestWorkspaceBackUpSave != null)
-            {
-                RequestWorkspaceBackUpSave(path, isBackUp);
-            }
-        }
-
-        /// <summary>
-        /// Event that is fired during the opening of the workspace.
-        ///
-        /// Use the XmlDocument object provided to conduct additional
-        /// workspace opening operations.
-        /// </summary>
-        public event Action<object> WorkspaceOpening;
-        internal void OnWorkspaceOpening(object obj)
-        {
-            var handler = WorkspaceOpening;
-            if (handler != null) handler(obj);
-        }
-
-        /// <summary>
-        /// Occurs when a workspaces is opened
-        /// </summary>
-        public event WorkspaceHandler WorkspaceOpened;
-        internal void OnWorkspaceOpened(WorkspaceModel workspace)
-        {
-            if(WorkspaceOpened != null)
-            {
-                WorkspaceOpened.Invoke(workspace);
-                if (workspace is HomeWorkspaceModel hws) 
-                    HandleStorageExtensionsOnWorkspaceOpened(hws);
-            }
-        }
-
-        /// <summary>
-        /// This event is raised right before the shutdown of DynamoModel started.
-        /// When this event is raised, the shutdown is guaranteed to take place
-        /// (i.e. user has had a chance to save the work and decided to proceed
-        /// with shutting down Dynamo). Handlers of this event can still safely
-        /// access the DynamoModel, the WorkspaceModel (along with its contents),
-        /// and the DynamoScheduler.
-        /// </summary>
-        public event DynamoModelHandler ShutdownStarted;
-
-        private void OnShutdownStarted()
-        {
-            if (ShutdownStarted != null)
-                ShutdownStarted(this);
-        }
-
-        /// <summary>
-        /// This event is raised after DynamoModel has been shut down. At this
-        /// point the DynamoModel is no longer valid and access to it should be
-        /// avoided.
-        /// </summary>
-        public event DynamoModelHandler ShutdownCompleted;
-
-        private void OnShutdownCompleted()
-        {
-            if (ShutdownCompleted != null)
-                ShutdownCompleted(this);
-        }
-
-        /// <summary>
-        /// This event is raised when Dynamo is ready for user interaction.
-        /// </summary>
-        public event Action<ReadyParams> DynamoReady;
-        private bool dynamoReady;
-
-        #endregion
-
         #region static properties
 
         /// <summary>
@@ -808,7 +689,7 @@ protected DynamoModel(IStartConfiguration config)
             var extensions = config.Extensions ?? LoadExtensions();
 
             LinterManager = new LinterManager(this.ExtensionManager);
-            
+
             // when dynamo is ready, alert the loaded extensions
             DynamoReady += (readyParams) =>
             {
@@ -1043,8 +924,8 @@ internal static void RaiseIExtensionStorageAccessWorkspaceSaving(HomeWorkspaceMo
                 logger.Log(ex.Message + " : " + ex.StackTrace);
                 return;
             }
-            
-            
+
+
             if (hasMatchingExtensionData)
             {
                 workspace.UpdateExtensionData(extension.UniqueId, data);
@@ -1176,7 +1057,7 @@ private void OnAsyncTaskStateChanged(DynamoScheduler sender, TaskStateChangedEve
                                     // Tracking node execution as generic event
                                     // it is distinguished with the legacy aggregated performance event
                                     Dynamo.Logging.Analytics.TrackEvent(
-                                        Actions.Run, 
+                                        Actions.Run,
                                         Categories.NodeOperations,
                                         node.GetOriginalName());
                                 }
@@ -1466,7 +1347,7 @@ private void LoadNodeModels(List<TypeLoadData> nodes, bool isPackageMember)
 
         private void InitializeAnalyticsService()
         {
-           AnalyticsService.Start(this,disableADP, IsHeadless, IsTestMode);
+            AnalyticsService.Start(this, disableADP, IsHeadless, IsTestMode);
         }
 
         private IPreferences CreateOrLoadPreferences(IPreferences preferences)
@@ -2241,7 +2122,7 @@ public void AddHomeWorkspace()
                 IsTestMode, LinterManager, string.Empty);
 
             defaultWorkspace.RunSettings.RunType = PreferenceSettings.DefaultRunType;
-            
+
             RegisterHomeWorkspace(defaultWorkspace);
             AddWorkspace(defaultWorkspace);
             CurrentWorkspace = defaultWorkspace;
@@ -2447,7 +2328,7 @@ public void Paste(Point2D targetPoint, bool useOffset = true)
 
             // Create the new NodeModel's
             var newNodeModels = new List<NodeModel>();
-            using(CurrentWorkspace.BeginDelayedGraphExecution())
+            using (CurrentWorkspace.BeginDelayedGraphExecution())
             {
                 foreach (var node in nodes)
                 {
@@ -2516,17 +2397,17 @@ from c in connectors
 
                         // If the guid is in nodeLookup, then we connect to the new pasted node. Otherwise we
                         // re-connect to the original.
-                let startNode =
-                        modelLookup.TryGetValue(c.Start.Owner.GUID, out start)
-                            ? start as NodeModel
-                            : CurrentWorkspace.Nodes.FirstOrDefault(x => x.GUID == c.Start.Owner.GUID)
+                    let startNode =
+                            modelLookup.TryGetValue(c.Start.Owner.GUID, out start)
+                                ? start as NodeModel
+                                : CurrentWorkspace.Nodes.FirstOrDefault(x => x.GUID == c.Start.Owner.GUID)
                     let endNode =
                         modelLookup.TryGetValue(c.End.Owner.GUID, out end)
                             ? end as NodeModel
                             : CurrentWorkspace.Nodes.FirstOrDefault(x => x.GUID == c.End.Owner.GUID)
 
-                // Don't make a connector if either end is null.
-                where startNode != null && endNode != null
+                    // Don't make a connector if either end is null.
+                    where startNode != null && endNode != null
                     select
                         ConnectorModel.Make(startNode, endNode, c.Start.Index, c.End.Index);
 
@@ -2586,7 +2467,7 @@ from c in connectors
 
                 // Record models that are created as part of the command.
                 CurrentWorkspace.RecordCreatedModels(createdModels);
-            }    
+            }
         }
 
         /// <summary>
@@ -2728,7 +2609,7 @@ public void AddWorkspace(WorkspaceModel workspace)
 
             Action savedHandler = () => OnWorkspaceSaved(workspace);
             workspace.Saved += savedHandler;
-            Action<SaveContext> savingHandler = (c) => OnWorkspaceSaving(workspace,c);
+            Action<SaveContext> savingHandler = (c) => OnWorkspaceSaving(workspace, c);
             workspace.WorkspaceSaving += savingHandler;
             workspace.MessageLogged += LogMessage;
             workspace.PropertyChanged += OnWorkspacePropertyChanged;
 
@@ -7,6 +7,7 @@
 using Dynamo.Graph.Workspaces;
 using System.Collections.Generic;
 using Dynamo.Graph;
+using Dynamo.Extensions;
 
 namespace Dynamo.Models
 {
@@ -375,6 +376,137 @@ internal virtual void OnComputeModelDeserialized()
                 ComputeModelDeserialized();
         }
 
+        internal delegate void FunctionNamePromptRequestHandler(object sender, FunctionNamePromptEventArgs e);
+        internal event FunctionNamePromptRequestHandler RequestsFunctionNamePrompt;
+        internal void OnRequestsFunctionNamePrompt(Object sender, FunctionNamePromptEventArgs e)
+        {
+            if (RequestsFunctionNamePrompt != null)
+                RequestsFunctionNamePrompt(this, e);
+        }
+
+        internal event Action<PresetsNamePromptEventArgs> RequestPresetsNamePrompt;
+        internal void OnRequestPresetNamePrompt(PresetsNamePromptEventArgs e)
+        {
+            if (RequestPresetsNamePrompt != null)
+                RequestPresetsNamePrompt(e);
+        }
+
+        /// <summary>
+        /// Occurs when a workspace is saved to a file.
+        /// </summary>
+        public event WorkspaceHandler WorkspaceSaved;
+        internal void OnWorkspaceSaved(WorkspaceModel workspace)
+        {
+            if (WorkspaceSaved != null)
+            {
+                WorkspaceSaved(workspace);
+            }
+        }
+
+        /// <summary>
+        /// Occurs when a workspace is about to be saved to a file.
+        /// </summary>
+        public event WorkspaceSaveHandler WorkspaceSaving;
+        internal void OnWorkspaceSaving(WorkspaceModel workspace, SaveContext saveContext)
+        {
+            if (WorkspaceSaving != null)
+            {
+                WorkspaceSaving(workspace, saveContext);
+                if (workspace is HomeWorkspaceModel hws)
+                    HandleStorageExtensionsOnWorkspaceSaving(hws, saveContext);
+            }
+        }
+
+        /// <summary>
+        /// Occurs when a workspace is scheduled to be saved to a backup file.
+        /// </summary>
+        public event Action<string, bool> RequestWorkspaceBackUpSave;
+        internal void OnRequestWorkspaceBackUpSave(string path, bool isBackUp)
+        {
+            if (RequestWorkspaceBackUpSave != null)
+            {
+                RequestWorkspaceBackUpSave(path, isBackUp);
+            }
+        }
+
+        /// <summary>
+        /// Event that is fired during the opening of the workspace.
+        ///
+        /// Use the XmlDocument object provided to conduct additional
+        /// workspace opening operations.
+        /// </summary>
+        public event Action<object> WorkspaceOpening;
+        internal void OnWorkspaceOpening(object obj)
+        {
+            var handler = WorkspaceOpening;
+            if (handler != null) handler(obj);
+        }
+
+        /// <summary>
+        /// Occurs when a workspaces is opened
+        /// </summary>
+        public event WorkspaceHandler WorkspaceOpened;
+        internal void OnWorkspaceOpened(WorkspaceModel workspace)
+        {
+            if (WorkspaceOpened != null)
+            {
+                WorkspaceOpened.Invoke(workspace);
+                if (workspace is HomeWorkspaceModel hws)
+                    HandleStorageExtensionsOnWorkspaceOpened(hws);
+            }
+        }
+
+        /// <summary>
+        /// This event is raised right before the shutdown of DynamoModel started.
+        /// When this event is raised, the shutdown is guaranteed to take place
+        /// (i.e. user has had a chance to save the work and decided to proceed
+        /// with shutting down Dynamo). Handlers of this event can still safely
+        /// access the DynamoModel, the WorkspaceModel (along with its contents),
+        /// and the DynamoScheduler.
+        /// </summary>
+        public event DynamoModelHandler ShutdownStarted;
+
+        private void OnShutdownStarted()
+        {
+            if (ShutdownStarted != null)
+                ShutdownStarted(this);
+        }
+
+        /// <summary>
+        /// This event is raised after DynamoModel has been shut down. At this
+        /// point the DynamoModel is no longer valid and access to it should be
+        /// avoided.
+        /// </summary>
+        public event DynamoModelHandler ShutdownCompleted;
+
+        private void OnShutdownCompleted()
+        {
+            if (ShutdownCompleted != null)
+                ShutdownCompleted(this);
+        }
+
+        /// <summary>
+        /// This event is raised when Dynamo is ready for user interaction.
+        /// </summary>
+        public event Action<ReadyParams> DynamoReady;
+        private bool dynamoReady;
+        /// <summary>
+        /// Event that is raised when Dynamo model requests a particular python engine
+        /// to reset. String parameter is engine name.
+        /// </summary>
+        internal static event Action<string> RequestPythonReset;
+        internal void OnRequestPythonReset(string pythonEngine)
+        {
+            //only reset if current workspace is a homeworkspace
+            //can't guarantee which workspace to mark dirty otherwise
+            if (CurrentWorkspace is HomeWorkspaceModel hmwsm)
+            {
+                RequestPythonReset?.Invoke(pythonEngine);
+                ResetEngine(true);
+            }
+
+        }
+
         #endregion
     }
 
 
@@ -35,4 +35,6 @@
 [assembly: InternalsVisibleTo("PythonNodeModels")]
 [assembly: InternalsVisibleTo("LibraryViewExtensionMSWebBrowser")]
 [assembly: InternalsVisibleTo("PythonMigrationViewExtension")]
-[assembly: InternalsVisibleTo("LintingViewExtension")]
+[assembly: InternalsVisibleTo("LintingViewExtension")]
+[assembly: InternalsVisibleTo("DSCPython")]
+[assembly: InternalsVisibleTo("DynamoPythonTests")]