pymammotion 0.5.8__py3-none-any.whl → 0.5.10__py3-none-any.whl

pymammotion/data/model/errors.py

@@ -1,12 +1,12 @@
-from dataclasses import field, dataclass
+from dataclasses import dataclass, field
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 from pymammotion.http.model.http import ErrorInfo
 
 
-@dataclass(DataClassORJSONMixin)
-class DeviceErrors:
-    err_code_list: list = field(default_factory=list)
-    err_code_list_time: list | None = field(default_factory=list)
-    error_codes: dict[str, ErrorInfo] = field(default_factory=dict)
+@dataclass
+class DeviceErrors(DataClassORJSONMixin):
+    err_code_list: list[int] = field(default_factory=list)
+    err_code_list_time: list[int] | None = field(default_factory=list)
+    error_codes: dict[str, ErrorInfo] = field(default_factory=dict)

pymammotion/data/mqtt/event.py

@@ -153,7 +153,15 @@ class DeviceLogProgressEventParams(GeneralParams):
 class ThingEventMessage(DataClassORJSONMixin):
     method: Literal["thing.events", "thing.properties"]
     id: str
-    params: DeviceProtobufMsgEventParams | DeviceWarningEventParams | dict
+    params: (
+        DeviceProtobufMsgEventParams
+        | DeviceWarningEventParams
+        | DeviceNotificationEventParams
+        | DeviceLogProgressEventParams
+        | DeviceBizReqEventParams
+        | DeviceConfigurationRequestEvent
+        | dict
+    )
     version: Literal["1.0"]
 
     @classmethod

pymammotion/http/http.py

@@ -32,7 +32,12 @@ class MammotionHTTP:
         async with ClientSession(MAMMOTION_API_DOMAIN) as session:
             async with session.post(
                 "/user-server/v1/code/record/export-data",
-                headers=self._headers,
+                headers={
+                    **self._headers,
+                    "Authorization": f"Bearer {self.login_info.access_token}",
+                    "Content-Type": "application/json",
+                    "User-Agent": "okhttp/4.9.3",
+                },
             ) as resp:
                 data = await resp.json()
                 reader = csv.DictReader(data.get("data", "").split("\n"), delimiter=",")

pymammotion/mammotion/commands/messages/media.py

@@ -5,12 +5,16 @@ from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import (
     MUL_LANGUAGE,
     MUL_SEX,
+    GetHeadlamp,
+    LampCtrlSta,
+    LampManualCtrlSta,
     LubaMsg,
     MsgAttr,
     MsgCmdType,
     MsgDevice,
     MulSetAudio,
     MulSetWiper,
+    SetHeadlamp,
     SocMul,
 )
 
@@ -45,4 +49,33 @@ class MessageMedia(AbstractMessage, ABC):
         # 2
         return self.send_order_msg_media(SocMul(set_wiper=MulSetWiper(round=round_num)))
 
-    # TODO add lamp methods
+    def get_car_light(self, ids: int):
+        return self.send_order_msg_media(SocMul(get_lamp=GetHeadlamp(get_ids=ids)))
+
+    def set_car_light(self, on_off: bool = False):
+        """Set mower light.
+        set whether light is on during the night during mowing
+        auto night on true, id=1121, power_ctrl=1
+        auto night off false, id=1121, power_ctrl=1
+        """
+
+        ctrl_state = LampCtrlSta.power_ctrl_on if on_off else LampCtrlSta.power_off
+        return self.send_order_msg_media(
+            SocMul(
+                set_lamp=SetHeadlamp(
+                    set_ids=1121, lamp_power_ctrl=1, lamp_ctrl=ctrl_state, ctrl_lamp_bright=False, lamp_bright=0
+                )
+            )
+        )
+
+    def set_car_manual_light(self, manual_ctrl: bool = False):
+        """Set mower light.
+        set whether light is on manually
+        manual on: true, id=1125, power_ctrl=2
+        manual off: false, id=1127, power_ctrl=2
+        """
+        ids = 1125 if manual_ctrl else 1127
+        manual_light_ctrl = LampManualCtrlSta.manual_power_off if manual_ctrl else LampManualCtrlSta.manual_power_on
+        return self.send_order_msg_media(
+            SocMul(set_lamp=SetHeadlamp(set_ids=ids, lamp_power_ctrl=2, lamp_manual_ctrl=manual_light_ctrl))
+        )

pymammotion/mqtt/mammotion_mqtt.py

@@ -179,14 +179,14 @@ class MammotionMQTT:
             future = asyncio.run_coroutine_threadsafe(self.on_message(topic, payload, iot_id), self.loop)
             asyncio.wrap_future(future, loop=self.loop)
 
-    def _thing_on_connect(self, userdata, flags, reason_code, properties) -> None:
+    def _thing_on_connect(self, session_flag, rc, user_data) -> None:
         """Is called on thing connect."""
         self.is_connected = True
         if self.on_connected is not None:
             future = asyncio.run_coroutine_threadsafe(self.on_connected(), self.loop)
             asyncio.wrap_future(future, loop=self.loop)
 
-        logger.debug("on_connect, session_flag:%d, rc:%d", flags, reason_code)
+        logger.debug("on_connect, session_flag:%d, rc:%d", session_flag, rc)
 
         # self._linkkit_client.subscribe_topic(f"/sys/{self._product_key}/{self._device_name}/#")
 

{pymammotion-0.5.8.dist-info → pymammotion-0.5.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.5.8
+Version: 0.5.10
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.5.8.dist-info → pymammotion-0.5.10.dist-info}/RECORD

@@ -30,7 +30,7 @@ pymammotion/data/model/device_config.py,sha256=DTnoePsMwJrKVXqGeKvbZQjs8Zab61U5T
 pymammotion/data/model/device_info.py,sha256=Q5PbPdTfd948ZWc8EHjN5zwU6pha5MCr47ZEXzCYKNY,1148
 pymammotion/data/model/device_limits.py,sha256=m8HdxD-RaAkPm7jHYb9GLxMEH9IfzBPz0ZypmsLnId4,1946
 pymammotion/data/model/enums.py,sha256=NLImBbeqwbwBLbABC_NbBzk4M8OxhUTcto6QcGZVNOc,1707
-pymammotion/data/model/errors.py,sha256=27QFBtrGuxa0RwZ53CIKno2SeLYh9OBkEhl140gP_EI,392
+pymammotion/data/model/errors.py,sha256=EEUpcw-S3Q6n-4TFiWgTv7hS5id1BLTvLQCkmyivEbg,403
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
 pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTGc47QTEpp8DD0,1103
 pymammotion/data/model/generate_route_information.py,sha256=pgjqURwmEIzjCMbl4Z5JDDkfxyUAdry1KhPfyir3-mU,777
@@ -43,7 +43,7 @@ pymammotion/data/model/region_data.py,sha256=VokMRqB_o4OFL1TWAM90Fvm-1z4jcYrw3X2
 pymammotion/data/model/report_info.py,sha256=3nXBFRfdKWnZj4YfBcrPwhBRpq58ICMQlrESfI1tTMg,3808
 pymammotion/data/model/work.py,sha256=AfKMItFqnRtAlVHzKCfYY-BQy-WFDYZBzdj-9Yc03bo,655
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pymammotion/data/mqtt/event.py,sha256=C8TGRJs9wNxwg9FFmr9qcsweDnl5v5kcVcwiHxtYzJw,5384
+pymammotion/data/mqtt/event.py,sha256=pj65y93ACcTzUIJkHZC6s_pRFBYaNMSU1wyYRhiGvw4,5571
 pymammotion/data/mqtt/properties.py,sha256=laud9rE-JqBHWKZ44Dov2yMkp3Ld8ghpBwlZ4_3g9uQ,4321
 pymammotion/data/mqtt/status.py,sha256=SgdrpE1Uldb01hybO6hYhgU1Sp1eILghC0UhMZMHrdQ,1091
 pymammotion/data/state_manager.py,sha256=K3o__YsjBS5C5tEujANnxI-lgQpbXhPMUIy3sgVc3QI,12056
@@ -52,7 +52,7 @@ pymammotion/event/event.py,sha256=Z8WYxv_-5khEqKjL1w4c_Et24G1Kdm8QFuIBylD3h3U,30
 pymammotion/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/encryption.py,sha256=lzXu3WwBdQlzjXxWnlJuRgkCrKdPbxx5drhMitVKIEk,8287
-pymammotion/http/http.py,sha256=_Umuj6DKnTiDZ_y6C6DqPvHMRxKvqHqM0G_1QlsmHN8,12103
+pymammotion/http/http.py,sha256=7tIk7KzM6Wq4bWApcdAgsvQ139HEMvqfIX2STRVJTyM,12331
 pymammotion/http/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/model/camera_stream.py,sha256=ilxQNny_w9Frwt-m8kbHinvyjDv4Bx8C2swfZ2lTEDE,600
 pymammotion/http/model/http.py,sha256=VDBmi9nyY5Y2ns_HYvKIyzbkKRxhZ5elpq0lWXWzbGw,4123
@@ -63,7 +63,7 @@ pymammotion/mammotion/commands/abstract_message.py,sha256=P5FcjGkfoQ1O4Q9JKdq306
 pymammotion/mammotion/commands/mammotion_command.py,sha256=3OFXQjF7HFwPd_j6utHVI2Kfwh7t6_6ff_9MKAWGTlk,2570
 pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/messages/driver.py,sha256=LAYGvAcDDXwwliQ1OfRwNBk1VpIdpURo1TlA64zpLA4,3701
-pymammotion/mammotion/commands/messages/media.py,sha256=a6CY_1wEpepH9zg6-HfH1lt-jtC1sFy8hm7tFRgzlG4,1493
+pymammotion/mammotion/commands/messages/media.py,sha256=BcKOtQn7aRChAw41Er4oxixOuNsIblOejQxrBGTER84,2822
 pymammotion/mammotion/commands/messages/navigation.py,sha256=aEEpvDW5QukJ0QiWMhPjjz0eTTF1ndQuvv8a6hJlUg0,23257
 pymammotion/mammotion/commands/messages/network.py,sha256=OrmW4-BP_o3piBjwXZ12WY0HqbXHQqeDXC0YaDPeBM8,7409
 pymammotion/mammotion/commands/messages/ota.py,sha256=ZHLQRE5ETvLEIu2Vbj3m2XidIWT8uorYSHxkZd3pkRc,1376
@@ -81,7 +81,7 @@ pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0z
 pymammotion/mqtt/linkkit/h2client.py,sha256=w9Nvi_nY4CLD_fw-pHtYChwQf7e2TiAGeqkY_sF4cf0,19659
 pymammotion/mqtt/linkkit/linkkit.py,sha256=SGWny2_LKa8qg8RD0Bgd3a4S_fMqpYxJ7a9eFRvgcN0,132923
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
-pymammotion/mqtt/mammotion_mqtt.py,sha256=4jNNV5tx6CCryjLSmAQA6u19bhRSuVkZem32JCpOakE,10198
+pymammotion/mqtt/mammotion_mqtt.py,sha256=p2efgd35ePi9bZxsGp2gtcS83BHiw7A1NR-utZx8Ijg,10183
 pymammotion/proto/__init__.py,sha256=vUF-eieR8e4VfduqaQ3KfeCRhsMD56NTX2Kk6sS38IE,73466
 pymammotion/proto/basestation.proto,sha256=YiSsDmT0DY_ep6DHay13SbhxGMhentYt0BmJrVQrwLQ,1198
 pymammotion/proto/basestation_pb2.py,sha256=suenbpMz9JZCXdGJGdiPaapppRz9Cf4IDzAXUfdIG3w,3083
@@ -125,7 +125,7 @@ pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tp
 pymammotion/utility/mur_mur_hash.py,sha256=xEfOZVbqRawJj66eLgtnZ85OauDR47oIPr29OHelzPI,4468
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.5.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.5.8.dist-info/METADATA,sha256=mrFv21PLSWIsA6_dxsKSqW3AeU7TrM_QsabDerHx5J8,3870
-pymammotion-0.5.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.5.8.dist-info/RECORD,,
+pymammotion-0.5.10.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.5.10.dist-info/METADATA,sha256=R9J_whXYxCOIP_CxxXAMx6ZotbuPjgTZD_NNVB9fgFU,3871
+pymammotion-0.5.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.5.10.dist-info/RECORD,,