appmesh 1.6.14__py3-none-any.whl → 1.6.16__py3-none-any.whl

appmesh/client_http_oauth.py

@@ -1,8 +1,7 @@
 # client_http_oauth.py
 # pylint: disable=line-too-long,broad-exception-caught,too-many-lines, import-outside-toplevel, protected-access
-import os
 import logging
-from typing import Optional, Union
+from typing import Optional, Union, Tuple
 from keycloak import KeycloakOpenID
 from .client_http import AppMeshClient
 
@@ -18,10 +17,10 @@ class AppMeshClientOAuth(AppMeshClient):
         self,
         oauth2: dict,  # Required for Keycloak
         rest_url: str = "https://127.0.0.1:6060",
-        rest_ssl_verify=AppMeshClient.DEFAULT_SSL_CA_CERT_PATH,
-        rest_ssl_client_cert=AppMeshClient.DEFAULT_SSL_CLIENT_CERT_PATH,
-        rest_timeout=(60, 300),
-        jwt_token=None,  # Keycloak dict
+        rest_ssl_verify: Union[bool, str] = AppMeshClient._DEFAULT_SSL_CA_CERT_PATH,
+        rest_ssl_client_cert: Optional[Union[str, Tuple[str, str]]] = None,
+        rest_timeout: Tuple[float, float] = (60, 300),
+        jwt_token: Optional[dict] = None,  # Keycloak dict
         auto_refresh_token: bool = True,  # Default to True for Keycloak
     ):
         """Initialize an App Mesh HTTP client with Keycloak support.
@@ -63,7 +62,6 @@ class AppMeshClientOAuth(AppMeshClient):
         user_name: str,
         user_pwd: str,
         totp_code: Optional[str] = "",
-        timeout_seconds: Union[str, int] = AppMeshClient.DURATION_ONE_WEEK_ISO,
     ) -> dict:
         """Login with user name and password using Keycloak.
         Args:

appmesh/client_tcp.py

@@ -44,15 +44,15 @@ class AppMeshClientTCP(AppMeshClient):
     """
 
     # TLS-optimized chunk size, leaves room for TLS overhead within the 16 KB limit
-    TCP_BLOCK_SIZE = 16 * 1024 - 128
-    ENCODING_UTF8 = "utf-8"
-    HTTP_USER_AGENT_TCP = "appmesh/python/tcp"
-    HTTP_HEADER_KEY_X_SEND_FILE_SOCKET = "X-Send-File-Socket"
-    HTTP_HEADER_KEY_X_RECV_FILE_SOCKET = "X-Recv-File-Socket"
+    _TCP_BLOCK_SIZE = 16 * 1024 - 128
+    _ENCODING_UTF8 = "utf-8"
+    _HTTP_USER_AGENT_TCP = "appmesh/python/tcp"
+    _HTTP_HEADER_KEY_X_SEND_FILE_SOCKET = "X-Send-File-Socket"
+    _HTTP_HEADER_KEY_X_RECV_FILE_SOCKET = "X-Recv-File-Socket"
 
     def __init__(
         self,
-        rest_ssl_verify: Union[bool, str] = AppMeshClient.DEFAULT_SSL_CA_CERT_PATH,
+        rest_ssl_verify: Union[bool, str] = AppMeshClient._DEFAULT_SSL_CA_CERT_PATH,
         rest_ssl_client_cert: Optional[Union[str, Tuple[str, str]]] = None,
         jwt_token: Optional[str] = None,
         tcp_address: Tuple[str, int] = ("127.0.0.1", 6059),
@@ -100,14 +100,14 @@ class AppMeshClientTCP(AppMeshClient):
             return body
 
         if isinstance(body, str):
-            return body.encode(self.ENCODING_UTF8)
+            return body.encode(self._ENCODING_UTF8)
 
         if isinstance(body, (dict, list)):
-            return json.dumps(body).encode(self.ENCODING_UTF8)
+            return json.dumps(body).encode(self._ENCODING_UTF8)
 
         raise TypeError(f"Unsupported body type: {type(body)}")
 
-    def _request_http(self, method: AppMeshClient.Method, path: str, query: Optional[dict] = None, header: Optional[dict] = None, body=None) -> requests.Response:
+    def _request_http(self, method: AppMeshClient._Method, path: str, query: Optional[dict] = None, header: Optional[dict] = None, body=None) -> requests.Response:
         """Send HTTP request over TCP transport.
 
         Args:
@@ -134,12 +134,12 @@ class AppMeshClientTCP(AppMeshClient):
         appmesh_request.http_method = method.value
         appmesh_request.request_uri = path
         appmesh_request.client_addr = socket.gethostname()
-        appmesh_request.headers[self.HTTP_HEADER_KEY_USER_AGENT] = self.HTTP_USER_AGENT_TCP
+        appmesh_request.headers[self._HTTP_HEADER_KEY_USER_AGENT] = self._HTTP_USER_AGENT_TCP
 
         # Add authentication token
         token = self._get_access_token()
         if token:
-            appmesh_request.headers[self.HTTP_HEADER_KEY_AUTH] = token
+            appmesh_request.headers[self._HTTP_HEADER_KEY_AUTH] = token
 
         # Add custom headers
         if header:
@@ -171,17 +171,17 @@ class AppMeshClientTCP(AppMeshClient):
         response.headers = appmesh_resp.headers
 
         # Set response content
-        # response.encoding = self.ENCODING_UTF8 # only need when charset not in appmesh_resp.body_msg_type
+        # response.encoding = self._ENCODING_UTF8 # only need when charset not in appmesh_resp.body_msg_type
         if isinstance(appmesh_resp.body, bytes):
             response._content = appmesh_resp.body
         else:
-            response._content = str(appmesh_resp.body).encode(self.ENCODING_UTF8)
+            response._content = str(appmesh_resp.body).encode(self._ENCODING_UTF8)
 
         # Set content type
         if appmesh_resp.body_msg_type:
             response.headers["Content-Type"] = appmesh_resp.body_msg_type
 
-        return AppMeshClient.EncodingResponse(response)
+        return AppMeshClient._EncodingResponse(response)
 
     def _apply_file_attributes(self, local_file: str, headers: dict) -> None:
         """Apply file attributes from headers to local file."""
@@ -232,15 +232,15 @@ class AppMeshClientTCP(AppMeshClient):
             preserve_permissions: Apply remote file permissions/ownership locally.
         """
         header = {
-            AppMeshClient.HTTP_HEADER_KEY_X_FILE_PATH: remote_file,
-            self.HTTP_HEADER_KEY_X_RECV_FILE_SOCKET: "true",
+            AppMeshClient._HTTP_HEADER_KEY_X_FILE_PATH: remote_file,
+            self._HTTP_HEADER_KEY_X_RECV_FILE_SOCKET: "true",
         }
 
-        resp = self._request_http(AppMeshClient.Method.GET, path="/appmesh/file/download", header=header)
+        resp = self._request_http(AppMeshClient._Method.GET, path="/appmesh/file/download", header=header)
         resp.raise_for_status()
 
-        if self.HTTP_HEADER_KEY_X_RECV_FILE_SOCKET not in resp.headers:
-            raise ValueError(f"Server did not respond with socket transfer option: " f"{self.HTTP_HEADER_KEY_X_RECV_FILE_SOCKET}")
+        if self._HTTP_HEADER_KEY_X_RECV_FILE_SOCKET not in resp.headers:
+            raise ValueError(f"Server did not respond with socket transfer option: " f"{self._HTTP_HEADER_KEY_X_RECV_FILE_SOCKET}")
 
         # Download file chunks
         with open(local_file, "wb") as fp:
@@ -267,9 +267,9 @@ class AppMeshClientTCP(AppMeshClient):
 
         # Prepare headers
         header = {
-            AppMeshClient.HTTP_HEADER_KEY_X_FILE_PATH: remote_file,
+            AppMeshClient._HTTP_HEADER_KEY_X_FILE_PATH: remote_file,
             "Content-Type": "text/plain",
-            self.HTTP_HEADER_KEY_X_SEND_FILE_SOCKET: "true",
+            self._HTTP_HEADER_KEY_X_SEND_FILE_SOCKET: "true",
         }
 
         # Add file attributes if requested
@@ -277,16 +277,16 @@ class AppMeshClientTCP(AppMeshClient):
             header.update(self._get_file_attributes(local_file))
 
         # Initiate upload
-        resp = self._request_http(AppMeshClient.Method.POST, path="/appmesh/file/upload", header=header)
+        resp = self._request_http(AppMeshClient._Method.POST, path="/appmesh/file/upload", header=header)
         resp.raise_for_status()
 
-        if self.HTTP_HEADER_KEY_X_SEND_FILE_SOCKET not in resp.headers:
-            raise ValueError(f"Server did not respond with socket transfer option: " f"{self.HTTP_HEADER_KEY_X_SEND_FILE_SOCKET}")
+        if self._HTTP_HEADER_KEY_X_SEND_FILE_SOCKET not in resp.headers:
+            raise ValueError(f"Server did not respond with socket transfer option: " f"{self._HTTP_HEADER_KEY_X_SEND_FILE_SOCKET}")
 
         # Upload file chunks
         with open(local_file, "rb") as fp:
             while True:
-                chunk_data = fp.read(self.TCP_BLOCK_SIZE)
+                chunk_data = fp.read(self._TCP_BLOCK_SIZE)
                 if not chunk_data:
                     self.tcp_transport.send_message([])  # EOF signal
                     break

appmesh/server_http.py

@@ -40,7 +40,7 @@ class AppMeshServer(metaclass=abc.ABCMeta):
     def __init__(
         self,
         rest_url: str = "https://127.0.0.1:6060",
-        rest_ssl_verify: Union[bool, str] = AppMeshClient.DEFAULT_SSL_CA_CERT_PATH,
+        rest_ssl_verify: Union[bool, str] = AppMeshClient._DEFAULT_SSL_CA_CERT_PATH,
         rest_ssl_client_cert: Optional[Union[str, Tuple[str, str]]] = None,
         rest_timeout: Tuple[float, float] = (60, 300),
         *,
@@ -81,7 +81,7 @@ class AppMeshServer(metaclass=abc.ABCMeta):
 
         while True:
             resp = self._client._request_http(
-                AppMeshClient.Method.GET,
+                AppMeshClient._Method.GET,
                 path=path,
                 query=query_params,
             )
@@ -106,7 +106,7 @@ class AppMeshServer(metaclass=abc.ABCMeta):
         query_params = {"process_key": pkey}
 
         resp = self._client._request_http(
-            AppMeshClient.Method.PUT,
+            AppMeshClient._Method.PUT,
             path=path,
             query=query_params,
             body=result,

appmesh/server_tcp.py

@@ -18,7 +18,7 @@ class AppMeshServerTCP(AppMeshServer):
 
     def __init__(
         self,
-        rest_ssl_verify: Union[bool, str] = AppMeshClient.DEFAULT_SSL_CA_CERT_PATH,
+        rest_ssl_verify: Union[bool, str] = AppMeshClient._DEFAULT_SSL_CA_CERT_PATH,
         rest_ssl_client_cert: Optional[Union[str, Tuple[str, str]]] = None,
         tcp_address: Tuple[str, int] = ("127.0.0.1", 6059),
         *,

appmesh/tcp_messages.py

@@ -1,4 +1,5 @@
 """TCP message classes for HTTP-like communication."""
+__all__ = []
 
 # Standard library imports
 from dataclasses import dataclass, field

appmesh/tcp_transport.py

@@ -1,5 +1,6 @@
 # tcp_transport.py
 """TCP Transport layer handling socket connections."""
+__all__ = []
 
 import socket
 import ssl

{appmesh-1.6.14.dist-info → appmesh-1.6.16.dist-info}/METADATA

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

appmesh-1.6.16.dist-info/RECORD

@@ -0,0 +1,16 @@
+appmesh/__init__.py,sha256=on6GmTTwo6mrRbw_XUuf8sZdl5zBYsGT4CSf8l__NnI,2488
+appmesh/app.py,sha256=bJyv_uOSMj5esMgkFWuvpMPS5ayFTBJLVll2Tvw8xB4,11213
+appmesh/app_output.py,sha256=s6eqevFxETTVXSPTJX6JyGNpHHILv4ZyM7YWvlkuqQs,741
+appmesh/app_run.py,sha256=m3ihaacx84o1rl2Oc3EbnppW8D-PTxdehftbWRe8rPk,1732
+appmesh/appmesh_client.py,sha256=ywB2222PtJUffdfdxZcBfdhZs1KYyc7JvzMxwuK2qyI,378
+appmesh/client_http.py,sha256=Cq2BBH6eygs-aySoqyiv2saV9mu0gvzd5XF4SB_MhcU,48973
+appmesh/client_http_oauth.py,sha256=qD0uRToAzcqIl0Dqu-JFBusguHUtpnetjme0sKikLeI,5916
+appmesh/client_tcp.py,sha256=4grKe_BGy-_QNGJ_41LCnLOE0cYm3fE-FSsPLW7JRpY,11843
+appmesh/server_http.py,sha256=uP_ozwv6zYm_3SO9pMATk3wcW6m0UsQ_KVOXEM4cRS8,4196
+appmesh/server_tcp.py,sha256=8pu6njVkMjJTG5F4sWjm0W3lygY782avH32-B1uzvJU,1365
+appmesh/tcp_messages.py,sha256=Igo8MPwzQtKhvfAsYgS_opCBxowvG-cHIRRoCHtvvTY,2004
+appmesh/tcp_transport.py,sha256=SLIWxaz0fg462GThxDjgXb0zjo-BZt3eLmSOIv6VFng,8176
+appmesh-1.6.16.dist-info/METADATA,sha256=_GXtei9_IVGv4kNT0m9Vj4c2jHHfeDuiVZa4Aap1TIw,11814
+appmesh-1.6.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+appmesh-1.6.16.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.6.16.dist-info/RECORD,,

appmesh-1.6.14.dist-info/RECORD

@@ -1,16 +0,0 @@
-appmesh/__init__.py,sha256=on6GmTTwo6mrRbw_XUuf8sZdl5zBYsGT4CSf8l__NnI,2488
-appmesh/app.py,sha256=bJyv_uOSMj5esMgkFWuvpMPS5ayFTBJLVll2Tvw8xB4,11213
-appmesh/app_output.py,sha256=s6eqevFxETTVXSPTJX6JyGNpHHILv4ZyM7YWvlkuqQs,741
-appmesh/app_run.py,sha256=m3ihaacx84o1rl2Oc3EbnppW8D-PTxdehftbWRe8rPk,1732
-appmesh/appmesh_client.py,sha256=ywB2222PtJUffdfdxZcBfdhZs1KYyc7JvzMxwuK2qyI,378
-appmesh/client_http.py,sha256=BsFgafrk4iUJlmrz21hlovyN5XAPYTGKjLNMt6aH8nM,58986
-appmesh/client_http_oauth.py,sha256=zES-f6AnG6dUo754zd-HM6Pvu4vp_64vTKT61npY6HE,5934
-appmesh/client_tcp.py,sha256=K3IneOSl8xiOIC9z4jHK_4Mhq2n8eeUDASvXJQiRjfQ,11817
-appmesh/server_http.py,sha256=g2NYREF-f-vnSFVntAJDc0H43v_kNEqS7M4y7Q_DpEY,4193
-appmesh/server_tcp.py,sha256=GXEVDmYwM19ZUKkRXm8eEzBep9rE1vzV-PwaTlROpFU,1364
-appmesh/tcp_messages.py,sha256=E0cKWUta7NjuLoTGk-Z9CvbdZyakwG7hO8st_07E5L4,1991
-appmesh/tcp_transport.py,sha256=nkml2hqSkyeJrGDKGAYjWDgOnSyYMEImVT1PQ6jeudk,8163
-appmesh-1.6.14.dist-info/METADATA,sha256=2LZhu1Rp50ERLUa9DxhS-zQNM5om3-aLwtlcB4zNrUw,11814
-appmesh-1.6.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-appmesh-1.6.14.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-1.6.14.dist-info/RECORD,,