DYN-7554: Return of the python libraries (#9)

* Add wheels as originally implemented.

* Use current ALC

* Use async right, Trygve

Author: twastvedt

DSPythonNet3/DSPythonNet3.csproj

@@ -8,19 +8,12 @@
 		<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
-		<Reference Include="Python.Deployment">
-			<HintPath>..\extern\Python\Python.Deployment.dll</HintPath>
-			<Private>True</Private>
-		</Reference>
-		<Reference Include="Python.Included">
-			<HintPath>..\extern\Python\Python.Included.dll</HintPath>
-			<Private>True</Private>
-		</Reference>
 		<InternalsVisibleTo Include="PythonMigrationViewExtension" />
 		<InternalsVisibleTo Include="DynamoPythonTests" />
 
 		<PackageReference Include="DynamoVisualProgramming.Core" Version="$(DynamoPackageVersion)" ExcludeAssets="runtime" />
 		<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="$(DynamoPackageVersion)" ExcludeAssets="runtime" />
+		<PackageReference Include="Python.Included" Version="3.11.6" />
 		<PackageReference Include="pythonnet" Version="3.1.0-preview-ADSK-*" />
 	</ItemGroup>
 	<ItemGroup>
@@ -45,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.InstallPythonAsync().Wait();
+            Task.Run(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.InstallPythonAsync().Wait();
+            Task.Run(DSPythonNet3Evaluator.InstallPythonAsync).Wait();
 
             if (!PythonEngine.IsInitialized)
             {

DSPythonNet3/DSPythonNet3Evaluator.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Diagnostics;
 using System.Reflection;
+using System.Runtime.Loader;
 using Autodesk.DesignScript.Runtime;
 using DSPythonNet3.Encoders;
 using Dynamo.Events;
@@ -246,7 +247,7 @@ public override object Evaluate(
                 return null;
             }
 
-            InstallPythonAsync().Wait();
+            Task.Run(InstallPythonAsync).Wait();
             if (!PythonEngine.IsInitialized)
             {
                 PythonEngine.Initialize();
@@ -346,6 +347,13 @@ internal static async Task InstallPythonAsync()
                     }
 
                     await Python.Included.Installer.SetupPython();
+
+                    Assembly assembly = Assembly.GetAssembly(typeof(DSPythonNet3Evaluator)) ?? throw new Exception("Can't get assembly.");
+                    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);
+
                     isPythonInstalled = true;
                 }
                 catch (Exception e)

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>