quarchpy 2.2.12.dev1__py2.py3-none-any.whl → 2.2.13.dev1__py2.py3-none-any.whl

quarchpy/qps/qpsFuncs.py

@@ -1,6 +1,8 @@
-from threading import Thread, Lock, Event, active_count
+from threading import Thread, Lock, Event
 from queue import Queue, Empty
 import platform
+
+from quarchpy.install_qps import find_qps
 from quarchpy.qis import isQisRunning, startLocalQis
 from quarchpy.connection_specific.connection_QPS import QpsInterface
 from quarchpy.connection_specific.jdk_jres.fix_permissions import main as fix_permissions, find_java_permissions
@@ -67,6 +69,12 @@ def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
 
 
 def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=True):
+
+    # Check if QPS is installed
+    if not find_qps():
+        logging.error("Unable to find or install QPS... Aborting...")
+        return
+
     if keepQisRunning:
         if not isQisRunning():
             startLocalQis()
@@ -118,20 +126,20 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     # Single or multiple QPS builds for each OS
     is_single_qps_build = True
     if is_single_qps_build: # One QPS to rule them all.
-        qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
+        qps_path = os.path.join(qps_path, "connection_specific", "QPS", "qps.jar")
     else: # Different QPS.jar for each OS
         if current_os in "Windows":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
+            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "qps.jar")
         elif current_os in "Linux" and current_arch == "x86_64":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "lin-amd64", "qps.jar")
+            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "qps.jar")
         elif current_os in "Linux" and current_arch == "aarch64":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "lin-arm64", "qps.jar")
+            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "qps.jar")
         elif current_os in "Darwin" and current_arch == "x86_64":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "mac-amd64", "qps.jar")
+            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "qps.jar")
         elif current_os in "Darwin" and current_arch == "arm64":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "mac-arm64", "qps.jar")
+            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "qps.jar")
         else:  # default to windows
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
+            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "qps.jar")
 
     # Change the working directory to the directory containing qps.jar
     os.chdir(os.path.dirname(qps_path))
@@ -300,5 +308,4 @@ def GetQpsModuleSelection(QpsConnection, favouriteOnly=True, additionalOptions=[
             favourite = False
             continue
         else:
-            return myDeviceID
-
+            return myDeviceID

quarchpy/run.py

@@ -1,16 +1,22 @@
+
+import os
+import sys
 """
 This module allows specific quarchpy utilities and embedded applications to be run from the command line
 using the format:
 > python -m quarchpy.run [option]
 """
 
-### This is very important. It allows us to import from the run.py we are running from.
-### If this cwn parent wasn't added we would always look at the python3/Lib/sitepackages/quarchpy
-### which is not always where we are running from.
-import sys, os
-cwd=os.getcwd()
+"""
+This is very important. It allows us to import from the run.py we are running from.
+If this cwn parent wasn't added we would always look at the python3/Lib/sitepackages/quarchpy
+which is not always where we are running from.
+"""
+
+cwd = os.getcwd()
 parent_dir = os.path.dirname(cwd)
-sys.path.insert(0, parent_dir) #It must be added at the start of the list so it is caught there before installed quarchpy is found.
+# It must be added at the start of the list so it is caught there before installed quarchpy is found.
+sys.path.insert(0, parent_dir)
 
 # Import the various functions which need to be called from the command line options
 from quarchpy.debug.SystemTest import main as systemTestMain
@@ -18,17 +24,20 @@ from quarchpy.debug.module_debug import parse_arguments as moduleDebugMain
 from quarchpy.qis.qisFuncs import startLocalQis, isQisRunning, closeQis as closeQIS
 from quarchpy.qps.qpsFuncs import startLocalQps, isQpsRunning, closeQps as closeQPS
 from quarchpy.debug.upgrade_quarchpy import main as uprade_quarchpy_main
-from quarchpy.user_interface import*
+from quarchpy.user_interface import *
 from quarchpy.debug.simple_terminal import main as simple_terminal_main
+from quarchpy.install_qps import find_qps
 import sys, logging, traceback
 
+
 def main(args):
     """
     Main function parses the arguments from the run command only
     """
-   
+
     # Run the internal parser
-    _parse_run_options(args)  
+    _parse_run_options(args)
+
 
 def _parse_run_options(args):
     """
@@ -44,13 +53,13 @@ def _parse_run_options(args):
     found = False
 
     # Arguments may not always be present
-    if (len(args) > 0):
+    if len(args) > 0:
         # Obtain the list of commands that can be executed
         run_options = _get_run_options()
         # Try to locate a matching command name, executing it if found and passing in the remaining parameters
         main_arg = args[0]
         for item in run_options:
-            if (item[0] == main_arg or item[1] == main_arg):
+            if item[0] == main_arg or item[1] == main_arg:
                 found = True
                 item[2](args[1:])
     else:
@@ -59,11 +68,11 @@ def _parse_run_options(args):
         _run_help_function()
 
     # If parsing failed, error and print the available commands
-    if (found == False):
+    if not found:
         logging.error("ERROR - Command line argument not recognised")
         _run_help_function()
 
-        
+
 def _get_run_options():
     """
     Gets the list of options for quarchpy.run commands which can be called.  This is used internally to access the available commands
@@ -77,32 +86,36 @@ def _get_run_options():
 
     run_options = []
 
-    #                   [old_name           , simple_name    , execute_function              , help_description]
-    run_options.append (["debug_info"       , "debug"       , _run_debug_function          , "Runs system tests which displays useful information for debugging"])
-    run_options.append ([None               , "module_debug", _run_module_debug_function   , "Gives debug info on selected module and DUT"])
-    run_options.append ([None               , "qcs"         , _run_qcs_function            , "Launches Quarch Compliance Suite server"])
-    run_options.append (["calibration_tool" , "calibration" , _run_calibration_function    , "Runs the Quarch power module calibration tool"])
-    run_options.append ([None               , "qis"         , _run_qis_function            , "Launches Quarch Instrument Server for communication with Quarch power modules"])
-    run_options.append ([None               , "qps"         , _run_qps_function            , "Launches Quarch Power Studios, for power capture and analysis"])
-    run_options.append (["simple_terminal"  , "terminal"    , _run_simple_terminal_function, "Runs the Simple Terminal script"])
-    run_options.append (["upgrade_quarchpy" , "upgrade"     , _run_upgrade_function        , "Detects if an update of Quarchpy is available and assists in the upgrade process"])
-    run_options.append (["fix_permissions" , "fix_perm"     , _run_fix_permissions         , "Fixes Permissions for running Java 21 programs"])
-    run_options.append (["h"                , "help"        , _run_help_function           , "Displays the help screen with a list of commands supported"])
-    run_options.append (["dd"               , "list_drives" , _run_show_drives_function    , "Displays a list of shown drives on the current system"])
+    #                   [old_name           , simple_name    , execute_function               , help_description]
+    run_options.append(["debug_info"        , "debug"        , _run_debug_function            , "Runs system tests which displays useful information for debugging"])
+    run_options.append([None                , "module_debug" , _run_module_debug_function     , "Gives debug info on selected module and DUT"])
+    run_options.append([None                , "qcs"          , _run_qcs_function              , "Launches Quarch Compliance Suite server"])
+    run_options.append(["calibration_tool"  , "calibration"  , _run_calibration_function      , "Runs the Quarch power module calibration tool"])
+    run_options.append([None                , "qis"          , _run_qis_function              ,"Launches Quarch Instrument Server for communication with Quarch power modules"])
+    run_options.append([None                , "qps"          , _run_qps_function              , "Launches Quarch Power Studios, for power capture and analysis"])
+    run_options.append(["simple_terminal"   , "terminal"     , _run_simple_terminal_function  , "Runs the Simple Terminal script"])
+    run_options.append(["upgrade_quarchpy"  , "upgrade"      , _run_upgrade_function          , "Detects if an update of Quarchpy is available and assists in the upgrade process"])
+    run_options.append(["fix_permissions"   , "fix_perm"     , _run_fix_permissions           , "Fixes Permissions for running Java 21 programs"])
+    run_options.append(["h"                 , "help"         , _run_help_function             , "Displays the help screen with a list of commands supported"])
+    run_options.append(["dd"                , "list_drives"  , _run_show_drives_function      , "Displays a list of shown drives on the current system"])
+    run_options.append([None                , "install_qps"  , _run_install_missing_components, "Displays a list of shown drives on the current system"])
 
     return run_options
 
-def _run_simple_terminal_function(args=None):
+
+def _run_simple_terminal_function(args=[]):
     """
     Runs the Simple Terminal script
 
     Parameters
     ----------
-    None
+    args : list[str]
+        List of sub arguments to process
     """
     simple_terminal_main()
 
-def _run_debug_function(args=None):
+
+def _run_debug_function(args=[]):
     """
     Executes the python debug/system test option, returning details of the installation to the user
     for debug purposes
@@ -116,7 +129,8 @@ def _run_debug_function(args=None):
 
     systemTestMain(args)
 
-def _run_module_debug_function(args=None):
+
+def _run_module_debug_function(args=[]):
     """
     Executes the python debug/system test option, returning details of the installation to the user
     for debug purposes
@@ -130,7 +144,8 @@ def _run_module_debug_function(args=None):
 
     moduleDebugMain(args)
 
-def _run_show_drives_function(args=None):
+
+def _run_show_drives_function(args=[]):
     """
     Shows a list of current found drives to the user.
 
@@ -152,7 +167,8 @@ def _run_show_drives_function(args=None):
         logging.error("'Pip install quarchQCS'")
         logging.error("Then retry this command")
 
-def _run_qcs_function(args=None):
+
+def _run_qcs_function(args=[]):
     """
     Executes the QCS server back end process
 
@@ -175,7 +191,7 @@ def _run_qcs_function(args=None):
         logging.error("Then retry this command")
 
 
-def _run_qis_function(args=None):
+def _run_qis_function(args=[]):
     """
     Executes Quarch Instrumentation Server
 
@@ -186,22 +202,22 @@ def _run_qis_function(args=None):
 
     """
     shutdown = False
-    if args != None:
+    if args is not None:
         for arg in args:
             if "-shutdown" in arg:
                 shutdown = True
-                if isQisRunning() == True:
+                if isQisRunning():
                     printText("Closing QIS")
                     closeQIS()
                     break
                 else:
                     printText("QIS is not running")
 
-    if shutdown is False:
+    if not shutdown:
         startLocalQis(args=args)
 
 
-def _run_qps_function(args=None):
+def _run_qps_function(args=[]):
     """
     Executes Quarch Power Studio
 
@@ -212,22 +228,22 @@ def _run_qps_function(args=None):
 
     """
     shutdown = False
-    if args != None:
+    if args is not None:
         for arg in args:
             if "-shutdown" in arg:
                 shutdown = True
-                if isQpsRunning() == True:
+                if isQpsRunning():
                     printText("Closing QPS")
                     closeQPS()
                     break
                 else:
                     printText("QPS is not running")
 
-    if shutdown is False:
+    if not shutdown:
         startLocalQps(args=args)
 
 
-def _run_calibration_function(args=None):
+def _run_calibration_function(args=[]):
     """
     Executes the calibration utility for power modules
 
@@ -250,9 +266,7 @@ def _run_calibration_function(args=None):
         traceback.print_exc()
 
 
-
-
-def _run_upgrade_function(args=None):
+def _run_upgrade_function(args=[]):
     """
     Checks for updates to quarchpy and runs the update process if required
 
@@ -265,14 +279,21 @@ def _run_upgrade_function(args=None):
 
     uprade_quarchpy_main(args)
 
+
 def _run_fix_permissions(args):
-    '''
+    """
     Fixes excecution permissions for running quarch java 21 applications.
-    '''
-    from quarchpy.connection_specific.jdk_j21_jres.fix_permissions import main as fix_permissions_main
+
+    Parameters
+    ----------
+    args : list[str]
+        List of sub arguments to process
+    """
+    from quarchpy.connection_specific.jdk_jres.fix_permissions import main as fix_permissions_main
     fix_permissions_main()
 
-def _run_help_function(args=None):
+
+def _run_help_function(args=[]):
     """
     Shows the quarchpy.run help screen
 
@@ -287,11 +308,24 @@ def _run_help_function(args=None):
     # Iterate through all of the possible commands and print a nice help string for each
     run_options = _get_run_options()
     display_options = []
-    for item in run_options:        
-        short_name = item[1]        
+    for item in run_options:
+        short_name = item[1]
         description = item[3]
-        display_options.append([short_name,description])
+        display_options.append([short_name, description])
     displayTable(display_options, align="l", tableHeaders=["Command", "Description"])
 
+
+def _run_install_missing_components(args):
+    """
+    Attempts to find QPS + Required JDK JRE Binaries and install them if required.
+
+    Parameters
+    ----------
+    args : list[str]
+        List of sub arguments to process
+    """
+    find_qps()
+
+
 if __name__ == "__main__":
-    main (sys.argv[1:])
+    main(sys.argv[1:])

{quarchpy-2.2.12.dev1.dist-info → quarchpy-2.2.13.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quarchpy
-Version: 2.2.12.dev1
+Version: 2.2.13.dev1
 Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com
@@ -20,6 +20,8 @@ Description-Content-Type: text/x-rst
 Requires-Dist: zeroconf (>=0.23.0)
 Requires-Dist: numpy
 Requires-Dist: pandas
+Requires-Dist: requests
+Requires-Dist: packaging
 
 ====================
 Changelog (Quarchpy)
@@ -37,6 +39,20 @@ Change Log
 ----------
 
 
+2.2.13
+------
+- New QPS 1.48 and QIS 1.50
+- Lightweight Quarchpy, QPS and QIS now downloaded on first use after install.
+- Minor bug fixes
+
+2.2.12
+------
+- Minor bug fix
+
+2.2.11
+------
+- Minor bug fix
+
 2.2.10
 ------
 - Fix for new HDPPM FW discovery over eithernet