appmesh 1.6.4__py3-none-any.whl → 1.6.6__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,6 +17,7 @@ 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
@@ -123,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"
@@ -229,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():
@@ -306,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)
@@ -472,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 {}),
@@ -1396,9 +1398,9 @@ 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
+        token = self._get_access_token()
+        if 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
@@ -1436,4 +1438,4 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             # Wrap the response for encoding handling
             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

@@ -116,8 +116,9 @@ class AppMeshClientTCP(AppMeshClient):
             self.tcp_transport.connect()
 
         appmesh_request = RequestMessage()
-        if super().jwt_token:
-            appmesh_request.headers["Authorization"] = "Bearer " + super().jwt_token
+        token = self._get_access_token()
+        if 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

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-1.6.4.dist-info → appmesh-1.6.6.dist-info}/METADATA

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

{appmesh-1.6.4.dist-info → appmesh-1.6.6.dist-info}/RECORD

@@ -3,14 +3,14 @@ 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=hKv8t5ufqfnNkt4Bi4NCfDcn5LZisFP5qtNxzGsehVo,57457
+appmesh/client_http.py,sha256=dzNZvMztm0POLHNS8iNHo1iuJprjvQP0kii1UWOH-XA,57529
 appmesh/client_http_oauth.py,sha256=1d51o0JX_xtB8d2bEuM7_XJHcwMnhcjkbIq7GE1Zxm8,6120
-appmesh/client_tcp.py,sha256=ewKKltGHqjs7XM-9Hc1Jp9bciwvlNQR1k0Nzu3xviks,11442
-appmesh/server_http.py,sha256=vf_Kh7ZIyEuBijZp8I2Rv-Fy9gxFdPFn5Pp2rUNCT1U,4319
+appmesh/client_tcp.py,sha256=aq6UUzytZA4ibE9WQMMWdo1uW8sHETEhJjsbM6IYSno,11457
+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.4.dist-info/METADATA,sha256=9LUrGW7tdTI5__wP2srofLy7_mj6WK0_O3z1nUVgWvc,11828
-appmesh-1.6.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-appmesh-1.6.4.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-1.6.4.dist-info/RECORD,,
+appmesh-1.6.6.dist-info/METADATA,sha256=2zvQG43uxfAhmT0v4e-_jyfQJT5veka--K-3Zeokqyw,11828
+appmesh-1.6.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+appmesh-1.6.6.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.6.6.dist-info/RECORD,,