Addressing PR review

Author: LuckierDodge

.github/workflows/docker-publish.yml

@@ -38,10 +38,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      # Login against a Docker registry except on PR
+      # Login against a Docker registry
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}

src/wei/core/admin.py

@@ -5,14 +5,14 @@
 
 
 def send_safety_stop(module: Module) -> None:
-    """E-stops a module"""
+    """Safety stops a module"""
     if AdminCommands.SAFETY_STOP in module.about.admin_commands:
         InterfaceMap.interfaces[module.interface].send_admin_command(
             module, AdminCommands.SAFETY_STOP
         )
-        print(f"Module {module.name} has been e-stopped.")
+        print(f"Module {module.name} has been safety-stopped.")
     else:
-        print(f"Module {module.name} does not support e-stop.")
+        print(f"Module {module.name} does not support safety stop.")
         send_pause(module)
 
 

src/wei/modules/rest_module.py

@@ -65,7 +65,7 @@ class RESTModule:
 
     # * Admin command function placeholders
     _safety_stop = None
-    """Handles custom e-stop functionality"""
+    """Handles custom safety-stop functionality"""
     _pause = None
     """Handles custom pause functionality"""
     _reset = None
@@ -502,7 +502,7 @@ async def safety_stop(request: Request):
             if self._safety_stop:
                 return self._safety_stop(state)
             else:
-                return {"message": "Module e-stopped"}
+                return {"message": "Module safety-stopped"}
 
         @self.router.post("/admin/pause")
         async def pause(request: Request):
@@ -707,8 +707,8 @@ def example_shutdown_handler(state: State):
 
     @rest_module.safety_stop()
     def custom_safety_stop(state: State):
-        """Custom e-stop functionality"""
-        print("Custom e-stop functionality")
-        return {"message": "Custom e-stop functionality"}
+        """Custom safety-stop functionality"""
+        print("Custom safety-stop functionality")
+        return {"message": "Custom safety-stop functionality"}
 
     rest_module.start()

src/wei/routers/admin_routes.py

@@ -25,15 +25,15 @@
 
 @router.api_route("/safety_stop", methods=["POST"])
 def safety_stop_workcell() -> None:
-    """E-stops a workcell"""
+    """Safety-stops a workcell"""
     for module in state_manager.get_all_modules().values():
         send_safety_stop(module)
     state_manager.paused = True
 
 
 @router.api_route("/safety_stop/{module_name}", methods=["POST"])
 def safety_stop_module(module_name: str) -> None:
-    """E-stops a module"""
+    """Safety-stops a module"""
     send_safety_stop(state_manager.get_module(module_name))
 
 

src/wei/types/module_types.py

@@ -27,7 +27,7 @@ class Location(Generic[T]):
 class AdminCommands(str, Enum):
     """Valid Admin Commands to send to a Module"""
 
-    ESTOP = "estop"
+    SAFETY_STOP = "estop"
     RESET = "reset"
     PAUSE = "pause"
     RESUME = "resume"

tests/test_module/test_rest_node.py

@@ -86,4 +86,5 @@ def measure_action(state: State, action: ActionRequest) -> StepResponse:
     return StepFileResponse(StepStatus.SUCCEEDED, "test", "test.txt")
 
 
-test_rest_node.start()
+if __name__ == "__main__":
+    test_rest_node.start()