quarchpy 2.1.22__py2.py3-none-any.whl → 2.1.24.dev1__py2.py3-none-any.whl

quarchpy/qis/qisFuncs.py

@@ -3,7 +3,7 @@ Contains general functions for starting and stopping QIS processes
 """
 
 import os, sys 
-import time, platform
+import time, platform 
 from threading import Thread, Lock, Event, active_count
 from queue import Queue, Empty
 from quarchpy.connection_specific.connection_QIS import QisInterface
@@ -11,26 +11,30 @@ from quarchpy.user_interface.user_interface import printText, logDebug
 import subprocess
 import logging
 
-def isQisRunning():
+def isQisRunning(): 
     """
     Checks if a local instance of QIS is running and responding
+    
     Returns
     -------
     is_running : bool
         True if QIS is running and responding
-    """
 
+    """
+ 
     qisRunning = False
     myQis = None
+    
     #attempt to connect to Qis
     try:
         myQis = QisInterface(connectionMessage=False)
         if (myQis is not None):
             #if we can connect to qis, it's running
-            qisRunning = True
+            qisRunning = True 
     except:
         #if there's no connection to qis, an exception will be caught
-        pass
+        pass    
+     
     if (qisRunning is False):
         logging.debug("QIS is not running")
         return False 
@@ -53,16 +57,12 @@ def isQisRunningAndResponding(timeout=2):
     counter = 0
     maxCounter = 20
     while counter <= maxCounter:
-        print(str(counter))  # TODO Remove sb db
         versionResponse = myQis.sendAndReceiveCmd(cmd="$version")
         if ": v" in versionResponse.lower():
             qisResponding = True
             break
         else:
             logging.debug("Qis returned from $version: " + str(versionResponse) + "  Expected to contain ': v'")
-            print("Qis returned from $version: " + str(
-                versionResponse) + "  Expected to contain ': v'")  # TODO Remove sb db
-
             time.sleep(timeout / maxCounter)  # We attempt to get QIS
             counter += 1
 
@@ -89,34 +89,73 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
         List of additional parameters to be supplied to QIS on the command line
 
     """
-    # 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")
+
+    # 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))
 
     # Building the command
     # Process command prefix. Needed for headless mode, to support OSs with no system tray.
-    if (headless == True or (args is not None and "-headless" in args)):
-        cmdPrefix = "java -Djava.awt.headless=true"
+    if headless is True or (args is not None and "-headless" in args):
+        cmd_prefix = "java -Djava.awt.headless=true"
     else:
-        cmdPrefix = "java"
+        cmd_prefix = "java"
     # Process command suffix (additional standard options for QIS).
-    if (terminal == True):
-        cmdSuffix = " -terminal"
+    if terminal is True:
+        cmd_suffix = " -terminal"
     else:
-        cmdSuffix = ""
+        cmd_suffix = ""
     if args is not None:
         for option in args:
             # Avoid doubling the terminal option
-            if (option == "-terminal" and terminal == True):
+            if option == "-terminal" and terminal is True:
                 continue
             # Headless option is processed seperately as a java 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
+            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
 
     # 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.
@@ -140,8 +179,8 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
         else:
             logDebug("QIS running but not responding")
 
-    #change directory back to start directory 
-    os.chdir(current_direc)
+    # change directory back to start directory
+    os.chdir(current_dir)
 
 
 def reader(stream, q, source, lock,stop_flag):
@@ -297,4 +336,5 @@ def GetQisModuleSelection (QisConnection):
         myDeviceID = None
 
     return myDeviceID
-
+ 
+ 

quarchpy/qps/qpsFuncs.py

@@ -14,7 +14,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 is becuase
+    This func will return true if QPS is running with a working QIS connection.
     '''
     myQps=None
     logging.debug("Checking if QPS is running")
@@ -78,13 +78,51 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     temp =""
     args = temp.join(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")
+    # Record current working directory
     current_dir = os.getcwd()
-    os.chdir(os.path.dirname(QpsPath))
+    # 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)
 
-    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:
@@ -93,17 +131,19 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
         else:
             process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, shell=True)
 
-    startTime = time.time()
-    while not isQpsRunning():
-        time.sleep(0.2)
-        _get_std_msg_and_err_from_QPS_process(process)
+        startTime = time.time()
+        while not isQpsRunning():
+            time.sleep(0.2)
+            _get_std_msg_and_err_from_QPS_process(process)
+
+            if time.time() - startTime > timeout:
+                os.chdir(current_dir)
+                raise TimeoutError("QPS failed to launch within timelimit of " + str(timeout) + " sec.")
 
-        if time.time() - startTime > timeout:
-            os.chdir(current_dir)
-            raise TimeoutError("QPS failed to launch within timelimit of " + str(timeout) + " sec.")
     # return current working directory
     os.chdir(current_dir)
 
+
 def reader(stream, q, source, lock,stop_flag):
     '''
     Used to read output and place it in a queue for multithreaded reading
@@ -121,6 +161,7 @@ def reader(stream, q, source, lock,stop_flag):
         with lock:
             q.put((source, line.strip()))
 
+
 def _get_std_msg_and_err_from_QPS_process(process):
     '''
     Uses multithreading to check for stderr and stdmsg passed by the process that launches QPS

quarchpy/run.py

@@ -4,6 +4,14 @@ 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()
+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.
+
 # 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
@@ -14,6 +22,13 @@ from quarchpy.user_interface import*
 from quarchpy.debug.simple_terminal import main as simple_terminal_main
 import sys, logging, traceback
 
+
+#
+# #from .qps.qpsFuncs import startLocalQps, isQpsRunning, closeQps as closeQPS
+# from qps.qpsFuncs import startLocalQps, isQpsRunning, closeQps as closeQPS
+# from .qps.qpsFuncs import startLocalQps
+# #from quarchpy.qps.qpsFuncs import startLocalQps, isQpsRunning, closeQps as closeQPS
+
 def main(args):
     """
     Main function parses the arguments from the run command only

quarchpy/user_interface/user_interface.py

@@ -205,6 +205,7 @@ def printText(text, fillLine=False, terminalWidth=100, fill=" ", **kwargs):
         # if line is not empty
         if text.strip() != "":
                 TestCenter.testPoint ("Quarch_Host.LogComment","Message=" + __formatForTestcenter(text),stack_level=2)
+                logging.debug(str(text))
 
     else:
         if fillLine:

{quarchpy-2.1.22.dist-info → quarchpy-2.1.24.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quarchpy
-Version: 2.1.22
+Version: 2.1.24.dev1
 Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com
@@ -36,9 +36,20 @@ Quarchpy
 Change Log
 ----------
 
-2.1.21
+2.1.24
+------
+QPS and QIS comes with java 21 and libs requred to run.
+
+
+2.1.23
 ------
-- Bug fix QPS v1.39 QIS v1.42 reverting mDNS scanning change. 
+- QIS and QPS devices and interfaces can use sendCommand to send comannds to the modules and to the applications uniformly
+- Tidy up of print statments and comments.
+
+2.1.22
+------
+- QIS and QPS patch containing mDNS removal
+
 
 2.1.21
 ------
@@ -47,7 +58,7 @@ Change Log
 
 2.1.20
 ------
-- Improved direct IP scanning for quarch modules.
+- Improved direct IP scanning for quarch modules
 - New QPS v1.37 and QIS v1.40
 
 2.1.19
@@ -76,19 +87,19 @@ Change Log
 
 2.1.14
 ------
-- minor bug fixes and logging improvements.
+- minor bug fixes and logging improvements
 
 2.1.13
 ------
 - New QPS v1.36
 - New QIS v1.39
-- minor bug fixes and logging improvements.
+- minor bug fixes and logging improvements
 
 2.1.12
 ------
 - New QPS v1.35
 - New QIS v1.38
-- minor bug fixes and removal of depracated code.
+- minor bug fixes and removal of depracated code
 
 2.1.11
 ------
@@ -127,7 +138,7 @@ Change Log
 2.1.3
 -----
 - New QPS v1.22
-- modules on the network can now be connected to using conType:QTLNumber eg. TCP:QTL1999-02-001. 
+- modules on the network can now be connected to using conType:QTLNumber eg. TCP:QTL1999-02-001
 - fixed QIS not closing with QPS when launch with by QPS
 - closeConnection added to QIS api
 - display table formats multiline items and handles empty cells