PyPI - quarchpy - Versions diffs - 2.1.20.dev1__py2.py3-none-any.whl → 2.1.20.dev3__py2.py3-none-any.whl - Mend

quarchpy 2.1.20.dev1py2.py3-none-any.whl → 2.1.20.dev3py2.py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (152) hide show

quarchpy/docs/_build/html/source/quarchpy.utilities.html CHANGED Viewed

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>quarchpy.utilities package &#8212; quarchpy  documentation</title>
-    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=b3523f8e" />
-    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=039e1c02" />
+    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=61cd365c" />
+    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=12dfc556" />
     <script src="../_static/documentation_options.js?v=5929fcd5"></script>
     <script src="../_static/doctools.js?v=888ff710"></script>
     <script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
@@ -18,8 +18,9 @@
   <link rel="stylesheet" href="../_static/custom.css" type="text/css" />
-  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
   </head><body>
@@ -193,11 +194,11 @@ on the reporting of the results.</p>
       <div class="clearer"></div>
     </div>
     <div class="footer">
-      &copy;2020, Quarch Technology Ltd.
+      &#169;2020, Quarch Technology Ltd.
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 7.2.6</a>
-      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.13</a>
+      Powered by <a href="https://www.sphinx-doc.org/">Sphinx 7.2.6</a>
+      &amp; <a href="https://alabaster.readthedocs.io">Alabaster 0.7.16</a>
       |
       <a href="../_sources/source/quarchpy.utilities.rst.txt"

quarchpy/docs/_build/html/source/readme.html CHANGED Viewed

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>Quarchpy - Readme &#8212; quarchpy  documentation</title>
-    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=b3523f8e" />
-    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=039e1c02" />
+    <link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=61cd365c" />
+    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=12dfc556" />
     <script src="../_static/documentation_options.js?v=5929fcd5"></script>
     <script src="../_static/doctools.js?v=888ff710"></script>
     <script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
@@ -18,8 +18,9 @@
   <link rel="stylesheet" href="../_static/custom.css" type="text/css" />
-  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
   </head><body>
@@ -129,11 +130,11 @@
       <div class="clearer"></div>
     </div>
     <div class="footer">
-      &copy;2020, Quarch Technology Ltd.
+      &#169;2020, Quarch Technology Ltd.
       |
-      Powered by <a href="http://sphinx-doc.org/">Sphinx 7.2.6</a>
-      &amp; <a href="https://github.com/bitprophet/alabaster">Alabaster 0.7.13</a>
+      Powered by <a href="https://www.sphinx-doc.org/">Sphinx 7.2.6</a>
+      &amp; <a href="https://alabaster.readthedocs.io">Alabaster 0.7.16</a>
       |
       <a href="../_sources/source/readme.rst.txt"

quarchpy/fio/__pycache__/FIO_interface.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/fio/__pycache__/__init__.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/fio/__pycache__/fioDiskFinder.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/iometer/__pycache__/__init__.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/iometer/__pycache__/gen_iometer_template.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/iometer/__pycache__/iometerFuncs.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/qis/__pycache__/StreamHeaderInfo.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/qis/__pycache__/__init__.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/qis/__pycache__/qisFuncs.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/qis/qisFuncs.py CHANGED Viewed

@@ -11,38 +11,71 @@ from quarchpy.user_interface.user_interface import printText
 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
     else:
         logging.debug("QIS is running")
         return True
-def startLocalQis(terminal=False, headless=False, args=None):
+def isQisRunningAndResponding(timeout=2):
+    """
+    checks if qis is running and responding to a $version
+    """
+    qisRunning = isQisRunning()
+    if qisRunning ==False:
+        logging.debug("QIS is not running")
+        return False
+    logging.debug("Qis is running")
+    myQis = QisInterface(connectionMessage=False)
+    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
+    if (qisRunning is False):
+        logging.debug("QIS is not running")
+        return False
+    else:
+        logging.debug("QIS is running")
+        return True
+def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     """
     Executes QIS on the local system, using the version contained within quarchpy
@@ -95,16 +128,17 @@ def startLocalQis(terminal=False, headless=False, args=None):
             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():
             _get_std_msg_and_err_from_QIS_process(process)
             if time.time() - startTime > timeout:
                 raise TimeoutError("QIS failed to launch within timelimit of " + str(timeout) + " sec.")
             pass
+        if isQisRunningAndResponding(timeout=timeout):
+            logging.debug("QPS running and responding")
+        else:
+            logging.debug("QIS running but not responding")
     #change directory back to start directory
     os.chdir(current_direc)

quarchpy/qps/__pycache__/__init__.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/qps/__pycache__/qpsFuncs.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/qps/qpsFuncs.py.bak CHANGED Viewed

@@ -1,9 +1,6 @@
-from threading import Thread, Lock, Event, active_count
-from queue import Queue, Empty
-import time
 import os, sys
 import datetime
-import platform
+import time, platform
 from quarchpy.qis import isQisRunning, startLocalQis
 from quarchpy.connection_specific.connection_QIS import QisInterface
 from quarchpy.connection_specific.connection_QPS import QpsInterface
@@ -69,7 +66,7 @@ def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
         return False
-def startLocalQps(keepQisRunning=False, args=[], timeout=30):
+def startLocalQps(keepQisRunning=False, args=[]):
     if keepQisRunning:
         if not isQisRunning():
             startLocalQis()
@@ -79,76 +76,39 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30):
     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()
+    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.
+    command = "-jar \"" + QpsPath + "\""
+    currentOs = platform.system()
+    if currentOs in "Windows":
+        if "-logging=ON" not in str(args):
+            command = "start /high /b javaw -Djava.awt.headless=true " + command + " " + str(args)
+        else:
+            command = "java " + command + " " + str(args)
+            # command = "start /high /b javaw -Djava.awt.headless=true " + command + " " + str(args) # Running application with this method seems to prevent QPS from logging to terminal
+        # command = command + " -ccs=HIDE"  # note: multiple -ccs options ignored
         os.system(command)
-    else:
+    elif currentOs in "Linux":
+        command = command + "-ccs=HIDE"
         if sys.version_info[0] < 3:
-            process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+            os.popen2("java " + command + " 2>&1")
         else:
-            process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, shell=True)
+            os.popen("java " + command + " 2>&1")
+    else:  # default to Windows
+        command = "start /high /b javaw -Djava.awt.headless=true " + command + " " + str(args)
+        command = command + " -ccs=HIDE"
+        os.system(command)
-    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.")
-    # return current working directory
-    os.chdir(current_dir)
+        time.sleep(0.3)
+        pass
-def reader(stream, q, source, lock,stop_flag):
-    '''
-    Used to read output and place it in a queue for multithreaded reading
-    :param stream:
-    :param q:
-    :param source:
-    :param lock: The lock for the queue
-    :param stop_flag: Flag to exit the loop and close the thread
-    :return: None
-    '''
-    while not stop_flag.is_set():
-        line = stream.readline()
-        if not line:
-            break
-        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
-    This allows the user to understand why QPS might not have appeared.
-    :param process: The Process Used to launch QPS
-    :return: None
-    '''
-    # Read back stdmsg and stderr in seperate threads so they are non blocking
-    q = Queue()
-    lock = Lock()
-    stop_flag = Event()
-    t1 = Thread(target=reader, args=[process.stdout, q, 'stdout', lock, stop_flag])
-    t2 = Thread(target=reader, args=[process.stderr, q, 'stderr', lock, stop_flag])
-    t1.start()
-    t2.start()
-    counter = 0
-    # check for stderr or stdmsg from the queue
-    while counter <= 3: # If 3 empty reads from the queue then move on to see if QPS is running.
-        try:
-            source, line = q.get(timeout=1)  # Wait for 1 second for new lines
-            counter = 0
-            if source == "stderr":
-                logging.error(f"{source}: {line}")
-            else:
-                print(f"{source}: {line}")
-        except Empty:
-            counter += 1
-    time.sleep(3)
-    stop_flag.set() #Close the threads and return to the main loop where QPS is check to see if its started yet
+    os.chdir(current_direc)
 def closeQps(host='127.0.0.1', port=9822):
@@ -241,7 +201,7 @@ QPS requires time in mS with no decimal point, so this is converted here
 def toQpsTimeStamp(timestamp):
     """
-    DEPRECATED - QPS expects time passed as a string and error handling is done in QPS.
+    DEPRICATED - QPS expects time passed as a sring and error hadling is done in QPS.
     Returns the parameter passed as a valid qps timestamp
     Assumes

quarchpy/user_interface/__pycache__/__init__.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy/user_interface/__pycache__/user_interface.cpython-311.pyc CHANGED Viewed

Binary file

quarchpy 2.1.20.dev1__py2.py3-none-any.whl → 2.1.20.dev3__py2.py3-none-any.whl

quarchpy 2.1.20.dev1py2.py3-none-any.whl → 2.1.20.dev3py2.py3-none-any.whl