appmesh 1.2.5__py3-none-any.whl → 1.2.9__py3-none-any.whl

appmesh/appmesh_client.py

@@ -13,7 +13,7 @@ import uuid
 from enum import Enum, unique
 from datetime import datetime
 from http import HTTPStatus
-from typing import Optional
+from typing import Optional, Tuple
 from urllib import parse
 
 import aniso8601
@@ -31,7 +31,7 @@ _SSL_CA_PEM_FILE = "/opt/appmesh/ssl/ca.pem"
 _SSL_CLIENT_PEM_FILE = "/opt/appmesh/ssl/client.pem"
 _SSL_CLIENT_PEM_KEY_FILE = "/opt/appmesh/ssl/client-key.pem"
 HTTP_USER_AGENT_HEADER_NAME = "User-Agent"
-HTTP_USER_AGENT = "appmeshsdk/py"
+HTTP_USER_AGENT = "appmesh/python"
 
 
 def _get_str_item(data: dict, key):
@@ -296,7 +296,7 @@ class App(object):
         return output
 
 
-class Run(object):
+class AppRun(object):
     """
     Application run object indicate to a remote run from run_async()
     """
@@ -657,19 +657,19 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         exit_code = int(resp.headers["Exit-Code"]) if "Exit-Code" in resp.headers else None
         return AppOutput(status_code=resp.status_code, output=resp.text, out_position=out_position, exit_code=exit_code)
 
-    def app_health(self, app_name: str) -> int:
+    def app_health(self, app_name: str) -> bool:
         """Get application health status, 0 is health.
 
         Args:
             app_name (str): the application name.
 
         Returns:
-            int: '0' is heathy, '1' is unhealthy.
+            bool: healthy or not
         """
         resp = self._request_http(AppMeshClient.Method.GET, path=f"/appmesh/app/{app_name}/health")
         if resp.status_code != HTTPStatus.OK:
             raise Exception(resp.text)
-        return int(resp.text)
+        return int(resp.text) == 0
 
     ########################################
     # Application manage
@@ -1241,13 +1241,13 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         )
         if resp.status_code != HTTPStatus.OK:
             raise Exception(resp.text)
-        return Run(self, resp.json()["name"], resp.json()["process_uuid"])
+        return AppRun(self, resp.json()["name"], resp.json()["process_uuid"])
 
-    def run_async_wait(self, run: Run, stdout_print: bool = True, timeout: int = 0) -> int:
+    def run_async_wait(self, run: AppRun, stdout_print: bool = True, timeout: int = 0) -> int:
         """Wait for an async run to be finished
 
         Args:
-            run (Run): asyncrized run result from run_async().
+            run (AppRun): asyncrized run result from run_async().
             stdout_print (bool, optional): print remote stdout to local or not.
             timeout (int, optional): wait max timeout seconds and return if not finished, 0 means wait until finished
 
@@ -1282,7 +1282,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         stdout_print: bool = True,
         max_time_seconds=DEFAULT_RUN_APP_TIMEOUT_SECONDS,
         life_cycle_seconds=DEFAULT_RUN_APP_LIFECYCLE_SECONDS,
-    ) -> int:
+    ) -> Tuple[int, str]:
         """Block run a command remotely, 'name' attribute in app_json dict used to run an existing application
         The synchronized run will block the process until the remote run is finished then return the result from HTTP response
 
@@ -1294,6 +1294,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
 
         Returns:
             int: process exit code, return None if no exit code.
+            str: stdout text
         """
         path = "/appmesh/app/syncrun"
         resp = self._request_http(
@@ -1310,7 +1311,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
                 exit_code = int(resp.headers.get("Exit-Code"))
         elif stdout_print:
             print(resp.text)
-        return exit_code
+        return exit_code, resp.text
 
     def _request_http(self, method: Method, path: str, query: dict = None, header: dict = None, body=None) -> requests.Response:
         """REST API

{appmesh-1.2.5.dist-info → appmesh-1.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: appmesh
-Version: 1.2.5
+Version: 1.2.9
 Summary: Client SDK for App Mesh
 Home-page: https://github.com/laoshanxi/app-mesh
 Author: laoshanxi
@@ -43,7 +43,7 @@ Cloud native | Schedule cloud-level applications to run on multiple hosts with r
 Micro service application | ⚡️ [Consul micro-service cluster management](https://app-mesh.readthedocs.io/en/latest/CONSUL.html)
 Extra Features | Collect host/app resource usage <br> Remote shell command execution <br> File upload/download interface <br> Hot-update support `systemctl reload appmesh` <br> Bash completion <br> Reverse proxy <br> [Web GUI](https://github.com/laoshanxi/app-mesh-ui)
 Platform support | X86_64 <br> ARM32 <br> ARM64
-SDK | [Python](https://app-mesh.readthedocs.io/en/latest/api/appmesh_client.html) <br> [Golang](https://github.com/laoshanxi/app-mesh/blob/main/src/sdk/go/appmesh_client.go) <br> [Swagger OpenAPI Specification](https://petstore.swagger.io/?url=https://raw.githubusercontent.com/laoshanxi/app-mesh/main/src/daemon/rest/openapi.yaml)
+SDK | [Python](https://app-mesh.readthedocs.io/en/latest/api/appmesh_client.html) <br> [Golang](https://github.com/laoshanxi/app-mesh/blob/main/src/sdk/go/appmesh_client.go) <br> [JavaScript](https://www.npmjs.com/package/appmesh) <br> [Java](https://github.com/laoshanxi/app-mesh/blob/main/src/sdk/java/) <br> [Swagger OpenAPI Specification](https://petstore.swagger.io/?url=https://raw.githubusercontent.com/laoshanxi/app-mesh/main/src/daemon/rest/openapi.yaml)
 
 ## Getting started
 
@@ -94,9 +94,9 @@ Refer to the [Installation doc](https://app-mesh.readthedocs.io/en/latest/Instal
 
 ---
 
-### Component diagram
+### Mind diagram
 
-![block-diagram](https://github.com/laoshanxi/app-mesh/raw/main/docs/source/block_diagram.png)
+![mind-diagram](https://github.com/laoshanxi/picture/raw/master/appmesh/mind.png)
 
 ---
 

appmesh-1.2.9.dist-info/RECORD

@@ -0,0 +1,6 @@
+appmesh/__init__.py,sha256=xRdXeFHEieRauuJZElbEBASgXG0ZzU1a5_0isAhM7Gw,11
+appmesh/appmesh_client.py,sha256=12PXzQY1MTh48XR5XaCLQ3Lvs1g7lLD2KE9QcrNhPgw,62480
+appmesh-1.2.9.dist-info/METADATA,sha256=k4BdUChQq2Ts5YwEJwPGolTy1jpYpZdWnm6SmEtLrKo,11041
+appmesh-1.2.9.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+appmesh-1.2.9.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.2.9.dist-info/RECORD,,

{appmesh-1.2.5.dist-info → appmesh-1.2.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

appmesh-1.2.5.dist-info/RECORD

@@ -1,6 +0,0 @@
-appmesh/__init__.py,sha256=xRdXeFHEieRauuJZElbEBASgXG0ZzU1a5_0isAhM7Gw,11
-appmesh/appmesh_client.py,sha256=vPC9L3hkvGuYRPHyzx6N6zbISKoSLah5PtbiE1Ktpv4,62419
-appmesh-1.2.5.dist-info/METADATA,sha256=5EqsWLxfTX4CVSKJ1RhroBlR53G-5fxQlMeZ5-3suI8,10927
-appmesh-1.2.5.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-appmesh-1.2.5.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-1.2.5.dist-info/RECORD,,