dsf-python 3.6.0b2__py3-none-any.whl → 3.6.0b2.post3__py3-none-any.whl

dsf/__init__.py

@@ -1,3 +1,5 @@
+__version__ = "3.6.0-b2.post3"
+
 # path to unix socket file
 SOCKET_FILE = "/run/dsf/dcs.sock"
 

dsf/commands/plugins.py

@@ -21,7 +21,7 @@ def reload_plugin(plugin: str):
     return BaseCommand("ReloadPlugin", **{"plugin": plugin})
 
 
-def set_plugin_data(plugin: str, key: str, value: str):
+def set_plugin_data(plugin: str, key: str, value):
     """
     Update custom plugin data in the object model
     May be used to update only the own plugin data unless the plugin has the ManagePlugins permission.
@@ -34,10 +34,8 @@ def set_plugin_data(plugin: str, key: str, value: str):
         raise TypeError("plugin must be a string")
     if not isinstance(key, str) or not key:
         raise TypeError("key must be a string")
-    if not isinstance(value, str):
-        raise TypeError("value must be a string")
     return BaseCommand(
-        "SetPluginData", **{"Plugin": plugin, "key": key, "value": value}
+        "SetPluginData", **{"plugin": plugin, "key": key, "value": value}
     )
 
 

dsf/http.py

@@ -1,5 +1,8 @@
 import asyncio
 import json
+import socket
+import stat
+import errno
 import os
 from concurrent.futures import ThreadPoolExecutor
 from enum import Enum
@@ -11,10 +14,11 @@ from .object_model import HttpEndpointType
 class HttpResponseType(str, Enum):
     """Enumeration of supported HTTP responses"""
 
-    StatusCode = "StatusCode"
-    PlainText = "PlainText"
-    JSON = "JSON"
-    File = "File"
+    StatusCode = "statuscode"
+    PlainText = "plainText"
+    JSON = "json"
+    File = "file"
+    URI = "uri"
 
 
 class ReceivedHttpRequest:
@@ -47,7 +51,7 @@ class HttpEndpointConnection:
         """Close the connection"""
         self.writer.close()
 
-    async def read_request(self):
+    async def read_request(self) -> ReceivedHttpRequest:
         """
         Read information about the last HTTP request.
         Note that a call to this method may fail!
@@ -67,9 +71,9 @@ class HttpEndpointConnection:
         try:
             await self.send(
                 {
-                    "StatusCode": status_code,
-                    "Response": response,
-                    "ResponseType": response_type,
+                    "statusCode": status_code,
+                    "response": response,
+                    "responseType": response_type,
                 }
             )
         finally:
@@ -149,11 +153,47 @@ class HttpEndpointUnixSocket:
         """Set the handler to handle client connections"""
         self.handler = handler
 
+    def _create_socket(self, path: str):
+        path = os.fspath(path)
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+
+        # Check for abstract socket. `str` and `bytes` paths are supported.
+        if path[0] not in (0, '\x00'):
+            try:
+                if stat.S_ISSOCK(os.stat(path).st_mode):
+                    os.remove(path)
+            except FileNotFoundError:
+                pass
+            except OSError as err:
+                # Directory may have permissions only to create socket.
+                # logger.error('Unable to check or remove stale UNIX socket '
+                #                 '%r: %r', path, err)
+                pass
+
+        try:
+            sock.bind(path)
+            os.chmod(path, os.stat(path).st_mode | stat.S_IWGRP | stat.S_IRGRP)
+        except OSError as exc:
+            sock.close()
+            if exc.errno == errno.EADDRINUSE:
+                # Let's improve the error message by adding
+                # with what exact address it occurs.
+                msg = f'Address {path!r} is already in use'
+                raise OSError(errno.EADDRINUSE, msg) from None
+            else:
+                raise
+        except:
+            sock.close()
+            raise
+
+        return sock
+
     def start_connection_listener(self):
         try:
             self._loop = asyncio.new_event_loop()
+            sock = self._create_socket(self.socket_file)
             self._server = asyncio.start_unix_server(
-                self.handle_connection, self.socket_file, backlog=self.backlog
+                self.handle_connection, sock=sock, backlog=self.backlog
             )
             self._loop.create_task(self._server)
             self._loop.run_forever()

{dsf_python-3.6.0b2.dist-info → dsf_python-3.6.0b2.post3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsf-python
-Version: 3.6.0b2
+Version: 3.6.0b2.post3
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.

{dsf_python-3.6.0b2.dist-info → dsf_python-3.6.0b2.post3.dist-info}/RECORD

@@ -1,6 +1,6 @@
-dsf/__init__.py,sha256=9EA8iGOVjKYNIW7dikfDMqcH3t6Mj-0Hx9tIG_PEU0g,222
+dsf/__init__.py,sha256=U7DYDaYF0GThefa06ZcAU5GdqaVgrLolsWdXUpTL1Ww,254
 dsf/exceptions.py,sha256=TIF-e0wAprfodFTfRD9chP6JZ97yA04dlaHN90mgGVI,93
-dsf/http.py,sha256=ZOz0dRGWyxgWDoS-1c3DqQkNmyAZuhPi9y6vtano-mU,5829
+dsf/http.py,sha256=x3vPh4eZXYoBI0UVFZVGxc1p-fzN7vHhOpqPJ7Usl_w,7221
 dsf/utils.py,sha256=9GfGUu0sbeoJBJ6RuRIpI-BZ-1PKIMWaemWliknt1v0,2571
 dsf/commands/__init__.py,sha256=O4_mLIDnLnN3zLxvH8_3mx3Yx2rU4f2Ha3cm9PmFaS4,198
 dsf/commands/base_command.py,sha256=rwjaXeZ38yayAH7gYBm9Nf1xpYsg38Ul6oMexSkuCIo,378
@@ -17,7 +17,7 @@ dsf/commands/http_endpoints.py,sha256=CevsLjAh_9GG6MQkAL7aFZKsuyRvYgNkiSCc5-jGv7
 dsf/commands/model_subscription.py,sha256=Dq4M7EfRjkHUcIbTrLjJRAxhAhMiawowLbEFS11NMEc,224
 dsf/commands/object_model.py,sha256=QDtxBbkJA7AozjicUtMAhBq9uGkB9_OHcZQIr8koJG4,2522
 dsf/commands/packages.py,sha256=e7LObfz7xNygMPGi2A5o_F6OG1yFhN5fYO--U0tf5WM,712
-dsf/commands/plugins.py,sha256=w_7YlIxj95w046vO89qGbAXyVzOBw_o-dlMuaqFE-JA,3020
+dsf/commands/plugins.py,sha256=noLoiQTXuHxjFgXnk2LxgdoNZnhZXXIY-IIJcEQr_Zk,2930
 dsf/commands/responses.py,sha256=Q6jZwEKbmKkph96EepUdgD6LfY2VAX41MAaj6aJ1-XQ,1755
 dsf/commands/user_sessions.py,sha256=qFN_NfS8n2gVXqfdN0_kA3--kvtrX0ELYKtkxT1U7-E,1312
 dsf/connections/__init__.py,sha256=83E9M8yOZfdQqm196fnOaR7Wy4_IDYVhFwIl9BltsxI,1898
@@ -172,8 +172,8 @@ dsf/object_model/tools/tools.py,sha256=2wOEZlXswUnVBa0cuhyGYHz1z2R-mF25fi0a7WY3W
 dsf/object_model/volumes/__init__.py,sha256=XuRDty30gqn8jshASvclpxVTachXeAeJyo2-iHKEsKc,50
 dsf/object_model/volumes/volumes.py,sha256=gqbo5kUQo037A7Wv49vxnnaBhGlNjilJydjW8V2sKZ4,3073
 dsf/utility/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsf_python-3.6.0b2.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-dsf_python-3.6.0b2.dist-info/METADATA,sha256=BwSRQmLS4RsuytQ4UH9CUUZYgfHcE4uByQaxIGXKdDU,2054
-dsf_python-3.6.0b2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-dsf_python-3.6.0b2.dist-info/top_level.txt,sha256=hrm-wnKtms7vAmVuHX6jIj3C6G5p3uKCiXZH4HwJ4LA,4
-dsf_python-3.6.0b2.dist-info/RECORD,,
+dsf_python-3.6.0b2.post3.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+dsf_python-3.6.0b2.post3.dist-info/METADATA,sha256=9cm9octK6ubgXD6IKbq7iuHiMv2Aj992k9cTFuSG85c,2060
+dsf_python-3.6.0b2.post3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+dsf_python-3.6.0b2.post3.dist-info/top_level.txt,sha256=hrm-wnKtms7vAmVuHX6jIj3C6G5p3uKCiXZH4HwJ4LA,4
+dsf_python-3.6.0b2.post3.dist-info/RECORD,,