Louis/bug-fixes (#117)

* Fix undefined script property

* Fix deprecation warning for bloch sphere

* Remove versions from pyvenv.sh

* Update missing virtual environment error message

* Move warning suppression into ENCODE_IMAGE snippet

* Update psvenv.ps1

Update to work the same as pyvenv.sh.

Author: louislefevre

bin/pyvenv.ps1

@@ -5,6 +5,9 @@
 # This script sets up a Python virtual environment and installs dependencies.
 # Note that this script is designed to be run in a Windows PowerShell environment.
 
+# Dependencies list.
+$packages = @("qiskit", "matplotlib", "pylatexenc")
+
 # Use Windows paths by default.
 $venv="$((Get-Location).tostring())\venv"
 $python="python"
@@ -43,31 +46,21 @@ if (!(Get-Command $pip_path -errorAction SilentlyContinue)) {
   Exit
 }
 
-# Dependencies list (empty value means use latest version).
-$packages = @{"qiskit"=""; "matplotlib"="3.3.4"; "pylatexenc"=""}
-
 # Install package dependencies.
-foreach ($i in $packages.GetEnumerator()) {
+foreach ($i in $packages) {
   # Check if the package is installed. If no, install package.
-  Invoke-Expression "$python_path -c `"import $($i.Name)`"" >$null 2>&1
-  if ($LastExitCode -ne 0) {
-    "Installing $($i.Name)..."
-		
-    # If package requires specific version, add it to the command.
-    if ($i.Value) {
-      $pkg_cmd="$($i.Name)==$($i.Value)"
-    } else {
-      $pkg_cmd="$($i.Name)"
-    }
+  $cmd = Invoke-Expression "$pip_path list --disable-pip-version-check | Select-String -Pattern `"^$i `""
+  if ($cmd -eq $null) {
+    "Installing $i..."
 
     # Install package.
-    Invoke-Expression "$pip_path install --quiet $pkg_cmd"
+    Invoke-Expression "$pip_path install --quiet --disable-pip-version-check $i"
     if ($LastExitCode -eq 0) {
-      "Successfully installed $($i.Name)"
+      "Successfully installed $i"
     } else {
-      "Error: failed to install $($i.Name)"
+      "Error: failed to install $i"
     }
   } else {
-    "$($i.Name) is installed"
+    "$i is installed"
   }
 }

bin/pyvenv.sh

@@ -4,8 +4,8 @@
 # Note that this script is designed to be run in POSIX-compatible environments
 # which use Bash.
 
-# Dependencies list (empty value means use latest version).
-declare -A packages=(["qiskit"]="" ["matplotlib"]="3.3.4" ["pylatexenc"]="")
+# Dependencies list
+declare -a packages=("qiskit" "matplotlib" "pylatexenc")
 
 # Check OS for paths.
 venv="$PWD/venv"
@@ -51,22 +51,13 @@ if [[ ! -x "$pip_path" ]]; then
 fi
 
 # Install package dependencies.
-for i in "${!packages[@]}"; do
-  # If package requires specific version, add it to the command.
-  if [ ! -z "${packages[$i]}" ]; then
-    pkg_cmd="$i==${packages[$i]}"
-    regex_cmd="^$i\s*${packages[$i]}"
-  else
-    pkg_cmd="$i"
-    regex_cmd="^$i "
-  fi
-
+for i in "${packages[@]}"; do
   # Check if the package is installed. If no, install package.
-  if ! "$pip_path" list --disable-pip-version-check | grep -E "$regex_cmd" &>/dev/null; then
+  if ! "$pip_path" list --disable-pip-version-check | grep -E "^$i " &>/dev/null; then
     echo "Installing $i..."
 
     # Install package.
-    if "$pip_path" install --quiet --disable-pip-version-check "$pkg_cmd"; then
+    if "$pip_path" install --quiet --disable-pip-version-check "$i"; then
       echo "Successfully installed $i"
     else
       echo "Error: failed to install $i"

nodes/quantum/bloch-sphere/bloch-sphere.js

@@ -106,7 +106,7 @@ module.exports = function(RED) {
               done();
             }).catch((err) => {
               // Check if error is due to script containing a measurement
-              if (shell.script.includes(snippets.MEASURE.toString().substring(0, 11))) {
+              if (shell.history.join('\n').includes(snippets.MEASURE.toString().substring(0, 11))) {
                 err = new Error(errors.BLOCH_SPHERE_WITH_MEASUREMENT);
               }
               logger.error(node.id, err);

nodes/quantum/quantum-circuit/quantum-circuit.js

@@ -128,7 +128,7 @@ module.exports = function(RED) {
 
       let error;
       if (!fileSystem.existsSync(PythonPath)) {
-        node.warn('Python virtual environment not found - creating virtual environment. Do not close Node-RED.');
+        node.warn('Initialising Python virtual environment. Do not close Node-RED or rerun the circuit.');
         logger.warn(node.id, 'Python virtual environment not found');
         logger.info(node.id, 'Creating virtual environment');
 

nodes/snippets.js

@@ -160,6 +160,8 @@ const ENCODE_IMAGE =
 `import matplotlib.pyplot as plt
 import base64
 import io
+import warnings
+warnings.filterwarnings("ignore", category=UserWarning)
 buffer = io.BytesIO()
 plt.savefig(buffer,  format='png')
 buffer.seek(0)