Install wheels.

Author: twastvedt

DSPythonNet3/DSPythonNet3.csproj

@@ -38,6 +38,9 @@
 			<LastGenOutput>Resources.en-US.Designer.cs</LastGenOutput>
 		</EmbeddedResource>
 	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\DSPythonNet3Wheels\DSPythonNet3Wheels.csproj" />
+	</ItemGroup>
 	<ItemGroup>
 		<None Update="pkg.json">
 			<TargetPath>..\%(Filename)%(Extension)</TargetPath>

DSPythonNet3/DSPythonNet3CodeCompletionProviderCore.cs

@@ -71,7 +71,7 @@ import clr
 
         private object ExecutePythonScriptCode(string code)
         {
-            DSPythonNet3Evaluator.InstallPython();
+            DSPythonNet3Evaluator.InstallPythonAsync().Wait();
 
             if (!PythonEngine.IsInitialized)
             {
@@ -375,7 +375,7 @@ public DSPythonNet3CodeCompletionProviderCore()
             BasicVariableTypes.Add(Tuple.Create(LIST_VARIABLE, typeof(PyList)));
             BasicVariableTypes.Add(Tuple.Create(DICT_VARIABLE, typeof(PyDict)));
 
-            DSPythonNet3Evaluator.InstallPython();
+            DSPythonNet3Evaluator.InstallPythonAsync().Wait();
 
             if (!PythonEngine.IsInitialized)
             {

DSPythonNet3/DSPythonNet3Evaluator.cs

@@ -247,7 +247,7 @@ public override object Evaluate(
                 return null;
             }
 
-            InstallPython();
+            InstallPythonAsync().Wait();
             if (!PythonEngine.IsInitialized)
             {
                 PythonEngine.Initialize();
@@ -322,7 +322,7 @@ public static object EvaluatePythonScript(
         /// NOTE: Calling SetupPython multiple times will add the install location to the path many times,
         /// potentially causing the environment variable to overflow.
         /// </summary>
-        internal static void InstallPython()
+        internal static async Task InstallPythonAsync()
         {
             if (!isPythonInstalled)
             {
@@ -340,7 +340,11 @@ internal static void InstallPython()
                         Python.Included.PythonEnv.DeployEmbeddedPython = false;
                     }
 
-                    Python.Included.Installer.SetupPython().Wait();
+                    await Python.Included.Installer.SetupPython();
+
+                    Assembly wheelsAssembly = Assembly.LoadFile(Path.Join(Path.GetDirectoryName(Assembly.GetAssembly(typeof(DSPythonNet3Evaluator)).Location), "DSPythonNet3Wheels.dll")    );
+                    await Task.WhenAll(wheelsAssembly.GetManifestResourceNames().Where(x => x.Contains(".whl")).Select(wheel => Python.Included.Installer.InstallWheel(wheelsAssembly, wheel)));
+
                     isPythonInstalled = true;
                 }
                 catch (Exception e)
@@ -438,7 +442,7 @@ private static void InitializeEncoders()
         /// </summary>
         /// <param name="e">Exception to inspect</param>
         /// <returns>Trace back message</returns>
-        private static string GetTraceBack(Exception e)
+        private static string? GetTraceBack(Exception e)
         {
             if (e is not PythonException pythonExc || pythonExc.Traceback == null)
             {
@@ -452,7 +456,7 @@ private static string GetTraceBack(Exception e)
                 throw new NotSupportedException(Properties.Resources.InternalErrorTraceBackInfo);
             }
 
-            return (string)field.Invoke(pythonExc, [pythonExc.Traceback]);
+            return (string?)field.Invoke(pythonExc, [pythonExc.Traceback]);
         }
 
         #region Marshalling

DSPythonNet3Wheels/DSPythonNet3Wheels.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputPath>$(BuildOutput)extra\</OutputPath>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Remove="Resources\*.whl" />
+		<EmbeddedResource Include="Resources\*.whl" />
+	</ItemGroup>
+
+	<Target Name="UpdateWheels">
+		<RemoveDir Directories="Resources" />
+		<MakeDir Directories="Resources" />
+		<Exec Command="pip download --only-binary :all: --platform win_amd64 --implementation cp --python-version 3.11 --dest Resources --no-cache -r requirements.txt" />
+	</Target>
+</Project>