quarchpy 2.2.7.dev1__py2.py3-none-any.whl → 2.2.8.dev1__py2.py3-none-any.whl

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

@@ -40,11 +40,75 @@
 </section>
 <section id="module-quarchpy.fio.FIO_interface">
 <span id="quarchpy-fio-fio-interface-module"></span><h2>quarchpy.fio.FIO_interface module<a class="headerlink" href="#module-quarchpy.fio.FIO_interface" title="Link to this heading">¶</a></h2>
+<dl class="py function">
+<dt class="sig sig-object py" id="quarchpy.fio.FIO_interface.convert_qis_stream_to_unix_time">
+<span class="sig-prename descclassname"><span class="pre">quarchpy.fio.FIO_interface.</span></span><span class="sig-name descname"><span class="pre">convert_qis_stream_to_unix_time</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">qis_stream_file</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">unix_stream_start_time</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.fio.FIO_interface.convert_qis_stream_to_unix_time" title="Link to this definition">¶</a></dt>
+<dd><p>Converts a QIS stream CSV file to Unix time by adding the unixStreamStartTime to the first column
+in each row, taking into account the time units provided in both the CSV header and the start time.</p>
+<dl class="field-list simple">
+<dt class="field-odd">Parameters<span class="colon">:</span></dt>
+<dd class="field-odd"><ul class="simple">
+<li><p><strong>qis_stream_file</strong> (<em>str</em>) – The path to the QIS stream CSV file.</p></li>
+<li><p><strong>unix_stream_start_time</strong> (<em>str</em>) – The starting Unix time with units (e.g., “1737374310S”, “1737374310000mS”).</p></li>
+</ul>
+</dd>
+<dt class="field-even">Returns<span class="colon">:</span></dt>
+<dd class="field-even"><p>Path to the converted CSV file.</p>
+</dd>
+<dt class="field-odd">Return type<span class="colon">:</span></dt>
+<dd class="field-odd"><p>str</p>
+</dd>
+</dl>
+</dd></dl>
+
+<dl class="py function">
+<dt class="sig sig-object py" id="quarchpy.fio.FIO_interface.fio_json_to_csv">
+<span class="sig-prename descclassname"><span class="pre">quarchpy.fio.FIO_interface.</span></span><span class="sig-name descname"><span class="pre">fio_json_to_csv</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">output_file</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.fio.FIO_interface.fio_json_to_csv" title="Link to this definition">¶</a></dt>
+<dd></dd></dl>
+
 <dl class="py function">
 <dt class="sig sig-object py" id="quarchpy.fio.FIO_interface.follow">
 <span class="sig-prename descclassname"><span class="pre">quarchpy.fio.FIO_interface.</span></span><span class="sig-name descname"><span class="pre">follow</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">thefile</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">p</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.fio.FIO_interface.follow" title="Link to this definition">¶</a></dt>
 <dd></dd></dl>
 
+<dl class="py function">
+<dt class="sig sig-object py" id="quarchpy.fio.FIO_interface.merge_fio_qis_stream">
+<span class="sig-prename descclassname"><span class="pre">quarchpy.fio.FIO_interface.</span></span><span class="sig-name descname"><span class="pre">merge_fio_qis_stream</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">qis_stream_file</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">fio_output_file</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">unix_stream_start_time</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">output_file</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">rounding_option</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">'round'</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.fio.FIO_interface.merge_fio_qis_stream" title="Link to this definition">¶</a></dt>
+<dd><p>Merge FIO and QIS data into a single CSV file.</p>
+<dl class="simple">
+<dt>For each FIO entry:</dt><dd><ul class="simple">
+<li><p>If timestamps match, append FIO data to the corresponding QIS row.</p></li>
+<li><dl class="simple">
+<dt>If no match, handle based on <cite>rounding_option</cite>:</dt><dd><ul>
+<li><p>“round”: Find the nearest QIS time and add FIO data to that row.</p></li>
+<li><p>“insert”: Add a new row with blank QIS data and only FIO data.</p></li>
+</ul>
+</dd>
+</dl>
+</li>
+</ul>
+</dd>
+</dl>
+<dl class="field-list simple">
+<dt class="field-odd">Parameters<span class="colon">:</span></dt>
+<dd class="field-odd"><ul class="simple">
+<li><p><strong>qis_stream_file</strong> (<em>str</em>) – Path to the QIS CSV file (converted to Unix time).</p></li>
+<li><p><strong>fio_output_file</strong> (<em>str</em>) – Path to the FIO output file (in JSON format).</p></li>
+<li><p><strong>unix_stream_start_time</strong> (<em>str</em>) – Starting Unix timestamp for the QIS stream.</p></li>
+<li><p><strong>output_file</strong> (<em>str</em><em>, </em><em>optional</em>) – Output file path for the merged CSV. If not provided, the file is saved
+with “_merged” appended to the QIS file name.</p></li>
+<li><p><strong>rounding_option</strong> (<em>str</em>) – Determines how to handle mismatched times (“round” or “insert”).</p></li>
+</ul>
+</dd>
+<dt class="field-even">Returns<span class="colon">:</span></dt>
+<dd class="field-even"><p>Path to the merged CSV file.</p>
+</dd>
+<dt class="field-odd">Return type<span class="colon">:</span></dt>
+<dd class="field-odd"><p>str</p>
+</dd>
+</dl>
+</dd></dl>
+
 <dl class="py function">
 <dt class="sig sig-object py" id="quarchpy.fio.FIO_interface.return_data">
 <span class="sig-prename descclassname"><span class="pre">quarchpy.fio.FIO_interface.</span></span><span class="sig-name descname"><span class="pre">return_data</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">output_file</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">p</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">fioCallbacks</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">myStream</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">user_data</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">arguments</span></span></em><span class="sig-paren">)</span><a class="headerlink" href="#quarchpy.fio.FIO_interface.return_data" title="Link to this definition">¶</a></dt>

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

@@ -505,7 +505,10 @@
 <li class="toctree-l1"><a class="reference internal" href="quarchpy.fio.html">quarchpy.fio package</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="quarchpy.fio.html#submodules">Submodules</a></li>
 <li class="toctree-l2"><a class="reference internal" href="quarchpy.fio.html#module-quarchpy.fio.FIO_interface">quarchpy.fio.FIO_interface module</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.FIO_interface.convert_qis_stream_to_unix_time"><code class="docutils literal notranslate"><span class="pre">convert_qis_stream_to_unix_time()</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.FIO_interface.fio_json_to_csv"><code class="docutils literal notranslate"><span class="pre">fio_json_to_csv()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.FIO_interface.follow"><code class="docutils literal notranslate"><span class="pre">follow()</span></code></a></li>
+<li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.FIO_interface.merge_fio_qis_stream"><code class="docutils literal notranslate"><span class="pre">merge_fio_qis_stream()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.FIO_interface.return_data"><code class="docutils literal notranslate"><span class="pre">return_data()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.FIO_interface.runFIO"><code class="docutils literal notranslate"><span class="pre">runFIO()</span></code></a></li>
 <li class="toctree-l3"><a class="reference internal" href="quarchpy.fio.html#quarchpy.fio.FIO_interface.start_fio"><code class="docutils literal notranslate"><span class="pre">start_fio()</span></code></a></li>

quarchpy/qis/qisFuncs.py

@@ -2,7 +2,7 @@
 Contains general functions for starting and stopping QIS processes
 """
 
-import os, sys 
+import os, sys
 import time, platform
 from threading import Thread, Lock, Event, active_count
 from queue import Queue, Empty
@@ -12,6 +12,7 @@ from quarchpy.user_interface.user_interface import printText, logDebug
 import subprocess
 import logging
 
+
 def isQisRunning():
     """
     Checks if a local instance of QIS is running and responding
@@ -34,7 +35,7 @@ def isQisRunning():
         pass
     if (qisRunning is False):
         logging.debug("QIS is not running")
-        return False 
+        return False
     else:
         logging.debug("QIS is running")
         return True
@@ -45,7 +46,7 @@ def isQisRunningAndResponding(timeout=2):
     checks if qis is running and responding to a $version
     """
     qisRunning = isQisRunning()
-    if qisRunning ==False:
+    if qisRunning == False:
         logging.debug("QIS is not running")
         return False
 
@@ -63,7 +64,6 @@ def isQisRunningAndResponding(timeout=2):
             time.sleep(timeout / maxCounter)  # We attempt to get QIS
             counter += 1
 
-
     if (qisRunning is False):
         logging.debug("QIS is not running")
         return False
@@ -91,10 +91,11 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     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")
+    java_path = "\"" + java_path
 
     # change directory to /QPS/QIS
     qis_path = os.path.dirname(os.path.abspath(__file__))
-    qis_path,junk = os.path.split (qis_path)
+    qis_path, junk = os.path.split(qis_path)
 
     # OS
     current_os = platform.system()
@@ -108,13 +109,13 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
         return
 
     # ensure the jres folder has the required permissions
-    permissions,message= find_java_permissions()
+    permissions, message = find_java_permissions()
     if permissions is False:
         logging.warning(message)
         logging.warning("Not having correct permissions will prevent Quarch Java Programs to launch")
         logging.warning("Run \"python -m quarchpy.run permission_fix\" to fix this.")
         user_input = input("Would you like to fix permissions now? (Y/N)")
-        if user_input.lower()=="y":
+        if user_input.lower() == "y":
             fix_permissions()
             permissions, message = find_java_permissions()
             time.sleep(0.5)
@@ -123,8 +124,6 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
             else:
                 logging.warning("Attempt to fix permissions was successful. Now continuing.")
 
-
-
     # if current_os != "Windows":
     #     subprocess.call(['chmod', '-R', '+rwx', java_path])
 
@@ -150,16 +149,14 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
 
     # Building the command
 
-
     # prefer IPV4 to IPV6
     ipv4v6_vm_args = "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
 
     # Process command prefix. Needed for headless mode, to support OSs with no system tray.
-    cmd_prefix =ipv4v6_vm_args
+    cmd_prefix = ipv4v6_vm_args
     if headless is True or (args is not None and "-headless" in args):
         cmd_prefix += " -Djava.awt.headless=true"
 
-
     # Process command suffix (additional standard options for QIS).
     if terminal is True:
         cmd_suffix = " -terminal"
@@ -177,9 +174,8 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     # record current working directory
     current_dir = os.getcwd()
 
+    command = "java\" " + cmd_prefix + " -jar qis.jar" + cmd_suffix
 
-    command = "java " + 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
@@ -195,9 +191,10 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
         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.
-        process = subprocess.Popen(command,shell=True)
-        startTime = time.time() #Checks for Popen launch only
+    # If logging to a terminal window is on then os.system should be used to view logging.
+    if "-logging=ON" in str(args):
+        process = subprocess.Popen(command, shell=True)
+        startTime = time.time()  # Checks for Popen launch only
         while not isQisRunning():
             if time.time() - startTime > timeout:
                 raise TimeoutError("QIS failed to launch within timelimit of " + str(timeout) + " sec.")
@@ -208,16 +205,15 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
         else:
             process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, shell=True)
 
-        startTime = time.time() #Checks for Popen launch only
+        startTime = time.time()  #Checks for Popen launch only
         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):
-            logDebug("QPS running and responding")
+            logDebug("QIS running and responding")
         else:
             logDebug("QIS running but not responding")
 
@@ -225,7 +221,7 @@ def startLocalQis(terminal=False, headless=False, args=None, timeout=20):
     os.chdir(current_dir)
 
 
-def reader(stream, q, source, lock,stop_flag):
+def reader(stream, q, source, lock, stop_flag):
     '''
     Used to read output and place it in a queue for multithreaded reading
     :param stream:
@@ -261,7 +257,7 @@ def _get_std_msg_and_err_from_QIS_process(process):
     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.
+    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
@@ -271,7 +267,7 @@ def _get_std_msg_and_err_from_QIS_process(process):
                 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
+    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):
@@ -311,6 +307,7 @@ def check_remote_qis(host='127.0.0.1', port=9722, timeout=0):
         logging.debug("QIS is running")
         return True
 
+
 def checkAndCloseQis(host='127.0.0.1', port=9722):
     if isQisRunning() is True:
         closeQis()
@@ -329,53 +326,53 @@ def closeQis(host='127.0.0.1', port=9722):
         QIS connection port if set to a value other than the default
         
     """
-    
+
     myQis = QisInterface(host, port)
-    retVal=myQis.sendAndReceiveCmd(cmd = "$shutdown")
+    retVal = myQis.sendAndReceiveCmd(cmd="$shutdown")
     myQis.disconnect()
     time.sleep(1)
     return retVal
 
+
 #DEPRICATED
-def GetQisModuleSelection (QisConnection):
+def GetQisModuleSelection(QisConnection):
     """
     Prints a list of modules for user selection
     
     .. deprecated:: 2.0.12
         Use the module selection functions of the QisInterface class instead
     """
-    
+
     # Request a list of all USB and LAN accessible power modules
     devList = QisConnection.getDeviceList()
     # Removes rest devices
-    devList = [ x for x in devList if "rest" not in x ]
+    devList = [x for x in devList if "rest" not in x]
 
     # Print the devices, so the user can choose one to connect to
-    printText ("\n ########## STEP 1 - Select a Quarch Module. ########## \n")
-    printText (' --------------------------------------------')
-    printText (' |  {:^5}  |  {:^30}|'.format("INDEX", "MODULE"))
-    printText (' --------------------------------------------')
-        
+    printText("\n ########## STEP 1 - Select a Quarch Module. ########## \n")
+    printText(' --------------------------------------------')
+    printText(' |  {:^5}  |  {:^30}|'.format("INDEX", "MODULE"))
+    printText(' --------------------------------------------')
+
     try:
         for idx in xrange(len(devList)):
-            printText (' |  {:^5}  |  {:^30}|'.format(str(idx+1), devList[idx]))
+            printText(' |  {:^5}  |  {:^30}|'.format(str(idx + 1), devList[idx]))
             printText(' --------------------------------------------')
     except:
         for idx in range(len(devList)):
-            printText (' |  {:^5}  |  {:^30}|'.format(str(idx+1), devList[idx]))
+            printText(' |  {:^5}  |  {:^30}|'.format(str(idx + 1), devList[idx]))
             printText(' --------------------------------------------')
 
     # Get the user to select the device to control
     try:
-        moduleId = int(raw_input ("\n>>> Enter the index of the Quarch module: "))
+        moduleId = int(raw_input("\n>>> Enter the index of the Quarch module: "))
     except NameError:
-        moduleId = int(input ("\n>>> Enter the index of the Quarch module: "))
+        moduleId = int(input("\n>>> Enter the index of the Quarch module: "))
 
     # Verify the selection
     if (moduleId > 0 and moduleId <= len(devList)):
-        myDeviceID = devList[moduleId-1]
+        myDeviceID = devList[moduleId - 1]
     else:
         myDeviceID = None
 
     return myDeviceID
-

quarchpy/qps/qpsFuncs.py

@@ -1,11 +1,7 @@
 from threading import Thread, Lock, Event, active_count
 from queue import Queue, Empty
-import time
-import os, sys
-import datetime
 import platform
 from quarchpy.qis import isQisRunning, startLocalQis
-from quarchpy.connection_specific.connection_QIS import QisInterface
 from quarchpy.connection_specific.connection_QPS import QpsInterface
 from quarchpy.connection_specific.jdk_j21_jres.fix_permissions import main as fix_permissions, find_java_permissions
 from quarchpy.user_interface import *
@@ -87,6 +83,7 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
     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")
+    java_path = "\"" + java_path
     # 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)
@@ -142,17 +139,17 @@ def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=T
 
     # OS dependency
     if current_os in "Windows":
-        command = java_path + "\\win_amd64_jdk_21_jre\\bin\\java -jar qps.jar " + str(args)
+        command = java_path + "\\win_amd64_jdk_21_jre\\bin\\java\" -jar qps.jar " + str(args)
     elif current_os in "Linux" and current_arch == "x86_64":
-        command = java_path + "/lin_amd64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
+        command = java_path + "/lin_amd64_jdk_21_jre/bin/java\" -jar qps.jar " + str(args)
     elif current_os in "Linux" and current_arch == "aarch64":
-        command = java_path + "/lin_arm64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
+        command = java_path + "/lin_arm64_jdk_21_jre/bin/java\" -jar qps.jar " + str(args)
     elif current_os in "Darwin" and current_arch == "x86_64":
-        command = java_path + "/mac_amd64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
+        command = java_path + "/mac_amd64_jdk_21_jre/bin/java\" -jar qps.jar " + str(args)
     elif current_os in "Darwin" and current_arch == "arm64":
-        command = java_path + "/mac_arm64_jdk_21_jre/bin/java -jar qps.jar " + str(args)
+        command = java_path + "/mac_arm64_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_path + "\\win_amd64_jdk_21_jre\\bin\\java\" -jar qps.jar " + 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.
         if current_os in "Windows":

{quarchpy-2.2.7.dev1.dist-info → quarchpy-2.2.8.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.1
 Name: quarchpy
-Version: 2.2.7.dev1
+Version: 2.2.8.dev1
 Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com
@@ -17,18 +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: zeroconf (>=0.23.0)
 Requires-Dist: numpy
 Requires-Dist: pandas
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: keywords
-Dynamic: license
-Dynamic: requires-dist
-Dynamic: summary
 
 ====================
 Changelog (Quarchpy)
@@ -46,6 +37,10 @@ Change Log
 ----------
 
 
+2.2.7
+-----
+- Bug fix for QIS 1.47 missing lib for linux only 
+
 2.2.6
 -----
 - New QPS 1.45 and QIS 1.47