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

appmesh/client_http.py

@@ -1,5 +1,5 @@
 # client_http.py
-# pylint: disable=broad-exception-raised,line-too-long,broad-exception-caught,too-many-lines, import-outside-toplevel, protected-access
+# pylint: disable=broad-exception-raised,line-too-long,broad-exception-caught,too-many-lines,import-outside-toplevel
 import abc
 import base64
 import json
@@ -17,69 +17,12 @@ from urllib import parse
 import aniso8601
 import jwt
 import requests
+from requests.auth import _basic_auth_str
 from .app import App
 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.
@@ -132,6 +75,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         - wait_for_async_run()
         - run_app_sync()
         - run_task()
+        - cancle_task()
 
         # System Management
         - forward_to
@@ -180,6 +124,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
 
     JSON_KEY_MESSAGE = "message"
     HTTP_USER_AGENT = "appmesh/python"
+    HTTP_HEADER_KEY_AUTH = "Authorization"
     HTTP_HEADER_KEY_USER_AGENT = "User-Agent"
     HTTP_HEADER_KEY_X_TARGET_HOST = "X-Target-Host"
     HTTP_HEADER_KEY_X_FILE_PATH = "X-File-Path"
@@ -194,6 +139,53 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         DELETE = "DELETE"
         POST_STREAM = "POST_STREAM"
 
+    class EncodingResponse(requests.Response):
+        """Response subclass that handles encoding conversion on Windows."""
+
+        def __init__(self, response: requests.Response):
+            super().__init__()
+
+            # copy essential fields from response
+            self.__dict__.update(response.__dict__)
+
+            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
+                            self.encoding = "utf-8"
+                            utf8_text = self.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
+                        self.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 super().text
+
     def __init__(
         self,
         rest_url: str = "https://127.0.0.1:6060",
@@ -239,7 +231,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         # Token auto-refresh
         self._token_refresh_timer = None
         self._auto_refresh_token = auto_refresh_token
-        self.jwt_token = jwt_token  # Set property last after all dependencies are initialized
+        self.jwt_token = jwt_token  # Set property last after all dependencies are initialized to setup refresh timer
 
     @staticmethod
     def _ensure_logging_configured():
@@ -316,7 +308,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
                     check_interval = 1  # Almost immediate refresh
                 else:
                     # Check at earlier of 5 minutes before expiry or regular interval
-                    check_interval = min(time_to_expiry - self.TOKEN_REFRESH_OFFSET, self.TOKEN_REFRESH_INTERVAL)
+                    check_interval = max(1, min(time_to_expiry - self.TOKEN_REFRESH_OFFSET, self.TOKEN_REFRESH_INTERVAL))
 
             # Create timer to execute refresh check
             self._token_refresh_timer = threading.Timer(check_interval, self._check_and_refresh_token)
@@ -482,7 +474,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             AppMeshClient.Method.POST,
             path="/appmesh/login",
             header={
-                "Authorization": "Basic " + base64.b64encode((user_name + ":" + user_pwd).encode()).decode(),
+                self.HTTP_HEADER_KEY_AUTH: _basic_auth_str(user_name, user_pwd),
                 "X-Expire-Seconds": str(self._parse_duration(timeout_seconds)),
                 **({"X-Audience": audience} if audience else {}),
                 # **({"X-Totp-Code": totp_code} if totp_code else {}),
@@ -1160,7 +1152,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
                     fp.write(chunk)
 
         # Apply file attributes (permissions, owner, group) if requested
-        if apply_file_attributes:
+        if apply_file_attributes and sys.platform != "win32":
             if "X-File-Mode" in resp.headers:
                 os.chmod(path=local_file, mode=int(resp.headers["X-File-Mode"]))
             if "X-File-User" in resp.headers and "X-File-Group" in resp.headers:
@@ -1406,9 +1398,8 @@ class AppMeshClient(metaclass=abc.ABCMeta):
 
         # Prepare headers
         header = {} if header is None else header
-        if self.jwt_token:
-            token = self._get_access_token()
-            header["Authorization"] = "Bearer " + token
+        if token := self._get_access_token():
+            header[self.HTTP_HEADER_KEY_AUTH] = f"Bearer {token}"
         if self.forward_to and len(self.forward_to) > 0:
             if ":" in self.forward_to:
                 header[self.HTTP_HEADER_KEY_X_TARGET_HOST] = self.forward_to
@@ -1444,6 +1435,6 @@ class AppMeshClient(metaclass=abc.ABCMeta):
                 raise Exception("Invalid http method", method)
 
             # Wrap the response for encoding handling
-            return EncodingResponse(resp)
+            return AppMeshClient.EncodingResponse(resp)
         except requests.exceptions.RequestException as e:
-            raise Exception(f"HTTP request failed: {str(e)}")
+            raise Exception(f"HTTP request failed: {str(e)}") from e

appmesh/client_tcp.py

@@ -3,10 +3,11 @@
 
 import json
 import os
+import sys
 import socket
 import uuid
 import requests
-from .client_http import AppMeshClient, EncodingResponse
+from .client_http import AppMeshClient
 from .tcp_transport import TCPTransport
 from .tcp_messages import RequestMessage, ResponseMessage
 
@@ -56,7 +57,7 @@ class AppMeshClientTCP(AppMeshClient):
         rest_ssl_verify=AppMeshClient.DEFAULT_SSL_CA_CERT_PATH if os.path.exists(AppMeshClient.DEFAULT_SSL_CA_CERT_PATH) else False,
         rest_ssl_client_cert=None,
         jwt_token=None,
-        tcp_address=("localhost", 6059),
+        tcp_address=("127.0.0.1", 6059),
     ):
         """Construct an App Mesh client TCP object to communicate securely with an App Mesh server over TLS.
 
@@ -78,7 +79,7 @@ class AppMeshClientTCP(AppMeshClient):
             jwt_token (str, optional): JWT token for authentication. Used in methods requiring login and user authorization.
 
             tcp_address (Tuple[str, int], optional): Address and port for establishing a TCP connection to the server.
-                Defaults to `("localhost", 6059)`.
+                Defaults to `("127.0.0.1", 6059)`.
         """
         self.tcp_transport = TCPTransport(address=tcp_address, ssl_verify=rest_ssl_verify, ssl_client_cert=rest_ssl_client_cert)
         super().__init__(rest_ssl_verify=rest_ssl_verify, rest_ssl_client_cert=rest_ssl_client_cert, jwt_token=jwt_token)
@@ -115,8 +116,8 @@ class AppMeshClientTCP(AppMeshClient):
             self.tcp_transport.connect()
 
         appmesh_request = RequestMessage()
-        if super().jwt_token:
-            appmesh_request.headers["Authorization"] = "Bearer " + super().jwt_token
+        if token := self._get_access_token():
+            appmesh_request.headers[self.HTTP_HEADER_KEY_AUTH] = token
         if super().forward_to and len(super().forward_to) > 0:
             raise Exception("Not support forward request in TCP mode")
         appmesh_request.headers[self.HTTP_HEADER_KEY_USER_AGENT] = self.HTTP_USER_AGENT_TCP
@@ -159,7 +160,7 @@ class AppMeshClientTCP(AppMeshClient):
         if appmesh_resp.body_msg_type:
             response.headers["Content-Type"] = appmesh_resp.body_msg_type
 
-        return EncodingResponse(response)
+        return AppMeshClient.EncodingResponse(response)
 
     ########################################
     # File management
@@ -189,7 +190,7 @@ class AppMeshClientTCP(AppMeshClient):
                     break
                 fp.write(chunk_data)
 
-        if apply_file_attributes:
+        if apply_file_attributes and sys.platform != "win32":
             if "X-File-Mode" in resp.headers:
                 os.chmod(path=local_file, mode=int(resp.headers["X-File-Mode"]))
             if "X-File-User" in resp.headers and "X-File-Group" in resp.headers:

appmesh/server_http.py

@@ -17,7 +17,7 @@ class AppMeshServer(metaclass=abc.ABCMeta):
     Server SDK for App Mesh application interacting with the local App Mesh REST service over HTTPS.
 
     Build-in runtime environment variables required:
-      - APP_MESH_PROCESS_ID
+      - APP_MESH_PROCESS_KEY
       - APP_MESH_APPLICATION_NAME
 
     Methods:
@@ -58,10 +58,10 @@ class AppMeshServer(metaclass=abc.ABCMeta):
     @staticmethod
     def _get_runtime_env() -> Tuple[str, str]:
         """Read and validate required runtime environment variables."""
-        process_id = os.getenv("APP_MESH_PROCESS_ID")
+        process_id = os.getenv("APP_MESH_PROCESS_KEY")
         app_name = os.getenv("APP_MESH_APPLICATION_NAME")
         if not process_id:
-            raise Exception("Missing environment variable: APP_MESH_PROCESS_ID. This must be set by App Mesh service.")
+            raise Exception("Missing environment variable: APP_MESH_PROCESS_KEY. This must be set by App Mesh service.")
         if not app_name:
             raise Exception("Missing environment variable: APP_MESH_APPLICATION_NAME. This must be set by App Mesh service.")
         return process_id, app_name

appmesh/server_tcp.py

@@ -20,7 +20,7 @@ class AppMeshServerTCP(AppMeshServer):
         self,
         rest_ssl_verify=AppMeshClient.DEFAULT_SSL_CA_CERT_PATH if os.path.exists(AppMeshClient.DEFAULT_SSL_CA_CERT_PATH) else False,
         rest_ssl_client_cert=None,
-        tcp_address: Tuple[str, int] = ("localhost", 6059),
+        tcp_address: Tuple[str, int] = ("127.0.0.1", 6059),
         *,
         logger_: Optional[logging.Logger] = None,
     ):

appmesh/tcp_transport.py

@@ -36,7 +36,7 @@ class TCPTransport:
                 - `tuple`: A pair of paths (`cert_file`, `key_file`), where `cert_file` is the client certificate file path and `key_file` is the private key file path.
 
             tcp_address (Tuple[str, int], optional): Address and port for establishing a TCP connection to the server.
-                Defaults to `("localhost", 6059)`.
+                Defaults to `("127.0.0.1", 6059)`.
         """
         self.tcp_address = address
         self.ssl_verify = ssl_verify

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appmesh
-Version: 1.6.3
+Version: 1.6.5
 Summary: Client SDK for App Mesh
 Home-page: https://github.com/laoshanxi/app-mesh
 Author: laoshanxi

appmesh-1.6.5.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=Clx0Wx8I8Wo8T63f2dco_vDI12mbcqKOMt7d7xBXJFc,57516
+appmesh/client_http_oauth.py,sha256=1d51o0JX_xtB8d2bEuM7_XJHcwMnhcjkbIq7GE1Zxm8,6120
+appmesh/client_tcp.py,sha256=hQ4s9ab1Drqaqhfx-pmLhqhFL48jbwNbkzOv1fCSUnw,11444
+appmesh/server_http.py,sha256=H6DfMhU2NxlBqxjmRG2C8NXMaGDxy_5QVyBmaVrelfI,4322
+appmesh/server_tcp.py,sha256=-CU5tw97WJmDcUNsNPWqpdZ0wxRzRD6kUP3XyNZUTHc,1444
+appmesh/tcp_messages.py,sha256=H9S_iCy0IuufY2v50_SUgRvcyQmJsySG65tBe_xb3Ko,1878
+appmesh/tcp_transport.py,sha256=0hRSp5fpL9wKB05JIyIRIuyBC8w1IdokryhMDHqtN4M,8946
+appmesh-1.6.5.dist-info/METADATA,sha256=vYzVg5U0rZNL8_HaPR3-CPuw2RFoLsUiB8UB7YDNyJI,11828
+appmesh-1.6.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+appmesh-1.6.5.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.6.5.dist-info/RECORD,,

appmesh-1.6.3.dist-info/RECORD

@@ -1,16 +0,0 @@
-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,,