Align with changes in oM and Engine on Reflection -> Base

Python_Engine/Compute/DownloadFile.cs

@@ -20,7 +20,7 @@
  * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
  */
 
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System.ComponentModel;
 using System.IO;
@@ -49,7 +49,7 @@ public static string DownloadFile(string url, string directory = null, bool forc
                 return downloadedFile;
             }
 
-            BH.Engine.Reflection.Compute.RecordError($"Download of {Path.GetFileName(url)} to {directory} did not work.");
+            BH.Engine.Base.Compute.RecordError($"Download of {Path.GetFileName(url)} to {directory} did not work.");
 
             return null;
         }

Python_Engine/Compute/InstallPythonEnvironment.cs

@@ -21,7 +21,7 @@
  */
 
 using BH.oM.Python;
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System.Collections.Generic;
 using System.ComponentModel;

Python_Engine/Compute/InstallPythonPackages.cs

@@ -21,7 +21,7 @@
  */
 
 using BH.oM.Python;
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System;
 using System.Collections.Generic;
@@ -45,7 +45,7 @@ public static PythonEnvironment InstallPythonPackages(this PythonEnvironment pyt
                 return null;
             if (Query.LoadPythonEnvironment(pythonEnvironment.Name) == null)
             {
-                BH.Engine.Reflection.Compute.RecordError("The environment given doesn't exist.");
+                BH.Engine.Base.Compute.RecordError("The environment given doesn't exist.");
                 return null;
             }
 
@@ -59,7 +59,7 @@ public static PythonEnvironment InstallPythonPackages(this PythonEnvironment pyt
                 string command = $"{Query.PythonExecutable(pythonEnvironment)} -m pip install --no-warn-script-location{(force ? " --force-reinstall" : "")} {String.Join(" ", packagesStrings)} > {Path.Combine(pythonEnvironment.EnvironmentDirectory(), "package_install.log")} && exit";
                 if (!Compute.RunCommandBool(command, hideWindows: true))
                 {
-                    BH.Engine.Reflection.Compute.RecordError($"Packages not installed for some reason.");
+                    BH.Engine.Base.Compute.RecordError($"Packages not installed for some reason.");
                     return null;
                 }
             }

Python_Engine/Compute/InstallPythonToolkit.cs

@@ -22,9 +22,9 @@
 
 using System;
 using System.Collections.Generic;
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 using System.ComponentModel;
-using BH.oM.Reflection;
+using BH.oM.Base;
 using System.IO;
 
 namespace BH.Engine.Python
@@ -49,7 +49,7 @@ public static Output<bool, List<string>> InstallPythonToolkit(bool run = false,
             Console.WriteLine("Installing python 3.7 embedded...");
             if (!Compute.InstallPython(force))
             {
-                BH.Engine.Reflection.Compute.RecordError("Coule not install Python");
+                BH.Engine.Base.Compute.RecordError("Coule not install Python");
                 return new Output<bool, List<string>> { Item1 = success, Item2 = installedPackages };
             }
             installedPackages.Add("Python 3.7");
@@ -58,7 +58,7 @@ public static Output<bool, List<string>> InstallPythonToolkit(bool run = false,
             Console.WriteLine("Installing pip...");
             if (!Compute.InstallPip())
             {
-                BH.Engine.Reflection.Compute.RecordError("Could not install pip");
+                BH.Engine.Base.Compute.RecordError("Could not install pip");
                 return new Output<bool, List<string>> { Item1 = success, Item2 = installedPackages };
             }
 

Python_Engine/Compute/InstallToolkitPythonEnvironment.cs

@@ -21,7 +21,7 @@
  */
 
 using BH.oM.Python;
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -39,7 +39,7 @@ public static partial class Compute
         [Output("pythonEnvironment", "A BHoM PythonEnvironment object.")]
         public static PythonEnvironment InstallToolkitPythonEnvironment(this PythonEnvironment pythonEnvironment, bool force = false, bool run = false)
         {
-            BH.Engine.Reflection.Compute.RecordNote($"This component will install a Python environment for {pythonEnvironment.Name}.");
+            BH.Engine.Base.Compute.RecordNote($"This component will install a Python environment for {pythonEnvironment.Name}.");
 
             if (!run)
                 return null;
@@ -52,7 +52,7 @@ public static PythonEnvironment InstallToolkitPythonEnvironment(this PythonEnvir
                 {
                     if (existingEnvironment.Version != pythonEnvironment.Version)
                     {
-                        BH.Engine.Reflection.Compute.RecordError($"An environment exists with the given name, but its Python version does not match the given version. To overwrite this existing environment set \"force\" to True.");
+                        BH.Engine.Base.Compute.RecordError($"An environment exists with the given name, but its Python version does not match the given version. To overwrite this existing environment set \"force\" to True.");
                         return null;
                     }
 
@@ -62,7 +62,7 @@ public static PythonEnvironment InstallToolkitPythonEnvironment(this PythonEnvir
                     {
                         if (!existingPackages.PackageInList(pkg))
                         {
-                            BH.Engine.Reflection.Compute.RecordError($"An environment exists with the given name, but it doesn't contain {pkg.GetString()}. To overwrite this existing environment set \"force\" to True.");
+                            BH.Engine.Base.Compute.RecordError($"An environment exists with the given name, but it doesn't contain {pkg.GetString()}. To overwrite this existing environment set \"force\" to True.");
                             return null;
                         }
                     }
@@ -89,7 +89,7 @@ public static PythonEnvironment InstallToolkitPythonEnvironment(this PythonEnvir
             string installPipCommand = $"{pythonEnvironment.PythonExecutable()} {pipInstallerPy} && exit";
             if (!Compute.RunCommandBool(installPipCommand, hideWindows: true))
             {
-                BH.Engine.Reflection.Compute.RecordError($"Pip installation did not work using the command {installPipCommand}.");
+                BH.Engine.Base.Compute.RecordError($"Pip installation did not work using the command {installPipCommand}.");
                 return null;
             }
 
@@ -103,7 +103,7 @@ public static PythonEnvironment InstallToolkitPythonEnvironment(this PythonEnvir
                 }
                 catch (Exception e)
                 {
-                    BH.Engine.Reflection.Compute.RecordError($"{pthFile} not found to be deleted: {e}.");
+                    BH.Engine.Base.Compute.RecordError($"{pthFile} not found to be deleted: {e}.");
                     return null;
                 }
             }
@@ -120,7 +120,7 @@ public static PythonEnvironment InstallToolkitPythonEnvironment(this PythonEnvir
                 }
                 catch (Exception e)
                 {
-                    BH.Engine.Reflection.Compute.RecordError($"{libFile} not capable of being moved to {newLibFile}: {e}.");
+                    BH.Engine.Base.Compute.RecordError($"{libFile} not capable of being moved to {newLibFile}: {e}.");
                     return null;
                 }
             }

Python_Engine/Compute/RemoveEnvironment.cs

@@ -21,7 +21,7 @@
  */
 
 using BH.oM.Python;
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System.ComponentModel;
 using System.IO;
@@ -49,7 +49,7 @@ public static bool RemoveEnvironment(this PythonEnvironment pythonEnvironment, b
                 }
                 catch (System.Exception e)
                 {
-                    BH.Engine.Reflection.Compute.RecordError($"Cannot fully remove the environment. You may have the directory, or a file within it open in another program. Original error code: {e}");
+                    BH.Engine.Base.Compute.RecordError($"Cannot fully remove the environment. You may have the directory, or a file within it open in another program. Original error code: {e}");
                     return false;
                 }
 

Python_Engine/Compute/RunCommandBool.cs

@@ -20,7 +20,7 @@
  * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
  */
 
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System.ComponentModel;
 

Python_Engine/Compute/RunCommandStdout.cs

@@ -20,7 +20,7 @@
  * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
  */
 
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System.ComponentModel;
 

Python_Engine/Compute/RunPythonScript.cs

@@ -22,7 +22,7 @@
 
 using BH.oM.Base;
 using BH.oM.Python;
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -48,7 +48,7 @@ public static CustomObject RunPythonScript(this PythonEnvironment pythonEnvironm
 
             if (!File.Exists(pythonScript))
             {
-                BH.Engine.Reflection.Compute.RecordError($"{pythonScript} does not exist.");
+                BH.Engine.Base.Compute.RecordError($"{pythonScript} does not exist.");
                 return null;
             }
 
@@ -64,7 +64,7 @@ public static CustomObject RunPythonScript(this PythonEnvironment pythonEnvironm
             };
             if (!executableStrings.Any(contents.Contains))
             {
-                BH.Engine.Reflection.Compute.RecordError($"The script passed does not seem to be directly executable using Python. It should contain an 'if __name__ == \"__main__\"' to enable the file to be called directly.");
+                BH.Engine.Base.Compute.RecordError($"The script passed does not seem to be directly executable using Python. It should contain an 'if __name__ == \"__main__\"' to enable the file to be called directly.");
                 return null;
             }
 
@@ -83,11 +83,11 @@ public static CustomObject RunPythonScript(this PythonEnvironment pythonEnvironm
             {
                 if (arguments.Contains("-h"))
                 {
-                    BH.Engine.Reflection.Compute.RecordNote($"It looks like you've asked for some documentation. Here it is!");
+                    BH.Engine.Base.Compute.RecordNote($"It looks like you've asked for some documentation. Here it is!");
                 }
                 else
                 {
-                    BH.Engine.Reflection.Compute.RecordError($"Something went wrong! The object returned contains the error message given by the Python code.");
+                    BH.Engine.Base.Compute.RecordError($"Something went wrong! The object returned contains the error message given by the Python code.");
                 }
 
                 return new CustomObject()

Python_Engine/Compute/RunPythonString.cs

@@ -21,7 +21,7 @@
  */
 
 using BH.oM.Python;
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -41,7 +41,7 @@ public static string RunPythonString(this PythonEnvironment pythonEnvironment, s
 
             if (!pythonString.Contains("print"))
             {
-                BH.Engine.Reflection.Compute.RecordWarning("Nothing is being passed to Stdout in the Python script, so nothing will be returned from this method.");
+                BH.Engine.Base.Compute.RecordWarning("Nothing is being passed to Stdout in the Python script, so nothing will be returned from this method.");
             }
 
             // place pythonScript into a temporary .py file ready to reference and run, then call using the passed executable

Python_Engine/Convert/FromPython.cs

@@ -146,7 +146,7 @@ public static List<object> FromPython(this PyIter input)
 
         private static object FromPython(this object obj)
         {
-            Engine.Reflection.Compute.RecordError($"Cannot convert from Python object of type {obj.GetType()}");
+            Engine.Base.Compute.RecordError($"Cannot convert from Python object of type {obj.GetType()}");
             return null;
         }
 

Python_Engine/Convert/GetString.cs

@@ -21,7 +21,7 @@
  */
 
 using BH.oM.Python;
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System.ComponentModel;
 
@@ -36,7 +36,7 @@ public static string GetString(this PythonPackage package)
         {
             if (package.Name == "" || package.Version == "")
             {
-                BH.Engine.Reflection.Compute.RecordError("The package is not valid as it does not contain either a name or version.");
+                BH.Engine.Base.Compute.RecordError("The package is not valid as it does not contain either a name or version.");
                 return "";
             }
             return $"{package.Name}=={package.Version}";
@@ -49,7 +49,7 @@ public static string GetString(this PythonEnvironment pythonEnvironment)
         {
             if (pythonEnvironment.Name == "" || pythonEnvironment.Version == oM.Python.Enums.PythonVersion.Undefined)
             {
-                BH.Engine.Reflection.Compute.RecordError("The environment is not valid as it does not contain either a name or version.");
+                BH.Engine.Base.Compute.RecordError("The environment is not valid as it does not contain either a name or version.");
                 return "";
             }
             return $"Environment: {pythonEnvironment.Name}\nVersion: {pythonEnvironment.Version}\nLocation: {Query.EnvironmentDirectory(pythonEnvironment)}";

Python_Engine/Convert/ToPython.cs

@@ -196,7 +196,7 @@ public static PyTuple ToPython(this ValueTuple<int, int, int> input)
 
         private static PyObject ToPython(this object obj)
         {
-            Engine.Reflection.Compute.RecordError($"Cannot convert to Python object of type {obj.GetType()}");
+            Engine.Base.Compute.RecordError($"Cannot convert to Python object of type {obj.GetType()}");
             return null;
         }
 

Python_Engine/Create/PythonEnvironment.cs

@@ -22,7 +22,7 @@
 
 using BH.oM.Python.Enums;
 using BH.oM.Python;
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -43,13 +43,13 @@ public static PythonEnvironment PythonEnvironment(string name, PythonVersion ver
         {
             if (name.Any(x => Char.IsWhiteSpace(x)))
             {
-                BH.Engine.Reflection.Compute.RecordError($"A BHoM PythonEnvironment name cannot contain whitespace characters.");
+                BH.Engine.Base.Compute.RecordError($"A BHoM PythonEnvironment name cannot contain whitespace characters.");
                 return null;
             }
 
             if (version == PythonVersion.Undefined)
             {
-                BH.Engine.Reflection.Compute.RecordError($"The Python version chosen cannot be \"Undefined\".");
+                BH.Engine.Base.Compute.RecordError($"The Python version chosen cannot be \"Undefined\".");
                 return null;
             }
 

Python_Engine/Create/PythonPackage.cs

@@ -21,7 +21,7 @@
  */
 
 using BH.oM.Python;
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 
 using System.ComponentModel;
 using System.Linq;
@@ -39,19 +39,19 @@ public static PythonPackage PythonPackage(string name, string version)
         {
             if (name == "" || version == "")
             {
-                BH.Engine.Reflection.Compute.RecordError($"The package name or version is not valid.");
+                BH.Engine.Base.Compute.RecordError($"The package name or version is not valid.");
                 return null;
             }
 
             if (name.Any(x => Char.IsWhiteSpace(x)))
             {
-                BH.Engine.Reflection.Compute.RecordError($"A PythonPackage name cannot contain whitespace characters.");
+                BH.Engine.Base.Compute.RecordError($"A PythonPackage name cannot contain whitespace characters.");
                 return null;
             }
 
             if (version.Any(x => Char.IsWhiteSpace(x)))
             {
-                BH.Engine.Reflection.Compute.RecordError($"A PythonPackage version cannot contain whitespace characters.");
+                BH.Engine.Base.Compute.RecordError($"A PythonPackage version cannot contain whitespace characters.");
                 return null;
             }
 

Python_Engine/Modify/AddQuotesIfRequired.cs

@@ -20,7 +20,7 @@
  * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
  */
 
-using BH.oM.Reflection.Attributes;
+using BH.oM.Base.Attributes;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

Python_Engine/Python_Engine.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -36,6 +36,11 @@
       <HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="BHoM_Engine">
+      <HintPath>C:\ProgramData\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
+      <Private>False</Private>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="Python.Runtime, Version=3.7.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\libs\Python.Runtime.dll</HintPath>
@@ -45,11 +50,6 @@
       <HintPath>C:\ProgramData\BHoM\Assemblies\Reflection_Engine.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Reflection_oM">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Reflection_oM.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Serialiser_Engine">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\ProgramData\BHoM\Assemblies\Serialiser_Engine.dll</HintPath>
@@ -151,4 +151,4 @@ if exist "C:\ProgramData\BHoM\Extensions\PythonCode\$(SolutionName)" rmdir "C:\P
 robocopy "$(ProjectDir)Python" "C:\ProgramData\BHoM\Extensions\PythonCode\$(SolutionName)" /s /purge /xf "*.pyc" /xd "\__pycache__\" &gt; output.log
 del output.log</PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>