pymammotion 0.5.40__py3-none-any.whl → 0.5.42__py3-none-any.whl

pymammotion/data/model/hash_list.py

@@ -218,6 +218,14 @@ class HashList(DataClassORJSONMixin):
         self.obstacle = {hash_id: frames for hash_id, frames in self.obstacle.items() if hash_id in hashlist}
         self.dump = {hash_id: frames for hash_id, frames in self.dump.items() if hash_id in hashlist}
         self.svg = {hash_id: frames for hash_id, frames in self.svg.items() if hash_id in hashlist}
+
+        area_hashes = list(self.area.keys())
+        for hash_id, plan_task in self.plan.items():
+            for item in plan_task.zone_hashs:
+                if item not in area_hashes:
+                    self.plan.pop(hash_id)
+                    break
+
         self.area_name = [
             area_item
             for area_item in self.area_name

pymammotion/homeassistant/mower_api.py

@@ -371,7 +371,7 @@ class HomeAssistantMowerApi:
             operation_settings.blade_height = -10
 
         route_information = GenerateRouteInformation(
-            one_hashs=operation_settings.areas,
+            one_hashs=list(operation_settings.areas),
             rain_tactics=operation_settings.rain_tactics,
             speed=operation_settings.speed,
             ultra_wave=operation_settings.ultra_wave,  # touch no touch etc

pymammotion/http/http.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import csv
 import random
 import time
@@ -33,7 +35,7 @@ class MammotionHTTP:
         self.msg = None
         self.account = account
         self._password = password
-        self.response: Response | None = None
+        self._response: Response | None = None
         self.login_info: LoginResponseData | None = None
         self.jwt_info: JWTTokenInfo = JWTTokenInfo("", "")
         self._headers = {"User-Agent": "okhttp/4.9.3", "App-Version": "Home Assistant,1.14.2.29"}
@@ -47,6 +49,17 @@ class MammotionHTTP:
         # Replace the line in the __init__ method with:
         self.client_id = f"{int(time.time() * 1000)}_{get_10_random()}_1"
 
+    @property
+    def response(self) -> Response | None:
+        return self._response
+
+    @response.setter
+    def response(self, response: Response) -> None:
+        self._response = response
+        decoded_token = jwt.decode(response.data.access_token, options={"verify_signature": False})
+        if isinstance(decoded_token, dict):
+            self.jwt_info = JWTTokenInfo(iot=decoded_token.get("iot", ""), robot=decoded_token.get("robot", ""))
+
     @staticmethod
     def generate_headers(token: str) -> dict:
         return {"Authorization": f"Bearer {token}"}
@@ -416,9 +429,6 @@ class MammotionHTTP:
                 self.response = login_response
                 self.msg = login_response.msg
                 self.code = login_response.code
-                decoded_token = jwt.decode(self.response.data.access_token, options={"verify_signature": False})
-                if isinstance(decoded_token, dict):
-                    self.jwt_info = JWTTokenInfo(iot=decoded_token.get("iot", ""), robot=decoded_token.get("robot", ""))
                 # TODO catch errors from mismatch user / password elsewhere
                 # Assuming the data format matches the expected structure
                 return login_response

{pymammotion-0.5.40.dist-info → pymammotion-0.5.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymammotion
-Version: 0.5.40
+Version: 0.5.42
 Author: jLynx
 Author-email: Michael Arthur <michael@jumblesoft.co.nz>
 License-Expression: GPL-3.0

{pymammotion-0.5.40.dist-info → pymammotion-0.5.42.dist-info}/RECORD

@@ -37,7 +37,7 @@ pymammotion/data/model/errors.py,sha256=lBHq2cE8P5fc6Q4JXgrkJXzFKTWgxsoPOyMlTaJW
 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=-_c8pk10zwRh-O2vJ0i3DDCOQbv9CRJ7YNWpfsIpajI,807
-pymammotion/data/model/hash_list.py,sha256=oVvoXFunlnIQpd7E_zENkTtQITt0C9UVAVsDHomc-tE,14551
+pymammotion/data/model/hash_list.py,sha256=5hXCSerL7EH6kmnfta8U6eJxpWumsFpzAukwECeJlf8,14810
 pymammotion/data/model/location.py,sha256=PwmITejfI4pm7PI4rzqSuuHetwle6IJr_CV95435s2M,871
 pymammotion/data/model/mowing_modes.py,sha256=4rMn1H8w2iU2aBwpmAhPh_sT81yqrocrWWUIaU7DCIc,1171
 pymammotion/data/model/rapid_state.py,sha256=mIdhAG_LZXpVcybxqTLgLXkNOmVmDTn04B9PGIDA8Ls,1251
@@ -52,12 +52,12 @@ pymammotion/data/mqtt/status.py,sha256=qwZPevIzScePA_25nbRWMN7IhU-MhhtIl7fcZKAJf
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=Z8WYxv_-5khEqKjL1w4c_Et24G1Kdm8QFuIBylD3h3U,3021
 pymammotion/homeassistant/__init__.py,sha256=j0aQZKWR41pCDR3g1y2p_zfp033pESECcqXiefRg1DQ,107
-pymammotion/homeassistant/mower_api.py,sha256=ky_sUIwvUHW114UpO2ggnXQQZRLPfDYpVjVMW34g3M4,19201
+pymammotion/homeassistant/mower_api.py,sha256=bQPCAre0tD3dO4vr07vfKOENmnA8Fv0NVMMq_fkt0ik,19207
 pymammotion/homeassistant/rtk_api.py,sha256=YyTF_14cWvvT31H-LYD715W82KsWfkV1nwXsJcHfQ7I,2445
 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=GVCxnAulP-A9BWcjuEGVJdr-kDEPlMF4VyKUoaNwPVg,19967
+pymammotion/http/http.py,sha256=bh1bYM9dJmc8Eh4jJ8J-IOVzJVThehHq633pqaaPv_E,20171
 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=GyWXIL4fNBssuE7WJR1IR89shWUEMbxRF3T9L24jGMM,6381
@@ -144,7 +144,7 @@ pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2R
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
 pymammotion/utility/constant/__init__.py,sha256=tcY0LDeD-qDDHx2LKt55KOyv9ZI0UfCNM6fknLCmm8s,110
 pymammotion/utility/constant/device_constant.py,sha256=MJE1DEOg86oWNSXYGx3xxJ542KEuSJNZ0VJLN4eHbUg,8237
-pymammotion-0.5.40.dist-info/METADATA,sha256=TGX6CKjw1JiszEYkUmeCUMnZ4GQS6LRO3ACqEciVg0E,3575
-pymammotion-0.5.40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pymammotion-0.5.40.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.5.40.dist-info/RECORD,,
+pymammotion-0.5.42.dist-info/METADATA,sha256=Qc1EJVsa848is148yLnj19w84HLUYCm7QF15WURBsHU,3575
+pymammotion-0.5.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pymammotion-0.5.42.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.5.42.dist-info/RECORD,,