Allow M999, bump version to 1.3.15, support self-update via GCODE.

Author: cjavad

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simplyprint-duet3d"
-version = "1.3.14"
+version = "1.3.15"
 description = "SimplyPrint integration with any Duet3D powered RepRapFirmware printers "
 readme = "README.rst"
 license-files = ["LICENSE"]

simplyprint_duet3d/ota.py

@@ -6,12 +6,15 @@
 import sys
 import tempfile
 from importlib import metadata
-from typing import Optional
+from typing import Optional, TYPE_CHECKING
 
 import aiohttp
 
 from simplyprint_duet3d.gcode import GCodeCommand
 
+if TYPE_CHECKING:
+    from simplyprint_duet3d.printer import DuetPrinter
+
 
 def in_virtual_env() -> bool:
     """Detect venvs (venv/virtualenv), pipx venvs, and conda envs."""
@@ -224,19 +227,22 @@ async def update_external_component(
 
 
 async def process_m997_command(
-    logger: logging.Logger,
+    client: "DuetPrinter",
     command: GCodeCommand,
 ) -> bool:
     """Process an M997 GCode command for OTA component updates."""
     s_param = next(filter(lambda p: p.startswith("S"), command.parameters), None)
     if not s_param:
-        logger.error("M997 command missing S parameter.")
+        client.logger.error("M997 command missing S parameter.")
         return False
     component_name = s_param[1:]  # Remove 'S' prefix
     component_name = component_name.strip('"').lower()
 
+    if component_name == "self" or component_name == "simplyprint_duet3d":
+        return await client.perform_self_upgrade()
+
     if component_name not in SUPPORTED_COMPONENTS:
-        logger.error(f"Component '{component_name}' is not supported for OTA updates.")
+        client.logger.error(f"Component '{component_name}' is not supported for OTA updates.")
         return False
 
-    return await update_external_component(logger, component_name)
+    return await update_external_component(client.logger, component_name)

simplyprint_duet3d/printer.py

@@ -347,6 +347,7 @@ async def deferred_gcode(self, event: GcodeDemandData) -> None:
             "G29",
             "G90",
             "G91",
+            "M999",
         ]
 
         response = []
@@ -359,14 +360,14 @@ async def deferred_gcode(self, event: GcodeDemandData) -> None:
                     await self._notify_with_setup_code(),
                 )
             elif item.code == "M997":
-                await ota.process_m997_command(self.logger, item)
+                await ota.process_m997_command(self, item)
             else:
                 response.append("{!s} G-Code blocked".format(item.code))
                 # TODO: notify sentry
 
         self.logger.debug("Gcode response: {!s}".format("\n   [gcode] ".join(response)))
 
-    async def _perform_self_upgrade(self) -> None:
+    async def perform_self_upgrade(self) -> bool:
         """Perform self-upgrade and restart the API."""
         self.logger.info("Performing self upgrade")
 
@@ -378,7 +379,7 @@ async def _perform_self_upgrade(self) -> None:
         if ret == 0:
             self.logger.info("Plugin updated successfully, restarting API.")
             await self.on_api_restart()
-            return
+            return True
 
         await self.push_notification(
             severity=NotificationEventSeverity.WARNING,
@@ -388,6 +389,8 @@ async def _perform_self_upgrade(self) -> None:
             ),
         )
 
+        return False
+
     async def on_gcode(self, event: GcodeDemandData) -> None:
         """
         Receive GCode from SP and send GCode to duet.
@@ -839,4 +842,4 @@ async def on_plugin_install(self, event: PluginInstallDemandData) -> None:
             )
             return
 
-        await self._perform_self_upgrade()
+        await self.perform_self_upgrade()