pymammotion 0.5.8__tar.gz → 0.5.10__tar.gz

{pymammotion-0.5.8 → pymammotion-0.5.10}/PKG-INFO

@@ -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.10/pymammotion/data/model/errors.py

@@ -0,0 +1,12 @@
+from dataclasses import dataclass, field
+
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
+from pymammotion.http.model.http import ErrorInfo
+
+
+@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-0.5.8 → pymammotion-0.5.10}/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-0.5.8 → pymammotion-0.5.10}/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-0.5.8 → pymammotion-0.5.10}/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-0.5.8 → pymammotion-0.5.10}/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 → pymammotion-0.5.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.5.8"
+version     = "0.5.10"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -66,7 +66,7 @@ autotyping = "^24.3.0"
 ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.5.8"
+current_version = "0.5.10"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true

pymammotion-0.5.8/pymammotion/data/model/errors.py

@@ -1,12 +0,0 @@
-from dataclasses import field, dataclass
-
-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)