indipyclient 0.2.2__tar.gz → 0.2.4__tar.gz

{indipyclient-0.2.2 → indipyclient-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: indipyclient
-Version: 0.2.2
+Version: 0.2.4
 Summary: Pure python package, providing a terminal client and a set of classes which can be used to create scripts or clients to control remote instruments using the INDI protocol.
 Keywords: indi,client,astronomy,instrument
 Author-email: Bernard Czenkusz <bernie@skipole.co.uk>

{indipyclient-0.2.2 → indipyclient-0.2.4}/indipyclient/__init__.py

@@ -6,4 +6,4 @@ from .events import (delProperty, defSwitchVector, defTextVector, defNumberVecto
 
 from .propertymembers import getfloat
 
-version = "0.2.2"
+version = "0.2.4"

{indipyclient-0.2.2 → indipyclient-0.2.4}/indipyclient/console/consoleclient.py

@@ -123,7 +123,7 @@ class ConsoleControl:
         "If self._shutdown becomes True, shutdown"
         while (not self._shutdown) and (not self.client.stopped) and (not self.stop):
             # no shutdown requested, just continue
-            await asyncio.sleep(0)
+            await asyncio.sleep(0.1)
         # so either shutdown has been requested or the ipyclient has stopped for some reason
         if not self.client.stopped:
             # client is still running, shut it down
@@ -147,6 +147,7 @@ class ConsoleControl:
             while not self.stop:
                 await asyncio.sleep(0)
                 if isinstance(self.screen, windows.TooSmall):
+                    await asyncio.sleep(0.1)
                     continue
                 if not self.connected:
                     if isinstance(self.screen, windows.MessagesScreen):
@@ -164,6 +165,7 @@ class ConsoleControl:
                     self.eventque.task_done()
                 except asyncio.QueueEmpty:
                     # no event received, so do not update screen
+                    await asyncio.sleep(0.02)
                     continue
                 if isinstance(event, VectorTimeOut) and (event.devicename == self.screen.devicename):
                     if isinstance(self.screen, windows.ChooseVectorScreen):
@@ -206,41 +208,32 @@ class ConsoleControl:
                         self.BLOBfiles[(event.devicename, event.vectorname, membername)] = filepath
                 if isinstance(self.screen, windows.MessagesScreen):
                     self.screen.update(event)
-                    continue
-                if isinstance(self.screen, windows.DevicesScreen):
+                elif isinstance(self.screen, windows.DevicesScreen):
                     self.screen.update(event)
-                    continue
-                if isinstance(self.screen, windows.EnableBLOBsScreen):
+                elif isinstance(self.screen, windows.EnableBLOBsScreen):
                     self.screen.update(event)
-                    continue
-                if event.devicename != self.screen.devicename:
+                elif event.devicename == self.screen.devicename:
                     # the remaining screens are only affected if the event devicename
                     # is the device they refer to
-                    continue
-                if isinstance(event, delProperty):
-                    if event.vectorname is None:
-                        # the whole device is disabled,
-                        if event.devicename and (event.devicename in self.devicenames):
-                            self.devicenames.remove(event.devicename)
-                        # show devicesscreen
-                        self.screen.close("Devices")
-                        continue
-                    if isinstance(self.screen, windows.ChooseVectorScreen):
-                        # one vector has been disabled, update the ChooseVectorScreen
+                    if isinstance(event, delProperty):
+                        if event.vectorname is None:
+                            # the whole device is disabled,
+                            if event.devicename and (event.devicename in self.devicenames):
+                                self.devicenames.remove(event.devicename)
+                            # show devicesscreen
+                            self.screen.close("Devices")
+                        elif isinstance(self.screen, windows.ChooseVectorScreen):
+                            # one vector has been disabled, update the ChooseVectorScreen
+                            self.screen.update(event)
+                        elif isinstance(self.screen, windows.VectorScreen) and (self.screen.vectorname == event.vectorname):
+                            # This vector has been disabled, show ChooseVectorScreen
+                            self.screen.close("Vectors")
+                    # so its not a delete property
+                    elif isinstance(self.screen, windows.ChooseVectorScreen):
+                        self.screen.update(event)
+                    elif isinstance(self.screen, windows.VectorScreen) and (self.screen.vectorname == event.vectorname):
+                        # The event refers to this vector
                         self.screen.update(event)
-                        continue
-                    if isinstance(self.screen, windows.VectorScreen) and (self.screen.vectorname == event.vectorname):
-                        # This vector has been disabled, show ChooseVectorScreen
-                        self.screen.close("Vectors")
-                        continue
-                    continue
-                # so its not a delete property
-                if isinstance(self.screen, windows.ChooseVectorScreen):
-                    self.screen.update(event)
-                    continue
-                if isinstance(self.screen, windows.VectorScreen) and (self.screen.vectorname == event.vectorname):
-                    # The event refers to this vector
-                    self.screen.update(event)
         except Exception:
             logger.exception("Exception report from ConsoleControl.updatescreen")
             raise
@@ -258,7 +251,7 @@ class ConsoleControl:
                         self.maxrows, self.maxcols = self.stdscr.getmaxyx()
                         if self.maxrows < 10 or self.maxcols < 40:
                             self.shutdown()
-                            continue
+                            break
                         if self.maxrows < MINROWS or self.maxcols < MINCOLS:
                             self.screen = windows.TooSmall(self.stdscr, self)
                             self.screen.show()
@@ -277,7 +270,7 @@ class ConsoleControl:
                         self.maxrows, self.maxcols = self.stdscr.getmaxyx()
                         if self.maxrows < 16 or self.maxcols < 40:
                             self.shutdown()
-                            continue
+                            break
                         if self.maxrows < MINROWS or self.maxcols < MINCOLS:
                             self.screen = windows.TooSmall(self.stdscr, self)
                             self.screen.show()
@@ -302,7 +295,7 @@ class ConsoleControl:
                         self.maxrows, self.maxcols = self.stdscr.getmaxyx()
                         if self.maxrows < 16 or self.maxcols < 40:
                             self.shutdown()
-                            continue
+                            break
                         if self.maxrows < MINROWS or self.maxcols < MINCOLS:
                             self.screen = windows.TooSmall(self.stdscr, self)
                             self.screen.show()
@@ -327,7 +320,7 @@ class ConsoleControl:
                         self.maxrows, self.maxcols = self.stdscr.getmaxyx()
                         if self.maxrows < 16 or self.maxcols < 40:
                             self.shutdown()
-                            continue
+                            break
                         if self.maxrows < MINROWS or self.maxcols < MINCOLS:
                             self.screen = windows.TooSmall(self.stdscr, self)
                             self.screen.show()
@@ -354,7 +347,7 @@ class ConsoleControl:
                         self.maxrows, self.maxcols = self.stdscr.getmaxyx()
                         if self.maxrows < 16 or self.maxcols < 40:
                             self.shutdown()
-                            continue
+                            break
                         if self.maxrows < MINROWS or self.maxcols < MINCOLS:
                             self.screen = windows.TooSmall(self.stdscr, self)
                             self.screen.show()
@@ -384,29 +377,25 @@ class ConsoleControl:
                         self.maxrows, self.maxcols = self.stdscr.getmaxyx()
                         if self.maxrows < 16 or self.maxcols < 40:
                             self.shutdown()
-                            continue
+                            break
                         if self.maxrows < MINROWS or self.maxcols < MINCOLS:
                             self.screen = windows.TooSmall(self.stdscr, self)
                             self.screen.show()
                             continue
                         self.screen = windows.VectorScreen(self.stdscr, self, self.screen.devicename, self.screen.vectorname)
                         self.screen.show()
-                        continue
-                    if result == "Quit":
+                    elif result == "Quit":
                         self.shutdown()
                         break
-                    if result == "Messages":
+                    elif result == "Messages":
                         self.screen = windows.MessagesScreen(self.stdscr, self)
                         self.screen.show()
-                        continue
-                    if result == "Devices":
+                    elif result == "Devices":
                         self.screen = windows.DevicesScreen(self.stdscr, self)
                         self.screen.show()
-                        continue
-                    if result == "Vectors":
+                    elif result == "Vectors":
                         self.screen = windows.ChooseVectorScreen(self.stdscr, self, self.screen.devicename, group=self.screen.vector.group)
                         self.screen.show()
-                        continue
 
         except Exception:
             logger.exception("Exception report from ConsoleControl.getinput")

{indipyclient-0.2.2 → indipyclient-0.2.4}/indipyclient/console/widgets.py

@@ -418,6 +418,7 @@ class BaseMember:
                 return self._close
             key = self.stdscr.getch()
             if key == -1:
+                await asyncio.sleep(0.02)
                 continue
             if key == curses.KEY_RESIZE:
                 return "Resize"

{indipyclient-0.2.2 → indipyclient-0.2.4}/indipyclient/console/windows.py

@@ -46,6 +46,7 @@ class ParentScreen:
                 return self._close
             key = self.stdscr.getch()
             if key == -1:
+                await asyncio.sleep(0.02)
                 continue
             if key == curses.KEY_RESIZE:
                 return "Resize"
@@ -83,6 +84,7 @@ class ConsoleClientScreen(ParentScreen):
                 return self._close
             key = self.stdscr.getch()
             if key == -1:
+                await asyncio.sleep(0.02)
                 continue
             if key == curses.KEY_RESIZE:
                 return "Resize"

{indipyclient-0.2.2 → indipyclient-0.2.4}/indipyclient/ipyclient.py

@@ -6,8 +6,6 @@ from time import sleep
 
 from datetime import datetime, timezone
 
-from base64 import standard_b64encode
-
 import xml.etree.ElementTree as ET
 
 import logging
@@ -61,32 +59,6 @@ def _makestart(element):
     return "".join(attriblist)
 
 
-def blob_xml_bytes(xmldata):
-    """A generator yielding blob xml byte strings
-       for a newBLOBVector.
-       reads member bytes, b64 encodes the data
-       and yields the byte string including tags."""
-
-    # yield initial newBLOBVector
-    newblobvector = _makestart(xmldata)
-    yield newblobvector.encode()
-    for oneblob in xmldata.iter('oneBLOB'):
-        bytescontent = oneblob.text
-        size = oneblob.get("size")
-        if size == "0":
-            oneblob.set("size", str(len(bytescontent)))
-        # yield start of oneblob
-        start = _makestart(oneblob)
-        yield start.encode()
-        # yield body, b64 encoded, in chunks
-        encoded_data = standard_b64encode(bytescontent)
-        chunksize = 1000
-        for b in range(0, len(encoded_data), chunksize):
-            yield encoded_data[b:b+chunksize]
-        yield b"</oneBLOB>"
-    yield b"</newBLOBVector>\n"
-
-
 
 class IPyClient(collections.UserDict):
 
@@ -293,7 +265,7 @@ class IPyClient(collections.UserDict):
     async def _check_alive(self, writer):
         try:
             while self.connected and (not self._stop):
-                await asyncio.sleep(0)
+                await asyncio.sleep(0.1)
                 if self.tx_timer:
                     # data has been sent, waiting for reply
                     telapsed = time.time() - self.tx_timer
@@ -314,7 +286,6 @@ class IPyClient(collections.UserDict):
         finally:
             self.connected = False
 
-
     def _logtx(self, txdata):
         "log tx data with level debug, and detail depends on self._verbose"
         if not self._verbose:
@@ -324,12 +295,13 @@ class IPyClient(collections.UserDict):
             binarydata = ET.tostring(txdata)
             logger.debug(startlog + binarydata.decode())
         elif self._verbose == 2:
-            data = copy.deepcopy(txdata)
-            tag = data.tag
-            for element in data:
-                if tag == "newBLOBVector":
+            if txdata.tag == "newBLOBVector" or txdata.tag == "setBLOBVector":
+                data = copy.deepcopy(txdata)
+                for element in data:
                     element.text = "NOT LOGGED"
-            binarydata = ET.tostring(data)
+                binarydata = ET.tostring(data)
+            else:
+                binarydata = ET.tostring(txdata)
             logger.debug(startlog + binarydata.decode())
         elif self._verbose == 1:
             data = copy.deepcopy(txdata)
@@ -348,25 +320,17 @@ class IPyClient(collections.UserDict):
                 try:
                     txdata = self.writerque.popleft()
                 except IndexError:
+                    await asyncio.sleep(0.1)
                     continue
                 if not self.connected:
                     break
                 if self._stop:
                     break
-                if txdata.tag == "newBLOBVector" and len(txdata):
-                    # txdata is a newBLOBVector containing blobs
-                    # the generator blob_xml_bytes yields bytes
-                    for binarydata in blob_xml_bytes(txdata):
-                        # Send to the port
-                        writer.write(binarydata)
-                        await writer.drain()
-                else:
-                    # its straight xml, send it out on the port
-                    binarydata = ET.tostring(txdata)
-                    # Send to the port
-                    writer.write(binarydata)
-                    await writer.drain()
-
+                # send it out on the port
+                binarydata = ET.tostring(txdata)
+                # Send to the port
+                writer.write(binarydata)
+                await writer.drain()
                 if self.timeout_enable:
                     # data has been transmitted set timers going, do not set timer
                     # for enableBLOB as no answer is expected for that

{indipyclient-0.2.2 → indipyclient-0.2.4}/indipyclient/propertymembers.py

@@ -3,6 +3,8 @@ import xml.etree.ElementTree as ET
 
 import sys, pathlib
 
+from base64 import standard_b64encode
+
 
 class ParseException(Exception):
     "Raised if an error occurs when parsing received data"
@@ -421,13 +423,12 @@ class BLOBMember(ParentBLOBMember):
         xmldata = ET.Element('oneBLOB')
         xmldata.set("name", self.name)
         xmldata.set("format", newformat)
-        xmldata.set("size", str(newsize))
         # the value set in the xmldata object should be a bytes object
         if isinstance(newvalue, bytes):
-            xmldata.text = newvalue
+            bytescontent = newvalue
         elif isinstance(newvalue, pathlib.Path):
             try:
-                xmldata.text = newvalue.read_bytes()
+                bytescontent = newvalue.read_bytes()
             except Exception:
                 raise ParseException("Unable to read the given file")
         elif hasattr(newvalue, "seek") and hasattr(newvalue, "read") and callable(newvalue.read):
@@ -440,7 +441,6 @@ class BLOBMember(ParentBLOBMember):
                 raise ParseException("The read BLOB is not a bytes object")
             if bytescontent == b"":
                 raise ParseException("The read BLOB value is empty")
-            xmldata.text = bytescontent
         else:
             # could be a path to a file
             try:
@@ -450,7 +450,10 @@ class BLOBMember(ParentBLOBMember):
                 raise ParseException("Unable to read the given file")
             if bytescontent == b"":
                 raise ParseException("The read BLOB value is empty")
-            xmldata.text = bytescontent
+        if not newsize:
+            newsize = len(bytescontent)
+        xmldata.set("size", str(newsize))
+        xmldata.text = standard_b64encode(bytescontent).decode("utf-8")
         return xmldata
 
 

{indipyclient-0.2.2 → indipyclient-0.2.4}/pyproject.toml

@@ -7,7 +7,7 @@ name = "indipyclient"
 authors = [{name = "Bernard Czenkusz", email = "bernie@skipole.co.uk"}]
 license = {file = "LICENSE"}
 classifiers = ["License :: OSI Approved :: MIT License", "Operating System :: POSIX :: Linux","Topic :: Scientific/Engineering :: Astronomy", "Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator"]
-version = "0.2.2"
+version = "0.2.4"
 description="Pure python package, providing a terminal client and a set of classes which can be used to create scripts or clients to control remote instruments using the INDI protocol."
 readme = "README.md"
 requires-python = ">=3.10"