zscaler-sdk-python 1.9.3__tar.gz → 1.9.4__tar.gz

{zscaler_sdk_python-1.9.3 → zscaler_sdk_python-1.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zscaler-sdk-python
-Version: 1.9.3
+Version: 1.9.4
 Summary: Official Python SDK for the Zscaler Products
 Home-page: https://github.com/zscaler/zscaler-sdk-python
 License: MIT

{zscaler_sdk_python-1.9.3 → zscaler_sdk_python-1.9.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zscaler-sdk-python"
-version = "1.9.3"
+version = "1.9.4"
 description = "Official Python SDK for the Zscaler Products"
 authors = ["Zscaler, Inc. <devrel@zscaler.com>"]
 license = "MIT"
@@ -49,6 +49,8 @@ pytest = ">=8.3.5"
 pytest-mock = ">=3.12.0"
 pytest-asyncio = ">=0.23.0"
 pytest-cov = ">=6.2.1"
+pytest-recording = ">=0.13.1"
+vcrpy = ">=6.0.1"
 pyfakefs = ">=5.7.0"
 responses = ">=0.25.7"
 sphinx = ">=7.2.0"
@@ -57,7 +59,7 @@ sphinx_rtd_theme = ">=1.3.0"
 wheel = ">=0.42.0"
 
 [tool.poetry.extras]
-dev = ["black", "pytest", "pytest-asyncio", "pytest-mock", "pytest-recording", "pytest-cov", "pyfakefs", "isort", "wheel"]
+dev = ["black", "pytest", "pytest-asyncio", "pytest-mock", "pytest-recording", "pytest-cov", "pyfakefs", "vcrpy", "isort", "wheel"]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

{zscaler_sdk_python-1.9.3 → zscaler_sdk_python-1.9.4}/zscaler/__init__.py

@@ -29,7 +29,7 @@ __license__ = "MIT"
 __contributors__ = [
     "William Guilherme",
 ]
-__version__ = "1.9.3"
+__version__ = "1.9.4"
 
 
 from zscaler.oneapi_client import Client as ZscalerClient  # noqa

{zscaler_sdk_python-1.9.3 → zscaler_sdk_python-1.9.4}/zscaler/request_executor.py

@@ -608,7 +608,31 @@ class RequestExecutor:
                 return request, response, response.text, Exception(
                     "401 Unauthorized - token refresh attempts exhausted or OAuth not available.")
 
-        # Handle “retryable” statuses such as 429, 503, etc.
+        # ZIA-specific: Handle EDIT_LOCK_NOT_AVAILABLE (409 Conflict)
+        # This error occurs when another admin session holds the edit lock
+        # Retry with exponential backoff to wait for the lock to be released
+        if response.status_code == 409 and request.get("service_type") == "zia":
+            if attempts < max_retries:
+                try:
+                    response_body = response.text
+                    if response_body and "EDIT_LOCK_NOT_AVAILABLE" in response_body:
+                        # Calculate backoff with exponential delay: 5s, 10s, 20s, etc.
+                        backoff_seconds = 5 * (2 ** attempts)
+                        # Cap at 60 seconds max backoff
+                        backoff_seconds = min(backoff_seconds, 60)
+                        
+                        logger.warning(
+                            f"ZIA edit lock not available (attempt {attempts + 1}/{max_retries + 1}). "
+                            f"Another admin session may be holding the lock. "
+                            f"Retrying in {backoff_seconds} seconds..."
+                        )
+                        time.sleep(backoff_seconds)
+                        attempts += 1
+                        return self.fire_request_helper(request, attempts, request_start_time)
+                except Exception as parse_error:
+                    logger.debug(f"Could not parse 409 response body: {parse_error}")
+
+        # Handle "retryable" statuses such as 429, 503, etc.
         if attempts < max_retries and self.is_retryable_status(response.status_code):
             backoff_seconds = self.get_retry_after(response.headers, logger)
             if backoff_seconds is None: