dsf-python 3.4.6__tar.gz → 3.4.6.post2__tar.gz

{dsf-python-3.4.6/src/dsf_python.egg-info → dsf-python-3.4.6.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsf-python
-Version: 3.4.6
+Version: 3.4.6.post2
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.
@@ -9,6 +9,22 @@ License: UNKNOWN
 Project-URL: Duet3D Support, https://forum.duet3d.com/
 Project-URL: Bug Reports, https://github.com/Duet3D/dsf-python/issues
 Project-URL: Source, https://github.com/Duet3D/dsf-python/
+Description: # Duet Software Framework Python Bindings
+        
+        This is also availabe as a [pip package on pypi](https://pypi.org/project/dsf-python/)
+        
+        Find out more about [Duet Software Framework](https://github.com/Duet3D/DuetSoftwareFramework).
+        
+        Find out more about [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python).
+        
+        Get in touch with the community at [Duet Software Framework Forum](https://forum.duet3d.com/category/31/dsf-development) for bug reports, discussion and any kind of exchange.
+        
+        ## Installation
+        This package contains a `setup.py` so it can be installed with `python3 setup.py install`.
+        
+        ## Usage
+        See included `examples/` folder for various use cases.
+        
 Keywords: Duet3D,DuetSoftwareFramework,DSF,dsf-python
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -23,22 +39,3 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.7, <4
 Description-Content-Type: text/markdown
 Provides-Extra: dev
-License-File: LICENSE
-
-# Duet Software Framework Python Bindings
-
-This is also availabe as a [pip package on pypi](https://pypi.org/project/dsf-python/)
-
-Find out more about [Duet Software Framework](https://github.com/Duet3D/DuetSoftwareFramework).
-
-Find out more about [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python).
-
-Get in touch with the community at [Duet Software Framework Forum](https://forum.duet3d.com/category/31/dsf-development) for bug reports, discussion and any kind of exchange.
-
-## Installation
-This package contains a `setup.py` so it can be installed with `python3 setup.py install`.
-
-## Usage
-See included `examples/` folder for various use cases.
-
-

{dsf-python-3.4.6 → dsf-python-3.4.6.post2}/setup.py

@@ -6,7 +6,7 @@ long_description = open("README.md", encoding="utf-8").read()
 
 setuptools.setup(
     name="dsf-python",
-    version="3.4.6",
+    version="3.4.6-2",
     description="Python interface to access DuetSoftwareFramework",
     long_description=long_description,
     long_description_content_type="text/markdown",

{dsf-python-3.4.6 → dsf-python-3.4.6.post2}/src/dsf/commands/code.py

@@ -79,7 +79,7 @@ class Code(BaseCommand):
     @property
     def is_from_file_channel(self) -> bool:
         """Check if this code is from a file channel"""
-        return self.channel is CodeChannel.File or self.channel is CodeChannel.File2
+        return self.channel is CodeChannel.File
 
     def parameter(self, letter: str, default=None):
         """Retrieve the parameter whose letter equals c or generate a default parameter"""

{dsf-python-3.4.6 → dsf-python-3.4.6.post2}/src/dsf/connections/init_messages/client_init_messages.py

@@ -17,6 +17,7 @@ clientinitmessages holds all messages a client can send to the server to initiat
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
+from __future__ import annotations
 from .server_init_message import ServerInitMessage
 from .. import ConnectionMode, InterceptionMode, SubscriptionMode
 from ...commands.code_channel import CodeChannel

{dsf-python-3.4.6 → dsf-python-3.4.6.post2/src/dsf_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsf-python
-Version: 3.4.6
+Version: 3.4.6.post2
 Summary: Python interface to access DuetSoftwareFramework
 Home-page: https://github.com/Duet3D/dsf-python
 Author: Duet3D Ltd.
@@ -9,6 +9,22 @@ License: UNKNOWN
 Project-URL: Duet3D Support, https://forum.duet3d.com/
 Project-URL: Bug Reports, https://github.com/Duet3D/dsf-python/issues
 Project-URL: Source, https://github.com/Duet3D/dsf-python/
+Description: # Duet Software Framework Python Bindings
+        
+        This is also availabe as a [pip package on pypi](https://pypi.org/project/dsf-python/)
+        
+        Find out more about [Duet Software Framework](https://github.com/Duet3D/DuetSoftwareFramework).
+        
+        Find out more about [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python).
+        
+        Get in touch with the community at [Duet Software Framework Forum](https://forum.duet3d.com/category/31/dsf-development) for bug reports, discussion and any kind of exchange.
+        
+        ## Installation
+        This package contains a `setup.py` so it can be installed with `python3 setup.py install`.
+        
+        ## Usage
+        See included `examples/` folder for various use cases.
+        
 Keywords: Duet3D,DuetSoftwareFramework,DSF,dsf-python
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -23,22 +39,3 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.7, <4
 Description-Content-Type: text/markdown
 Provides-Extra: dev
-License-File: LICENSE
-
-# Duet Software Framework Python Bindings
-
-This is also availabe as a [pip package on pypi](https://pypi.org/project/dsf-python/)
-
-Find out more about [Duet Software Framework](https://github.com/Duet3D/DuetSoftwareFramework).
-
-Find out more about [Duet Software Framework Python Bindings](https://github.com/Duet3D/dsf-python).
-
-Get in touch with the community at [Duet Software Framework Forum](https://forum.duet3d.com/category/31/dsf-development) for bug reports, discussion and any kind of exchange.
-
-## Installation
-This package contains a `setup.py` so it can be installed with `python3 setup.py install`.
-
-## Usage
-See included `examples/` folder for various use cases.
-
-

{dsf-python-3.4.6 → dsf-python-3.4.6.post2}/src/dsf_python.egg-info/SOURCES.txt

@@ -167,4 +167,10 @@ src/dsf_python.egg-info/PKG-INFO
 src/dsf_python.egg-info/SOURCES.txt
 src/dsf_python.egg-info/dependency_links.txt
 src/dsf_python.egg-info/requires.txt
-src/dsf_python.egg-info/top_level.txt
+src/dsf_python.egg-info/top_level.txt
+tests/test_code.py
+tests/test_custom_http_endpoint.py
+tests/test_custom_m_codes.py
+tests/test_object_model.py
+tests/test_send_simple_code.py
+tests/test_subscribe_object_model.py

dsf-python-3.4.6.post2/tests/test_code.py

@@ -0,0 +1,37 @@
+import unittest
+import json
+
+from src.dsf.commands.code import Code, CodeChannel, CodeFlags, CodeType, KeywordType
+
+
+class Model(unittest.TestCase):
+
+    def setUp(self):
+        self.maxDiff = None
+
+    def tearDown(self):
+        pass
+
+    def test_code(self):
+        json_str = '{"sourceConnection":30,"result":null,"type":"M","channel":"HTTP","lineNumber":null,"indent":0,"keyword":0,"keywordArgument":null,"majorNumber":98,"minorNumber":null,"flags":2048,"comment":null,"filePosition":null,"length":22,"parameters":[{"letter":"P","value":"0:/macros/test","isString":true}],"command":"Code"}'
+        c = Code.from_json(json.loads(json_str))
+        self.assertEqual(str(c), 'M98 P"0:/macros/test"')
+        self.assertEqual(c.type, CodeType.MCode)
+        self.assertEqual(c.majorNumber, 98)
+        self.assertEqual(c.minorNumber, None)
+        self.assertEqual(c.flags, CodeFlags.IsLastCode)
+        self.assertEqual(c.keyword, KeywordType.KeywordNone)
+        self.assertEqual(c.keywordArgument, None)
+        self.assertEqual(c.comment, None)
+        self.assertEqual(c.length, 22)
+        self.assertEqual(c.lineNumber, None)
+        self.assertEqual(c.filePosition, None)
+        self.assertEqual(c.indent, 0)
+        self.assertEqual(c.channel, CodeChannel.HTTP)
+        self.assertEqual(c.command, 'Code')
+
+    def test_code_keyword(self):
+        json_str = '{"sourceConnection":33,"result":null,"type":"K","channel":"HTTP","lineNumber":null,"indent":0,"keyword":9,"keywordArgument":"test","majorNumber":null,"minorNumber":null,"flags":2048,"comment":null,"filePosition":null,"length":12,"parameters":[],"command":"Code"}'
+        c = Code.from_json(json.loads(json_str))
+        self.assertEqual(c.type, CodeType.Keyword)
+        self.assertEqual(c.keyword, KeywordType.Echo)

dsf-python-3.4.6.post2/tests/test_custom_http_endpoint.py

@@ -0,0 +1,53 @@
+import threading
+import os
+import pathlib
+import socket
+import time
+import importlib.util
+
+here = pathlib.Path(__file__).parent.parent.resolve()
+example_path = here / "examples/custom_http_endpoint.py"
+spec = importlib.util.spec_from_file_location("custom_http_endpoint", example_path)
+custom_http_endpoint = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(custom_http_endpoint)
+
+
+def test_custom_http_endpoint(monkeypatch, tmp_path):
+    mock_dcs_socket_file = os.path.join(tmp_path, "dsf.socket")
+    monkeypatch.setattr(
+        "dsf.connections.CommandConnection.connect.__defaults__",
+        (mock_dcs_socket_file,),
+    )
+
+    dcs_passed = threading.Event()
+
+    def mock_dcs():
+        server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        server.bind(mock_dcs_socket_file)
+        server.listen(1)
+        conn, _ = server.accept()
+        conn.sendall('{"version":11, "id":"foobar"}'.encode())
+        assert conn.recv(1024) == b'{"mode":"Command","version":11}'
+        conn.sendall('{"success":true}'.encode())
+        assert (
+            conn.recv(1024) == b"{"
+            b'"command":"AddHttpEndpoint","EndpointType":"GET",'
+            b'"Namespace":"custom","Path":"getIt","IsUploadRequest":false'
+            b"}"
+        )
+        conn.sendall('{"result":"/var/run/dsf/custom/getIt-GET.sock","success":true}'.encode())
+        conn.close()
+        dcs_passed.set()  # indicate that all asserts passed and the mock_dcs is shutting down
+
+    thread = threading.Thread(target=mock_dcs, daemon=True)
+    thread.start()
+    time.sleep(1)
+
+    cmd_conn, endpoint = custom_http_endpoint.custom_http_endpoint()
+    dcs_passed.wait(5)
+    endpoint.close()
+    cmd_conn.close()
+
+    thread.join()
+
+    assert dcs_passed.is_set()

dsf-python-3.4.6.post2/tests/test_custom_m_codes.py

@@ -0,0 +1,70 @@
+import threading
+import os
+import pathlib
+import socket
+import time
+import importlib.util
+
+here = pathlib.Path(__file__).parent.parent.resolve()
+example_path = here / "examples/custom_m_codes.py"
+spec = importlib.util.spec_from_file_location("custom_m_codes", example_path)
+custom_m_codes = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(custom_m_codes)
+
+
+def test_custom_m_codes(monkeypatch, tmp_path):
+    mock_dcs_socket_file = os.path.join(tmp_path, "dsf.socket")
+    monkeypatch.setattr(
+        "dsf.connections.InterceptConnection.connect.__defaults__",
+        (mock_dcs_socket_file,),
+    )
+
+    dcs_passed = threading.Event()
+
+    def mock_dcs():
+        server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        server.bind(mock_dcs_socket_file)
+        server.listen(1)
+        conn, _ = server.accept()
+        print("send all")
+        conn.sendall(b'{"version":11, "id":"foobar"}')
+        assert (
+            conn.recv(1024) == b"{"
+            b'"mode":"Intercept","version":11,"InterceptionMode":"Pre","Channels":["HTTP","Telnet",'
+            b'"File","USB","Aux","Trigger","Queue","LCD","SBC","Daemon","Aux2","AutoPause","Unknown"],'
+            b'"Filters":null,"PriorityCodes":false'
+            b"}"
+        )
+        conn.sendall(b'{"success":true}')
+        conn.sendall(
+            b"{"
+            b'"connection":{"id":12,"apiVersion":10,"isConnected":true},"sourceConnection":12,'
+            b'"result":null,"type":"M","channel":"HTTP","lineNumber":null,"indent":0,"keyword":0,'
+            b'"keywordArgument":null,"majorNumber":1234,"minorNumber":null,"flags":2048,"comment":null,'
+            b'"filePosition":null,"length":6,"parameters":[],"command":"Code"'
+            b"}"
+        )
+        assert conn.recv(1024) == b'{"command":"Flush","Channel":"HTTP"}'
+        conn.sendall(b'{"result":true,"success":true}')
+        assert conn.recv(1024) == b'{"command":"Resolve","Type":0,"Content":null}'
+        conn.sendall(
+            b"{"
+            b'"connection":{"id":12,"apiVersion":10,"isConnected":true},"sourceConnection":12,'
+            b'"result":null,"type":"M","channel":"HTTP","lineNumber":null,"indent":0,"keyword":0,'
+            b'"keywordArgument":null,"majorNumber":5678,"minorNumber":null,"flags":2048,"comment":null,'
+            b'"filePosition":null,"length":6,"parameters":[],"command":"Code"'
+            b"}"
+        )
+        assert conn.recv(1024) == b'{"command":"Resolve","Type":0,"Content":null}'
+        conn.close()
+        dcs_passed.set()  # indicate that all asserts passed and the mock_dcs is shutting down
+
+    thread = threading.Thread(target=mock_dcs, daemon=True)
+    thread.start()
+    time.sleep(1)
+
+    custom_m_codes.start_intercept()
+
+    thread.join()
+
+    assert dcs_passed.is_set()

dsf-python-3.4.6.post2/tests/test_object_model.py

@@ -0,0 +1,149 @@
+import json
+import unittest
+
+from src.dsf.object_model import *
+
+
+class Model(unittest.TestCase):
+
+    def setUp(self):
+        self.maxDiff = None
+
+    def tearDown(self):
+        pass
+
+    def test_boards(self):
+        model = ObjectModel()
+
+        json_patch = '{"boards": [{"accelerometer": null, "bootloaderFileName": null, "canAddress": 0, "closedLoop": null, "directDisplay": null, "firmwareDate": "2022-11-30", "firmwareFileName": "Duet3Firmware_Mini5plus.uf2", "firmwareName": "RepRapFirmware for Duet 3 Mini 5+", "firmwareVersion": "3.4.5", "iapFileNameSBC": "Duet3_SBCiap32_Mini5plus.bin", "iapFileNameSD": "Duet3_SDiap32_Mini5plus.bin", "maxHeaters": 32, "maxMotors": 7, "mcuTemp": {"current": 33.1, "max": 33.6, "min": 19.4}, "name": "Duet 3 Mini 5+", "shortName": "Mini5plus", "state": "unknown", "supports12864": true, "supportsDirectDisplay": true, "uniqueId": "F8AU7-6P6KL-K65J0-409N2-KKW1Z-Z5W3W", "v12": null, "vIn": {"current": 19.4, "max": 19.4, "min": 19.3}}]}'
+        model.update_from_json(json_patch)
+
+        # Voltage change
+        json_patch = '{"boards":[{"vIn":{"current":42.5}}]}'
+        model.update_from_json(json_patch)
+        # Check if the value has been modified
+        self.assertEqual(model.boards[0].v_in.current, 42.5)
+        # Check if other values has not been altered
+        self.assertEqual(model.boards[0].v_in.min, 19.3)
+        self.assertEqual(model.boards[0].v_in.max, 19.4)
+
+    def test_http_endpoints(self):
+        from src.dsf.object_model.http_endpoints.http_endpoint_type import HttpEndpointType
+        model = ObjectModel()
+
+        json_patch = '{"httpEndpoints":[{"endpointType":"GET","namespace":"ExecOnMcode","path":"getCmdList","isUploadRequest":false,"unixSocket":"/run/dsf/ExecOnMcode/getCmdList-GET.sock"}]}'
+        model.update_from_json(json_patch)
+        self.assertEqual(len(model.http_endpoints), 1)
+        self.assertEqual(model.http_endpoints[0].endpoint_type, HttpEndpointType.GET)
+
+        json_patch = '{"httpEndpoints":[{},{"endpointType":"POST","namespace":"ExecOnMcode","path":"saveCmdList","isUploadRequest":false,"unixSocket":"/run/dsf/ExecOnMcode/saveCmdList-POST.sock"}]}'
+        model.update_from_json(json_patch)
+        self.assertEqual(len(model.http_endpoints), 2)
+        self.assertEqual(model.http_endpoints[1].endpoint_type, HttpEndpointType.POST)
+
+    def test_job(self):
+        model = ObjectModel()
+
+        json_patch = '{"job":{"file":{"filament":[496.4],"fileName":"0:/gcodes/Veil_Token.gcode","generatedBy":"ideaMaker 4.2.1.5321, 2022-10-01 17:45:38 UTC\u002B0200","height":1.04,"lastModified":"2022-10-01T16:45:39+01:00","layerHeight":0.12,"numLayers":9,"printTime":798,"size":594195,"thumbnails":[{"data":"iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAUnklEQVR4nO3cfYwcZ30H8O/zzMy\u002B3d77nl\u002BuztmOA7bjGIOdBBJioDSEJkBLStOWCERTaKS2alWkqqioqpD6BxSVSlUFaktVggRUjdomBVIaikrA4Y9AYkhsY5vEdnz2\u002Bezz3u3e3b7OzPP8\u002BsfM7O5dfMmdb\u002B9s1O9HWu3u3e7s8/xmnmeefZ7fLEBERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERET0/5261gXoljuA7N5cbuADw8PDU8bc6Isa3eJ5W3MaY/NWxiyQ6Xy9o1D0gCPnguBwv8jzvzY5\u002BTMAZq3L\u002BdG\u002BvqFfHRjYXDVmm0Dv2p72bimFZswCfZ2vc4GL/a5TnPTDM0UTHBtynBe/cv78\u002BOPALABZyzI\u002BAKTev2XL1poxb96bzR4oGbPLCAqdr3GgZvIaxZrF\u002BIwJpozIsY1aTz5Vr8/86/R08SWguZZlXC8/bw1E/3ImM3ZTOl24v39ot6OlcNmYnSOOuzWj9Zhv7UBW62FHqfRKNhpYWw1FXihZ84ILPPfVmZmnD1UqZ14GGqsp7Ad7e3ftdDOFd/f37r0Qhrs3uu4tWmGbo9RmT6nMa2\u002Bho4wijcDKBJRMzBjzk4xS4yfqwZGvz5dOfKdeH19NObcBmXv7\u002B/f81tDQnlIY3j7ierc5Su1MKdW/ku0YEb8pMuMpVZwJzZmGmHP9jvPSdBiePV71L/1naer0c8AlAHY15V1P13MDcf9\u002B4\u002BgDe3PpA3PW7negtg05zphWylmPDw9FmpNheOT5pvmdv7h0/shy3vO5jRt/6U2Z7IMN4NYRx9ntKOWtdTkBwIgEZWtOOMDh5xuNRz5\u002B8eJTy3nfp0dGbtqTyf3TJs99i7vCTuVqWREzY8y4hfxUizo6EQTHHpqc\u002BBcA4Xp8/kq517oAS9kDFLbkMl/2Fby840IjGv9YCBwAapVtOxRBAKAR39cB1CBoCDAnghIkXYXcOuXhLQCW1UC2ZHMPV5X6jawCqgBcicqqASgV3etVlltE0ABQhyAQYD6qg1cS7J2B7J1PpXIAnlrOtvqy2V9sOM7bp0TgQpCOy\u002BcAXS\u002B3FUETQAA4Ruvt88D2WbHvuZzyghHgfy4DF1f1AWvkum0gBghqgPgAVDzkFgAi0c1CoBGdq6ObwALQEj03AHwAAQQmfh5K1BCa8d8CAUIIfCzdffnG9Cy3zGVryspxkZQ5OaQ6yy1xXRTaDd7Gz61Erw0A\u002BB3lDgD4EjWKMC53gKihLB6rNMKwvNzyVq3NDTiCGhS0ADXVjvXiciOJL64Q87jsFlHM/bicSYxriMrrx/FuoP1lTwA0oipel67bBnICmC4a89NhR7/RU\u002B3zhQPAU4AjUeG1UlFPF/d8RgFGJD4jALMiKCNuICra2dHWXv17btPaSSvybDkMv7ncMp8Kgie3KvX\u002BYa03uAAcpRZ8SudjF0AWQEopaChoCBwV1TIQgYFCFdFZbTbufTu3caX\u002BvGnMuZLvf3e55X252XxCtL4rB/XOfkcPZSQq81LnCgFajdbGdeiBQkZF\u002B8WN94UPgZXoW3pNAVURVACUICjLwjiE1k7NA9PLLfN6u\u002B6\u002BgxwAvAO5XOGegYH\u002BqtXbJ8Tcf3M285sbtO7zgNZBtFwighqAM2LxsrG1sshpUWjOh\u002BHlukgttPYylJpztJ4GcPbM/Pz4nO9PHWs2X7rKKqjtmczYrb29u/dlMjdWwvCmPq1vvzGVunVIqXQvFFIA1FXUowzBRSu4LNJ80fefvWzN0XwqdWSiWj014ftnj1YqJ3CVM1w3AKP7h4dvvjGdLvRovdUDsr6VMc/RhR7AS2t3REFcLbJjm\u002BPkB5RCdoV1AKLGXxZBSezseL35RI\u002BSxzamUse/MzNz\u002BUeVSum56\u002Bxsci0biP5gPr97fyY/ckdv9pZJP9zd7zqb\u002Bx29o2mlkFaq39N62cOb5QhFalVrjzTF/qDkm6c/O3n\u002B6R8Dl7u1/T1A6s6BgZvv7\u002B3fXxO7f4Pr7nCV2hHPWuW79TkA0BSpiMhkzdpTc8YeySh14ofV\u002Bol/n5k6fgQodetzHsrnR27v7d0/6qbuGXKdNztK7ct0uS6\u002BSCMUuewoTJVDe6Eu5uQG1z17rF4/81i5fOxMozF9Mvq6te7WvIE8DHj3jI7uKAP7tzjeLqtx0IXaup4zUktJZn\u002BKYfiZD54//7WVvv/RTZtGqlq/64ZU6h4ruKPguq9fi3KuVDEMT3gK3zvj\u002B9/7WbX635\u002BZnV1xg3l0dOxdQ57\u002BqyHXfdNalHElRMRMxzNfrqijE37wbI\u002BWo1\u002B\u002BcGH8G9FIes2sdQNRj90w9s\u002BjrvtAt88G3VASi6IITlv52Z\u002BdfXnnSt//lRtu\u002BPwOL/X76asYaqyHkrX2ULPx\u002BU9duPBHK33vf2y/8eSgUq/PAfCuw/oF1laPBsG3P3r\u002B3Aewhguna/4lfUphq6fQkxULr2MKUcU3Hb9OYeXj8oQVac2sJF8gQ8QzVALMQ1AXoBLfz8Tj\u002BdYMkFxdfC8DPSkRpOIp0lRcNzeup1rqdpX1FJFW/Vozc4jG9fMQ1AQoQ6L6Rd\u002B99LzIihb7EnPxdLKLaLo6paLHHgBn8VRw/J5u7c/F9UxmxxoiKMV1nRDpOWvtwFV9wAqsdQMRALUmgM7p2k4qntWIpjmjg9aJ3yhoTylK6z4Kni/tqcQQ0RRugKhRROsb0XRuGP9/LZZujbVVdGy/vey\u002BqJ6CBfNmItFkb3IwJfVLpj7b94IgXqdpN4aongGima1mXM8A3c2T6ayBRTQjFe3Dxf9d\u002BKYF84PS7oSS6WHE5Wzvz/Z0cT1\u002BfYB2Pf14Gr7WXkdpl0ut7fAKWIcziAAXjAhcqFZXI0vcTMe7kgCGglZDMPF/Og96A8BIcgBJ6\u002BzRebAsdX4wIjURGZ8Ngr\u002B5mrqVQ3my37W/3qvVBhfRYlpnp7m4fp0HSNLYk78paZfZR3JQLjwzBvFaQ4D2gfRqDd\u002BKzDZEnrqauh2u1z51UyrzibxWO3NaZVyJG/SiaWDpuL9SfTsbQVK/UBY3wPY\u002B9RGt\u002BST1TOp9pX3oiExi6d3bFWs\u002BuPxQobD59ZnM72aBd/c6zu6s1oMpAJl4ujM6dSt4aJ\u002Buk1tnkGvxesa0CBrxAZIsogFR0P24B/I7/t9asLK20rD2rIgUNXBo1pgTPY5z\u002BKnJyfFL0cL3Vflwf//2kVzu7hHPO\u002BiJ7MxovTOndX8a7d4nOVskS4QeoszJlFJIoz1USSR1DhD1qqV4LaQs7UXCEO0GlBxcgbWzDWvHHeCFWWO\u002BB2O\u002B//Vi8eTV1u2tQO8bN20aE\u002BC2Ta672wH2aqV29yldSDs676E9rExGAUl9BQpGBKJUqzNQAHoB5KGQUapV784GZeI61xEN8yoQXBDBXDxi8K2drxlzGMCTl\u002Br1r/1vuXz2auu3HGvaQA4A3tuGhzfcmU5vnbdq37Z06kBTyX0j2tmsV/F9Y0IEzwT\u002BibKVFw2AmjWXrUgQaF33gGLW8y7XwnDuzPz8eN3a2ulqdXwOmOlu7ZakCsCmsZ6ekd3Z7NimVHZsg6vu3KjUfdscd7AHK1/LSRgRXBLBuNj5s2H4jUlrf1D0/fGLtdrkbK127hQw1d2qLK0PGBpNpws78vmxbel0YcB1\u002B\u002BrGjAiQs9YOp5TyUsoZCWGRh9ryhpS3b1RpvZq6F62dTAv\u002BayoMn3PEPH\u002B60Rh/dGbm0lqunXS1gbwZ6Hvn0NCet\u002Bfzt9dE7dvkOfuMYDSr1Ei3p3RDkYuTgf/Xf3Du3BfORxkk14178/mRB3sHDuRd9Z4R1zvoKbWj2\u002BsgRqTZsPbEnLGHG7CP/\u002BW5c9//CbDsNJP18NG\u002BvqEHh4b\u002BNK/1RzylN3Vz21bENEWKSmFiJgyPOMDhI43Gc1\u002Bemnr\u002BGFDp1uesuIE8APQf3LCh8LpMZvOFwNxycyZ1c9nYPVmtd/U5zmi3CrZcgUhlKgwe88PwH57x/Rc\u002BWyyu64LSA\u002Bgbeu8v9Baswb4tae\u002BOQHDXJs\u002B9bT3LAAC\u002BtbU5Y486GofP\u002B/5TvSIvfHFycuJbwNx6luPhwcH\u002Bd\u002BRyB4Zc9z2DjvtwtzuG12JFTMmYs0m28LgfHO918OKpqpn8t/LFqedWuG7yqg3kvp6eTQezvbsOxivdoylvL4DNAApZrdd8im0lrIgJIadKoXlyyg8f\u002B8jFiaewBl/gfhvI3DC44cBbezNv9ZRzMK2wx9G6kFaqt9uftRqBtTUDTNStnAzEHDru\u002Bz/8\u002BMWLT2ON0sq/uGHLG0Yy\u002BmMbXfdeD2qrXqdU/\u002BUwIsa3tqyUnhJIsRSaIwOuPn6k0XjxC5OTP3y1zINWA3konx95b3//Dqv1XQPafbuI7Cx47uvWpwrd93LT/9svnh//xLe6cGXbh4Ge\u002BzZvuWc45dzf67j3p9e5V\u002ByWpkilFAZP1EJ8db42d\u002BihcnnVQ7J7gfTHbhj7zPZU6o\u002B7UcZroWzMORE8M2PDZ7S1T39zdvbUlyqVywCgPjcy8qa9ufwnc1rdntF6VF/HGb4rMWNt7dH5uYP/WCweXs12HkT/4MPbhh7vc5y3dats14M5a559ZGrqfY9Uq6u6DuOThcL\u002Bu3v7Dg1onetW2a4lC4QNay8YkR\u002BfrQefdm/L5w/ltXPdpYGsVF0ENQguWMEZsThvrb4osurGXs36\u002BWlgVzpeTV7thVrXmolTz58xduxH1qZWu72667qnxerh\u002BKL6rIqn7H9OY6UBN6f1GICxjVm5zT0vUtssticLhdR1mHNzJbMirfWBmTj9IE6taC\u002B8AalCOn1VaRaLzYlARJABkIUgHa/huD8n8ZqL4zMpFhPx44rtTm7B9lSqzwFSNURjWUcEHqKUlBQEXrzu4\u002BHnK15nrMXzYQi3Ya1f0hplCLREOUUu4guToOLLLV\u002BZO3W16xiJzvyp5JYs6vkiqMbpE1WJFglnEDWKOazDT49cqbyI0lf8jqvudHxJbZSf1M7BWpxr1o08rFY5pL0IKuiIGQRVARoQVASYE4uyANMdK9hrISlHolUmAZoq\u002BksrV0ukdWxpxBe8IYrb4uOs8wZ073hLshiCuJxVEdQRdRpFEUyLtFaNayJww45pL4v2gkK0uinxFXgLSVxZwcK8KWBhwDp3TAhBKFF\u002BUeelpBbR6rBBx6Ww8TaSlISw4z3LnZZqWnvyTLl8dJkvX1Idr0znaOWOoR1sif8TX526YGUZ6MhR6sg3S7aBjm0lj9sxlDjPbGH2QCjty4o7L3E1EqVu\u002BGgfDFeigBBa\u002BysIxRUdKhaP3VUYOTekZasDAK9yIAuSPLL28\u002Bg\u002Bjl5HLldnAuSrxa0zRakzncfGcVucVeHHcWtdvowkVenKl1477\u002Brr\u002B5VerW9cnGOzWGdOUCu1IU6YawCt\u002B7q0n1fjvzUQZdI247/XEe3YprRbchgXOAlIZ6Ozi54vWUaRWihyrBaGj5wulf7wB/X6hdd4y2s6FYZz\u002B3pytZyjb3cVeqIfMlje6LozVWZh3NrXlCex6oxbDVGMGgCqiIaOPhbGLdlOiKXz2paKmRWplcLwT75fKj298ogsdDwIKi/Ozn5pIJud11oPWaUKWsFpHeDLjBXwyv19pbglyYtJrJqS/M4AWpdZNxBdqpwM\u002BxqIGkYD7QZqlviszng1rP2u\u002BvPR0Z0DjvN3Gxz37nzHeaydebpwQ7Joo0nCXfL6zkS0zvV/v9XHtndq8trkBwCS1pskIobSfu\u002BVKiAiUjXmuKfU8Wnff8JT6vCpqamXXlhFbtVSPjQyctP2dPrBLPT9w67e3a9U2ot3vY6vdRcAUO2YXSl5r93LyYKzhpH24yQ\u002B0eOOJD8sjFv7\u002BvCFP0wh8fB0cRZzzZijxtqv1YPg248Xi891KzYdUr\u002B3efNeR\u002BQNo573bgXsH3Scm3Iq\u002BhEwpyOZU2FRzLAwbsArz6jJ8QZ0nDWk3evbjr8nI5XW8SYLE1zDeEvJGSTJb0u2VTfmmZlK5cFWg3jf8PBtr0ulDg647jt6tN6RgRrJajWgAc/rGGZ17ujWc5WcBheePtunK1mQeRpIu0EIol/ESM4incMvI9IIrZ0VpSqi1GQ1DMcNMO4AP51oNE6fKZWOn1\u002B/HKuWXmD4/Rs33jnqeXvSSr1lUDtbNWTAgxpOK/Q4SmkH0S\u002BsJGnenb15q9GoOCayuFG0h2wL47ZwqGkk6Q0lGffbhtiyAWpa62IlDE8KcHKm2Tx0qlY78VK9fn6tY7PYENC3t69v596enp2eUnuyWu/q17rgKFXwgMG0UjkPqtdRHUmbi\u002BKW/OrLgs4mPiCtLGwUUawUgrgBSEeMWo2j43hrAIFv7awAMzVrf\u002BIAh8/U6986VCq9ACy9kp69e3Bw5I09PQPlMNziAje6WhcKrru5bm1BATkLFFwRV5Te4Kjkug6B0npQK5WNfpoH4lsz2dm7ATIXiFQCEau0vqSUqqS1nq8bU5kNw/HAmFoITA6m00VrzPzp2dnZS/V65eXrLM9oEWdXb\u002B/A7nR6eGsqlZ81ZhTWjmQ9b6zfcQoudM634YhA9SlBj1LoVUr1JuNpA1Epx9mcNBYLII6btNL5xV4KAWOVqgowl9b6cihSK/n\u002BeN3asmg9vcF1X56oVksXwrB2tFot4trMZyzLRqBnWzY7ONrTk9ueTg8Vw7Cggc09WhdcIDfoeRsq1m50RWkL2egoaCXIi1J9UVJf1IV4UdxU0tEG1l60EBsPo5rW2ul4pbgIpWppxynONJvjVWOmoFR5IJ0\u002Beb5SmZ0ol2eu1XXvRERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERERNe3/wOxabcDNmswcQAAAABJRU5ErkJggg==","format":"png","height":200,"offset":483,"size":7144,"width":200}]},"build":{"currentObject":-1,"m486Names":false,"m486Numbers":false,"objects":[]},"duration":0,"pauseDuration":0,"rawExtrusion":0,"warmUpDuration":0,"layers":[],"lastDuration":null}}'
+        model.update_from_json(json_patch)
+
+    def test_json_serialization(self):
+        with open('object_model/model_duet5mini.json') as fp:
+            json_data = json.load(fp)
+        model = ObjectModel.from_json(json_data)
+        json_text = json.dumps(json_data, sort_keys=True)
+        self.assertEqual(json_text, str(model))
+
+    def test_messages(self):
+        from src.dsf.object_model.messages import MessageType
+
+        model = ObjectModel()
+        json_patch = '{"messages":[{"content":"File 0:/gcodes/Veil_Token.gcode will print in 0h 14m plus heating time","time":"2022-12-31T16:42:22.8058935+00:00","type":0}]}'
+        model.update_from_json(json_patch)
+        self.assertEqual(len(model.messages), 1)
+        self.assertEqual(str(model.messages[0].time), "2022-12-31 16:42:22.805893+00:00")
+        self.assertEqual(model.messages[0].type, MessageType.Success)
+
+        json_patch = '{"messages":[]}'
+        model.update_from_json(json_patch)
+        self.assertEqual(len(model.messages), 0)
+
+    def test_move_kinematics(self):
+        from src.dsf.object_model.move.kinematics import CoreKinematics, DeltaKinematics, KinematicsName
+
+        model = ObjectModel()
+        json_patch = '{"move": {"kinematics": {"name": "delta","deltaRadius": 123}}}'
+        model.update_from_json(json_patch)
+
+        self.assertIsInstance(model.move.kinematics, DeltaKinematics)
+        self.assertEqual(model.move.kinematics.name, KinematicsName.delta)
+        self.assertEqual(model.move.kinematics.delta_radius, 123)
+
+        # Switch to CoreXY (eg: M669 K1)
+        json_patch = '{"move":{"kinematics":{"forwardMatrix":[[0.5,0.5,0],[0.5,-0.5,0],[0,0,1]],"inverseMatrix":[[1,1,0],[1,-1,0],[0,0,1]],"tiltCorrection":{"correctionFactor":1,"lastCorrections":[],"maxCorrection":1,"screwPitch":0.5,"screwX":[],"screwY":[]},"name":"coreXY","segmentation":null}}}'
+        model.update_from_json(json_patch)
+        self.assertIsInstance(model.move.kinematics, CoreKinematics)
+        self.assertEqual(model.move.kinematics.name, KinematicsName.coreXY)
+
+        # Switch to linear delta (eg: M669 K3)
+        json_patch = '{"move":{"kinematics":{"deltaRadius":105.6,"homedHeight":240,"printRadius":80,"towers":[{"angleCorrection":0,"diagonal":215,"endstopAdjustment":0,"xPos":-91.452,"yPos":-52.8},{"angleCorrection":0,"diagonal":215,"endstopAdjustment":0,"xPos":91.452,"yPos":-52.8},{"angleCorrection":0,"diagonal":215,"endstopAdjustment":0,"xPos":0,"yPos":105.6}],"xTilt":0,"yTilt":0,"name":"delta","segmentation":null}}}'
+        model.update_from_json(json_patch)
+        self.assertIsInstance(model.move.kinematics, DeltaKinematics)
+        self.assertEqual(model.move.kinematics.name, KinematicsName.delta)
+        self.assertEqual(model.move.kinematics.delta_radius, 105.6)
+
+    def test_plugins(self):
+        model = ObjectModel()
+        self.assertEqual(len(model.plugins), 0)
+
+        # Plugin installation
+        json_patch = '{"plugins":{"ExecOnMcode":{"dsfFiles":["execOnMcode.py","http_endpoints.py","MCodeAction.py","__init__.py"],"dwcFiles":["js/ExecOnMcode.09113059.js","js/ExecOnMcode.09113059.js.gz","js/ExecOnMcode.09113059.js.map","js/ExecOnMcode.09113059.js.map.gz"],"sdFiles":["sys/ExecOnMcode/top-example.py"],"pid":-1,"id":"ExecOnMcode","name":"ExecOnMcode","author":"Lo\u00EFc GRENON","version":"0.2","license":"GPL-3.0-or-later","homepage":"https://github.com/LoicGRENON/DSF_ExecOnMcode_Plugin","tags":[],"dwcVersion":"3.4.5","dwcDependencies":[],"sbcRequired":true,"sbcDsfVersion":"3.4.5","sbcExecutable":"execOnMcode.py","sbcExecutableArguments":null,"sbcExtraExecutables":[],"sbcOutputRedirected":true,"sbcPermissions":["commandExecution","codeInterceptionRead","registerHttpEndpoints","fileSystemAccess","launchProcesses"],"sbcPackageDependencies":[],"sbcPythonDependencies":["dsf-python\u003E=3.4.5"],"sbcPluginDependencies":[],"rrfVersion":null,"data":{}}}}'
+        model.update_from_json(json_patch)
+        self.assertEqual(len(model.plugins), 1)
+        self.assertIsInstance(model.plugins.get('ExecOnMcode'), Plugin)
+        self.assertEqual(len(model.plugins['ExecOnMcode'].dsf_files), 4)
+        self.assertEqual(len(model.plugins['ExecOnMcode'].sbc_permissions), 5)
+        self.assertEqual(model.plugins['ExecOnMcode'].pid, -1)
+
+        # Plugin start
+        json_patch = '{"plugins":{"ExecOnMcode":{"pid":1125}}}'
+        model.update_from_json(json_patch)
+        self.assertEqual(model.plugins['ExecOnMcode'].pid, 1125)
+
+        # Plugin removal
+        json_patch = '{"plugins":{"ExecOnMcode":null}}'
+        model.update_from_json(json_patch)
+        self.assertEqual(len(model.plugins), 0)
+
+    def test_sensors_filament_monitor(self):
+        from src.dsf.object_model.sensors.filament_monitors import FilamentMonitorType
+
+        model = ObjectModel()
+        self.assertEqual(len(model.sensors.filament_monitors), 0)
+
+        # Change filament monitor to Simple (eg: M591 D0 P1 C"io2.in" S1)
+        json_patch = '{"sensors":{"filamentMonitors":[{"enabled":true,"status":"ok","type":"simple"}]}}'
+        model.update_from_json(json_patch)
+        self.assertEqual(len(model.sensors.filament_monitors), 1)
+        self.assertEqual(model.sensors.filament_monitors[0].type, FilamentMonitorType.Simple)
+
+        # Change filament monitor to Pulsed (rg: M591 D0 P7 C"io2.in" S1)
+        json_patch = '{"sensors":{"filamentMonitors":[{"calibrated":null,"configured":{"mmPerPulse":1,"percentMax":160,"percentMin":60,"sampleDistance":5},"enabled":true,"status":"ok","type":"pulsed"}]}}'
+        model.update_from_json(json_patch)
+        self.assertEqual(len(model.sensors.filament_monitors), 1)
+        self.assertEqual(model.sensors.filament_monitors[0].type, FilamentMonitorType.Pulsed)
+
+    def test_user_sessions(self):
+        from src.dsf.object_model import AccessLevel, SessionType
+
+        model = ObjectModel()
+        self.assertEqual(len(model.user_sessions), 0)
+
+        json_patch = '{"userSessions":[{"accessLevel":"readWrite","id":2,"origin":"::ffff:192.168.1.200","originId":-1,"sessionType":"http"}]}'
+        model.update_from_json(json_patch)
+        self.assertEqual(len(model.user_sessions), 1)
+        self.assertEqual(model.user_sessions[0].access_level, AccessLevel.readWrite)
+        self.assertEqual(model.user_sessions[0].session_type, SessionType.http)
+
+if __name__ == '__main__':
+    unittest.main()

dsf-python-3.4.6.post2/tests/test_send_simple_code.py

@@ -0,0 +1,46 @@
+import threading
+import os
+import pathlib
+import socket
+import time
+import importlib.util
+
+here = pathlib.Path(__file__).parent.parent.resolve()
+example_path = here / "examples/send_simple_code.py"
+
+spec = importlib.util.spec_from_file_location("send_simple_code", example_path)
+send_simple_code = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(send_simple_code)
+
+
+def test_send_simple_code(monkeypatch, tmp_path):
+    mock_dcs_socket_file = os.path.join(tmp_path, "dsf.socket")
+    monkeypatch.setattr(
+        "dsf.connections.CommandConnection.connect.__defaults__",
+        (mock_dcs_socket_file,),
+    )
+
+    dcs_passed = threading.Event()
+
+    def mock_dcs():
+        server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        server.bind(mock_dcs_socket_file)
+        server.listen(1)
+        conn, _ = server.accept()
+        conn.sendall('{"version":11, "id":"foobar"}'.encode())
+        assert conn.recv(1024) == b'{"mode":"Command","version":11}'
+        conn.sendall('{"success":true}'.encode())
+        assert conn.recv(1024) == b'{"command":"SimpleCode","Code":"M115","Channel":"SBC"}'
+        conn.sendall('{"result":"fake code executed", "success":true}'.encode())
+        conn.close()
+        dcs_passed.set()  # indicate that all asserts passed and the mock_dcs is shutting down
+
+    thread = threading.Thread(target=mock_dcs, daemon=True)
+    thread.start()
+    time.sleep(1)
+
+    send_simple_code.send_simple_code()
+
+    thread.join()
+
+    assert dcs_passed.is_set()

dsf-python-3.4.6.post2/tests/test_subscribe_object_model.py

@@ -0,0 +1,54 @@
+import threading
+import os
+import pathlib
+import socket
+import time
+import importlib.util
+
+here = pathlib.Path(__file__).parent.parent.resolve()
+example_path = here / "examples/subscribe_object_model.py"
+spec = importlib.util.spec_from_file_location("subscribe_object_model", example_path)
+subscribe_object_model = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(subscribe_object_model)
+
+
+def test_subscribe_object_model(monkeypatch, tmp_path):
+    mock_dcs_socket_file = os.path.join(tmp_path, "dsf.socket")
+    monkeypatch.setattr(
+        "dsf.connections.SubscribeConnection.connect.__defaults__",
+        (mock_dcs_socket_file,),
+    )
+
+    dcs_passed = threading.Event()
+
+    def mock_dcs():
+        server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        server.bind(mock_dcs_socket_file)
+        server.listen(1)
+        conn, _ = server.accept()
+        conn.sendall('{"version":11, "id":"foobar"}'.encode())
+        assert (
+            conn.recv(1024)
+            == b'{"mode":"Subscribe","version":11,"SubscriptionMode":"Patch","Filter":"","Filters":null}'
+        )
+        conn.sendall('{"success":true}'.encode())
+        conn.sendall('{"boards":"fake-data", "job":"fake-data", "state":"fake-data"}'.encode())
+        assert conn.recv(1024) == b'{"command":"Acknowledge"}'
+        conn.sendall('{"boards":"some-other-fake-data"}'.encode())
+        assert conn.recv(1024) == b'{"command":"Acknowledge"}'
+        conn.sendall('{"job":"some-other-fake-data"}'.encode())
+        assert conn.recv(1024) == b'{"command":"Acknowledge"}'
+        conn.sendall('{"state":"some-other-fake-data"}'.encode())
+        assert conn.recv(1024) == b'{"command":"Acknowledge"}'
+        conn.close()
+        dcs_passed.set()  # indicate that all asserts passed and the mock_dcs is shutting down
+
+    thread = threading.Thread(target=mock_dcs, daemon=True)
+    thread.start()
+    time.sleep(1)
+
+    subscribe_object_model.subscribe()
+
+    thread.join()
+
+    assert dcs_passed.is_set()