BHoM · FraserGreenroyd · Mar 23, 2023 · Jan 3, 2023 · Jan 4, 2023 · Jan 5, 2023
diff --git a/Python_Engine/Compute/DownloadPython.cs b/Python_Engine/Compute/DownloadPython.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -32,7 +32,6 @@ public static partial class Compute
         [Description("Download a target version of Python.")]
         [Input("version", "A Python version.")]
         [Output("executablePath", "The path of the executable for the downloaded Python.")]
-        [PreviousVersion("5.3", "BH.Engine.Python.Compute.DownloadPython()")]
         public static string DownloadPython(this BH.oM.Python.Enums.PythonVersion version)
         {
             string targetDirectory = Query.EnvironmentsDirectory();
@@ -63,3 +62,4 @@ public static string DownloadPython(this BH.oM.Python.Enums.PythonVersion versio
     }
 }
 
+
diff --git a/Python_Engine/Compute/InstallBasePythonEnvironment.cs b/Python_Engine/Compute/InstallBasePythonEnvironment.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -118,3 +118,4 @@ public static oM.Python.PythonEnvironment InstallBasePythonEnvironment(bool run
         }
     }
 }
+
diff --git a/Python_Engine/Compute/InstallReferencedVirtualenv.cs b/Python_Engine/Compute/InstallReferencedVirtualenv.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -67,12 +67,12 @@ public static oM.Python.PythonEnvironment InstallReferencedVirtualenv(
             string bhomPythonExecutable = baseEnv.Executable;
 
             // set location where virtual env will be created
-            string targetDirectory = Path.Combine(Query.EnvironmentsDirectory(), name);
+            string targetDirectory = Query.VirtualEnvDirectory(name);
             if (!Directory.Exists(targetDirectory))
                 Directory.CreateDirectory(targetDirectory);
 
             // return existing env if it already exists
-            oM.Python.PythonEnvironment env = new oM.Python.PythonEnvironment() { Name = name, Executable = Path.Combine(targetDirectory, "Scripts", "python.exe") };
+            oM.Python.PythonEnvironment env = new oM.Python.PythonEnvironment() { Name = name, Executable = Query.VirtualEnvPythonExePath(name) };
             if (env.EnvironmentExists())
             {
                 BH.Engine.Base.Compute.RecordNote($"The {name} environment already exists and is being returned here instead of installing it again. To install a fresh version of this environment, remove this environment first.");
@@ -113,3 +113,4 @@ public static oM.Python.PythonEnvironment InstallReferencedVirtualenv(
         }
     }
 }
+
diff --git a/Python_Engine/Compute/InstallVirtualenv.cs b/Python_Engine/Compute/InstallVirtualenv.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -107,3 +107,4 @@ public static oM.Python.PythonEnvironment InstallVirtualenv(
         }
     }
 }
+
diff --git a/Python_Engine/Compute/Invoke.cs b/Python_Engine/Compute/Invoke.cs
@@ -1,6 +1,6 @@
-/*
+/*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -41,4 +41,4 @@ public static PyObject Invoke(PyObject module, string method, IEnumerable<object
             return module;
         }
     }
-}
+}
diff --git a/Python_Engine/Compute/IsValidEnvironmentName.cs b/Python_Engine/Compute/IsValidEnvironmentName.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -50,3 +50,4 @@ public static bool IsValidEnvironmentName(string name)
         }
     }
 }
+
diff --git a/Python_Engine/Compute/Logging.cs b/Python_Engine/Compute/Logging.cs
@@ -1,6 +1,6 @@
-/*
+/*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -51,3 +51,4 @@ public static string LoggingHeader(string text)
         }
     }
 }
+
diff --git a/Python_Engine/Compute/RemoveVirtualenv.cs b/Python_Engine/Compute/RemoveVirtualenv.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -76,3 +76,4 @@ public static bool RemoveVirtualenv(
         }
     }
 }
+
diff --git a/Python_Engine/Compute/Run.cs b/Python_Engine/Compute/Run.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -71,7 +71,6 @@ await Task.Run(() =>
         [Input("startDirectory", "The directory in which the command should be run.")]
         [Input("timeoutMinutes", "A number of minutes beyond which this command will timeout.")]
         [Output("success", "True if successful and False if not.")]
-        [PreviousVersion("5.3", "BH.Engine.Python.Compute.RunCommandBool(System.String, System.Boolean, System.String)")]
         public static bool RunCommandBool(string command, bool hideWindows = false, string startDirectory = null, double timeoutMinutes = 5)
         {
             System.Diagnostics.Process process = new System.Diagnostics.Process();
@@ -106,7 +105,6 @@ public static bool RunCommandBool(string command, bool hideWindows = false, stri
         [Input("startDirectory", "The directory in which the command should be run.")]
         [Input("timeoutMinutes", "A number of minutes beyond which this command will timeout.")]
         [Output("stdout", "The StandardOutput from the command that was run. If the process failed, then StandardError will be returned here instead.")]
-        [PreviousVersion("5.3", "BH.Engine.Python.Compute.RunCommandStdout(System.String, System.Boolean, System.String)")]
         public static string RunCommandStdout(string command, bool hideWindows = true, string startDirectory = null, double timeoutMinutes = 5)
         {
             System.Diagnostics.Process process = new System.Diagnostics.Process();
@@ -230,3 +228,4 @@ public static oM.Base.CustomObject RunPythonScript(this PythonEnvironment python
         }
     }
 }
+
diff --git a/Python_Engine/Convert/ToPython.cs b/Python_Engine/Convert/ToPython.cs
@@ -1,6 +1,6 @@
-/*
+/*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -38,3 +38,4 @@ public static bool ToPython<T>(this T[,] input)
         }
     }
 }
+
diff --git a/Python_Engine/Modify/AddQuotesIfRequired.cs b/Python_Engine/Modify/AddQuotesIfRequired.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -45,3 +45,4 @@ public static string AddQuotesIfRequired(this string path)
     }
 }
 
+
diff --git a/Python_Engine/Properties/AssemblyInfo.cs b/Python_Engine/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -55,5 +55,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyFileVersion("6.1.0.0")]
+
 
diff --git a/Python_Engine/Python_Engine.csproj b/Python_Engine/Python_Engine.csproj
@@ -77,6 +77,9 @@
     <Compile Include="Compute\Logging.cs" />
     <Compile Include="Convert\ToPython.cs" />
     <Compile Include="Modify\AddQuotesIfRequired.cs" />
+    <Compile Include="Query\VirtualEnv.cs" />
+    <Compile Include="Query\VirtualEnvPythonExePath.cs" />
+    <Compile Include="Query\VirtualEnvDirectory.cs" />
     <Compile Include="Query\ToString.cs" />
     <Compile Include="Query\CodeDirectory.cs" />
     <Compile Include="Query\EnvironmentExists.cs" />

diff --git a/Python_Engine/Query/CodeDirectory.cs b/Python_Engine/Query/CodeDirectory.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -31,11 +31,11 @@ public static partial class Query
     {
         [Description("The path where any BHoM generated Python code is placed prior to inclusion in a BHoM Python Environment.")]
         [Output("The path where any BHoM generated Python code is placed prior to inclusion in a BHoM Python Environment.")]
-        [PreviousVersion("5.3", "BH.Engine.Python.Query.CodeDirectory(BH.oM.Python.PythonEnvironment)")]
         public static string CodeDirectory()
         {
             return Path.Combine(Query.ExtensionsDirectory(), "PythonCode");
         }
     }
 }
 
+
diff --git a/Python_Engine/Query/EmbeddableURL.cs b/Python_Engine/Query/EmbeddableURL.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -80,3 +80,4 @@ public static string EmbeddableURL(this PythonVersion version)
         }
     }
 }
+
diff --git a/Python_Engine/Query/EnvironmentExists.cs b/Python_Engine/Query/EnvironmentExists.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -45,3 +45,4 @@ public static bool EnvironmentExists(this oM.Python.PythonEnvironment env)
         }
     }
 }
+
diff --git a/Python_Engine/Query/EnvironmentsDirectory.cs b/Python_Engine/Query/EnvironmentsDirectory.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -38,3 +38,4 @@ public static string EnvironmentsDirectory()
     }
 }
 
+
diff --git a/Python_Engine/Query/ExtensionsDirectory.cs b/Python_Engine/Query/ExtensionsDirectory.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -37,3 +37,4 @@ public static string ExtensionsDirectory()
     }
 }
 
+
diff --git a/Python_Engine/Query/ToString.cs b/Python_Engine/Query/ToString.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -39,3 +39,4 @@ public static string ToString(this oM.Python.PythonEnvironment env)
     }
 }
 
+
diff --git a/Python_Engine/Query/ToolkitName.cs b/Python_Engine/Query/ToolkitName.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2022, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -37,3 +37,4 @@ public static string ToolkitName()
     }
 }
 
+
diff --git a/Python_Engine/Query/VirtualEnv.cs b/Python_Engine/Query/VirtualEnv.cs
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the Buildings and Habitats object Model (BHoM)
+ * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ *
+ * Each contributor holds copyright over their respective contributions.
+ * The project versioning (Git) records all such contribution source information.
+ *
+ *
+ * The BHoM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3.0 of the License, or
+ * (at your option) any later version.
+ *
+ * The BHoM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.
+ */
+
+using BH.oM.Base.Attributes;
+using BH.oM.Python;
+using System.ComponentModel;
+using System.IO;
+using System.Xml.Linq;
+
+namespace BH.Engine.Python
+{
+    public static partial class Query
+    {
+        [Description("Get an installed environment without the overhead of attempting to install that environment.")]
+        [Input("envName","The virtual environment name to request.")]
+        [Output("The virtual environment, if it exists.")]
+        public static PythonEnvironment VirtualEnv(string envName)
+        {
+            string exePath = Query.VirtualEnvPythonExePath(envName);
+            if (File.Exists(exePath))
+            {
+                return new PythonEnvironment() { Name = envName, Executable = exePath };
+            }
+            else
+            {
+                BH.Engine.Base.Compute.RecordError($"No environment could be found for {envName}. Use the appropriate InstallPythonEnv to install this environment.");
+                return null;
+            }
+        }
+    }
+}
+
+