quarchpy 2.2.15__py2.py3-none-any.whl → 2.2.16__py2.py3-none-any.whl

quarchpy/install_qps.py

@@ -1,3 +1,4 @@
+import logging
 import os
 import sys
 import zipfile
@@ -5,8 +6,10 @@ import requests
 import shutil
 import xml.etree.ElementTree as ET
 
+from quarchpy.user_interface import printText, requestDialog
+
 # --- Configuration ---
-QPS_VERSION_FOR_DOWNLOAD = "1.49"
+QPS_VERSION_FOR_DOWNLOAD = "1.50"
 # URLs for the separate ZIP files.
 QPS_DOWNLOAD_URL = f"https://quarch.com/software_update/qps/QPS_{QPS_VERSION_FOR_DOWNLOAD}.zip"
 JDK_JRE_DOWNLOAD_URL = "https://quarch.com/software_update/qps/jdk_jres.zip"
@@ -26,10 +29,29 @@ EXTRACTION_FOLDER_QPS = os.path.join(TARGET_DIR, "QPS")
 EXTRACTION_FOLDER_JDK_JRE = os.path.join(TARGET_DIR, "jdk_jres")
 
 
+def get_installed_qps_version(qps_folder):
+    """Reads the appVersion from the app.properties file."""
+    properties_file = os.path.join(qps_folder, "app.properties")
+    if not os.path.exists(properties_file):
+        return None  # File doesn't exist, can't determine version
+
+    try:
+        with open(properties_file, 'r') as f:
+            for line in f:
+                if line.strip().startswith("appVersion="):
+                    # Split the line at '=' and return the version part
+                    return line.split('=', 1)[1].strip()
+    except Exception as e:
+        printText(f"  - Warning: Could not read version from {properties_file}. Error: {e}")
+        return None # Error reading file
+
+    return None # Version not found in the file
+
+
 def find_qps():
     """
-    Checks for QPS and JDK/JRE. If any are missing, it attempts an online or
-    offline installation of the required components.
+    Checks for QPS and JDK/JRE. If any are missing or outdated, it attempts an
+    online or offline installation of the required components.
     """
     qps_jar = "qps.jar"
     qps_path = os.path.join(EXTRACTION_FOLDER_QPS, qps_jar)
@@ -52,43 +74,58 @@ def find_qps():
     if jdk_folder_name:
         jdk_jre_check_file = os.path.join(EXTRACTION_FOLDER_JDK_JRE, jdk_folder_name, "bin", java_executable_name)
 
-    qps_found = os.path.exists(qps_path)
+    # --- Component Verification ---
+    qps_jar_exists = os.path.exists(qps_path)
+    installed_qps_version = get_installed_qps_version(EXTRACTION_FOLDER_QPS)
+
+    # Check if the required version string starts with the installed version number.
+    # This handles cases like required "1.48.1-SNAPSHOT" vs. installed "1.48".
+    qps_version_ok = False
+    if installed_qps_version:
+        qps_version_ok = QPS_VERSION_FOR_DOWNLOAD.startswith(installed_qps_version)
+
+    qps_ok = qps_jar_exists and qps_version_ok
     jdk_found = jdk_jre_check_file and os.path.exists(jdk_jre_check_file)
 
-    if qps_found and jdk_found:
+    if qps_ok and jdk_found:
+        logging.info(f"QPS version {installed_qps_version} and JDK/JRE are correctly installed.")
         return True
 
-    print("--- Missing Components Detected ---")
-    qps_needed = not qps_found
+    printText("--- Missing or Outdated Components Detected ---")
+    qps_needed = not qps_ok
     jdk_jre_needed = not jdk_found
-    if qps_needed:
-        print("Quarch Power Studio (QPS) is not installed.")
+
+    if not qps_jar_exists:
+        printText("Quarch Power Studio (QPS) is not installed.")
+    elif not qps_version_ok:
+        printText(f"QPS requires an update. (Installed: {installed_qps_version or 'Unknown'}, Required: {QPS_VERSION_FOR_DOWNLOAD})")
+
     if jdk_jre_needed:
-        print("Required Java JDK/JRE Binaries are not installed.")
+        printText("Required Java JDK/JRE Binaries are not installed.")
 
     # --- Installation Logic ---
     installation_successful = False
     response = ""
     if is_network_connection_available():
         network_available = True
-        print("\nAttempting online installation...")
-        response = input("Would you like to download and install the missing components? (y/n): ").lower()
+        printText("\nAttempting online installation...")
+        response = requestDialog("Would you like to download and install the missing/outdated components? (y/n): ").lower()
 
         if response == 'y':
             qps_url_to_use = QPS_DOWNLOAD_URL
 
             if qps_needed and not is_download_url_valid(qps_url_to_use):
-                print(f"The download url {qps_url_to_use} is not valid.")
-                print(f"Defaulting to URL for the latest version of QPS: \n{QPS_DOWNLOAD_URL_LATEST}")
+                printText(f"The download url {qps_url_to_use} is not valid.")
+                printText(f"Defaulting to URL for the latest version of QPS: \n{QPS_DOWNLOAD_URL_LATEST}")
 
                 latest_version = get_latest_qps_version()
                 if latest_version != QPS_VERSION_FOR_DOWNLOAD:
-                    print(f"Warning! The version of QuarchPy you are using does not officially support the latest version of QPS ({latest_version}).")
-                    print("Please consider upgrading QuarchPy.")
-                    proceed = input("Would you like to proceed with downloading the latest version? (y/n): ").lower()
+                    printText(f"Warning! The version of QuarchPy you are using does not officially support the latest version of QPS ({latest_version}).")
+                    printText("Please consider upgrading QuarchPy.")
+                    proceed = requestDialog("Would you like to proceed with downloading the latest version? (y/n): ").lower()
 
                     if proceed != 'y':
-                        print("Installation cancelled by user.")
+                        printText("Installation cancelled by user.")
                         qps_url_to_use = None
                     else:
                         qps_url_to_use = QPS_DOWNLOAD_URL_LATEST
@@ -101,34 +138,34 @@ def find_qps():
             else:
                 installation_successful = install_online(qps_url_to_use, JDK_JRE_DOWNLOAD_URL, qps_needed, jdk_jre_needed)
     else:
-        print("\nNo internet connection detected.")
+        printText("\nNo internet connection detected.")
         network_available = False
 
     if response == 'n' or not network_available:
-        print("To install manually, download the required files:")
+        printText("To install manually, download the required files:")
         if qps_needed:
-            print(f"  - QPS: {QPS_DOWNLOAD_URL} (or latest: {QPS_DOWNLOAD_URL_LATEST})")
+            printText(f"  - QPS: {QPS_DOWNLOAD_URL} (or latest: {QPS_DOWNLOAD_URL_LATEST})")
         if jdk_jre_needed:
-            print(f"  - JDK/JRE: {JDK_JRE_DOWNLOAD_URL}")
+            printText(f"  - JDK/JRE: {JDK_JRE_DOWNLOAD_URL}")
 
-        input("\nPress Enter to Continue after downloading.")
-        response = input("Would you like to install from the manually downloaded ZIP file(s)? (y/n) ").lower()
+        requestDialog("\nPress Enter to Continue after downloading.")
+        response = requestDialog("Would you like to install from the manually downloaded ZIP file(s)? (y/n) ").lower()
         if response == 'y':
             installation_successful = install_offline(qps_needed, jdk_jre_needed)
 
     if not installation_successful:
-        print("Installation was cancelled or failed.")
+        printText("Installation was cancelled or failed.")
         return False
 
     # --- Final Check ---
     qps_found = os.path.exists(qps_path)
     jdk_found = jdk_jre_check_file and os.path.exists(jdk_jre_check_file)
     if (qps_needed and not qps_found) or (jdk_jre_needed and not jdk_found):
-        print("\nInstallation failed. Some components are still missing.")
-        print("Please contact Quarch Support for further help: https://quarch.com/contact/")
+        printText("\nInstallation failed. Some components are still missing.")
+        printText("Please contact Quarch Support for further help: https://quarch.com/contact/")
         return False
     else:
-        print("\nAll required components are now installed.")
+        printText("\nAll required components are now installed.")
         return True
 
 
@@ -139,21 +176,21 @@ def install_online(qps_url, jdk_jre_url, qps_needed, jdk_jre_needed):
 
     if qps_needed:
         qps_zip_path = os.path.join(TARGET_DIR, "QPS_download.zip")
-        print("\n--- Installing QPS ---")
+        printText("\n--- Installing QPS ---")
         if download_file(qps_url, qps_zip_path):
             qps_success = extract_and_move_qps(qps_zip_path)
             os.remove(qps_zip_path)
-            print(f"Cleaned up {qps_zip_path}")
+            printText(f"Cleaned up {qps_zip_path}")
         else:
             qps_success = False
 
     if jdk_jre_needed:
         jdk_jre_zip_path = os.path.join(TARGET_DIR, "jdk_jre.zip")
-        print("\n--- Installing JDK/JRE ---")
+        printText("\n--- Installing JDK/JRE ---")
         if download_file(jdk_jre_url, jdk_jre_zip_path):
             jdk_jre_success = extract_and_move_jdk_jre(jdk_jre_zip_path)
             os.remove(jdk_jre_zip_path)
-            print(f"Cleaned up {jdk_jre_zip_path}")
+            printText(f"Cleaned up {jdk_jre_zip_path}")
         else:
             jdk_jre_success = False
 
@@ -166,7 +203,7 @@ def install_offline(qps_needed, jdk_jre_needed):
     jdk_jre_success = not jdk_jre_needed
 
     if qps_needed:
-        print("\nPlease select the QPS ZIP file (e.g., QPS_1.47.zip).")
+        printText("\nPlease select the QPS ZIP file (e.g., QPS_1.47.zip).")
         qps_zip_filepath = prompt_for_zip_path("Select QPS ZIP File")
         if qps_zip_filepath:
             qps_success = extract_and_move_qps(qps_zip_filepath)
@@ -174,7 +211,7 @@ def install_offline(qps_needed, jdk_jre_needed):
             return False  # User cancelled
 
     if jdk_jre_needed:
-        print("\nPlease select the JDK/JRE ZIP file (jdk_jre.zip).")
+        printText("\nPlease select the JDK/JRE ZIP file (jdk_jre.zip).")
         jdk_jre_zip_filepath = prompt_for_zip_path("Select JDK/JRE ZIP File")
         if jdk_jre_zip_filepath:
             jdk_jre_success = extract_and_move_jdk_jre(jdk_jre_zip_filepath)
@@ -187,7 +224,7 @@ def install_offline(qps_needed, jdk_jre_needed):
 def download_file(url, destination_path):
     """Downloads a file from a URL to a destination path with a progress bar."""
     try:
-        print(f"Downloading from {url}...")
+        printText(f"Downloading from {url}...")
         with requests.get(url, stream=True, timeout=30) as r:
             r.raise_for_status()
             total_size = int(r.headers.get('content-length', 0))
@@ -199,16 +236,16 @@ def download_file(url, destination_path):
                     done = int(50 * downloaded / total_size) if total_size > 0 else 0
                     sys.stdout.write(f"\r[{'=' * done}{' ' * (50 - done)}] {downloaded / (1024 * 1024):.2f} MB")
                     sys.stdout.flush()
-        print("\nDownload complete.")
+        printText("\nDownload complete.")
         return True
     except requests.RequestException as e:
-        print(f"\nError: Failed to download file. {e}")
+        printText(f"\nError: Failed to download file. {e}")
         return False
 
 def extract_and_move_qps(zip_filepath):
     """Extracts QPS from its ZIP and moves it to ...quarchpy\\connection_specific\\QPS."""
     temp_extract_path = os.path.join(TARGET_DIR, "temp_extract_qps")
-    print(f"Processing QPS ZIP file: {os.path.basename(zip_filepath)}")
+    printText(f"Processing QPS ZIP file: {os.path.basename(zip_filepath)}")
     try:
         if os.path.exists(temp_extract_path):
             shutil.rmtree(temp_extract_path)
@@ -218,22 +255,22 @@ def extract_and_move_qps(zip_filepath):
 
         src_qps_folder = temp_extract_path
         if not os.path.exists(src_qps_folder):
-            print(f"  - Error: 'qps' folder not found in the ZIP. Extraction failed.")
+            printText(f"  - Error: 'qps' folder not found in the ZIP. Extraction failed.")
             return False
 
         os.makedirs(EXTRACTION_FOLDER_QPS, exist_ok=True)
         dest_qps_path = EXTRACTION_FOLDER_QPS
         if os.path.exists(dest_qps_path):
-            print(f"  - Removing old 'qps' folder...")
+            printText(f"  - Removing old 'qps' folder...")
             shutil.rmtree(dest_qps_path)
-        print(f"  - Moving 'qps' to '{EXTRACTION_FOLDER_QPS}'...")
+        printText(f"  - Moving 'qps' to '{EXTRACTION_FOLDER_QPS}'...")
         shutil.move(os.path.join(src_qps_folder,"qps"), EXTRACTION_FOLDER_QPS)
         if os.path.exists(src_qps_folder):
             shutil.rmtree(src_qps_folder)
-        print("QPS components moved successfully.")
+        printText("QPS components moved successfully.")
         return True
     except (zipfile.BadZipFile, FileNotFoundError, OSError) as e:
-        print(f"\nError during QPS file operations: {e}")
+        printText(f"\nError during QPS file operations: {e}")
         return False
     finally:
         if os.path.exists(temp_extract_path):
@@ -243,7 +280,7 @@ def extract_and_move_qps(zip_filepath):
 def extract_and_move_jdk_jre(zip_filepath):
     """Extracts JDK/JRE from its ZIP and moves all component folders."""
     temp_extract_path = os.path.join(TARGET_DIR, "temp_extract_jdk_jre")
-    print(f"Processing JDK/JRE ZIP file: {os.path.basename(zip_filepath)}")
+    printText(f"Processing JDK/JRE ZIP file: {os.path.basename(zip_filepath)}")
     try:
         if os.path.exists(temp_extract_path):
             shutil.rmtree(temp_extract_path)
@@ -252,7 +289,7 @@ def extract_and_move_jdk_jre(zip_filepath):
             zip_ref.extractall(temp_extract_path)
 
         os.makedirs(EXTRACTION_FOLDER_JDK_JRE, exist_ok=True)
-        print(f"  - Moving JDK/JRE contents to '{EXTRACTION_FOLDER_JDK_JRE}'...")
+        printText(f"  - Moving JDK/JRE contents to '{EXTRACTION_FOLDER_JDK_JRE}'...")
         for item_name in os.listdir(temp_extract_path):
             src_item = os.path.join(temp_extract_path, item_name)
             dest_item = os.path.join(EXTRACTION_FOLDER_JDK_JRE, item_name)
@@ -260,10 +297,10 @@ def extract_and_move_jdk_jre(zip_filepath):
                 if os.path.exists(dest_item):
                     shutil.rmtree(dest_item)
                 shutil.move(src_item, dest_item)
-        print("JDK/JRE components moved successfully.")
+        printText("JDK/JRE components moved successfully.")
         return True
     except (zipfile.BadZipFile, FileNotFoundError, OSError) as e:
-        print(f"\nError during JDK/JRE file operations: {e}")
+        printText(f"\nError during JDK/JRE file operations: {e}")
         return False
     finally:
         if os.path.exists(temp_extract_path):
@@ -275,7 +312,7 @@ def prompt_for_zip_path(title="Select ZIP File"):
     try:
         import tkinter as tk
         from tkinter import filedialog
-        print("Opening file dialog...")
+        printText("Opening file dialog...")
         root = tk.Tk()
         root.withdraw()
         filepath = filedialog.askopenfilename(
@@ -284,12 +321,12 @@ def prompt_for_zip_path(title="Select ZIP File"):
         )
         return filepath
     except (ImportError, tk.TclError):
-        print("\nGUI not available. Please provide the path in the command line.")
-        filepath = input(f"Enter the full path to the '{title}' ZIP file: ")
+        printText("\nGUI not available. Please provide the path in the command line.")
+        filepath = requestDialog(f"Enter the full path to the '{title}' ZIP file: ")
         if os.path.isfile(filepath):
             return filepath
         else:
-            print("Error: The provided path is not a valid file.")
+            printText("Error: The provided path is not a valid file.")
             return None
 
 
@@ -306,7 +343,7 @@ def get_latest_qps_version():
     """Fetches the latest QPS version number from the Quarch XML file."""
     version_xml_url = "https://quarch.com/software_update/qps/current_version_all.xml"
     try:
-        print(f"Checking for the latest QPS version from {version_xml_url}...")
+        printText(f"Checking for the latest QPS version from {version_xml_url}...")
         response = requests.get(version_xml_url, timeout=10)
         response.raise_for_status()
         root = ET.fromstring(response.text)
@@ -314,34 +351,34 @@ def get_latest_qps_version():
 
         if latest_version_element is not None:
             latest_version = latest_version_element.text
-            print(f"  - Latest version found: {latest_version}")
+            printText(f"  - Latest version found: {latest_version}")
             return latest_version
         else:
-            print("  - Could not find 'LatestVersion' tag in the XML.")
+            printText("  - Could not find 'LatestVersion' tag in the XML.")
     except (requests.RequestException, ET.ParseError) as e:
-        print(f"  - Error fetching or parsing version info: {e}")
+        printText(f"  - Error fetching or parsing version info: {e}")
 
-    print(f"  - Could not determine latest version. Falling back to {QPS_VERSION_FOR_DOWNLOAD}.")
+    printText(f"  - Could not determine latest version. Falling back to {QPS_VERSION_FOR_DOWNLOAD}.")
     return QPS_VERSION_FOR_DOWNLOAD
 
 
 def is_download_url_valid(url):
     """Checks if the provided URL is valid using a HEAD request."""
     try:
-        print(f"Checking URL: {url} ...")
+        printText(f"Checking URL: {url} ...")
         response = requests.head(url, timeout=10)
         response.raise_for_status()
-        print("  - URL is valid.")
+        printText("  - URL is valid.")
         return True
     except requests.RequestException as e:
-        print(f"  - This URL is not valid: {e}")
+        printText(f"  - This URL is not valid: {e}")
         return False
 
 
 if __name__ == "__main__":
-    print("--- Running Component Check ---")
+    printText("--- Running Component Check ---")
     is_installed = find_qps()
     if is_installed:
-        print("\nSuccess! All required components are present.")
+        printText("\nSuccess! All required components are present.")
     else:
-        print("\n--- Script finished: Not all components could be found or installed. ---")
+        printText("\n--- Script finished: Not all components could be found or installed. ---")

quarchpy/qps/qpsFuncs.py

@@ -148,6 +148,10 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     else:  # default to windows
         command = java_path + "\\win_amd64_jdk_jre\\bin\\java\" -jar qps.jar " + str(args)
 
+    if isQpsRunning():
+        logging.debug("QPS is already running. Not starting another instance.")
+        os.chdir(current_dir)
+        return
     if "-logging=ON" in str(args): #If logging to a terminal window is on then os.system should be used to keep a window open to view logging.
         if current_os in "Windows":
             process = subprocess.Popen(command,shell=True)

{quarchpy-2.2.15.dist-info → quarchpy-2.2.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: quarchpy
-Version: 2.2.15
+Version: 2.2.16
 Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com
@@ -22,6 +22,15 @@ Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: requests
 Requires-Dist: packaging
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 ====================
 Changelog (Quarchpy)
@@ -39,6 +48,10 @@ Change Log
 ----------
 
 
+2.2.16
+------
+- New QPS 1.50 and QIS 1.52
+
 2.2.15
 ------
 - Bugfix for ">" appearing in qis output when streaming at max speed