appmesh 1.6.2__py3-none-any.whl → 1.6.3__py3-none-any.whl

appmesh/app.py

@@ -5,7 +5,7 @@ import json
 import copy
 
 from datetime import datetime
-from typing import Optional
+from typing import Optional, Any
 from enum import Enum, unique
 
 # pylint: disable=line-too-long
@@ -39,7 +39,7 @@ class App:
         return None
 
     @staticmethod
-    def _get_native_item(data: dict, key: str) -> Optional[object]:
+    def _get_native_item(data: dict, key: str) -> Optional[Any]:
         """Retrieve a deep copy of a value from a dictionary by key, if it exists."""
         return copy.deepcopy(data[key]) if (data and key in data and data[key] is not None) else None
 

appmesh/app_run.py

@@ -2,6 +2,7 @@
 """Application run object for remote application execution."""
 
 from contextlib import contextmanager
+from typing import Optional
 
 # pylint: disable=line-too-long
 
@@ -42,7 +43,7 @@ class AppRun:
         finally:
             self._client.forward_to = original_value
 
-    def wait(self, stdout_print: bool = True, timeout: int = 0) -> int:
+    def wait(self, stdout_print: bool = True, timeout: int = 0) -> Optional[int]:
         """Wait for the asynchronous run to complete.
 
         Args:

appmesh/appmesh_client.py

@@ -5,4 +5,6 @@
 # AppMeshClient, App, and AppOutput classes. The updated implementation can be found
 # in client_http.py, where these classes are now primarily maintained.
 
-from .client_http import AppMeshClient, App, AppOutput
+from .client_http import AppMeshClient
+from .app import App
+from .app_output import AppOutput

appmesh/client_http.py

@@ -3,8 +3,10 @@
 import abc
 import base64
 import json
+import locale
 import logging
 import os
+import sys
 import time
 from datetime import datetime
 from enum import Enum, unique
@@ -20,6 +22,64 @@ from .app_run import AppRun
 from .app_output import AppOutput
 
 
+class EncodingResponse:
+    """Wrapper for requests.Response that handles encoding conversion on Windows."""
+
+    def __init__(self, response: requests.Response):
+        self._response = response
+        self._converted_text = None
+        self._should_convert = False
+
+        # Check if we need to convert encoding on Windows
+        if sys.platform == "win32":
+            content_type = response.headers.get("Content-Type", "").lower()
+            if response.status_code == HTTPStatus.OK and "text/plain" in content_type and "utf-8" in content_type:
+                try:
+                    local_encoding = locale.getpreferredencoding()
+
+                    if local_encoding.lower() not in ["utf-8", "utf8"]:
+                        # Ensure response is decoded as UTF-8 first
+                        response.encoding = "utf-8"
+                        utf8_text = response.text  # This gives us proper Unicode string
+
+                        # Convert Unicode to local encoding, then back to Unicode
+                        # This simulates how text would appear in local encoding
+                        try:
+                            local_bytes = utf8_text.encode(local_encoding, errors="replace")
+                            self._converted_text = local_bytes.decode(local_encoding)
+                            self._should_convert = True
+                        except (UnicodeEncodeError, LookupError):
+                            # If local encoding can't handle the characters, fall back to UTF-8
+                            self._converted_text = utf8_text
+                            self._should_convert = True
+
+                except (UnicodeError, LookupError):
+                    # If any conversion fails, keep original UTF-8
+                    response.encoding = "utf-8"
+
+    @property
+    def text(self):
+        """Return converted text if needed, otherwise original text."""
+        if self._should_convert and self._converted_text is not None:
+            return self._converted_text
+        # return the original text from _response without modification
+        return self._response.text
+
+    def __getattr__(self, name):
+        """Dynamically delegate attribute access to the original response"""
+        return getattr(self._response, name)
+
+    def __dir__(self):
+        """Optional: allow dir() to show attributes of both wrapper and response"""
+        return list(set(dir(self._response) + list(self.__dict__.keys())))
+
+    @property
+    def __class__(self):
+        """Optional: allow isinstance checks for requests.Response"""
+        # Pretend to be a requests.Response for isinstance checks
+        return requests.Response
+
+
 class AppMeshClient(metaclass=abc.ABCMeta):
     """
     Client SDK for interacting with the App Mesh service via REST API.
@@ -1186,6 +1246,22 @@ class AppMeshClient(metaclass=abc.ABCMeta):
 
         return resp.text
 
+    def cancle_task(self, app_name: str) -> bool:
+        """Client cancle a running task to a App Mesh application.
+
+        Args:
+            app_name (str): Name of the target application (as registered in App Mesh).
+
+        Returns:
+            bool: Task exist and cancled status.
+        """
+        path = f"/appmesh/app/{app_name}/task"
+        resp = self._request_http(
+            AppMeshClient.Method.DELETE,
+            path=path,
+        )
+        return resp.status_code == HTTPStatus.OK
+
     def run_app_async(
         self,
         app: Union[App, str],
@@ -1367,13 +1443,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             else:
                 raise Exception("Invalid http method", method)
 
-            # Ensure response text decoding uses UTF-8 by default
-            try:
-                resp.encoding = "utf-8"
-            except Exception:
-                # If setting encoding fails for any reason, ignore and return the response as-is
-                pass
-
-            return resp
+            # Wrap the response for encoding handling
+            return EncodingResponse(resp)
         except requests.exceptions.RequestException as e:
             raise Exception(f"HTTP request failed: {str(e)}")

appmesh/client_tcp.py

@@ -6,7 +6,7 @@ import os
 import socket
 import uuid
 import requests
-from .client_http import AppMeshClient
+from .client_http import AppMeshClient, EncodingResponse
 from .tcp_transport import TCPTransport
 from .tcp_messages import RequestMessage, ResponseMessage
 
@@ -140,7 +140,7 @@ class AppMeshClientTCP(AppMeshClient):
                 appmesh_request.headers[k] = v
         if query:
             for k, v in query.items():
-                appmesh_request.querys[k] = v
+                appmesh_request.query[k] = v
 
         data = appmesh_request.serialize()
         self.tcp_transport.send_message(data)
@@ -153,13 +153,13 @@ class AppMeshClientTCP(AppMeshClient):
         appmesh_resp = ResponseMessage().deserialize(resp_data)
         response = requests.Response()
         response.status_code = appmesh_resp.http_status
-        response.encoding = self.ENCODING_UTF8
-        response._content = appmesh_resp.body.encode(self.ENCODING_UTF8)
+        # response.encoding = self.ENCODING_UTF8 # only need when charset not in appmesh_resp.body_msg_type
+        response._content = appmesh_resp.body if isinstance(appmesh_resp.body, bytes) else str(appmesh_resp.body).encode(self.ENCODING_UTF8)
         response.headers = appmesh_resp.headers
         if appmesh_resp.body_msg_type:
             response.headers["Content-Type"] = appmesh_resp.body_msg_type
 
-        return response
+        return EncodingResponse(response)
 
     ########################################
     # File management

appmesh/server_http.py

@@ -5,7 +5,7 @@ import abc
 import logging
 import os
 import time
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Union
 from http import HTTPStatus
 from .client_http import AppMeshClient
 
@@ -66,7 +66,7 @@ class AppMeshServer(metaclass=abc.ABCMeta):
             raise Exception("Missing environment variable: APP_MESH_APPLICATION_NAME. This must be set by App Mesh service.")
         return process_id, app_name
 
-    def task_fetch(self) -> str:
+    def task_fetch(self) -> Union[str, bytes]:
         """Fetch task data in the currently running App Mesh application process.
 
         Used by App Mesh application process to obtain the payload from App Mesh service
@@ -74,7 +74,7 @@ class AppMeshServer(metaclass=abc.ABCMeta):
 
 
         Returns:
-            str: The payload provided by the client as returned by the service.
+            Union[str, bytes]: The payload provided by the client as returned by the service.
         """
         process_id, app_name = self._get_runtime_env()
         path = f"/appmesh/app/{app_name}/task"
@@ -91,16 +91,16 @@ class AppMeshServer(metaclass=abc.ABCMeta):
                 time.sleep(0.1)
                 continue
 
-            return resp.text
+            return resp.content
 
-    def task_return(self, result: str) -> None:
+    def task_return(self, result: Union[str, bytes]) -> None:
         """Return the result of a server-side invocation back to the original client.
 
         Used by App Mesh application process to posts the `result` to App Mesh service
         after processed payload data so the invoking client can retrieve it.
 
         Args:
-            result (str): Result payload to be delivered back to the client.
+            result (Union[str, bytes]): Result payload to be delivered back to the client.
         """
         process_id, app_name = self._get_runtime_env()
         path = f"/appmesh/app/{app_name}/task"

appmesh/tcp_messages.py

@@ -1,41 +1,69 @@
 # tcp_messages.py
 
+from typing import get_type_hints
 import msgpack
 
 
 class RequestMessage:
     """TCP request message for HTTP-like communication"""
 
-    uuid: str = ""
-    request_uri: str = ""
-    http_method: str = ""
-    client_addr: str = ""
-    body: bytes = b""
-    headers: dict = {}
-    querys: dict = {}
+    def __init__(self):
+        self.uuid: str = ""
+        self.request_uri: str = ""
+        self.http_method: str = ""
+        self.client_addr: str = ""
+        self.body: bytes = b""
+        self.headers: dict = {}
+        self.query: dict = {}
 
     def serialize(self) -> bytes:
         """Serialize request message to bytes"""
-        # http://www.cnitblog.com/luckydmz/archive/2019/11/20/91959.html
-        self_dict = vars(self)
-        self_dict["headers"] = self.headers
-        self_dict["querys"] = self.querys
-        return msgpack.dumps(self_dict)
+        return msgpack.dumps(vars(self), use_bin_type=True)
 
 
 class ResponseMessage:
     """TCP response message for HTTP-like communication"""
 
-    uuid: str = ""
-    request_uri: str = ""
-    http_status: int = 0
-    body_msg_type: str = ""
-    body: str = ""
-    headers: dict = {}
+    uuid: str
+    request_uri: str
+    http_status: int
+    body_msg_type: str
+    body: bytes
+    headers: dict
+
+    def __init__(self):
+        self.uuid = ""
+        self.request_uri = ""
+        self.http_status = 0
+        self.body_msg_type = ""
+        self.body = b""
+        self.headers = {}
 
     def deserialize(self, buf: bytes):
-        """Deserialize response message"""
-        dic = msgpack.unpackb(buf)
+        """Deserialize TCP msgpack buffer with proper type conversion."""
+        dic = msgpack.unpackb(buf, raw=False)
+        hints = get_type_hints(self.__class__)
+
         for k, v in dic.items():
+            if k not in hints:
+                continue  # Skip unknown fields
+
+            # handle all types (int, bytes, dict, str)
+            t = hints[k]
+            if t is str:
+                if isinstance(v, bytes):
+                    v = v.decode("utf-8", errors="replace")
+                elif v is None:
+                    v = ""
+                else:
+                    v = str(v)
+            elif t is bytes:
+                if isinstance(v, str):
+                    v = v.encode("utf-8")  # handle accidental str
+                elif v is None:
+                    v = b""
+            elif t is int:
+                v = int(v or 0)
             setattr(self, k, v)
+
         return self

{appmesh-1.6.2.dist-info → appmesh-1.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appmesh
-Version: 1.6.2
+Version: 1.6.3
 Summary: Client SDK for App Mesh
 Home-page: https://github.com/laoshanxi/app-mesh
 Author: laoshanxi
@@ -40,9 +40,9 @@ Dynamic: summary
 
 # App Mesh: Advanced Application Management Platform
 
+<div align=center><img src="https://github.com/laoshanxi/picture/raw/master/appmesh/whatis.gif" align=center /></div>
 App Mesh is an open-source, multi-tenant application management platform designed for cloud-native environments. It efficiently manages, schedules, and monitors both microservices and traditional applications, offering a lightweight alternative to Kubernetes. App Mesh bridges the gap between simple process managers and complex container orchestration systems, making it ideal for organizations seeking to modernize their infrastructure without adopting full container-native complexity. Supporting both containerized and native applications, it provides a versatile solution for diverse enterprise needs.
 
-<div align=center><img src="https://github.com/laoshanxi/picture/raw/master/appmesh/whatis.gif" align=center /></div>
 <div align=center><img src="https://github.com/laoshanxi/picture/raw/master/appmesh/diagram.png" align=center /></div>
 
 ## Features

appmesh-1.6.3.dist-info/RECORD

@@ -0,0 +1,16 @@
+appmesh/__init__.py,sha256=TY1y5B5cE57uhraEzCFOZRWuo9SY1R-fYNRan8hCZOM,1670
+appmesh/app.py,sha256=crD4DRFZJuHtZMfSsz7C-EwvjPmGZbFXYXvA_wCdvdI,10734
+appmesh/app_output.py,sha256=vfn322AyixblI8DbXds08h6L_ybObiaRSifsA1-Xcoo,1035
+appmesh/app_run.py,sha256=aYq852a29OThIi32Xtx5s0sTXZ97T0lHD5WXH8yfPoc,2018
+appmesh/appmesh_client.py,sha256=ywB2222PtJUffdfdxZcBfdhZs1KYyc7JvzMxwuK2qyI,378
+appmesh/client_http.py,sha256=WLdHmi2ryzCiXFyIIAbKH3arfcs__rxt4kwehpO_w6s,57711
+appmesh/client_http_oauth.py,sha256=1d51o0JX_xtB8d2bEuM7_XJHcwMnhcjkbIq7GE1Zxm8,6120
+appmesh/client_tcp.py,sha256=OrKmJ-SMSmCPXj5WVhWwBXiK8Z_WyCrDmTim0pe1pc0,11407
+appmesh/server_http.py,sha256=vf_Kh7ZIyEuBijZp8I2Rv-Fy9gxFdPFn5Pp2rUNCT1U,4319
+appmesh/server_tcp.py,sha256=biBFF5IGWFOw2ru831cfmzn1DVXcBm9e-W6CP2VkfzE,1444
+appmesh/tcp_messages.py,sha256=H9S_iCy0IuufY2v50_SUgRvcyQmJsySG65tBe_xb3Ko,1878
+appmesh/tcp_transport.py,sha256=f28zfZNH46tUHfT8F1PrCM1wUXiSBIW7R3ipMsXJqIU,8946
+appmesh-1.6.3.dist-info/METADATA,sha256=Hcymb5xi90fgxLHqHNWHzicT2KLZzGPo4DonII-IQBQ,11828
+appmesh-1.6.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+appmesh-1.6.3.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.6.3.dist-info/RECORD,,

appmesh-1.6.2.dist-info/RECORD

@@ -1,16 +0,0 @@
-appmesh/__init__.py,sha256=TY1y5B5cE57uhraEzCFOZRWuo9SY1R-fYNRan8hCZOM,1670
-appmesh/app.py,sha256=4lo66ob1ZFDgL8VYKxH4_sh-vbHcGkZNThURE0go-d4,10732
-appmesh/app_output.py,sha256=vfn322AyixblI8DbXds08h6L_ybObiaRSifsA1-Xcoo,1035
-appmesh/app_run.py,sha256=TJ9xVX8xqUN9-OOmr_8JlgXoyg3hTmDFNKvGf4w_oR4,1980
-appmesh/appmesh_client.py,sha256=7yy9c_ygJbqMekrUsHWmRObwHLK82qP65xQLXxfGd8U,339
-appmesh/client_http.py,sha256=rVmGAc_nWkntoZBL7BCaQZtH9QOZXUis38tW9OhT2ps,54707
-appmesh/client_http_oauth.py,sha256=1d51o0JX_xtB8d2bEuM7_XJHcwMnhcjkbIq7GE1Zxm8,6120
-appmesh/client_tcp.py,sha256=hE0T_2Z0OQZdF5zi--iuvu2_-ka0DfSSQ4BP3oHlg44,11243
-appmesh/server_http.py,sha256=zr9sfS8g_mtP2kuAfmz-qU7rLSFTVt3srbFXaCbl8Y0,4253
-appmesh/server_tcp.py,sha256=biBFF5IGWFOw2ru831cfmzn1DVXcBm9e-W6CP2VkfzE,1444
-appmesh/tcp_messages.py,sha256=4XRv5lSm_8ElMg_37SuyIRrfxI7XFNNP_7SdO7us3PA,1023
-appmesh/tcp_transport.py,sha256=f28zfZNH46tUHfT8F1PrCM1wUXiSBIW7R3ipMsXJqIU,8946
-appmesh-1.6.2.dist-info/METADATA,sha256=NljlBJBJxpevRRrgxFPyjNpxsYeu3FuUk7_klAhJCcs,11828
-appmesh-1.6.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-appmesh-1.6.2.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-1.6.2.dist-info/RECORD,,