Skip to content

Modified getBaseClassMethods function to use the class data from the JSON instead of hard coding. #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 18, 2025
Merged

Modified getBaseClassMethods function to use the class data from the JSON instead of hard coding. #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4411a3
In python.ts, added constants for blocks_base_classes module and clas…
lizlooney Jul 18, 2025
da31658
In common_storage.ts, renamed ROBOT_CLASS_NAME to CLASS_NAME_ROBOT.
lizlooney Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions python_tools/json_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@


_DICT_FULL_MODULE_NAME_TO_MODULE_NAME = {
'blocks_base_classes.opmode': 'blocks_base_classes',
'blocks_base_classes.mechanism': 'blocks_base_classes',
'blocks_base_classes.robot_base': 'blocks_base_classes',

'hal._wpiHal': 'hal',
'hal.simulation._simulation': 'hal.simulation',

Expand Down
9 changes: 0 additions & 9 deletions python_tools/python_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,6 @@ def processSignature(signature_line: str) -> tuple[str, list[str], list[str], li


def ignoreMember(parent, key: str, member):
"""
if inspect.ismodule(parent):
if hasattr(parent, '__all__'):
if key not in parent.__all__:
return True
else:
return True
"""

if inspect.ismodule(member):
# Member is a module.
if not inspect.ismodule(parent):
Expand Down
68 changes: 34 additions & 34 deletions src/blocks/utils/generated/server_python_scripts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"aliases": {},
"classes": [
{
"className": "blocks_base_classes.mechanism.Mechanism",
"className": "blocks_base_classes.Mechanism",
"classVariables": [],
"constructors": [
{
"args": [],
"declaringClassName": "blocks_base_classes.mechanism.Mechanism",
"declaringClassName": "blocks_base_classes.Mechanism",
"functionName": "__init__",
"returnType": "blocks_base_classes.mechanism.Mechanism",
"returnType": "blocks_base_classes.Mechanism",
"tooltip": ""
}
],
Expand All @@ -20,10 +20,10 @@
{
"defaultValue": "",
"name": "self",
"type": "blocks_base_classes.mechanism.Mechanism"
"type": "blocks_base_classes.Mechanism"
}
],
"declaringClassName": "blocks_base_classes.mechanism.Mechanism",
"declaringClassName": "blocks_base_classes.Mechanism",
"functionName": "start",
"returnType": "None",
"tooltip": ""
Expand All @@ -33,10 +33,10 @@
{
"defaultValue": "",
"name": "self",
"type": "blocks_base_classes.mechanism.Mechanism"
"type": "blocks_base_classes.Mechanism"
}
],
"declaringClassName": "blocks_base_classes.mechanism.Mechanism",
"declaringClassName": "blocks_base_classes.Mechanism",
"functionName": "stop",
"returnType": "None",
"tooltip": ""
Expand All @@ -46,34 +46,34 @@
{
"defaultValue": "",
"name": "self",
"type": "blocks_base_classes.mechanism.Mechanism"
"type": "blocks_base_classes.Mechanism"
}
],
"declaringClassName": "blocks_base_classes.mechanism.Mechanism",
"declaringClassName": "blocks_base_classes.Mechanism",
"functionName": "update",
"returnType": "None",
"tooltip": ""
}
],
"instanceVariables": [],
"moduleName": "blocks_base_classes.mechanism",
"moduleName": "blocks_base_classes",
"staticMethods": []
},
{
"className": "blocks_base_classes.opmode.OpMode",
"className": "blocks_base_classes.OpMode",
"classVariables": [],
"constructors": [
{
"args": [
{
"defaultValue": "",
"name": "robot",
"type": "blocks_base_classes.robot_base.RobotBase"
"type": "blocks_base_classes.RobotBase"
}
],
"declaringClassName": "blocks_base_classes.opmode.OpMode",
"declaringClassName": "blocks_base_classes.OpMode",
"functionName": "__init__",
"returnType": "blocks_base_classes.opmode.OpMode",
"returnType": "blocks_base_classes.OpMode",
"tooltip": ""
}
],
Expand All @@ -84,10 +84,10 @@
{
"defaultValue": "",
"name": "self",
"type": "blocks_base_classes.opmode.OpMode"
"type": "blocks_base_classes.OpMode"
}
],
"declaringClassName": "blocks_base_classes.opmode.OpMode",
"declaringClassName": "blocks_base_classes.OpMode",
"functionName": "loop",
"returnType": "None",
"tooltip": ""
Expand All @@ -97,10 +97,10 @@
{
"defaultValue": "",
"name": "self",
"type": "blocks_base_classes.opmode.OpMode"
"type": "blocks_base_classes.OpMode"
}
],
"declaringClassName": "blocks_base_classes.opmode.OpMode",
"declaringClassName": "blocks_base_classes.OpMode",
"functionName": "start",
"returnType": "None",
"tooltip": ""
Expand All @@ -110,28 +110,28 @@
{
"defaultValue": "",
"name": "self",
"type": "blocks_base_classes.opmode.OpMode"
"type": "blocks_base_classes.OpMode"
}
],
"declaringClassName": "blocks_base_classes.opmode.OpMode",
"declaringClassName": "blocks_base_classes.OpMode",
"functionName": "stop",
"returnType": "None",
"tooltip": ""
}
],
"instanceVariables": [],
"moduleName": "blocks_base_classes.opmode",
"moduleName": "blocks_base_classes",
"staticMethods": []
},
{
"className": "blocks_base_classes.robot_base.RobotBase",
"className": "blocks_base_classes.RobotBase",
"classVariables": [],
"constructors": [
{
"args": [],
"declaringClassName": "blocks_base_classes.robot_base.RobotBase",
"declaringClassName": "blocks_base_classes.RobotBase",
"functionName": "__init__",
"returnType": "blocks_base_classes.robot_base.RobotBase",
"returnType": "blocks_base_classes.RobotBase",
"tooltip": ""
}
],
Expand All @@ -142,10 +142,10 @@
{
"defaultValue": "",
"name": "self",
"type": "blocks_base_classes.robot_base.RobotBase"
"type": "blocks_base_classes.RobotBase"
}
],
"declaringClassName": "blocks_base_classes.robot_base.RobotBase",
"declaringClassName": "blocks_base_classes.RobotBase",
"functionName": "start",
"returnType": "None",
"tooltip": ""
Expand All @@ -155,10 +155,10 @@
{
"defaultValue": "",
"name": "self",
"type": "blocks_base_classes.robot_base.RobotBase"
"type": "blocks_base_classes.RobotBase"
}
],
"declaringClassName": "blocks_base_classes.robot_base.RobotBase",
"declaringClassName": "blocks_base_classes.RobotBase",
"functionName": "stop",
"returnType": "None",
"tooltip": ""
Expand All @@ -168,17 +168,17 @@
{
"defaultValue": "",
"name": "self",
"type": "blocks_base_classes.robot_base.RobotBase"
"type": "blocks_base_classes.RobotBase"
}
],
"declaringClassName": "blocks_base_classes.robot_base.RobotBase",
"declaringClassName": "blocks_base_classes.RobotBase",
"functionName": "update",
"returnType": "None",
"tooltip": ""
}
],
"instanceVariables": [],
"moduleName": "blocks_base_classes.robot_base",
"moduleName": "blocks_base_classes",
"staticMethods": []
}
],
Expand All @@ -192,19 +192,19 @@
{
"enums": [],
"functions": [],
"moduleName": "blocks_base_classes.mechanism",
"moduleName": "blocks_base_classes",
"moduleVariables": []
},
{
"enums": [],
"functions": [],
"moduleName": "blocks_base_classes.opmode",
"moduleName": "blocks_base_classes",
"moduleVariables": []
},
{
"enums": [],
"functions": [],
"moduleName": "blocks_base_classes.robot_base",
"moduleName": "blocks_base_classes",
"moduleVariables": []
}
],
Expand Down
6 changes: 6 additions & 0 deletions src/blocks/utils/python.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ import * as SetPythonVariable from "../mrc_set_python_variable";

// Utilities related to blocks for python modules and classes, including those from RobotPy, external samples, etc.

export const MODULE_NAME_BLOCKS_BASE_CLASSES = 'blocks_base_classes';
export const CLASS_NAME_ROBOT_BASE = MODULE_NAME_BLOCKS_BASE_CLASSES + '.RobotBase';
export const CLASS_NAME_OPMODE = MODULE_NAME_BLOCKS_BASE_CLASSES + '.OpMode';
export const CLASS_NAME_MECHANISM = MODULE_NAME_BLOCKS_BASE_CLASSES + '.Mechanism';


export const robotPyData = generatedRobotPyData as PythonData;
const externalSamplesData = generatedExternalSamplesData as PythonData
const serverPythonScripts = generatedServerPythonScripts as PythonData;
Expand Down
Loading