pymammotion 0.2.29__py3-none-any.whl → 0.2.31__py3-none-any.whl

pymammotion/__init__.py

@@ -8,15 +8,16 @@ import asyncio
 import logging
 import os
 
+from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
+
 # works outside HA on its own
 from pymammotion.bluetooth.ble import MammotionBLE
 from pymammotion.http.http import MammotionHTTP, connect_http
 
 # TODO make a working device that will work outside HA too.
-from pymammotion.mammotion.devices import MammotionBaseBLEDevice
 from pymammotion.mqtt import MammotionMQTT
 
-__all__ = ["MammotionBLE", "MammotionHTTP", "connect_http", "MammotionBaseBLEDevice", "MammotionMQTT"]
+__all__ = ["MammotionBLE", "MammotionHTTP", "connect_http", "MammotionMQTT"]
 
 logger = logging.getLogger(__name__)
 
@@ -32,13 +33,15 @@ if __name__ == "__main__":
     CLIENT_ID = os.environ.get("CLIENT_ID")
     IOT_TOKEN = os.environ.get("IOT_TOKEN")
     REGION = os.environ.get("REGION")
+    cloud_client = CloudIOTGateway()
     luba = MammotionMQTT(
-        iot_token=IOT_TOKEN,
-        region_id=REGION,
-        product_key=PRODUCT_KEY,
-        device_name=DEVICE_NAME,
-        device_secret=DEVICE_SECRET,
-        client_id=CLIENT_ID,
+        iot_token=IOT_TOKEN or "",
+        region_id=REGION or "",
+        product_key=PRODUCT_KEY or "",
+        device_name=DEVICE_NAME or "",
+        device_secret=DEVICE_SECRET or "",
+        client_id=CLIENT_ID or "",
+        cloud_client=cloud_client,
     )
     luba.connect_async()
 

pymammotion/aliyun/cloud_gateway.py

@@ -17,7 +17,6 @@ from alibabacloud_iot_api_gateway.models import CommonParams, Config, IoTApiRequ
 from alibabacloud_tea_util.client import Client as UtilClient
 from alibabacloud_tea_util.models import RuntimeOptions
 
-from pymammotion.http.http import MammotionHTTP
 from pymammotion.aliyun.dataclass.aep_response import AepResponse
 from pymammotion.aliyun.dataclass.connect_response import ConnectResponse
 from pymammotion.aliyun.dataclass.dev_by_account_response import (
@@ -29,6 +28,7 @@ from pymammotion.aliyun.dataclass.session_by_authcode_response import (
     SessionByAuthCodeResponse,
 )
 from pymammotion.const import ALIYUN_DOMAIN, APP_KEY, APP_SECRET, APP_VERSION
+from pymammotion.http.http import MammotionHTTP
 from pymammotion.utility.datatype_converter import DatatypeConverter
 
 logger = getLogger(__name__)
@@ -88,7 +88,7 @@ class CloudIOTGateway:
         session_by_authcode_response: SessionByAuthCodeResponse | None = None,
         region_response: RegionResponse | None = None,
         dev_by_account: ListingDevByAccountResponse | None = None,
-    ):
+    ) -> None:
         """Initialize the CloudIOTGateway."""
         self.mammotion_http: MammotionHTTP | None = None
         self._app_key = APP_KEY
@@ -106,13 +106,13 @@ class CloudIOTGateway:
         self._devices_by_account_response = dev_by_account
 
     @staticmethod
-    def generate_random_string(length):
+    def generate_random_string(length: int):
         """Generate a random string of specified length."""
         characters = string.ascii_letters + string.digits
         return "".join(random.choice(characters) for _ in range(length))
 
     @staticmethod
-    def generate_hardware_string(length) -> str:
+    def generate_hardware_string(length: int) -> str:
         """Generate hardware string that is consistent per device."""
         hashed_uuid = hashlib.sha1(f"{uuid.getnode()}".encode()).hexdigest()
         return "".join(itertools.islice(itertools.cycle(hashed_uuid), length))
@@ -132,24 +132,6 @@ class CloudIOTGateway:
             hashlib.sha1,
         ).hexdigest()
 
-    def get_connect_response(self):
-        return self._connect_response
-
-    def get_login_by_oauth_response(self):
-        return self._login_by_oauth_response
-
-    def get_aep_response(self):
-        return self._aep_response
-
-    def get_session_by_authcode_response(self):
-        return self._session_by_authcode_response
-
-    def get_devices_by_account_response(self):
-        return self._devices_by_account_response
-
-    def get_region_response(self):
-        return self._region_response
-
     def get_region(self, country_code: str, auth_code: str):
         """Get the region based on country code and auth code."""
         config = Config(
@@ -630,8 +612,28 @@ class CloudIOTGateway:
         return message_id
 
     @property
-    def listing_dev_by_account_response(self):
+    def devices_by_account_response(self):
         return self._devices_by_account_response
 
-    def set_http(self, mammotion_http):
+    def set_http(self, mammotion_http) -> None:
         self.mammotion_http = mammotion_http
+
+    @property
+    def region_response(self):
+        return self._region_response
+
+    @property
+    def aep_response(self):
+        return self._aep_response
+
+    @property
+    def session_by_authcode_response(self):
+        return self._session_by_authcode_response
+
+    @property
+    def client_id(self):
+        return self._client_id
+
+    @property
+    def login_by_oath_response(self):
+        return self._login_by_oauth_response

pymammotion/aliyun/cloud_service.py

@@ -10,7 +10,7 @@ from aliyunsdkiot.request.v20180120.InvokeThingServiceRequest import (
 class CloudService:
     # com.aliyun.iot.aep.sdk
     # https://domestic.mammotion.com/privacy/ - lists all aliyun packages
-    def __init__(self):
+    def __init__(self) -> None:
         self.selectDeviceIOTID = ""
         accessKeyId = "<your accessKey>"
         accessKeySecret = "<your accessSecret>"
@@ -31,7 +31,7 @@ class CloudService:
     
     """
 
-    def invoke_thing_service(self, data: bytearray):
+    def invoke_thing_service(self, data: bytearray) -> None:
         base64_encoded = base64.b64encode(data).decode("utf-8")
 
         # Create a dictionary structure
@@ -53,7 +53,7 @@ class CloudService:
         # python2:  print(response)
         print(response)
 
-    def get_device_status(self):
+    def get_device_status(self) -> None:
         request = GetDeviceStatusRequest()
         request.set_accept_format("json")
 

pymammotion/aliyun/dataclass/dev_by_account_response.py

@@ -36,7 +36,7 @@ class Device(DataClassORJSONMixin):
 @dataclass
 class Data(DataClassORJSONMixin):
     total: int
-    data: List[Device]
+    data: list[Device]
     pageNo: int
     pageSize: int
 

pymammotion/bluetooth/ble.py

@@ -14,13 +14,13 @@ address = "90:38:0C:6E:EE:9E"
 class MammotionBLE:
     client: BleakClient
 
-    def __init__(self, bleEvt: BleNotificationEvent):
+    def __init__(self, bleEvt: BleNotificationEvent) -> None:
         self._bleEvt = bleEvt
 
     async def scanForLubaAndConnect(self) -> bool:
         scanner = BleakScanner()
 
-        def scanCallback(device, advertising_data):
+        def scanCallback(device, advertising_data) -> bool:
             # TODO: do something with incoming data
             print(device)
             print(advertising_data)
@@ -46,18 +46,18 @@ class MammotionBLE:
         if self.client is not None:
             return await self.client.disconnect()
 
-    async def notification_handler(self, _characteristic: BleakGATTCharacteristic, data: bytearray):
+    async def notification_handler(self, _characteristic: BleakGATTCharacteristic, data: bytearray) -> None:
         """Simple notification handler which prints the data received."""
         await self._bleEvt.BleNotification(data)
 
-    def service_changed_handler(self, characteristic: BleakGATTCharacteristic, data: bytearray):
+    def service_changed_handler(self, characteristic: BleakGATTCharacteristic, data: bytearray) -> None:
         """Simple notification handler which prints the data received."""
         print(f"Response 2 {characteristic.description}: {data}")
         print(data.decode("utf-8"))
         # BlufiNotifyData
         # run an event handler back to somewhere
 
-    async def notifications(self):
+    async def notifications(self) -> None:
         if self.client.is_connected:
             await self.client.start_notify(UUID_NOTIFICATION_CHARACTERISTIC, self.notification_handler)
             await self.client.start_notify(SERVICE_CHANGED_CHARACTERISTIC, self.service_changed_handler)

pymammotion/bluetooth/ble_message.py

@@ -51,14 +51,14 @@ class BleMessage:
     notification: BlufiNotifyData
     messageNavigation: MessageNavigation = MessageNavigation()
 
-    def __init__(self, client: BleakClient):
+    def __init__(self, client: BleakClient) -> None:
         self.client = client
         self.mSendSequence = itertools.count()
         self.mReadSequence = itertools.count()
         self.mAck = queue.Queue()
         self.notification = BlufiNotifyData()
 
-    async def get_device_version_main(self):
+    async def get_device_version_main(self) -> None:
         commEsp = dev_net_pb2.DevNet(todev_devinfo_req=dev_net_pb2.DrvDevInfoReq())
 
         for i in range(1, 8):
@@ -75,24 +75,38 @@ class BleMessage:
         lubaMsg.subtype = 1
         lubaMsg.net.CopyFrom(commEsp)
         byte_arr = lubaMsg.SerializeToString()
-        await self.messageNavigation.post_custom_data_bytes(byte_arr)
+        await self.post_custom_data_bytes(byte_arr)
 
-    async def get_task(self):
+    async def get_task(self) -> None:
         hash_map = {"pver": 1, "subCmd": 2, "result": 0}
-        await self.messageNavigation.post_custom_data(self.get_json_string(bleOrderCmd.task, hash_map))
+        await self.post_custom_data(self.get_json_string(bleOrderCmd.task, hash_map))
 
-    async def send_ble_alive(self):
+    async def send_ble_alive(self) -> None:
         hash_map = {"ctrl": 1}
-        await self.messageNavigation.post_custom_data(self.get_json_string(bleOrderCmd.bleAlive, hash_map))
+        await self.post_custom_data(self.get_json_string(bleOrderCmd.bleAlive, hash_map))
 
-    def clearNotification(self):
+    def get_json_string(self, cmd: int, hash_map: dict[str, object]) -> str:
+        jSONObject = {}
+        try:
+            jSONObject["cmd"] = cmd
+            jSONObject[tmp_constant.REQUEST_ID] = int(time.time())
+            jSONObject2 = {}
+            for key, value in hash_map.items():
+                jSONObject2[key] = value
+            jSONObject["params"] = jSONObject2
+            return json.dumps(jSONObject)
+        except Exception as e:
+            print(e)
+            return ""
+
+    def clearNotification(self) -> None:
         self.notification = None
         self.notification = BlufiNotifyData()
 
     # async def get_device_info(self):
     #     await self.postCustomData(self.getJsonString(bleOrderCmd.getDeviceInfo))
 
-    async def send_device_info(self):
+    async def send_device_info(self) -> None:
         """Currently not called"""
         luba_msg = luba_msg_pb2.LubaMsg(
             msgtype=luba_msg_pb2.MsgCmdType.MSG_CMD_TYPE_ESP,
@@ -107,7 +121,7 @@ class BleMessage:
         byte_arr = luba_msg.SerializeToString()
         await self.post_custom_data_bytes(byte_arr)
 
-    async def requestDeviceStatus(self):
+    async def requestDeviceStatus(self) -> None:
         request = False
         type = self.messageNavigation.getTypeValue(0, 5)
         try:
@@ -121,7 +135,7 @@ class BleMessage:
         # if not request:
         #     onStatusResponse(BlufiCallback.CODE_WRITE_DATA_FAILED, null)
 
-    async def requestDeviceVersion(self):
+    async def requestDeviceVersion(self) -> None:
         request = False
         type = self.messageNavigation.getTypeValue(0, 7)
         try:
@@ -132,7 +146,7 @@ class BleMessage:
             request = False
             _LOGGER.error(err)
 
-    async def sendBorderPackage(self, executeBorder: ExecuteBorder):
+    async def sendBorderPackage(self, executeBorder: ExecuteBorder) -> None:
         await self.messageNavigation.post_custom_data(serialize(executeBorder))
 
     async def gatt_write(self, data: bytes) -> None:
@@ -226,7 +240,7 @@ class BleMessage:
                 return dataBytes
             return await self._parseDataData(subType, dataBytes)
 
-    def _parseCtrlData(self, subType: int, data: bytes):
+    def _parseCtrlData(self, subType: int, data: bytes) -> None:
         pass
         # self._parseAck(data)
 
@@ -303,7 +317,7 @@ class BleMessage:
     def generateSendSequence(self):
         return next(self.mSendSequence) & 255
 
-    async def post_custom_data_bytes(self, data: bytes):
+    async def post_custom_data_bytes(self, data: bytes) -> None:
         if data == None:
             return
         type_val = self.getTypeValue(1, 19)
@@ -315,7 +329,7 @@ class BleMessage:
         except Exception as err:
             _LOGGER.debug(err)
 
-    async def post_custom_data(self, data_str: str):
+    async def post_custom_data(self, data_str: str) -> None:
         data = data_str.encode()
         if data == None:
             return
@@ -389,7 +403,7 @@ class BleMessage:
         require_ack: bool,
         hasFrag: bool,
         sequence: int,
-        data: bytes,
+        data: bytes | None,
     ) -> bytes:
         byteOS = BytesIO()
         dataLength = 0 if data == None else len(data)

pymammotion/bluetooth/data/convert.py

@@ -14,7 +14,7 @@ def parse_custom_data(data: bytes):
         print(err)
 
 
-def store_sys_data(sys):
+def store_sys_data(sys) -> None:
     if sys.HasField("systemTardStateTunnel"):
         tard_state_data_list = sys.systemTardStateTunnel.tard_state_data
         longValue8 = tard_state_data_list[0]

pymammotion/bluetooth/data/framectrldata.py

@@ -6,7 +6,7 @@ class FrameCtrlData:
     FRAME_CTRL_POSITION_REQUIRE_ACK = 3
     mValue = 0
 
-    def __init__(self, frameCtrlValue):
+    def __init__(self, frameCtrlValue) -> None:
         self.mValue = frameCtrlValue
 
     def check(self, position):

pymammotion/bluetooth/data/notifydata.py

@@ -6,7 +6,7 @@ from io import BytesIO
 class BlufiNotifyData:
     """generated source for class BlufiNotifyData"""
 
-    def __init__(self):
+    def __init__(self) -> None:
         self.mDataOS = BytesIO()
         self.mFrameCtrlValue = 0
         self.mPkgType = 0
@@ -18,7 +18,7 @@ class BlufiNotifyData:
         return self.mTypeValue
 
     #  JADX INFO: Access modifiers changed from: package-private
-    def setType(self, i):
+    def setType(self, i) -> None:
         """Generated source for method setType"""
         self.mTypeValue = i
 
@@ -28,7 +28,7 @@ class BlufiNotifyData:
         return self.mPkgType
 
     #  JADX INFO: Access modifiers changed from: package-private
-    def setPkgType(self, i):
+    def setPkgType(self, i) -> None:
         """Generated source for method setPkgType"""
         self.mPkgType = i
 
@@ -38,7 +38,7 @@ class BlufiNotifyData:
         return self.mSubType
 
     #  JADX INFO: Access modifiers changed from: package-private
-    def setSubType(self, i):
+    def setSubType(self, i) -> None:
         """Generated source for method setSubType"""
         self.mSubType = i
 
@@ -47,12 +47,12 @@ class BlufiNotifyData:
         return self.mFrameCtrlValue
 
     #  JADX INFO: Access modifiers changed from: package-private
-    def setFrameCtrl(self, i):
+    def setFrameCtrl(self, i) -> None:
         """Generated source for method setFrameCtrl"""
         self.mFrameCtrlValue = i
 
     #  JADX INFO: Access modifiers changed from: package-private
-    def addData(self, bArr, i):
+    def addData(self, bArr, i) -> None:
         """Generated source for method addData"""
         self.mDataOS.write(bArr[i:])
 

pymammotion/const.py

@@ -5,5 +5,6 @@ APP_SECRET = "1ba85698bb10e19c6437413b61ba3445"
 APP_VERSION = "1.11.130"
 ALIYUN_DOMAIN = "api.link.aliyun.com"
 MAMMOTION_DOMAIN = "https://id.mammotion.com"
+MAMMOTION_API_DOMAIN = "https://domestic.mammotion.com"
 MAMMOTION_CLIENT_ID = "MADKALUBAS"
 MAMMOTION_CLIENT_SECRET = "GshzGRZJjuMUgd2sYHM7"

pymammotion/data/model/__init__.py

@@ -5,3 +5,5 @@ from .hash_list import HashList
 from .plan import Plan
 from .rapid_state import RapidState, RTKStatus
 from .region_data import RegionData
+
+__all__ = ["GenerateRouteInformation", "HashList", "Plan", "RapidState", "RTKStatus", "RegionData"]

pymammotion/data/model/device.py

@@ -1,6 +1,5 @@
 """MowingDevice class to wrap around the betterproto dataclasses."""
 
-import math
 from dataclasses import dataclass
 
 import betterproto
@@ -20,8 +19,8 @@ from pymammotion.proto.mctrl_sys import (
     MctlSys,
     MowToAppInfoT,
     ReportInfoData,
-    SystemUpdateBufMsg,
     SystemRapidStateTunnelMsg,
+    SystemUpdateBufMsg,
 )
 from pymammotion.utility.constant import WorkMode
 from pymammotion.utility.conversions import parse_double
@@ -37,7 +36,7 @@ class MowingDevice:
     location: Location
     mowing_state: RapidState
 
-    def __init__(self):
+    def __init__(self) -> None:
         self.device = LubaMsg()
         self.map = HashList(area={}, path={}, obstacle={}, hashlist=[])
         self.location = Location()
@@ -58,7 +57,7 @@ class MowingDevice:
         """Update the raw LubaMsg data."""
         self.device = LubaMsg(**raw)
 
-    def buffer(self, buffer_list: SystemUpdateBufMsg):
+    def buffer(self, buffer_list: SystemUpdateBufMsg) -> None:
         """Update the device based on which buffer we are reading from."""
         match buffer_list.update_buf_data[0]:
             case 1:
@@ -100,7 +99,7 @@ class MowingDevice:
                     ]
                 )
 
-    def update_report_data(self, toapp_report_data: ReportInfoData):
+    def update_report_data(self, toapp_report_data: ReportInfoData) -> None:
         coordinate_converter = CoordinateConverter(self.location.RTK.latitude, self.location.RTK.longitude)
         for index, location in enumerate(toapp_report_data.locations):
             if index == 0 and location.real_pos_y != 0:
@@ -116,12 +115,15 @@ class MowingDevice:
 
         self.report_data = self.report_data.from_dict(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
 
-    def run_state_update(self, rapid_state: SystemRapidStateTunnelMsg):
+    def run_state_update(self, rapid_state: SystemRapidStateTunnelMsg) -> None:
         self.mowing_state = RapidState().from_raw(rapid_state.rapid_state_data)
 
-    def mow_info(self, toapp_mow_info: MowToAppInfoT):
+    def mow_info(self, toapp_mow_info: MowToAppInfoT) -> None:
         pass
 
+    def report_missing_data(self) -> None:
+        """Report missing data so we can refetch it."""
+
     @property
     def net(self):
         """Will return a wrapped betterproto of net."""
@@ -164,7 +166,7 @@ class DevNetData:
 
     net: dict
 
-    def __init__(self, net: DevNet):
+    def __init__(self, net: DevNet) -> None:
         if isinstance(net, dict):
             self.net = net
         else:
@@ -187,13 +189,13 @@ class SysData:
 
     sys: dict
 
-    def __init__(self, sys: MctlSys):
+    def __init__(self, sys: MctlSys) -> None:
         if isinstance(sys, dict):
             self.sys = sys
         else:
             self.sys = sys.to_dict()
 
-    def __getattr__(self, item):
+    def __getattr__(self, item: str):
         """Intercept call to get sys in dict and return a betterproto dataclass."""
         if self.sys.get(item) is None:
             return MctlSys().__getattribute__(item)
@@ -210,13 +212,13 @@ class NavData:
 
     nav: dict
 
-    def __init__(self, nav: MctlNav):
+    def __init__(self, nav: MctlNav) -> None:
         if isinstance(nav, dict):
             self.nav = nav
         else:
             self.nav = nav.to_dict()
 
-    def __getattr__(self, item):
+    def __getattr__(self, item: str):
         """Intercept call to get nav in dict and return a betterproto dataclass."""
         if self.nav.get(item) is None:
             return MctlNav().__getattribute__(item)
@@ -233,13 +235,13 @@ class DriverData:
 
     driver: dict
 
-    def __init__(self, driver: MctlDriver):
+    def __init__(self, driver: MctlDriver) -> None:
         if isinstance(driver, dict):
             self.driver = driver
         else:
             self.driver = driver.to_dict()
 
-    def __getattr__(self, item):
+    def __getattr__(self, item: str):
         """Intercept call to get driver in dict and return a betterproto dataclass."""
         if self.driver.get(item) is None:
             return MctlDriver().__getattribute__(item)
@@ -256,13 +258,13 @@ class MulData:
 
     mul: dict
 
-    def __init__(self, mul: SocMul):
+    def __init__(self, mul: SocMul) -> None:
         if isinstance(mul, dict):
             self.mul = mul
         else:
             self.mul = mul.to_dict()
 
-    def __getattr__(self, item):
+    def __getattr__(self, item: str):
         """Intercept call to get mul in dict and return a betterproto dataclass."""
         if self.mul.get(item) is None:
             return SocMul().__getattribute__(item)
@@ -279,13 +281,13 @@ class OtaData:
 
     ota: dict
 
-    def __init__(self, ota: MctlOta):
+    def __init__(self, ota: MctlOta) -> None:
         if isinstance(ota, dict):
             self.ota = ota
         else:
             self.ota = ota.to_dict()
 
-    def __getattr__(self, item):
+    def __getattr__(self, item: str):
         """Intercept call to get ota in dict and return a betterproto dataclass."""
         if self.ota.get(item) is None:
             return MctlOta().__getattribute__(item)
@@ -302,13 +304,13 @@ class PeptData:
 
     pept: dict
 
-    def __init__(self, pept: MctlPept):
+    def __init__(self, pept: MctlPept) -> None:
         if isinstance(pept, dict):
             self.pept = pept
         else:
             self.pept = pept.to_dict()
 
-    def __getattr__(self, item):
+    def __getattr__(self, item: str):
         """Intercept call to get pept in dict and return a betterproto dataclass."""
         if self.pept.get(item) is None:
             return MctlPept().__getattribute__(item)

pymammotion/data/model/device_config.py

@@ -62,7 +62,7 @@ def create_path_order(operation_mode: OperationSettings, device_name: str) -> st
     return str(bArr, "UTF-8")
 
 
-def calculate_yuka_mode(operation_mode: OperationSettings):
+def calculate_yuka_mode(operation_mode: OperationSettings) -> int:
     if operation_mode.is_mow and operation_mode.is_dump and operation_mode.is_edge:
         return 14
     if operation_mode.is_mow and operation_mode.is_dump and not operation_mode.is_edge:

pymammotion/data/model/enums.py

@@ -9,7 +9,7 @@ class PositionMode(Enum):
     UNKNOWN = 4
 
     @staticmethod
-    def from_value(value):
+    def from_value(value: int):
         if value == 0:
             return PositionMode.FIX
         elif value == 1:
@@ -21,7 +21,7 @@ class PositionMode(Enum):
         else:
             return PositionMode.UNKNOWN
 
-    def __str__(self):
+    def __str__(self) -> str:
         if self == PositionMode.FIX:
             return "Fix"
         elif self == PositionMode.SINGLE:
@@ -42,7 +42,7 @@ class RTKStatus(Enum):
     UNKNOWN = 6
 
     @staticmethod
-    def from_value(value):
+    def from_value(value: int):
         if value == 0:
             return RTKStatus.NONE
         elif value == 1 or value == 2:
@@ -54,7 +54,7 @@ class RTKStatus(Enum):
         else:
             return RTKStatus.UNKNOWN
 
-    def __str__(self):
+    def __str__(self) -> str:
         if self == RTKStatus.NONE:
             return "None"
         elif self == RTKStatus.SINGLE:

pymammotion/data/model/excute_boarder_params.py

@@ -5,7 +5,7 @@ class ExecuteBorderParams:
     currentFrame = 0
     jobIndex = ""
 
-    def __init__(self, i, str_, list_):
+    def __init__(self, i, str_, list_) -> None:
         """Generated source for method __init__"""
         self.currentFrame = i
         self.border = list_
@@ -15,7 +15,7 @@ class ExecuteBorderParams:
         """Generated source for method getCurrentFrame"""
         return self.currentFrame
 
-    def set_current_frame(self, i):
+    def set_current_frame(self, i) -> None:
         """Generated source for method setCurrentFrame"""
         self.currentFrame = i
 
@@ -23,7 +23,7 @@ class ExecuteBorderParams:
         """Generated source for method getJobIndex"""
         return self.jobIndex
 
-    def set_job_index(self, str_):
+    def set_job_index(self, str_) -> None:
         """Generated source for method setJobIndex"""
         self.jobIndex = str_
 
@@ -31,11 +31,11 @@ class ExecuteBorderParams:
         """Generated source for method getBorder"""
         return self.border
 
-    def set_border(self, border_list):
+    def set_border(self, border_list) -> None:
         """Generated source for method setBorder"""
         self.border = border_list
 
-    def __str__(self):
+    def __str__(self) -> str:
         """Generated source for method toString"""
         return (
             "ExecuteBorderParamsBean{currentFrame="