Pr test print (#161)

* remove errors

* cleanup of file

* Remove some unnecessary leftovers

* fix warnings

* reduce timeout values

* add mrc_print

* Add Mechanisms and OpModes to translation

* Add super to derived methods

* remove update from default block for robot

* Update methods for mechanism and robot

* Update base classes

* Base classes for running

* Get robot code to generate correctly

* Fix needing annotations

* Changes needed for opmode to work

* Changed because components wasn't taken out of Blockly in the translation files

* change if( to if (

* Changed to put all decorations on one import

* Change from annotations to decorations
(annotations are something different in python)

Author: alan412

.gitignore

@@ -11,6 +11,10 @@
 # production
 /build
 
+# python stuff
+__pycache__
+*.egg-info
+
 # misc
 .DS_Store
 .env.local

server_python_scripts/blocks_base_classes/__init__.py

@@ -0,0 +1,8 @@
+"""Base classes for SystemCore blocks interface."""
+
+from .opmode import OpMode, Teleop, Auto, Test, Name, Group
+from .mechanism import Mechanism
+from .robot_base import RobotBase
+
+__all__ = ['OpMode', 'Teleop', 'Auto', 'Test', 'Name', 'Group'
+           'Mechanism', 'RobotBase']

server_python_scripts/blocks_base_classes/mechanism.py

@@ -0,0 +1,14 @@
+# This is the class all mechanisms derive from
+
+class Mechanism:
+    def __init__(self):
+        self.hardware = []
+    def start(self):
+        for hardware in self.hardware:
+            hardware.start()
+    def update(self):
+        for hardware in self.hardware:
+            hardware.update()
+    def stop(self):
+        for hardware in self.hardware:
+            hardware.stop()

server_python_scripts/blocks_base_classes/opmode.py

@@ -0,0 +1,26 @@
+# This is the base class that all OpModes derive from
+class OpMode:
+    def __init__(self, robot):
+        self.robot = robot
+    def start(self):
+        self.robot.start()
+    def loop(self):
+        self.robot.update()
+    def stop(self):
+        self.robot.stop()
+
+# For now this does nothing but it lets the decorator work
+def Teleop(OpMode):
+    return OpMode
+
+def Auto(OpMode):
+    return OpMode
+
+def Test(OpMode):
+    return OpMode
+
+def Name(OpMode, str):
+    return OpMode
+
+def Group(OpMode, str):
+    return OpMode

server_python_scripts/blocks_base_classes/pyproject.toml

@@ -0,0 +1,21 @@
+[build-system]
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "blocks_base_classes"
+version = "0.1.0"
+description = "Base classes for SystemCore blocks interface"
+requires-python = ">=3.8"
+license = {text = "Apache-2.0"}
+authors = [
+    {name = "Alan Smith", email = "[email protected]"}
+]
+dependencies = []
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["blocks_base_classes*"]
+
+[tool.setuptools.package-dir]
+"blocks_base_classes" = "."

server_python_scripts/blocks_base_classes/robot_base.py

@@ -0,0 +1,14 @@
+# This is the class all robots derive from
+
+class RobotBase:
+    def __init__(self):
+        self.hardware = []
+    def start(self):
+        for hardware in self.hardware:
+            hardware.start()
+    def update(self):
+        for hardware in self.hardware:
+            hardware.update()
+    def stop(self):
+        for hardware in self.hardware:
+            hardware.stop()

server_python_scripts/opmode.py

@@ -15,10 +15,8 @@
 import argparse
 from pathlib import Path
 
-# Add the current directory to Python path to import local modules
-sys.path.insert(0, str(Path(__file__).parent))
+from blocks_base_classes import OpMode
 
-from opmode import OpMode
 from robot import Robot
 
 

server_python_scripts/run_opmode.py

@@ -626,7 +626,7 @@ const CALL_PYTHON_FUNCTION = {
           break;
         }
         case FunctionKind.INSTANCE_COMPONENT: {
-          const componentNameChoices = [];
+          const componentNameChoices : string[] = [];
           this.mrcComponents.forEach(component => componentNameChoices.push(component.name));
           if (!componentNameChoices.includes(this.mrcComponentName)) {
             componentNameChoices.push(this.mrcComponentName);
@@ -723,7 +723,7 @@ const CALL_PYTHON_FUNCTION = {
                 }
               }
               if (indexOfComponentName != -1) {
-                const componentNameChoices = [];
+                const componentNameChoices : string[] = [];
                 this.mrcComponents.forEach(component => componentNameChoices.push(component.name));
                 titleInput.removeField(FIELD_COMPONENT_NAME);
                 titleInput.insertFieldAt(indexOfComponentName,

src/blocks/mrc_call_python_function.ts

@@ -214,7 +214,7 @@ const CLASS_METHOD_DEF = {
     mrcRenameParameter: function (this: ClassMethodDefBlock, oldName: string, newName: string) {
         let nextBlock = this.getInputTargetBlock('STACK');
 
-        if(nextBlock){
+        if (nextBlock){
             findConnectedBlocksOfType(nextBlock, MRC_GET_PARAMETER_BLOCK_NAME).forEach((block) => {
                 if (block.getFieldValue('PARAMETER_NAME') === oldName) {
                     block.setFieldValue(newName, 'PARAMETER_NAME');
@@ -362,12 +362,12 @@ export const pythonFromBlock = function (
     }
     if (block.mrcPythonMethodName == '__init__') {
         let class_specific = generator.getClassSpecificForInit();
-        branch = generator.INDENT + 'super.__init__(' + class_specific + ')\n' +
+        branch = generator.INDENT + 'super().__init__(' + class_specific + ')\n' +
             generator.defineClassVariables() + branch;
     }
-    else if (funcName == 'update'){
+    else if (generator.inBaseClassMethod(blocklyName)){
         // Special case for update, to also call the update method of the base class
-        branch = generator.INDENT + 'super.update()\n' + branch;
+        branch = generator.INDENT + 'super().' + blocklyName + '()\n' + branch;
     }
     if (returnValue) {
         returnValue = generator.INDENT + 'return ' + returnValue + '\n';