improve dev editor experience (#15)

Author: zavub

DSPythonNet3/DSPythonNet3CodeCompletionProviderCore.cs

@@ -35,7 +35,7 @@ internal class DSPythonNet3CodeCompletionProviderCore : PythonCodeCompletionProv
         /// The scope used by the engine.  This is where all the loaded symbols
         /// are stored.  It's essentially an environment dictionary.
         /// </summary>
-        internal PyModule Scope
+        internal PyModule? Scope
         {
             get { return scope; }
             set { scope = value; }
@@ -413,10 +413,10 @@ protected override object EvaluateScript(string script, PythonScriptType evalTyp
                 switch (evalType)
                 {
                     case PythonScriptType.Expression:
-                        var result = Scope.Eval(script);
+                        var result = Scope?.Eval(script);
                         return DSPythonNet3Evaluator.OutputMarshaler.Marshal(result);
                     default:
-                        Scope.Exec(script);
+                        Scope?.Exec(script);
                         return null;
                 }
             }
@@ -568,6 +568,7 @@ public void Dispose()
                     using (Py.GIL())
                     {
                         Scope.Dispose();
+                        Scope = null;
                     }
                 }
                 catch { }

DSPythonNet3/DSPythonNet3Evaluator.cs

@@ -344,7 +344,36 @@ internal static async Task InstallPythonAsync()
                     AssemblyLoadContext context = AssemblyLoadContext.GetLoadContext(assembly) ?? throw new Exception("Can't get assembly context.");
 
                     Assembly wheelsAssembly = context.LoadFromAssemblyPath(Path.Join(Path.GetDirectoryName(assembly.Location), "DSPythonNet3Wheels.dll"));
-                    await Task.WhenAll(wheelsAssembly.GetManifestResourceNames().Where(x => x.Contains(".whl")).Select(wheel => Python.Included.Installer.InstallWheel(wheelsAssembly, wheel))).ConfigureAwait(false);
+
+                    List<string> pipWheelInstall = new List<string>();
+                    await Task.WhenAll(wheelsAssembly.GetManifestResourceNames().Where(x =>
+                    {
+                        bool isWheel = x.Contains(".whl");
+                        if (isWheel && x.Contains("pywin32-"))
+                        {
+                            pipWheelInstall.Add(x);
+                            return false;
+                        }
+
+                        return isWheel;
+                    }).Select(wheel => Python.Included.Installer.InstallWheel(wheelsAssembly, wheel))).ConfigureAwait(false);
+
+                    foreach (var pipWheelResource in pipWheelInstall)
+                    {                        
+                        var pipWheelName = pipWheelResource.Remove(0, "DSPythonNet3Wheels.Resources.".Count());
+                        string wheelPath = Path.Combine(Python.Included.Installer.EmbeddedPythonHome, "Lib", pipWheelName);
+                        using (Stream? stream = wheelsAssembly.GetManifestResourceStream(pipWheelResource))
+                        {
+                            using (FileStream destination = new FileStream(wheelPath, FileMode.Create))
+                            {
+                                stream?.CopyTo(destination);
+                            }
+                        }
+
+                        string cmdToExecute = $"python -m pip install \"Lib\\{pipWheelName}\"";
+                        await Python.Deployment.Installer.RunCommand(cmdToExecute, CancellationToken.None);
+                        File.Delete(wheelPath);
+                    }
 
                     isPythonInstalled = true;
                 }