pymammotion 0.4.38__tar.gz → 0.5.44__tar.gz

pymammotion-0.5.44/.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.4.38 → pymammotion-0.5.44}/PKG-INFO

@@ -1,33 +1,29 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pymammotion
-Version: 0.4.38
-Summary: 
-License: GPL-3.0
-Author: Michael Arthur
-Author-email: michael@jumblesoft.co.nz
-Requires-Python: >=3.10
-Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: aiohttp (>=3.9.1)
-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: 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: crcmod (>=1.7,<2.0)
-Requires-Dist: cryptography (>=43.0.1)
-Requires-Dist: jsonic (>=1.0.0,<2.0.0)
-Requires-Dist: mashumaro (>=3.13,<4.0)
-Requires-Dist: numpy (>=1.26.0)
-Requires-Dist: orjson (>=3.9.15,<4.0.0)
-Requires-Dist: paho-mqtt (>=2.1.0,<3.0.0)
-Requires-Dist: protobuf (>=4.23.1)
-Requires-Dist: py-jsonic (>=0.0.2,<0.0.3)
+Version: 0.5.44
+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,>=0.8.0
+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
 Description-Content-Type: text/markdown
 
 # PyMammotion - Python API for Mammotion Mowers [![Discord](https://img.shields.io/discord/1247286396297678879)](https://discord.gg/vpZdWhJX8x)
@@ -96,4 +92,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.4.38 → pymammotion-0.5.44}/pymammotion/__init__.py

@@ -15,12 +15,12 @@ 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.mqtt import MammotionMQTT
+from pymammotion.mqtt import AliyunMQTT, MammotionMQTT
 
 logger = logging.getLogger(__name__)
 
 
-__all__ = ["MammotionBLE", "MammotionHTTP", "MammotionMQTT", "logger"]
+__all__ = ["MammotionBLE", "MammotionHTTP", "AliyunMQTT", "MammotionMQTT", "logger"]
 
 
 # TODO provide interface to pick between mqtt/cloud/bluetooth
@@ -35,8 +35,9 @@ if __name__ == "__main__":
     CLIENT_ID = os.environ.get("CLIENT_ID")
     IOT_TOKEN = os.environ.get("IOT_TOKEN")
     REGION = os.environ.get("REGION")
-    cloud_client = CloudIOTGateway()
-    luba = MammotionMQTT(
+    mammotion_http = MammotionHTTP()
+    cloud_client = CloudIOTGateway(mammotion_http)
+    luba = AliyunMQTT(
         iot_token=IOT_TOKEN or "",
         region_id=REGION or "",
         product_key=PRODUCT_KEY or "",

{pymammotion-0.4.38 → pymammotion-0.5.44}/pymammotion/aliyun/client.py

@@ -1,3 +1,4 @@
+from datetime import UTC, datetime
 import time
 
 from Tea.exceptions import UnretryableException
@@ -80,7 +81,7 @@ class Client:
                 "maxAttempts": UtilClient.default_number(runtime.max_attempts, 3),
             },
             "backoff": {
-                "policy": UtilClient.default_string(runtime.backoff_policy, "no"),
+                "policy": UtilClient.default_string(runtime.backoff_policy, "yes"),
                 "period": UtilClient.default_number(runtime.backoff_period, 1),
             },
             "ignoreSSL": runtime.ignore_ssl,
@@ -103,7 +104,7 @@ class Client:
                 _request.headers = TeaCore.merge(
                     {
                         "host": self._domain,
-                        "date": UtilClient.get_date_utcstring(),
+                        "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",
@@ -123,6 +124,9 @@ class Client:
                 _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):
@@ -170,7 +174,7 @@ class Client:
                 "maxAttempts": UtilClient.default_number(runtime.max_attempts, 3),
             },
             "backoff": {
-                "policy": UtilClient.default_string(runtime.backoff_policy, "no"),
+                "policy": UtilClient.default_string(runtime.backoff_policy, "yes"),
                 "period": UtilClient.default_number(runtime.backoff_period, 1),
             },
             "ignoreSSL": runtime.ignore_ssl,
@@ -183,7 +187,7 @@ class Client:
             if _retry_times > 0:
                 _backoff_time = TeaCore.get_backoff_time(_runtime.get("backoff"), _retry_times)
                 if _backoff_time > 0:
-                    TeaCore.sleep(_backoff_time)
+                    await TeaCore.sleep_async(_backoff_time)
             _retry_times = _retry_times + 1
             try:
                 _request = TeaRequest()