appmesh 1.6.10__py3-none-any.whl → 1.6.11__py3-none-any.whl

appmesh/app_output.py

@@ -1,11 +1,11 @@
 # app_output.py
+# pylint: disable=line-too-long
 """Application output information"""
 
+# Standard library imports
 from http import HTTPStatus
 from typing import Optional
 
-# pylint: disable=line-too-long
-
 
 class AppOutput(object):
     """

appmesh/client_http.py

@@ -1,7 +1,10 @@
 # client_http.py
 # pylint: disable=broad-exception-raised,line-too-long,broad-exception-caught,too-many-lines,import-outside-toplevel
+
+# Standard library imports
 import abc
 import base64
+import http.cookiejar as cookiejar
 import json
 import locale
 import logging
@@ -9,19 +12,21 @@ import os
 import sys
 import threading
 import time
-import requests
-import http.cookiejar as cookiejar
 from datetime import datetime
 from enum import Enum, unique
 from http import HTTPStatus
-import threading
 from typing import Optional, Tuple, Union
 from urllib import parse
+
+# Third-party imports
 import aniso8601
 import jwt
+import requests
+
+# Local imports
 from .app import App
-from .app_run import AppRun
 from .app_output import AppOutput
+from .app_run import AppRun
 
 
 class AppMeshClient(metaclass=abc.ABCMeta):
@@ -220,7 +225,8 @@ class AppMeshClient(metaclass=abc.ABCMeta):
             rest_timeout (tuple, optional): HTTP connection timeouts for API requests, as `(connect_timeout, read_timeout)`.
                 The default is `(60, 300)`, where `60` seconds is the maximum time to establish a connection and `300` seconds for the maximum read duration.
 
-            rest_cookie_file (str, optional): Path to a file for storing session cookies. If provided, cookies will be saved to and loaded from this file to maintain session state across client instances.
+            rest_cookie_file (str, optional): Path to a file for storing session cookies.
+                If provided, cookies will be saved to and loaded from this file to maintain session state across client instances instead of keep jwt_token.
 
             jwt_token (str, optional): JWT token for API authentication, used in headers to authorize requests where required.
             auto_refresh_token (bool, optional): Enable automatic token refresh before expiration.
@@ -235,16 +241,16 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         self.rest_timeout = rest_timeout
         self._forward_to = None
 
-        # Session and cookie management
-        self._lock = threading.Lock()
-        self.session = requests.Session()
-        self.cookie_file = self._load_cookies(rest_cookie_file)
-
         # 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 to setup refresh timer
 
+        # Session and cookie management
+        self._lock = threading.Lock()
+        self.session = requests.Session()
+        self.cookie_file = self._load_cookies(rest_cookie_file)
+
     @staticmethod
     def _ensure_logging_configured():
         """Ensure logging is configured. If no handlers are configured, add a default console handler."""
@@ -262,6 +268,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
         self.session.cookies = cookiejar.MozillaCookieJar(cookie_file)
         if os.path.exists(cookie_file):
             self.session.cookies.load(ignore_discard=True, ignore_expires=True)
+            self.jwt_token = self._get_cookie_value(self.session.cookies, self.COOKIE_TOKEN)
         else:
             os.makedirs(os.path.dirname(cookie_file), exist_ok=True)
             self.session.cookies.save(ignore_discard=True, ignore_expires=True)
@@ -453,7 +460,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
 
         # handle session
         with self._lock:
-            if self.cookie_file:
+            if hasattr(self, "cookie_file") and self.cookie_file:
                 self.session.cookies.save(ignore_discard=True, ignore_expires=True)
 
     @property
@@ -575,6 +582,7 @@ class AppMeshClient(metaclass=abc.ABCMeta):
                 "totp_challenge": challenge,
                 "expire_seconds": self._parse_duration(timeout),
             },
+            header={self.HTTP_HEADER_JWT_set_cookie: "true"} if self.cookie_file else {},
         )
         if resp.status_code == HTTPStatus.OK and "access_token" in resp.json():
             self.jwt_token = resp.json()["access_token"]

appmesh/client_tcp.py

@@ -1,15 +1,20 @@
 # client_tcp.py
 # pylint: disable=line-too-long,broad-exception-raised,broad-exception-caught,import-outside-toplevel,protected-access
 
+# Standard library imports
 import json
 import os
-import sys
 import socket
+import sys
 import uuid
+
+# Third-party imports
 import requests
+
+# Local imports
 from .client_http import AppMeshClient
-from .tcp_transport import TCPTransport
 from .tcp_messages import RequestMessage, ResponseMessage
+from .tcp_transport import TCPTransport
 
 
 class AppMeshClientTCP(AppMeshClient):

appmesh/server_http.py

@@ -1,12 +1,15 @@
 # server_http.py
 # pylint: disable=line-too-long,broad-exception-raised,broad-exception-caught,import-outside-toplevel,protected-access
 
+# Standard library imports
 import abc
 import logging
 import os
 import time
-from typing import Optional, Tuple, Union
 from http import HTTPStatus
+from typing import Optional, Tuple, Union
+
+# Local imports
 from .client_http import AppMeshClient
 
 logger = logging.getLogger(__name__)

appmesh/server_tcp.py

@@ -1,9 +1,12 @@
 # server_tcp.py
 # pylint: disable=line-too-long,broad-exception-raised,broad-exception-caught,import-outside-toplevel,protected-access
 
-import os
+# Standard library imports
 import logging
+import os
 from typing import Optional, Tuple
+
+# Local imports
 from .client_http import AppMeshClient
 from .client_tcp import AppMeshClientTCP
 from .server_http import AppMeshServer

appmesh/tcp_messages.py

@@ -1,6 +1,9 @@
 # tcp_messages.py
 
+# Standard library imports
 from typing import get_type_hints
+
+# Third-party imports
 import msgpack
 
 

appmesh/tcp_transport.py

@@ -1,5 +1,6 @@
 # tcp_transport.py
 
+# Standard library imports
 import os
 import socket
 import ssl

{appmesh-1.6.10.dist-info → appmesh-1.6.11.dist-info}/METADATA

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

appmesh-1.6.11.dist-info/RECORD

@@ -0,0 +1,16 @@
+appmesh/__init__.py,sha256=uJ5LOadwZW2nOXkSuPOy2S3WH9Bx0BUn5wUvPBeFzoc,2217
+appmesh/app.py,sha256=crD4DRFZJuHtZMfSsz7C-EwvjPmGZbFXYXvA_wCdvdI,10734
+appmesh/app_output.py,sha256=N8BihWhuUgPUyqZabZMKhQylk8nTHXKk6kMIdidEkGM,1061
+appmesh/app_run.py,sha256=aYq852a29OThIi32Xtx5s0sTXZ97T0lHD5WXH8yfPoc,2018
+appmesh/appmesh_client.py,sha256=ywB2222PtJUffdfdxZcBfdhZs1KYyc7JvzMxwuK2qyI,378
+appmesh/client_http.py,sha256=FXCldfTZVU_5RSuSknlH1K2UiC6gOeotj-4NDQzdEhY,60752
+appmesh/client_http_oauth.py,sha256=1d51o0JX_xtB8d2bEuM7_XJHcwMnhcjkbIq7GE1Zxm8,6120
+appmesh/client_tcp.py,sha256=RX3T3OG4iOAju8ZPOnTjI_y97Y23_kWoNDjmKjtrBeU,11524
+appmesh/server_http.py,sha256=wfyiIa2zC-uJR2ZNTGMjYWheqAfSRl0aAv5b_GYcwpE,4343
+appmesh/server_tcp.py,sha256=J65kmN7DJftyW1LlF--S3keQ6VGmqXb778E79I1R0_k,1488
+appmesh/tcp_messages.py,sha256=YB_AiMOSzN9j8oSrF0V9gD184Ugbsff-ZnezExwmvtk,1928
+appmesh/tcp_transport.py,sha256=FCfTBHb9FLwMUIxZejOuH_NocHQFGaNDge57IUTJvgs,8973
+appmesh-1.6.11.dist-info/METADATA,sha256=gHUSXnQdxvG61jPEUWcJBSJlrmR_PIHZ_qyyaYwTuIc,11764
+appmesh-1.6.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+appmesh-1.6.11.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
+appmesh-1.6.11.dist-info/RECORD,,

appmesh-1.6.10.dist-info/RECORD

@@ -1,16 +0,0 @@
-appmesh/__init__.py,sha256=uJ5LOadwZW2nOXkSuPOy2S3WH9Bx0BUn5wUvPBeFzoc,2217
-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=KD4AMcMbHqaLJWSrra0J03kMqWAiwYHiyusUc5kpr6o,60443
-appmesh/client_http_oauth.py,sha256=1d51o0JX_xtB8d2bEuM7_XJHcwMnhcjkbIq7GE1Zxm8,6120
-appmesh/client_tcp.py,sha256=aq6UUzytZA4ibE9WQMMWdo1uW8sHETEhJjsbM6IYSno,11457
-appmesh/server_http.py,sha256=rBIYO9rbR-r3x1Jcry440Sp--IM-OWKRaOhNpGdkxh8,4299
-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.10.dist-info/METADATA,sha256=do80dYMa4qK9tg1qKDM4M0klzIgzfcEGlWo6w1OIBfg,11764
-appmesh-1.6.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-appmesh-1.6.10.dist-info/top_level.txt,sha256=-y0MNQOGJxUzLdHZ6E_Rfv5_LNCkV-GTmOBME_b6pg8,8
-appmesh-1.6.10.dist-info/RECORD,,