quarchpy 2.1.17.dev2__py2.py3-none-any.whl → 2.1.18__py2.py3-none-any.whl

quarchpy/docs/_build/html/source/modules.html

@@ -102,7 +102,7 @@
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html">quarchpy.fio package</a><ul>
 <li class="toctree-l4"><a class="reference internal" href="quarchpy.fio.html#submodules">Submodules</a></li>
 <li class="toctree-l4"><a class="reference internal" href="quarchpy.fio.html#module-quarchpy.fio.FIO_interface">quarchpy.fio.FIO_interface module</a></li>
-<li class="toctree-l4"><a class="reference internal" href="quarchpy.fio.html#quarchpy-fio-fiodiskfinder-module">quarchpy.fio.fioDiskFinder module</a></li>
+<li class="toctree-l4"><a class="reference internal" href="quarchpy.fio.html#module-quarchpy.fio.fioDiskFinder">quarchpy.fio.fioDiskFinder module</a></li>
 <li class="toctree-l4"><a class="reference internal" href="quarchpy.fio.html#module-quarchpy.fio">Module contents</a></li>
 </ul>
 </li>

quarchpy/docs/_build/html/source/quarchpy.fio.html

@@ -69,8 +69,34 @@
 <dd></dd></dl>
 
 </section>
-<section id="quarchpy-fio-fiodiskfinder-module">
-<h2>quarchpy.fio.fioDiskFinder module<a class="headerlink" href="#quarchpy-fio-fiodiskfinder-module" title="Link to this heading">¶</a></h2>
+<section id="module-quarchpy.fio.fioDiskFinder">
+<span id="quarchpy-fio-fiodiskfinder-module"></span><h2>quarchpy.fio.fioDiskFinder module<a class="headerlink" href="#module-quarchpy.fio.fioDiskFinder" title="Link to this heading">¶</a></h2>
+<dl class="py class">
+<dt class="sig sig-object py" id="quarchpy.fio.fioDiskFinder.fioDiskFinder">
+<em class="property"><span class="pre">class</span><span class="w"> </span></em><span class="sig-prename descclassname"><span class="pre">quarchpy.fio.fioDiskFinder.</span></span><span class="sig-name descname"><span class="pre">fioDiskFinder</span></span><a class="headerlink" href="#quarchpy.fio.fioDiskFinder.fioDiskFinder" title="Link to this definition">¶</a></dt>
+<dd><p>Bases: <code class="xref py py-class docutils literal notranslate"><span class="pre">AbsDiskFinder</span></code></p>
+<dl class="py method">
+<dt class="sig sig-object py" id="quarchpy.fio.fioDiskFinder.fioDiskFinder.bytes2human">
+<span class="sig-name descname"><span class="pre">bytes2human</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.fio.fioDiskFinder.fioDiskFinder.bytes2human" title="Link to this definition">¶</a></dt>
+<dd></dd></dl>
+
+<dl class="py method">
+<dt class="sig sig-object py" id="quarchpy.fio.fioDiskFinder.fioDiskFinder.findDevices">
+<span class="sig-name descname"><span class="pre">findDevices</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.fio.fioDiskFinder.fioDiskFinder.findDevices" title="Link to this definition">¶</a></dt>
+<dd></dd></dl>
+
+<dl class="py method">
+<dt class="sig sig-object py" id="quarchpy.fio.fioDiskFinder.fioDiskFinder.formatList">
+<span class="sig-name descname"><span class="pre">formatList</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">deviceList</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.fio.fioDiskFinder.fioDiskFinder.formatList" title="Link to this definition">¶</a></dt>
+<dd></dd></dl>
+
+<dl class="py method">
+<dt class="sig sig-object py" id="quarchpy.fio.fioDiskFinder.fioDiskFinder.returnDisk">
+<span class="sig-name descname"><span class="pre">returnDisk</span></span><span class="sig-paren">(</span><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.fio.fioDiskFinder.fioDiskFinder.returnDisk" title="Link to this definition">¶</a></dt>
+<dd></dd></dl>
+
+</dd></dl>
+
 </section>
 <section id="module-quarchpy.fio">
 <span id="module-contents"></span><h2>Module contents<a class="headerlink" href="#module-quarchpy.fio" title="Link to this heading">¶</a></h2>

quarchpy/docs/_build/html/source/quarchpy.html

@@ -205,6 +205,7 @@
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.qis.html#quarchpy.qis.qisFuncs.check_remote_qis"><code class="docutils literal notranslate"><span class="pre">check_remote_qis()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.qis.html#quarchpy.qis.qisFuncs.closeQis"><code class="docutils literal notranslate"><span class="pre">closeQis()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.qis.html#quarchpy.qis.qisFuncs.isQisRunning"><code class="docutils literal notranslate"><span class="pre">isQisRunning()</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" href="quarchpy.qis.html#quarchpy.qis.qisFuncs.reader"><code class="docutils literal notranslate"><span class="pre">reader()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.qis.html#quarchpy.qis.qisFuncs.startLocalQis"><code class="docutils literal notranslate"><span class="pre">startLocalQis()</span></code></a></li>
 </ul>
 </li>
@@ -286,6 +287,7 @@
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.qps.html#quarchpy.qps.qpsFuncs.closeQps"><code class="docutils literal notranslate"><span class="pre">closeQps()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.qps.html#quarchpy.qps.qpsFuncs.isQpsRunning"><code class="docutils literal notranslate"><span class="pre">isQpsRunning()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.qps.html#quarchpy.qps.qpsFuncs.legacyAdjustTime"><code class="docutils literal notranslate"><span class="pre">legacyAdjustTime()</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" href="quarchpy.qps.html#quarchpy.qps.qpsFuncs.reader"><code class="docutils literal notranslate"><span class="pre">reader()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.qps.html#quarchpy.qps.qpsFuncs.startLocalQps"><code class="docutils literal notranslate"><span class="pre">startLocalQps()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.qps.html#quarchpy.qps.qpsFuncs.toQpsTimeStamp"><code class="docutils literal notranslate"><span class="pre">toQpsTimeStamp()</span></code></a></li>
 </ul>
@@ -506,7 +508,16 @@
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.FIO_interface.timeNow"><code class="docutils literal notranslate"><span class="pre">timeNow()</span></code></a></li>
 </ul>
 </li>
-<li class="toctree-l2"><a class="reference internal" href="quarchpy.fio.html#quarchpy-fio-fiodiskfinder-module">quarchpy.fio.fioDiskFinder module</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quarchpy.fio.html#module-quarchpy.fio.fioDiskFinder">quarchpy.fio.fioDiskFinder module</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.fioDiskFinder.fioDiskFinder"><code class="docutils literal notranslate"><span class="pre">fioDiskFinder</span></code></a><ul>
+<li class="toctree-l4"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.fioDiskFinder.fioDiskFinder.bytes2human"><code class="docutils literal notranslate"><span class="pre">fioDiskFinder.bytes2human()</span></code></a></li>
+<li class="toctree-l4"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.fioDiskFinder.fioDiskFinder.findDevices"><code class="docutils literal notranslate"><span class="pre">fioDiskFinder.findDevices()</span></code></a></li>
+<li class="toctree-l4"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.fioDiskFinder.fioDiskFinder.formatList"><code class="docutils literal notranslate"><span class="pre">fioDiskFinder.formatList()</span></code></a></li>
+<li class="toctree-l4"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.fioDiskFinder.fioDiskFinder.returnDisk"><code class="docutils literal notranslate"><span class="pre">fioDiskFinder.returnDisk()</span></code></a></li>
+</ul>
+</li>
+</ul>
+</li>
 <li class="toctree-l2"><a class="reference internal" href="quarchpy.fio.html#module-quarchpy.fio">Module contents</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.runFIO"><code class="docutils literal notranslate"><span class="pre">runFIO()</span></code></a></li>
 </ul>

quarchpy/docs/_build/html/source/quarchpy.qis.html

@@ -97,6 +97,18 @@ an address can be specified for remote systems.</p>
 </dl>
 </dd></dl>
 
+<dl class="py function">
+<dt class="sig sig-object py" id="quarchpy.qis.qisFuncs.reader">
+<span class="sig-prename descclassname"><span class="pre">quarchpy.qis.qisFuncs.</span></span><span class="sig-name descname"><span class="pre">reader</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">stream</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">q</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">source</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">lock</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">stop_flag</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.qis.qisFuncs.reader" title="Link to this definition">¶</a></dt>
+<dd><p>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</p>
+</dd></dl>
+
 <dl class="py function">
 <dt class="sig sig-object py" id="quarchpy.qis.qisFuncs.startLocalQis">
 <span class="sig-prename descclassname"><span class="pre">quarchpy.qis.qisFuncs.</span></span><span class="sig-name descname"><span class="pre">startLocalQis</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">terminal</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">False</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">headless</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">False</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">args</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.qis.qisFuncs.startLocalQis" title="Link to this definition">¶</a></dt>

quarchpy/docs/_build/html/source/quarchpy.qps.html

@@ -59,9 +59,21 @@
 <span class="sig-prename descclassname"><span class="pre">quarchpy.qps.qpsFuncs.</span></span><span class="sig-name descname"><span class="pre">legacyAdjustTime</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">timestamp</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.qps.qpsFuncs.legacyAdjustTime" title="Link to this definition">¶</a></dt>
 <dd></dd></dl>
 
+<dl class="py function">
+<dt class="sig sig-object py" id="quarchpy.qps.qpsFuncs.reader">
+<span class="sig-prename descclassname"><span class="pre">quarchpy.qps.qpsFuncs.</span></span><span class="sig-name descname"><span class="pre">reader</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">stream</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">q</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">source</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">lock</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">stop_flag</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.qps.qpsFuncs.reader" title="Link to this definition">¶</a></dt>
+<dd><p>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</p>
+</dd></dl>
+
 <dl class="py function">
 <dt class="sig sig-object py" id="quarchpy.qps.qpsFuncs.startLocalQps">
-<span class="sig-prename descclassname"><span class="pre">quarchpy.qps.qpsFuncs.</span></span><span class="sig-name descname"><span class="pre">startLocalQps</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">keepQisRunning</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">False</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">args</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">[]</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.qps.qpsFuncs.startLocalQps" title="Link to this definition">¶</a></dt>
+<span class="sig-prename descclassname"><span class="pre">quarchpy.qps.qpsFuncs.</span></span><span class="sig-name descname"><span class="pre">startLocalQps</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">keepQisRunning</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">False</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">args</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">[]</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">timeout</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">30</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.qps.qpsFuncs.startLocalQps" title="Link to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="py function">
@@ -109,7 +121,7 @@ Assumes</p>
 
 <dl class="py function">
 <dt class="sig sig-object py" id="quarchpy.qps.startLocalQps">
-<span class="sig-prename descclassname"><span class="pre">quarchpy.qps.</span></span><span class="sig-name descname"><span class="pre">startLocalQps</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">keepQisRunning</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">False</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">args</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">[]</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.qps.startLocalQps" title="Link to this definition">¶</a></dt>
+<span class="sig-prename descclassname"><span class="pre">quarchpy.qps.</span></span><span class="sig-name descname"><span class="pre">startLocalQps</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">keepQisRunning</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">False</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">args</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">[]</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">timeout</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">30</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.qps.startLocalQps" title="Link to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="py function">

quarchpy/qis/qisFuncs.py

@@ -3,7 +3,9 @@ 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
 from quarchpy.user_interface.user_interface import printText
 import subprocess
@@ -97,15 +99,7 @@ def startLocalQis(terminal=False, headless=False, args=None):
         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
+            _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.")
@@ -115,6 +109,55 @@ def startLocalQis(terminal=False, headless=False, args=None):
     os.chdir(current_direc)
 
 
+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_QIS_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:
+                printText(f"{source}: {line}")
+        except Empty:
+            counter += 1
+    stop_flag.set() #Close the threads and return to the main loop where QPS is check to see if its started yet
+
+
 def check_remote_qis(host='127.0.0.1', port=9722, timeout=0):
     """
         Checks if a local or specified instance of QIS is running and responding
@@ -219,5 +262,4 @@ def GetQisModuleSelection (QisConnection):
         myDeviceID = None
 
     return myDeviceID
- 
- 
+

quarchpy/qps/qpsFuncs.py

@@ -1,6 +1,9 @@
+from threading import Thread, Lock, Event, active_count
+from queue import Queue, Empty
+import time
 import os, sys
 import datetime
-import time, platform
+import platform
 from quarchpy.qis import isQisRunning, startLocalQis
 from quarchpy.connection_specific.connection_QIS import QisInterface
 from quarchpy.connection_specific.connection_QPS import QpsInterface
@@ -65,7 +68,8 @@ def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
         logging.debug("$list: " + str(answer))
         return False
 
-def startLocalQps(keepQisRunning=False, args=[]):
+
+def startLocalQps(keepQisRunning=False, args=[], timeout=30):
     if keepQisRunning:
         if not isQisRunning():
             startLocalQis()
@@ -87,28 +91,64 @@ def startLocalQps(keepQisRunning=False, args=[]):
         else:
             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 isQpsRunning():
-            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("QPS failed to launch within timelimit of " + str(timeout) + " sec.")
-            pass
+    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)
 
+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:
+                printText(f"{source}: {line}")
+        except Empty:
+            counter += 1
+    stop_flag.set() #Close the threads and return to the main loop where QPS is check to see if its started yet
+
 
 def closeQps(host='127.0.0.1', port=9822):
     myQps = QpsInterface(host, port)

quarchpy/qps/qpsFuncs.py.bak

@@ -1,6 +1,9 @@
+from threading import Thread, Lock, Event, active_count
+from queue import Queue, Empty
+import time
 import os, sys
 import datetime
-import time, platform
+import platform
 from quarchpy.qis import isQisRunning, startLocalQis
 from quarchpy.connection_specific.connection_QIS import QisInterface
 from quarchpy.connection_specific.connection_QPS import QpsInterface
@@ -66,7 +69,7 @@ def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
         return False
 
 
-def startLocalQps(keepQisRunning=False, args=[]):
+def startLocalQps(keepQisRunning=False, args=[], timeout=30):
     if keepQisRunning:
         if not isQisRunning():
             startLocalQis()
@@ -76,7 +79,7 @@ def startLocalQps(keepQisRunning=False, 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()
+    current_dir = os.getcwd()
     os.chdir(os.path.dirname(QpsPath))
 
     command = "java -jar \"" + QpsPath + "\"" + " " + str(args)
@@ -84,23 +87,68 @@ def startLocalQps(keepQisRunning=False, args=[]):
         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")
-        startTime = time.time() #Checks for Popen launch only
-        timeout = 10
-        while not isQpsRunning():
-            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
+            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)
+
+        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)
 
-    os.chdir(current_direc)
+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
 
 
 def closeQps(host='127.0.0.1', port=9822):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quarchpy
-Version: 2.1.17.dev2
+Version: 2.1.18
 Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com
@@ -17,6 +17,9 @@ Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: System
 Classifier: Topic :: System :: Power (UPS)
 Description-Content-Type: text/x-rst
+Requires-Dist: zeroconf (>=0.23.0)
+Requires-Dist: numpy
+Requires-Dist: pandas
 
 ====================
 Changelog (Quarchpy)
@@ -33,6 +36,24 @@ Quarchpy
 Change Log
 ----------
 
+2.1.18
+------
+- Minor bug fix
+
+2.1.17
+------
+- Improved QIS QPS launching on Linux sytems
+- System debug for linux systems
+
+2.1.16
+------
+- FIO mb/s parsing
+- Improved QIS QPS launching
+
+2.1.15
+------
+- minor bug fix
+
 2.1.14
 ------
 - minor bug fixes and logging improvements.