pymammotion 0.4.34__tar.gz → 0.4.36__tar.gz

{pymammotion-0.4.34 → pymammotion-0.4.36}/PKG-INFO

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

{pymammotion-0.4.34 → pymammotion-0.4.36}/pymammotion/http/http.py

@@ -3,9 +3,9 @@ from typing import cast
 
 from aiohttp import ClientSession
 
-from pymammotion.aliyun.model.stream_subscription_response import StreamSubscriptionResponse
 from pymammotion.const import MAMMOTION_API_DOMAIN, MAMMOTION_CLIENT_ID, MAMMOTION_CLIENT_SECRET, MAMMOTION_DOMAIN
 from pymammotion.http.encryption import EncryptionUtils
+from pymammotion.http.model.camera_stream import StreamSubscriptionResponse, VideoResourceResponse
 from pymammotion.http.model.http import ErrorInfo, LoginResponseData, Response
 
 
@@ -108,6 +108,51 @@ class MammotionHTTP:
                 # Assuming the data format matches the expected structure
                 return Response[StreamSubscriptionResponse].from_dict(data)
 
+    async def get_stream_subscription_mini_or_x_series(
+        self, iot_id: str, is_yuka: bool
+    ) -> Response[StreamSubscriptionResponse]:
+        """Get agora.io data for view camera stream (New models 2025)"""
+
+        # Prepare the payload with cameraStates based on is_yuka flag
+        payload = {"deviceId": iot_id, "mode": 0, "cameraStates": []}
+
+        # Add appropriate cameraStates based on the is_yuka flag
+        if is_yuka:
+            payload["cameraStates"] = [{"cameraState": 1}, {"cameraState": 0}, {"cameraState": 1}]
+        else:
+            payload["cameraStates"] = [{"cameraState": 1}, {"cameraState": 0}, {"cameraState": 0}]
+
+        async with ClientSession(MAMMOTION_API_DOMAIN) as session:
+            async with session.post(
+                "/device-server/v1/stream/token",
+                json=payload,
+                headers={
+                    "Authorization": f"{self._headers.get('Authorization', "")}",
+                    "Content-Type": "application/json",
+                    "User-Agent": "okhttp/3.14.9",
+                },
+            ) as resp:
+                data = await resp.json()
+                # TODO catch errors from mismatch like token expire etc
+                # Assuming the data format matches the expected structure
+                return Response[StreamSubscriptionResponse].from_dict(data)
+
+    async def get_video_resource(self, iot_id: str) -> Response[VideoResourceResponse]:
+        """Get video resource for new models (2025 series)"""
+        async with ClientSession(MAMMOTION_API_DOMAIN) as session:
+            async with session.get(
+                f"/device-server/v1/video-resource/{iot_id}",
+                headers={
+                    "Authorization": f"{self._headers.get('Authorization', '')}",
+                    "Content-Type": "application/json",
+                    "User-Agent": "okhttp/3.14.9",
+                },
+            ) as resp:
+                data = await resp.json()
+                # TODO catch errors from mismatch like token expire etc
+                # Assuming the data format matches the expected structure
+                return Response[VideoResourceResponse].from_dict(data)
+
     async def refresh_login(self, account: str, password: str | None = None) -> Response[LoginResponseData]:
         if self._password is None and password is not None:
             self._password = password

pymammotion-0.4.34/pymammotion/aliyun/model/stream_subscription_response.py → pymammotion-0.4.36/pymammotion/http/model/camera_stream.py

@@ -16,3 +16,16 @@ class StreamSubscriptionResponse(DataClassORJSONMixin):
     channelName: str
     token: str
     uid: int
+    license: str | None = None
+    availableTime: int | None = None
+
+
+@dataclass
+class VideoResourceResponse(DataClassORJSONMixin):
+    id: str
+    deviceId: str
+    deviceName: str
+    cycleType: int
+    usageYearMonth: str
+    totalTime: int
+    availableTime: int

{pymammotion-0.4.34 → pymammotion-0.4.36}/pymammotion/mammotion/commands/messages/navigation.py

@@ -4,7 +4,7 @@ import logging
 import time
 
 from pymammotion.data.model import GenerateRouteInformation
-from pymammotion.data.model.plan import Plan
+from pymammotion.data.model.hash_list import Plan
 from pymammotion.data.model.region_data import RegionData
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import (

{pymammotion-0.4.34 → pymammotion-0.4.36}/pymammotion/mammotion/devices/mammotion.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import asyncio
-from enum import Enum
 import logging
 from typing import Any
 
@@ -15,31 +14,23 @@ from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.enums import ConnectionPreference
 from pymammotion.data.state_manager import StateManager
 from pymammotion.http.http import MammotionHTTP
+from pymammotion.http.model.camera_stream import StreamSubscriptionResponse, VideoResourceResponse
+from pymammotion.http.model.http import Response
 from pymammotion.mammotion.devices.mammotion_bluetooth import MammotionBaseBLEDevice
 from pymammotion.mammotion.devices.mammotion_cloud import MammotionBaseCloudDevice, MammotionCloud
 from pymammotion.mqtt import MammotionMQTT
+from pymammotion.utility.device_type import DeviceType
 
 TIMEOUT_CLOUD_RESPONSE = 10
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class ConnectionPreference(Enum):
-    """Enum for connection preference."""
-
-    EITHER = 0
-    WIFI = 1
-    BLUETOOTH = 2
-
-
 class MammotionMixedDeviceManager:
-    preference: ConnectionPreference
-    _ble_device: MammotionBaseBLEDevice | None = None
-    _cloud_device: MammotionBaseCloudDevice | None = None
-
     def __init__(
         self,
         name: str,
+        mammotion_http: MammotionHTTP,
         cloud_device: Device | None = None,
         ble_device: BLEDevice | None = None,
         mqtt: MammotionCloud | None = None,
@@ -50,6 +41,7 @@ class MammotionMixedDeviceManager:
         self._state_manager.get_device().name = name
         self.add_ble(cloud_device, ble_device)
         self.add_cloud(cloud_device, mqtt)
+        self.mammotion_http = mammotion_http
         self.preference = preference
         self._state_manager.preference = preference
 
@@ -169,19 +161,6 @@ class Mammotion:
         """Initialize MammotionDevice."""
         self._login_lock = asyncio.Lock()
 
-    def add_ble_device(
-        self,
-        cloud_device: Device,
-        ble_device: BLEDevice,
-        preference: ConnectionPreference = ConnectionPreference.BLUETOOTH,
-    ) -> None:
-        if ble_device:
-            self.device_manager.add_device(
-                MammotionMixedDeviceManager(
-                    name=ble_device.name, cloud_device=cloud_device, ble_device=ble_device, preference=preference
-                )
-            )
-
     async def login_and_initiate_cloud(self, account, password, force: bool = False) -> None:
         async with self._login_lock:
             exists: MammotionCloud | None = self.mqtt_list.get(account)
@@ -231,6 +210,7 @@ class Mammotion:
             if device.deviceName.startswith(("Luba-", "Yuka-")) and mower_device is None:
                 mixed_device = MammotionMixedDeviceManager(
                     name=device.deviceName,
+                    mammotion_http=mqtt_client.cloud_client.mammotion_http,
                     cloud_device=device,
                     mqtt=mqtt_client,
                     preference=ConnectionPreference.WIFI,
@@ -315,15 +295,27 @@ class Mammotion:
                 return await device.cloud().start_map_sync()
             # TODO work with both with EITHER
 
-    async def get_stream_subscription(self, name: str):
+    async def get_stream_subscription(self, name: str, iot_id: str) -> Response[StreamSubscriptionResponse] | Any:
         device = self.get_device_by_name(name)
-        if device.preference is ConnectionPreference.WIFI:
-            if device.has_cloud():
-                _stream_response = await device.cloud().mqtt.cloud_client.mammotion_http.get_stream_subscription(
-                    device.cloud().iot_id
-                )
-                _LOGGER.debug(_stream_response)
-                return _stream_response
+        if DeviceType.is_mini_or_x_series(name):
+            _stream_response = await device.mammotion_http.get_stream_subscription_mini_or_x_series(
+                iot_id, DeviceType.is_yuka(name)
+            )
+            _LOGGER.debug(_stream_response)
+            return _stream_response
+        else:
+            _stream_response = await device.mammotion_http.get_stream_subscription(iot_id)
+            _LOGGER.debug(_stream_response)
+            return _stream_response
+
+    async def get_video_resource(self, name: str, iot_id: str) -> Response[VideoResourceResponse] | None:
+        device = self.get_device_by_name(name)
+
+        if DeviceType.is_mini_or_x_series(name):
+            _video_resource_response = await device.mammotion_http.get_video_resource(iot_id)
+            _LOGGER.debug(_video_resource_response)
+            return _video_resource_response
+        return None
 
     def mower(self, name: str) -> MowingDevice | None:
         device = self.get_device_by_name(name)

{pymammotion-0.4.34 → pymammotion-0.4.36}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.34"
+version     = "0.4.36"
 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.4.34"
+current_version = "0.4.36"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true