7.2 Deployment (#139)

al-fisher · web-flow · commit 5895be8912ed · 2024-06-20T14:07:30.000+01:00
diff --git a/Python_Engine/Compute/BasePythonEnvironment.cs b/Python_Engine/Compute/BasePythonEnvironment.cs
@@ -82,9 +82,10 @@ public static PythonEnvironment BasePythonEnvironment(
             };
             using (Process p = Process.Start(process.StartInfo))
             {
+                string standardError = p.StandardError.ReadToEnd();
                 p.WaitForExit();
                 if (p.ExitCode != 0)
-                    BH.Engine.Base.Compute.RecordError($"Error installing pip.\n{p.StandardError.ReadToEnd()}");
+                    BH.Engine.Base.Compute.RecordError($"Error installing pip.\n{standardError}");
                 File.Delete(pipInstaller);
             }
 
diff --git a/Python_Engine/Compute/InstallPackage.cs b/Python_Engine/Compute/InstallPackage.cs
@@ -64,9 +64,10 @@ List<string> packages
             };
             using (Process p = Process.Start(process.StartInfo))
             {
+                string standardError = p.StandardError.ReadToEnd();
                 p.WaitForExit();
                 if (p.ExitCode != 0)
-                    BH.Engine.Base.Compute.RecordError($"Error installing packages [{packagesString}].\n{p.StandardError.ReadToEnd()}");
+                    BH.Engine.Base.Compute.RecordError($"Error installing packages [{packagesString}].\n{standardError}");
             }
         }
 
@@ -112,9 +113,10 @@ string requirements
             };
             using (Process p = Process.Start(process.StartInfo))
             {
+                string standardError = p.StandardError.ReadToEnd();
                 p.WaitForExit();
                 if (p.ExitCode != 0)
-                    BH.Engine.Base.Compute.RecordError($"Error installing packages from {requirements}.\n{p.StandardError.ReadToEnd()}");
+                    BH.Engine.Base.Compute.RecordError($"Error installing packages from {requirements}.\n{standardError}");
             }
         }
 
@@ -155,9 +157,10 @@ string packageDirectory
             };
             using (Process p = Process.Start(process.StartInfo))
             {
+                string standardError = p.StandardError.ReadToEnd();
                 p.WaitForExit();
                 if (p.ExitCode != 0)
-                    BH.Engine.Base.Compute.RecordError($"Error installing package from \"{packageDirectory}\".\n{p.StandardError.ReadToEnd()}");
+                    BH.Engine.Base.Compute.RecordError($"Error installing package from \"{packageDirectory}\".\n{standardError}");
             }
         }
 
diff --git a/Python_Engine/Compute/RequirementsTxt.cs b/Python_Engine/Compute/RequirementsTxt.cs
@@ -72,10 +72,11 @@ public static string RequirementsTxt(
             using (Process p = Process.Start(process.StartInfo))
             {
                 StreamWriter sr = new StreamWriter(targetPath);
+                sr.Write(p.StandardOutput.ReadToEnd());
+                string standardError = p.StandardError.ReadToEnd();
                 p.WaitForExit();
                 if (p.ExitCode != 0)
-                    BH.Engine.Base.Compute.RecordError($"Error creating requirements.txt from \"{executable}\".\n{p.StandardError.ReadToEnd()}");
-                sr.Write(p.StandardOutput.ReadToEnd());
+                    BH.Engine.Base.Compute.RecordError($"Error creating requirements.txt from \"{executable}\".\n{standardError}");
                 sr.Close();
             }
 
diff --git a/Python_Engine/Compute/VirtualEnvironment.cs b/Python_Engine/Compute/VirtualEnvironment.cs
@@ -100,9 +100,10 @@ public static PythonEnvironment VirtualEnvironment(this PythonVersion version, s
             };
             using (Process p = Process.Start(process.StartInfo))
             {
+                string standardError = p.StandardError.ReadToEnd();
                 p.WaitForExit();
                 if (p.ExitCode != 0)
-                    BH.Engine.Base.Compute.RecordError($"Error creating virtual environment.\n{p.StandardError.ReadToEnd()}");
+                    BH.Engine.Base.Compute.RecordError($"Error creating virtual environment.\n{standardError}");
             }
 
             // install ipykernel, pytest and black into new virtualenv
@@ -121,9 +122,10 @@ public static PythonEnvironment VirtualEnvironment(this PythonVersion version, s
             };
             using (Process p = Process.Start(process2.StartInfo))
             {
+                string standardError = p.StandardError.ReadToEnd();
                 p.WaitForExit();
                 if (p.ExitCode != 0)
-                    BH.Engine.Base.Compute.RecordError($"Error registering the \"{name}\" virtual environment.\n{p.StandardError.ReadToEnd()}");
+                    BH.Engine.Base.Compute.RecordError($"Error registering the \"{name}\" virtual environment.\n{standardError}");
             }
             // replace text in a file
 
diff --git a/Python_Engine/Python_Engine.csproj b/Python_Engine/Python_Engine.csproj
@@ -8,7 +8,7 @@
     <Authors>BHoM</Authors>
     <Copyright>Copyright © https://github.com/BHoM</Copyright>
     <RootNamespace>BH.Engine.Python</RootNamespace>
-    <FileVersion>7.1.0.0</FileVersion>
+    <FileVersion>7.2.0.0</FileVersion>
     <OutputPath>..\Build\</OutputPath>
   </PropertyGroup>
 
diff --git a/Python_Engine/Query/Version.cs b/Python_Engine/Query/Version.cs
@@ -58,10 +58,14 @@ public static PythonVersion Version(string pythonExecutable)
                 string versionString;
                 using (Process p = Process.Start(process.StartInfo))
                 {
+                    string standardError = p.StandardError.ReadToEnd();
+                    versionString = p.StandardOutput.ReadToEnd().TrimEnd();
                     p.WaitForExit();
                     if (p.ExitCode != 0)
-                        BH.Engine.Base.Compute.RecordError($"Error getting Python version.\n{p.StandardError.ReadToEnd()}");
-                    versionString = p.StandardOutput.ReadToEnd().TrimEnd();
+                    {
+                        BH.Engine.Base.Compute.RecordError($"Error getting Python version.\n{standardError}");
+                        return PythonVersion.Undefined;
+                    }
                 }
 
                 return (PythonVersion)Enum.Parse(typeof(PythonVersion), "v" + versionString.Replace("Python ", "").Replace(".", "_"));
diff --git a/Python_oM/Python_oM.csproj b/Python_oM/Python_oM.csproj
@@ -8,7 +8,7 @@
     <Authors>BHoM</Authors>
     <Copyright>Copyright © https://github.com/BHoM</Copyright>
     <RootNamespace>BH.oM.Python</RootNamespace>
-    <FileVersion>7.1.0.0</FileVersion>
+    <FileVersion>7.2.0.0</FileVersion>
     <OutputPath>..\Build\</OutputPath>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,10 @@ public static PythonEnvironment BasePythonEnvironment(`
`82`	`82`	`};`
`83`	`83`	`using (Process p = Process.Start(process.StartInfo))`
`84`	`84`	`{`
	`85`	`+ string standardError = p.StandardError.ReadToEnd();`
`85`	`86`	`p.WaitForExit();`
`86`	`87`	`if (p.ExitCode != 0)`
`87`		`- BH.Engine.Base.Compute.RecordError($"Error installing pip.\n{p.StandardError.ReadToEnd()}");`
	`88`	`+ BH.Engine.Base.Compute.RecordError($"Error installing pip.\n{standardError}");`
`88`	`89`	`File.Delete(pipInstaller);`
`89`	`90`	`}`
`90`	`91`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,10 @@ List<string> packages`
`64`	`64`	`};`
`65`	`65`	`using (Process p = Process.Start(process.StartInfo))`
`66`	`66`	`{`
	`67`	`+ string standardError = p.StandardError.ReadToEnd();`
`67`	`68`	`p.WaitForExit();`
`68`	`69`	`if (p.ExitCode != 0)`
`69`		`- BH.Engine.Base.Compute.RecordError($"Error installing packages [{packagesString}].\n{p.StandardError.ReadToEnd()}");`
	`70`	`+ BH.Engine.Base.Compute.RecordError($"Error installing packages [{packagesString}].\n{standardError}");`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`
`@@ -112,9 +113,10 @@ string requirements`
`112`	`113`	`};`
`113`	`114`	`using (Process p = Process.Start(process.StartInfo))`
`114`	`115`	`{`
	`116`	`+ string standardError = p.StandardError.ReadToEnd();`
`115`	`117`	`p.WaitForExit();`
`116`	`118`	`if (p.ExitCode != 0)`
`117`		`- BH.Engine.Base.Compute.RecordError($"Error installing packages from {requirements}.\n{p.StandardError.ReadToEnd()}");`
	`119`	`+ BH.Engine.Base.Compute.RecordError($"Error installing packages from {requirements}.\n{standardError}");`
`118`	`120`	`}`
`119`	`121`	`}`
`120`	`122`
`@@ -155,9 +157,10 @@ string packageDirectory`
`155`	`157`	`};`
`156`	`158`	`using (Process p = Process.Start(process.StartInfo))`
`157`	`159`	`{`
	`160`	`+ string standardError = p.StandardError.ReadToEnd();`
`158`	`161`	`p.WaitForExit();`
`159`	`162`	`if (p.ExitCode != 0)`
`160`		`- BH.Engine.Base.Compute.RecordError($"Error installing package from \"{packageDirectory}\".\n{p.StandardError.ReadToEnd()}");`
	`163`	`+ BH.Engine.Base.Compute.RecordError($"Error installing package from \"{packageDirectory}\".\n{standardError}");`
`161`	`164`	`}`
`162`	`165`	`}`
`163`	`166`
Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,11 @@ public static string RequirementsTxt(`
`72`	`72`	`using (Process p = Process.Start(process.StartInfo))`
`73`	`73`	`{`
`74`	`74`	`StreamWriter sr = new StreamWriter(targetPath);`
	`75`	`+ sr.Write(p.StandardOutput.ReadToEnd());`
	`76`	`+ string standardError = p.StandardError.ReadToEnd();`
`75`	`77`	`p.WaitForExit();`
`76`	`78`	`if (p.ExitCode != 0)`
`77`		`- BH.Engine.Base.Compute.RecordError($"Error creating requirements.txt from \"{executable}\".\n{p.StandardError.ReadToEnd()}");`
`78`		`- sr.Write(p.StandardOutput.ReadToEnd());`
	`79`	`+ BH.Engine.Base.Compute.RecordError($"Error creating requirements.txt from \"{executable}\".\n{standardError}");`
`79`	`80`	`sr.Close();`
`80`	`81`	`}`
`81`	`82`
Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,10 @@ public static PythonEnvironment VirtualEnvironment(this PythonVersion version, s`
`100`	`100`	`};`
`101`	`101`	`using (Process p = Process.Start(process.StartInfo))`
`102`	`102`	`{`
	`103`	`+ string standardError = p.StandardError.ReadToEnd();`
`103`	`104`	`p.WaitForExit();`
`104`	`105`	`if (p.ExitCode != 0)`
`105`		`- BH.Engine.Base.Compute.RecordError($"Error creating virtual environment.\n{p.StandardError.ReadToEnd()}");`
	`106`	`+ BH.Engine.Base.Compute.RecordError($"Error creating virtual environment.\n{standardError}");`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`// install ipykernel, pytest and black into new virtualenv`
`@@ -121,9 +122,10 @@ public static PythonEnvironment VirtualEnvironment(this PythonVersion version, s`
`121`	`122`	`};`
`122`	`123`	`using (Process p = Process.Start(process2.StartInfo))`
`123`	`124`	`{`
	`125`	`+ string standardError = p.StandardError.ReadToEnd();`
`124`	`126`	`p.WaitForExit();`
`125`	`127`	`if (p.ExitCode != 0)`
`126`		`- BH.Engine.Base.Compute.RecordError($"Error registering the \"{name}\" virtual environment.\n{p.StandardError.ReadToEnd()}");`
	`128`	`+ BH.Engine.Base.Compute.RecordError($"Error registering the \"{name}\" virtual environment.\n{standardError}");`
`127`	`129`	`}`
`128`	`130`	`// replace text in a file`
`129`	`131`