quarchpy 2.1.16.dev2__py2.py3-none-any.whl → 2.1.17.dev2__py2.py3-none-any.whl

quarchpy/qis/qisFuncs.py

@@ -54,92 +54,65 @@ def startLocalQis(terminal=False, headless=False, args=None):
         List of additional parameters to be supplied to QIS on the command line
 
     """
-
-    # java path
-    java_path = os.path.dirname(os.path.abspath(__file__))
-    java_path, junk = os.path.split(java_path)
-    java_path = os.path.join(java_path, "connection_specific", "jdk-j21-jres")
-
-    # change directory to /QPS/QIS
-    qis_path = os.path.dirname(os.path.abspath(__file__))
-    qis_path,junk = os.path.split (qis_path)
-
-    # OS
-    current_os = platform.system()
-
-    # ensure the jres folder has the required permissions
-    if current_os != "Windows":
-        subprocess.call(['chmod', '-R', '+rwx', java_path])
-
-    # single or multiple QPS builds for each OS
-    is_single_qps_build = True
-    if is_single_qps_build:
-        qis_path = os.path.join(qis_path, "connection_specific", "QPS", "win-amd64", "qis", "qis.jar")
-    else:
-        if current_os in "Windows":
-            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "win-amd64", "qis", "qis.jar")
-        elif current_os in "Linux":
-            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "lin-amd64", "qis", "qis.jar")
-        elif current_os in "Darwin":
-            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "mac-amd64", "qis", "qis.jar")
-        else:  # default to windows
-            qis_path = os.path.join(qis_path, "connection_specific", "QPS", "win-amd64", "qis", "qis.jar")
-
-    os.chdir(os.path.dirname(qis_path))
+    # Gathering Vars needed to build the command
+    QisPath =os.path.dirname(os.path.abspath(__file__))
+    QisPath,junk = os.path.split (QisPath)
+    QisPath = os.path.join(QisPath, "connection_specific","QPS", "qis", "qis.jar")
 
     # Building the command
     # Process command prefix. Needed for headless mode, to support OSs with no system tray.
-    if headless is True or (args is not None and "-headless" in args):
-        cmd_prefix = "java -Djava.awt.headless=true"
+    if (headless == True or (args is not None and "-headless" in args)):
+        cmdPrefix = "java -Djava.awt.headless=true"
     else:
-        cmd_prefix = "java"
+        cmdPrefix = "java"
     # Process command suffix (additional standard options for QIS).
-    if terminal is True:
-        cmd_suffix = " -terminal"
+    if (terminal == True):
+        cmdSuffix = " -terminal"
     else:
-        cmd_suffix = ""
+        cmdSuffix = ""
     if args is not None:
         for option in args:
             # Avoid doubling the terminal option
-            if option == "-terminal" and terminal is True:
+            if (option == "-terminal" and terminal == True):
                 continue
             # Headless option is processed seperately as a java command
-            if option != "-headless":
-                cmd_suffix = cmd_suffix + " " + option
-
-    # record current working directory
-    current_dir = os.getcwd()
-
-    command = cmd_prefix + " -jar qis.jar" + cmd_suffix
-    
-    # different start for different OS
-    if current_os == "Windows":
-        command = java_path + "\\win-amd64-jdk-21-jre\\bin\\" + command
-    elif current_os == "Linux":
-        command = java_path + "/lin-amd64-jdk-21-jre/bin/" + command
-    elif current_os == "Darwin":
-        command = java_path + "/mac-amd64-jdk-21-jre/bin/" + command
-    else:  # default to windows
-        command = java_path + "\\win-amd64-jdk-21-jre\\bin\\" + command
+            if (option != "-headless"):
+                cmdSuffix = cmdSuffix + " " + option
+    # Find file path and change directory to Qis Location
+    current_direc = os.getcwd() 
+    os.chdir(os.path.dirname(QisPath))
+    command = cmdPrefix+" -jar qis.jar"+cmdSuffix
 
     # Use the command and check QIS has launched
     if "-logging=ON" in str(args): #If logging to a terminal window is on then os.system should be used to view logging.
         os.system(command)
     else:
         if sys.version_info[0] < 3:
-            sp=os.popen2(command + " 2>&1")
+            process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
         else:
-            sp=os.popen(command + " 2>&1")
+            process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, shell=True)
+
         startTime = time.time() #Checks for Popen launch only
         timeout = 10
+        last_error = ""
+        last_out = ""
         while not isQisRunning():
+            time.sleep(0.2)
+            stdout, stderr = process.communicate()
+            if stderr is not None and stderr != last_error:
+                logging.error(str(stderr))
+                last_error = stderr
+
+            if stdout is not None and stdout != last_out:
+                printText(str(stdout))
+                last_out = stdout
+
             if time.time() - startTime > timeout:
                 raise TimeoutError("QIS failed to launch within timelimit of " + str(timeout) + " sec.")
-            time.sleep(0.2)
             pass
-    
-    # change directory back to start directory
-    os.chdir(current_dir)
+
+    #change directory back to start directory 
+    os.chdir(current_direc)
 
 
 def check_remote_qis(host='127.0.0.1', port=9722, timeout=0):

quarchpy/qps/qpsFuncs.py

@@ -11,7 +11,7 @@ import logging
 
 def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
     '''
-    This func will return true if QPS is running with a working QIS connection.
+    This func will return true if QPS is running with a working QIS connection. This is becuase
     '''
     myQps=None
     logging.debug("Checking if QPS is running")
@@ -65,7 +65,6 @@ def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
         logging.debug("$list: " + str(answer))
         return False
 
-
 def startLocalQps(keepQisRunning=False, args=[]):
     if keepQisRunning:
         if not isQisRunning():
@@ -73,51 +72,13 @@ def startLocalQps(keepQisRunning=False, args=[]):
     temp =""
     args = temp.join(args)
 
-    # Record current working directory
+    QpsPath = os.path.dirname(os.path.abspath(__file__))
+    QpsPath, junk = os.path.split(QpsPath)
+    QpsPath = os.path.join(QpsPath, "connection_specific", "QPS", "qps.jar")
     current_dir = os.getcwd()
-    # JRE 21 path
-    java_path = os.path.dirname(os.path.abspath(__file__))
-    java_path, junk = os.path.split(java_path)
-    java_path = os.path.join(java_path, "connection_specific", "jdk-j21-jres")
-    # Start to build the path towards qps.jar
-    qps_path = os.path.dirname(os.path.abspath(__file__))
-    qps_path, junk = os.path.split(qps_path)
-
-    # Check the current OS
-    current_os = platform.system()
-
-    # Ensure the jres folder has the required permissions
-    if current_os != "Windows":
-        subprocess.call(['chmod', '-R', '+rwx', java_path])
-
-    # 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")
-    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")
-        elif current_os in "Linux":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "lin-amd64", "qps.jar")
-        elif current_os in "Darwin":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "mac-amd64", "qps.jar")
-        else:  # default to windows
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
-
-    # Change the working directory to the directory containing qps.jar
-    os.chdir(os.path.dirname(qps_path))
-
-
-    # OS dependency
-    if current_os in "Windows":
-        command = java_path + "\\win-amd64-jdk-21-jre\\bin\\java -jar qps.jar " + str(args)
-    elif current_os in "Linux":
-        command = java_path + "/lin-amd64-jdk-21-jre/bin/java -jar qps.jar " + str(args)
-    elif current_os in "Darwin":
-        command = java_path + "/mac-amd64-jdk-21-jre/bin/java -jar qps.jar " + str(args)
-    else:  # default to windows
-        command = java_path + "\\win-amd64-jdk-21-jre\\bin\\java -jar qps.jar " + str(args)
+    os.chdir(os.path.dirname(QpsPath))
 
+    command = "java -jar \"" + QpsPath + "\"" + " " + str(args)
     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.
         os.system(command)
     else:
@@ -131,7 +92,7 @@ def startLocalQps(keepQisRunning=False, args=[]):
         last_error = ""
         last_out = ""
         while not isQpsRunning():
-            time.sleep(0.5)
+            time.sleep(0.2)
             stdout, stderr = process.communicate()
             if stderr is not None and stderr != last_error:
                 logging.error(str(stderr))

quarchpy/qps/qpsFuncs.py.bak

@@ -11,7 +11,7 @@ import logging
 
 def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
     '''
-    This func will return true if QPS is running with a working QIS connection.
+    This func will return true if QPS is running with a working QIS connection. This is becuase
     '''
     myQps=None
     logging.debug("Checking if QPS is running")
@@ -73,75 +73,34 @@ def startLocalQps(keepQisRunning=False, args=[]):
     temp =""
     args = temp.join(args)
 
-    # Record current working directory
-    current_dir = os.getcwd()
-    # JRE 21 path
-    java_path = os.path.dirname(os.path.abspath(__file__))
-    java_path, junk = os.path.split(java_path)
-    java_path = os.path.join(java_path, "connection_specific", "jdk-j21-jres")
-    # Start to build the path towards qps.jar
-    qps_path = os.path.dirname(os.path.abspath(__file__))
-    qps_path, junk = os.path.split(qps_path)
-
-    # Check the current OS
-    current_os = platform.system()
-
-    # Ensure the jres folder has the required permissions
-    if current_os != "Windows":
-        subprocess.call(['chmod', '-R', '+rwx', java_path])
-
-    # 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")
-    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")
-        elif current_os in "Linux":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "lin-amd64", "qps.jar")
-        elif current_os in "Darwin":
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "mac-amd64", "qps.jar")
-        else:  # default to windows
-            qps_path = os.path.join(qps_path, "connection_specific", "QPS", "win-amd64", "qps.jar")
-
-    # Change the working directory to the directory containing qps.jar
-    os.chdir(os.path.dirname(qps_path))
-
-
-    # OS dependency
-    if current_os in "Windows":
-        command = java_path + "\\win-amd64-jdk-21-jre\\bin\\java -jar qps.jar " + str(args)
-    elif current_os in "Linux":
-        command = java_path + "/lin-amd64-jdk-21-jre/bin/java -jar qps.jar " + str(args)
-    elif current_os in "Darwin":
-        command = java_path + "/mac-amd64-jdk-21-jre/bin/java -jar qps.jar " + str(args)
-    else:  # default to windows
-        command = java_path + "\\win-amd64-jdk-21-jre\\bin\\java -jar qps.jar " + str(args)
+    QpsPath = os.path.dirname(os.path.abspath(__file__))
+    QpsPath, junk = os.path.split(QpsPath)
+    QpsPath = os.path.join(QpsPath, "connection_specific", "QPS", "qps.jar")
+    current_direc = os.getcwd()
+    os.chdir(os.path.dirname(QpsPath))
 
+    command = "java -jar \"" + QpsPath + "\"" + " " + str(args)
     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.
         os.system(command)
     else:
-        process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-
+        if sys.version_info[0] < 3:
+            sp=os.popen2(command + " 2>&1")
+        else:
+            sp=os.popen(command + " 2>&1")
         startTime = time.time() #Checks for Popen launch only
         timeout = 10
         while not isQpsRunning():
-            time.sleep(0.5)
-            stdout, stderr = process.communicate()
-            if stderr is not None and stderr != last_error:
-                print(str(stderr))
-                last_error = stderr
-
-            if stdout is not None and stdout != last_out:
-                print(str(stdout))
-                last_out = stdout
-
+            retval=str(sp.read())
+            if str(retval)!="":
+                logging.debug(retval)
+                if "fail" or "error" in retval.lower():
+                    raise Exception(retval)
+            time.sleep(0.2)
             if time.time() - startTime > timeout:
                 raise TimeoutError("QPS failed to launch within timelimit of " + str(timeout) + " sec.")
             pass
 
-    # return current working directory
-    os.chdir(current_dir)
+    os.chdir(current_direc)
 
 
 def closeQps(host='127.0.0.1', port=9822):

quarchpy/run.py.bak

@@ -3,28 +3,24 @@ This module allows specific quarchpy utilities and embedded applications to be r
 using the format:
 > python -m quarchpy.run [option]
 """
-import os
-import sys, logging, traceback
-cwd=os.getcwd()
 
 # Import the various functions which need to be called from the command line options
 from quarchpy.debug.SystemTest import main as systemTestMain
 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.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
-
+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):
     """
@@ -59,11 +55,11 @@ def _parse_run_options(args):
         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
-
+    
     Returns
     -------
     options_list : list[list[object]]
@@ -276,13 +272,12 @@ 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])
     displayTable(display_options, align="l", tableHeaders=["Command", "Description"])
 
 if __name__ == "__main__":
-    main(sys.argv[1:])
-
-
+    main (["qps"])
+    main (sys.argv[1:])

{quarchpy-2.1.16.dev2.dist-info → quarchpy-2.1.17.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quarchpy
-Version: 2.1.16.dev2
+Version: 2.1.17.dev2
 Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com