quarchpy 2.1.10.dev4__py3-none-any.whl → 2.1.10.dev6__py3-none-any.whl

quarchpy/device/device.py

@@ -115,62 +115,30 @@ class quarchDevice:
             # Creates the connection object.
             self.connectionObj = QISConnection(self.ConString, host, port)
 
+            #TODO This is a list of contype::serialnumber when connecting over rest and TCP we need to be comparing IP address NOT contype::serialNumber.
             list = self.connectionObj.qis.getDeviceList()
             list_str = "".join(list).lower()
 
-            timeout = time.time() + int(timeout) # now + n seconds
-
-            # check for device in list, has a timeout
-            while time.time() < timeout:
-
-                # Check if it's a module's QTL number
-                if "qtl" not in self.ConString.lower():
-
-                    # If not, check if it contains a valid IP address format
-                    ip_address = re.search(r"[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}", self.ConString)
-                    if not ip_address:
-                        raise ValueError(f"ConString {self.ConString} does not contain a valid QTL number or IP address")
-
-                    # Attempt to get QTL number from qis "$list details"
-                    temp_str = _check_ip_in_qis_list(ip_address.group(), self.connectionObj.qis.get_list_details())
-                    if temp_str:
-                        # If found
-                        self.ConString = temp_str
-                        break
-
-                    logging.debug("Did not find ip address in list details, attempt targetted qis scan")
-
-                    # If it's not present in the list already, then try scanning for it via qis
-                    # Scan is purposefully after initial check! 09/03/2023
-                    # Valid response example "Located device: 192.168.1.3"
-                    if "located" in str(self.connectionObj.qis.scanIP(self.ConString)).lower():
-                        # Note - Qis takes a moment or 2 to add this newly located device to the $list 21/03/23
-                        timeout += 20   # Extend the timeout as the drive was located
-
-                        while time.time() < timeout:
-                            # try find the new device again from ipaddress
-                            temp_str = _check_ip_in_qis_list(ip_address.group(), self.connectionObj.qis.get_list_details())
-                            if temp_str:
-                                # If the item is found, break out of this loop
-                                self.ConString = temp_str
-                                break
-                            time.sleep(1)   # Slow down the poll
-                        else:
-                            # if it's not found, continue and allow program to timeout
-                            continue
-                        # Break out of both loops
+            #check for device in list, has a timeout
+            while 1:
+                if (self.timeout == 0 or "qtl" not in self.ConString.lower()):
+                    #If the quarch module is not found using a standard scan, it may be on a different subnet. Do ipAddressLookup for a module at this address.
+                    try:
+                        response = self.connectionObj.qis.scanIP(self.ConString)
+                        logging.debug("$scan " + self.ConString + "= " + response)
+                        self.ConString = response
                         break
+                    except:
+                        raise ValueError("Search timeout - no Quarch module found.")
 
-                elif str(self.ConString).lower() in str(list_str).lower():
-                    # If we have QTL device, and it's in list, nothing more needs done.
+                elif (self.ConString in list_str):
                     break
+
                 else:
                     time.sleep(1)
+                    self.timeout -= 1
                     list = self.connectionObj.qis.getDeviceList()
                     list_str = "".join(list).lower()
-            else:
-                # If we didn't hit a 'break' condition in the above loop, then it timed out
-                raise TimeoutError(f"Could not find module '{self.ConString}' from Qis within specified time")
 
             self.connectionObj.qis.sendAndReceiveCmd(cmd="$default " + self.ConString)
 
@@ -271,7 +239,7 @@ class quarchDevice:
         logging.debug("Attempting to open " + self.ConType[:3] + " connection")
 
         if self.ConType[:3] == "QIS":
-            self.connectionObj.qis.connect() #todo should have a return val so that failed connections are caught.
+            self.connectionObj.qis.connect()
 
         elif self.ConType == "PY":
             del self.connectionObj
@@ -279,7 +247,7 @@ class quarchDevice:
             return self.connectionObj
 
         elif self.ConType[:3] == "QPS":
-            return self.connectionObj.qps.connect(self.ConString)
+            self.connectionObj.qps.connect(self.ConString)
 
         else:
             raise Exception("Connection type not recognised")
@@ -434,25 +402,6 @@ class quarchDevice:
             return None
 
 
-def _check_ip_in_qis_list(ip_address, detailed_device_list):
-    """
-    Checks if the IP address is in qis device list
-    :param detailed_device_list: list formatted return from qis command "$list details"
-    :return String : return contype and constring for module if it's in list, else None
-    """
-    # logging.debug(f"List details from Qis : \n{str(''.join(detailed_device_list))}")
-
-    for module in detailed_device_list:
-        # Note for future developers : Restricted this to only TCP modules, not RESt
-        if ip_address in module and "tcp" in module.lower():
-            # '1) REST::QTL2312-01-009 IP:192.168.1.5 Port:80 NBName:2312-01-009     Stream:No Name:Power Analysis Module'
-            # Split on spaces and grab second element ("tcp::qtl2312-01-009")
-            ret_string = module.split()[1]
-            return ret_string
-
-    # If the ip address wasn't found, then return none
-    return None
-
 # TODO: Can we make this an '_' internal function?
 def checkModuleFormat(ConString):
     ConnectionTypes = ["USB", "SERIAL", "TELNET", "REST", "TCP"]  # acceptable conTypes

quarchpy/device/quarchArray.py

@@ -74,6 +74,6 @@ class subDevice(quarchDevice):
             pos = x.find(':')
             lineNum = x[:pos]
             returnStr += (x[pos+1:].strip() + "\r\n")
-        returnStr = returnStr.strip()
+            returnStr = returnStr.strip()
         return returnStr
 

quarchpy/device/quarchPPM.py

@@ -12,7 +12,7 @@ class quarchPPM(quarchDevice):
         if numb_colons == 1:
             self.ConString = self.ConString.replace(':', '::')
  
-    def startStream(self, fileName='streamData.txt', fileMaxMB=200000, streamName ='Stream With No Name', streamDuration = None, streamAverage = None, releaseOnData = False, separator=","):
+    def startStream(self, fileName='streamData.txt', fileMaxMB=2000, streamName ='Stream With No Name', streamDuration = None, streamAverage = None, releaseOnData = False, separator=","):
         return self.connectionObj.qis.startStream(self.ConString, fileName, fileMaxMB, streamName, streamAverage, releaseOnData, separator, streamDuration)
 
     def streamRunningStatus(self):

quarchpy/device/quarchQPS.py

@@ -28,54 +28,48 @@ class quarchQPS(quarchDevice):
         self.IP_address = quarchDevice.connectionObj.qps.host
         self.port_number = quarchDevice.connectionObj.qps.port
 
-    def startStream(self, directory, unserInput=True):
-        """
-        directory - str - desired stream dir
-        unserInput=True - if a failure occurs userInput=True allows user to rectify problem with user input. set to False if user interaction is not available (automating).
-        """
+    def startStream(self, directory):
         time.sleep(1) #TODO remove this sleep once script->QPS timeing issue resolved. This works fine in the meantime
-        return quarchStream(self.quarchDevice, directory, unserInput)
-
-
-
+        return quarchStream(self.quarchDevice, directory)
     
 
-class quarchStream:
-    def __init__(self, quarchQPS, directory, unserInput=True):
+class quarchStream(quarchQPS):
+    def __init__(self, quarchQPS, directory):
         self.connectionObj = quarchQPS.connectionObj
+        
         self.IP_address = quarchQPS.connectionObj.qps.host
         self.port_number = quarchQPS.connectionObj.qps.port
+
         self.ConString = quarchQPS.ConString
         self.ConType = quarchQPS.ConType
+        
         time.sleep(1)
-        response = self.startQPSStream(directory)
-        if not "fail:" in response.lower():
-            return
-        else:
-            if unserInput is False:
-                raise Exception(response)
-            else:
-                self.failCheck(response)
-
-    def startQPSStream(self, newDirectory):
-        '''STARTS the stream '''
-        response = self.connectionObj.qps.sendCmdVerbose("$start stream " + str(newDirectory))
-        return response
-
-    def failCheck(self, response):
-        ''' handles failed starting of stream that requires input from user to fix.'''
-        while "fail:" in response.lower():
-            if "Fail: Directory already exists" in response:
+      
+        #check to see if any invalid file entries
+        newDirectory = self.failCheck(directory)
+        
+    def failCheck(self, newDirectory):
+        validResponse = False
+
+        while (validResponse == False):
+            #send the command to start stream
+            response = self.connectionObj.qps.sendCmdVerbose( "$start stream " + str(newDirectory))
+            #if the stream fails, loop until user enters valid name
+            if "Fail" in response: #TODO should check when this fail is not a path name issue
                 print (response)
                 print("Please enter a new file name:")
-                if sys.version_info.major==3:
-                    newDir = input()
+                #grab directory bar end file / folder
+                path = os.path.dirname(newDirectory)
+                #get a new file name
+                if sys.version_info.major==3:                    
+                    newEnd = input()
                 else:
-                    newDir = raw_input()
-                response = self.startQPSStream( newDir)
-            else:  #  If its a failure we don't know how to handle.
-                raise Exception(response)
-        return response
+                    newEnd = raw_input()
+                #append user input to directory
+                newDirectory = path.replace("\\\\","\\") + newEnd
+            else:
+                validResponse = True;
+        return newDirectory
 
     def get_stats(self, format="df"):
         """

quarchpy/device/scanDevices.py

@@ -104,7 +104,7 @@ def list_USB(debuPrint=False):
                         if not os.path.isfile("/etc/udev/rules.d/20-quarchmodules.rules"):
                             usb_permission_error = True
                 usb_modules["USB:???"] = "LOCKED MODULE"
-
+                continue
 
             try:
                 module_sn = i_handle.getASCIIStringDescriptor(3)
@@ -119,7 +119,7 @@ def list_USB(debuPrint=False):
                 if (debuPrint): printText(i_handle.getASCIIStringDescriptor(3) + " " + i_handle.getASCIIStringDescriptor(
                     2) + " " + i_handle.getASCIIStringDescriptor(1))
             except Exception as err:
-                logging.error("USB exception on reading descriptor strings: " + str(err))
+                logging.error("USB exception on reading descriptor strings: " + err)
                 usb_modules["USB:???"] = "LOCKED MODULE"
                 continue
 
@@ -137,7 +137,7 @@ def list_USB(debuPrint=False):
                 logging.debug("Closing USB handle to quarch module: " + str(i))
                 i_handle.close()
             except Exception as err:
-                logging.error("Exception on closing USB port: " + str(err))
+                logging.error("Exception on closing USB port: " + err)
                 continue
 
     # before returning the list of usb modules scan through the list for a 1944 create a quarch device and use sendCommand("*enclosure?")
@@ -177,105 +177,98 @@ def list_USB(debuPrint=False):
 List all Quarch devices found over LAN, using a UDP broadcast scan
 '''
 def list_network(target_conn="all", debugPring=False, lanTimeout=1, ipAddressLookup=None):
+    # Create and configure the socket for broadcast.
+    mySocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    mySocket.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+    mySocket.settimeout(lanTimeout)
 
-    ipList = socket.gethostbyname_ex(socket.gethostname())
-    logging.debug(os.path.basename(__file__) + ": Discovered the following interfaces: " + str(ipList))
-    retVal={}
-    for ip in ipList[2]:
-        # Create and configure the socket for broadcast.
-        mySocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        mySocket.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
-        mySocket.settimeout(lanTimeout)
+    lan_modules = dict()
 
-        lan_modules = dict()
+    specifiedDevice = None
 
-        specifiedDevice = None
+    if ipAddressLookup is not None:
+        # Attempts to find the device through UDP then REST
+        specifiedDevice = lookupDevice(str(ipAddressLookup).strip(), mySocket, lan_modules )
 
-        if ipAddressLookup is not None:
-            # Attempts to find the device through UDP then REST
-            specifiedDevice = lookupDevice(str(ipAddressLookup).strip(), mySocket, lan_modules )
 
 
+    # Broadcast the message.
+    logging.debug("Broadcast LAN discovery message for UDP scan")
+    mySocket.sendto(b'Discovery: Who is out there?\0\n', ('255.255.255.255', 30303))
 
-        # Broadcast the message.
-        logging.debug("Broadcast LAN discovery message for UDP scan")
-        mySocket.bind((ip,56732))
-        mySocket.sendto(b'Discovery: Who is out there?\0\n', ('255.255.255.255', 30303))
-        #mySocket.sendto(b'Discovery: Who is out there?\0\n', ('255.255.255.255', 30303)) #56732
+    counter = 0
 
-        counter = 0
+    # Receive messages until timeout.
+    while True:
+        network_modules = {}
+        counter += 1
+        # Receive raw message until timeout, then break.
+        try:
+            msg_received = mySocket.recvfrom(256)
+        except:
+            # check if any a device was targeted directly and allow parse
+            if specifiedDevice is not None:
+                msg_received = specifiedDevice
+                specifiedDevice = None
+            else:
+                break
+        cont = 0
+
+        # print(msg_received)
+        # Used split \r\n since values of 13 or 10 were looked at as /r and /n when using splitlines
+        # This fixes for all cases except if 13 is followed by 10.
+        splits = msg_received[0].split(b"\r\n")
+        del splits[-1]
+        for lines in splits:
+            if cont <= 1:
+                index = cont
+                data = repr(lines).replace("'", "").replace("b", "")
+                cont += 1
+            else:
+                index = repr(lines[0]).replace("'", "")
+                data = repr(lines[1:]).replace("'", "").replace("b", "")
 
-        # Receive messages until timeout.
-        while True:
-            network_modules = {}
-            counter += 1
-            # Receive raw message until timeout, then break.
-            try:
-                msg_received = mySocket.recvfrom(256)
-            except:
-                # check if any a device was targeted directly and allow parse
-                if specifiedDevice is not None:
-                    msg_received = specifiedDevice
-                    specifiedDevice = None
-                else:
-                    break
-            cont = 0
-
-            # print(msg_received)
-            # Used split \r\n since values of 13 or 10 were looked at as /r and /n when using splitlines
-            # This fixes for all cases except if 13 is followed by 10.
-            splits = msg_received[0].split(b"\r\n")
-            del splits[-1]
-            for lines in splits:
-                if cont <= 1:
-                    index = cont
-                    data = repr(lines).replace("'", "").replace("b", "")
-                    cont += 1
-                else:
-                    index = repr(lines[0]).replace("'", "")
-                    data = repr(lines[1:]).replace("'", "").replace("b", "")
-
-                network_modules[index] = data
-
-            module_name = get_user_level_serial_number(network_modules)
-            logging.debug("Found UDP response: " + module_name)
-
-            ip_module = msg_received[1][0].strip()
+            network_modules[index] = data
 
-            try:
-                # Add a QTL before modules without it.
-                if "QTL" not in module_name.decode("utf-8"):
-                    module_name = "QTL" + module_name.decode("utf-8")
-            except:
-                # Add a QTL before modules without it.
-                if "QTL" not in module_name:
-                    module_name = "QTL" + module_name
-
-            # Checks if there's a value in the TELNET key.
-            if (target_conn.lower() == "all" or target_conn.lower() == "telnet"):
-                if network_modules.get("\\x8a") or network_modules.get("138"):
-                    # Append the information to the list.
-                    lan_modules["TELNET:" + ip_module] = module_name
-                    logging.debug("Found Telnet module: " + module_name)
-
-            # Checks if there's a value in the REST key.
-            if (target_conn.lower() == "all" or target_conn.lower() == "rest"):
-                if network_modules.get("\\x84") or network_modules.get("132"):
-                    # Append the information to the list.
-                    lan_modules["REST:" + ip_module] = module_name
-                    logging.debug("Found REST module: " + module_name)
-
-            # Checks if there's a value in the TCP key.
-            if (target_conn.lower() == "all" or target_conn.lower() == "tcp"):
-                if network_modules.get("\\x85") or network_modules.get("133"):
-                    # Append the information to the list.
-                    lan_modules["TCP:" + ip_module] = module_name
-                    logging.debug("Found TCP module: " + module_name)
-
-        mySocket.close()
-        logging.debug("Finished UDP scan")
-        retVal.update(lan_modules)
-    return retVal
+        module_name = get_user_level_serial_number(network_modules)
+        logging.debug("Found UDP response: " + module_name)
+
+        ip_module = msg_received[1][0].strip()
+
+        try:
+            # Add a QTL before modules without it.
+            if "QTL" not in module_name.decode("utf-8"):
+                module_name = "QTL" + module_name.decode("utf-8")
+        except:
+            # Add a QTL before modules without it.
+            if "QTL" not in module_name:
+                module_name = "QTL" + module_name
+
+        # Checks if there's a value in the TELNET key.
+        if (target_conn.lower() == "all" or target_conn.lower() == "telnet"):
+            if network_modules.get("\\x8a") or network_modules.get("138"):
+                # Append the information to the list.
+                lan_modules["TELNET:" + ip_module] = module_name
+                logging.debug("Found Telnet module: " + module_name)
+
+        # Checks if there's a value in the REST key.
+        if (target_conn.lower() == "all" or target_conn.lower() == "rest"):
+            if network_modules.get("\\x84") or network_modules.get("132"):
+                # Append the information to the list.
+                lan_modules["REST:" + ip_module] = module_name
+                logging.debug("Found REST module: " + module_name)
+
+        # Checks if there's a value in the TCP key.
+        if (target_conn.lower() == "all" or target_conn.lower() == "tcp"):
+            if network_modules.get("\\x85") or network_modules.get("133"):
+                # Append the information to the list.
+                lan_modules["TCP:" + ip_module] = module_name
+                logging.debug("Found TCP module: " + module_name)
+
+    mySocket.close()
+    logging.debug("Finished UDP scan")
+
+    return lan_modules
 
 
 ''''''

quarchpy/disk_test/DiskTargetSelection.py

@@ -31,6 +31,7 @@ def getDiskTargetSelection (purpose = "iometer"):
 
     if purpose.lower() == "iometer":
         iometerObject = iometerDiskFinder()
-        driveInfo = iometerObject.returnDisk()
+        disk = iometerObject.returnDisk()
+        driveInfo = disk
 
     return driveInfo

quarchpy/docs/CHANGES.rst

@@ -13,13 +13,6 @@ Quarchpy
 Change Log
 ----------
 
-2.1.11
-------
-- New QPS v1.31
-- New QIS v1.34
-
-2.1.10
-------
 
 2.1.8
 -----