pymammotion 0.2.10__tar.gz → 0.5.53__tar.gz

pymammotion-0.5.53/.gitignore

@@ -0,0 +1,237 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64
+lib64/
+bin/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+pyvenv.cfg
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+scripts.txt
+.idea

{pymammotion-0.2.10 → pymammotion-0.5.53}/PKG-INFO

@@ -1,35 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pymammotion
-Version: 0.2.10
-Summary: 
-License: GNU-3.0
-Author: Michael Arthur
-Author-email: michael@jumblesoft.co.nz
-Requires-Python: >=3.10,<3.13
-Classifier: License :: Other/Proprietary License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: aiohttp (>=3.9.1,<4.0.0)
-Requires-Dist: alibabacloud-apigateway-util (>=0.0.2,<0.0.3)
-Requires-Dist: alibabacloud-iot-api-gateway (>=0.0.4,<0.0.5)
-Requires-Dist: alicloud-gateway-iot (>=1.0.0,<2.0.0)
-Requires-Dist: aliyun-iot-linkkit (>=1.2.12,<2.0.0)
-Requires-Dist: aliyun-python-sdk-iot (>=8.57.0,<9.0.0)
-Requires-Dist: async-timeout (>=4.0.3,<5.0.0)
-Requires-Dist: betterproto (>=1.2.5,<2.0.0)
-Requires-Dist: bleak (>=0.21.0)
-Requires-Dist: bleak-retry-connector (>=3.5.0,<4.0.0)
-Requires-Dist: jsonic (>=1.0.0,<2.0.0)
-Requires-Dist: mashumaro (>=3.13,<4.0)
-Requires-Dist: nest-asyncio (>=1.6.0,<2.0.0)
-Requires-Dist: numpy (>=1.26.0,<2.0.0)
-Requires-Dist: orjson (>=3.9.15,<4.0.0)
-Requires-Dist: paho-mqtt (>=1.6.1,<2.0.0)
-Requires-Dist: protobuf (>=4.23.1)
-Requires-Dist: py-jsonic (>=0.0.2,<0.0.3)
-Requires-Dist: pyjoystick (>=1.2.4,<2.0.0)
+Version: 0.5.53
+Author: jLynx
+Author-email: Michael Arthur <michael@jumblesoft.co.nz>
+License-Expression: GPL-3.0
+License-File: LICENSE
+Requires-Python: <4.0,>=3.12
+Requires-Dist: aiohttp>=3.9.1
+Requires-Dist: alibabacloud-apigateway-util<0.0.3,>=0.0.2
+Requires-Dist: alibabacloud-iot-api-gateway<0.0.5,>=0.0.4
+Requires-Dist: alicloud-gateway-iot<2,>=1.0.0
+Requires-Dist: async-timeout<5,>=4.0.3
+Requires-Dist: betterproto2>=0.9.1
+Requires-Dist: bleak-retry-connector>=3.5.0
+Requires-Dist: bleak>=0.21.0
+Requires-Dist: crcmod~=1.7
+Requires-Dist: cryptography>=43.0.1
+Requires-Dist: jsonic<2,>=1.0.0
+Requires-Dist: mashumaro~=3.13
+Requires-Dist: numpy>=1.26.0
+Requires-Dist: orjson<4,>=3.9.15
+Requires-Dist: paho-mqtt<3,>=2.1.0
+Requires-Dist: protobuf>=4.23.1
+Requires-Dist: py-jsonic<0.0.3,>=0.0.2
+Requires-Dist: pyjwt>=2.10.1
+Requires-Dist: shapely>=2.1.2
 Description-Content-Type: text/markdown
 
 # PyMammotion - Python API for Mammotion Mowers [![Discord](https://img.shields.io/discord/1247286396297678879)](https://discord.gg/vpZdWhJX8x)
@@ -70,7 +65,7 @@ pip install pymammotion
 PyMammotion uses `betterproto` and `protoc` for generating protobuf models. To set up the development environment:
 
 1. Clone the repository
-2. ???
+2. poetry install --with=dev
 3. Profit
 
 ## Contributing 🤝
@@ -98,4 +93,3 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 The trademarks "Mammotion," "Luba," and "Yuka" referenced herein are registered trademarks of their respective owners. The author of this software repository is not affiliated with, endorsed by, or connected to these trademark owners in any way.
 
-

{pymammotion-0.2.10 → pymammotion-0.5.53}/README.md

@@ -36,7 +36,7 @@ pip install pymammotion
 PyMammotion uses `betterproto` and `protoc` for generating protobuf models. To set up the development environment:
 
 1. Clone the repository
-2. ???
+2. poetry install --with=dev
 3. Profit
 
 ## Contributing 🤝

{pymammotion-0.2.10 → pymammotion-0.5.53}/pymammotion/__init__.py

@@ -8,18 +8,21 @@ import asyncio
 import logging
 import os
 
+from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
+
 # works outside HA on its own
-from pymammotion.bluetooth.ble import LubaBLE
-from pymammotion.http.http import MammotionHTTP, connect_http
+from pymammotion.bluetooth.ble import MammotionBLE
+from pymammotion.http.http import MammotionHTTP
 
 # TODO make a working device that will work outside HA too.
-from pymammotion.mammotion.devices import MammotionBaseBLEDevice
-from pymammotion.mqtt import MammotionMQTT
-
-__all__ = ["LubaBLE", "MammotionHTTP", "connect_http", "MammotionBaseBLEDevice", "MammotionMQTT"]
+from pymammotion.mqtt import AliyunMQTT, MammotionMQTT
 
 logger = logging.getLogger(__name__)
 
+
+__all__ = ["MammotionBLE", "MammotionHTTP", "AliyunMQTT", "MammotionMQTT", "logger"]
+
+
 # TODO provide interface to pick between mqtt/cloud/bluetooth
 
 if __name__ == "__main__":
@@ -32,13 +35,16 @@ if __name__ == "__main__":
     CLIENT_ID = os.environ.get("CLIENT_ID")
     IOT_TOKEN = os.environ.get("IOT_TOKEN")
     REGION = os.environ.get("REGION")
-    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,
+    mammotion_http = MammotionHTTP()
+    cloud_client = CloudIOTGateway(mammotion_http)
+    luba = AliyunMQTT(
+        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-0.5.53/pymammotion/aliyun/client.py

@@ -0,0 +1,235 @@
+from datetime import UTC, datetime
+import time
+
+from Tea.exceptions import UnretryableException
+from Tea.request import TeaRequest
+
+from pymammotion.aliyun.tea.core import TeaCore
+
+try:
+    from typing import Dict
+except ImportError:
+    pass
+
+from alibabacloud_apigateway_util.client import Client as APIGatewayUtilClient
+from alibabacloud_tea_util.client import Client as UtilClient
+
+
+class Client:
+    """test"""
+
+    _app_key = None  # type: str
+    _app_secret = None  # type: str
+    _protocol = None  # type: str
+    _user_agent = None  # type: str
+    _read_timeout = None  # type: int
+    _connect_timeout = None  # type: int
+    _http_proxy = None  # type: str
+    _https_proxy = None  # type: str
+    _no_proxy = None  # type: str
+    _max_idle_conns = None  # type: int
+    _domain = None  # type: str
+
+    def __init__(self, config) -> None:
+        self._domain = config.domain
+        self._app_key = config.app_key
+        self._app_secret = config.app_secret
+        self._protocol = config.protocol
+        self._read_timeout = config.read_timeout
+        self._connect_timeout = config.connect_timeout
+        self._http_proxy = config.http_proxy
+        self._https_proxy = config.https_proxy
+        self._no_proxy = config.no_proxy
+        self._max_idle_conns = config.max_idle_conns
+
+    def do_request(self, pathname, protocol, method, header, body, runtime):
+        """Send request
+
+        @type pathname: str
+        @param pathname: the url path
+
+        @type protocol: str
+        @param protocol: http or https
+
+        @type method: str
+        @param method: example GET
+
+        @type header: Dict[str, str]
+        @param header: request header
+
+        @type body: iot_api_gateway_models.IoTApiRequest
+        @param body: the object of IoTApiRequest
+
+        @type runtime: util_models.RuntimeOptions
+        @param runtime: which controls some details of call api, such as retry times
+
+        @rtype: TeaResponse
+        @return: the response
+        """
+        body.validate()
+        runtime.validate()
+        _runtime = {
+            "timeouted": "retry",
+            "readTimeout": UtilClient.default_number(runtime.read_timeout, self._read_timeout),
+            "connectTimeout": UtilClient.default_number(runtime.connect_timeout, self._connect_timeout),
+            "httpProxy": UtilClient.default_string(runtime.http_proxy, self._http_proxy),
+            "httpsProxy": UtilClient.default_string(runtime.https_proxy, self._https_proxy),
+            "noProxy": UtilClient.default_string(runtime.no_proxy, self._no_proxy),
+            "maxIdleConns": UtilClient.default_number(runtime.max_idle_conns, self._max_idle_conns),
+            "retry": {
+                "retryable": runtime.autoretry,
+                "maxAttempts": UtilClient.default_number(runtime.max_attempts, 3),
+            },
+            "backoff": {
+                "policy": UtilClient.default_string(runtime.backoff_policy, "yes"),
+                "period": UtilClient.default_number(runtime.backoff_period, 1),
+            },
+            "ignoreSSL": runtime.ignore_ssl,
+        }
+        _last_request = None
+        _last_exception = None
+        _now = time.time()
+        _retry_times = 0
+        while TeaCore.allow_retry(_runtime.get("retry"), _retry_times, _now):
+            if _retry_times > 0:
+                _backoff_time = TeaCore.get_backoff_time(_runtime.get("backoff"), _retry_times)
+                if _backoff_time > 0:
+                    TeaCore.sleep(_backoff_time)
+            _retry_times = _retry_times + 1
+            try:
+                _request = TeaRequest()
+                _request.protocol = UtilClient.default_string(self._protocol, protocol)
+                _request.method = UtilClient.default_string(method, "POST")
+                _request.pathname = pathname
+                _request.headers = TeaCore.merge(
+                    {
+                        "host": self._domain,
+                        "date": datetime.now(UTC).strftime("%a, %d %b %Y %H:%M:%S GMT"),
+                        "x-ca-nonce": UtilClient.get_nonce(),
+                        "x-ca-key": self._app_key,
+                        "x-ca-signaturemethod": "HmacSHA256",
+                        "accept": "application/json",
+                        "user-agent": self.get_user_agent(),
+                    },
+                    header,
+                )
+                if UtilClient.empty(body.id):
+                    body.id = UtilClient.get_nonce()
+                if not UtilClient.is_unset(body):
+                    _request.headers["content-type"] = "application/octet-stream"
+                    _request.headers["content-md5"] = APIGatewayUtilClient.get_content_md5(
+                        UtilClient.to_jsonstring(TeaCore.to_map(body))
+                    )
+                    _request.body = UtilClient.to_jsonstring(TeaCore.to_map(body))
+                _request.headers["x-ca-signature"] = APIGatewayUtilClient.get_signature(_request, self._app_secret)
+                _last_request = _request
+                _response = TeaCore.do_action(_request, _runtime)
+                if _response.body.get("code") == 20056:
+                    raise Exception("Gateway timeout.")
+
+                return _response
+            except Exception as e:
+                if TeaCore.is_retryable(e):
+                    _last_exception = e
+                    continue
+                raise e
+        raise UnretryableException(_last_request, _last_exception)
+
+    async def async_do_request(self, pathname, protocol, method, header, body, runtime):
+        """Send request
+
+        @type pathname: str
+        @param pathname: the url path
+
+        @type protocol: str
+        @param protocol: http or https
+
+        @type method: str
+        @param method: example GET
+
+        @type header: Dict[str, str]
+        @param header: request header
+
+        @type body: iot_api_gateway_models.IoTApiRequest
+        @param body: the object of IoTApiRequest
+
+        @type runtime: util_models.RuntimeOptions
+        @param runtime: which controls some details of call api, such as retry times
+
+        @rtype: TeaResponse
+        @return: the response
+        """
+        body.validate()
+        runtime.validate()
+        _runtime = {
+            "timeouted": "retry",
+            "readTimeout": UtilClient.default_number(runtime.read_timeout, self._read_timeout),
+            "connectTimeout": UtilClient.default_number(runtime.connect_timeout, self._connect_timeout),
+            "httpProxy": UtilClient.default_string(runtime.http_proxy, self._http_proxy),
+            "httpsProxy": UtilClient.default_string(runtime.https_proxy, self._https_proxy),
+            "noProxy": UtilClient.default_string(runtime.no_proxy, self._no_proxy),
+            "maxIdleConns": UtilClient.default_number(runtime.max_idle_conns, self._max_idle_conns),
+            "retry": {
+                "retryable": runtime.autoretry,
+                "maxAttempts": UtilClient.default_number(runtime.max_attempts, 3),
+            },
+            "backoff": {
+                "policy": UtilClient.default_string(runtime.backoff_policy, "yes"),
+                "period": UtilClient.default_number(runtime.backoff_period, 1),
+            },
+            "ignoreSSL": runtime.ignore_ssl,
+        }
+        _last_request = None
+        _last_exception = None
+        _now = time.time()
+        _retry_times = 0
+        while TeaCore.allow_retry(_runtime.get("retry"), _retry_times, _now):
+            if _retry_times > 0:
+                _backoff_time = TeaCore.get_backoff_time(_runtime.get("backoff"), _retry_times)
+                if _backoff_time > 0:
+                    await TeaCore.sleep_async(_backoff_time)
+            _retry_times = _retry_times + 1
+            try:
+                _request = TeaRequest()
+                _request.protocol = UtilClient.default_string(self._protocol, protocol)
+                _request.method = UtilClient.default_string(method, "POST")
+                _request.pathname = pathname
+                _request.headers = TeaCore.merge(
+                    {
+                        "host": self._domain,
+                        "date": UtilClient.get_date_utcstring(),
+                        "x-ca-nonce": UtilClient.get_nonce(),
+                        "x-ca-key": self._app_key,
+                        "x-ca-signaturemethod": "HmacSHA256",
+                        "accept": "application/json",
+                        "user-agent": self.get_user_agent(),
+                    },
+                    header,
+                )
+                if UtilClient.empty(body.id):
+                    body.id = UtilClient.get_nonce()
+                if not UtilClient.is_unset(body):
+                    _request.headers["content-type"] = "application/octet-stream"
+                    _request.headers["content-md5"] = APIGatewayUtilClient.get_content_md5(
+                        UtilClient.to_jsonstring(TeaCore.to_map(body))
+                    )
+                    _request.body = UtilClient.to_jsonstring(TeaCore.to_map(body))
+                _request.headers["x-ca-signature"] = APIGatewayUtilClient.get_signature(_request, self._app_secret)
+                _last_request = _request
+                _response = await TeaCore.async_do_action(_request, _runtime)
+                return _response
+            except Exception as e:
+                if TeaCore.is_retryable(e):
+                    _last_exception = e
+                    continue
+                raise e
+        raise UnretryableException(_last_request, _last_exception)
+
+    def get_user_agent(self):
+        """Get user agent
+
+        @rtype: str
+        @return: user agent
+        """
+        user_agent = UtilClient.get_user_agent(self._user_agent)
+        return user_agent