hiddenlayer-sdk 2.0.6__tar.gz → 2.0.8__tar.gz

{hiddenlayer_sdk-2.0.6 → hiddenlayer_sdk-2.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hiddenlayer-sdk
-Version: 2.0.6
+Version: 2.0.8
 Summary: Official HiddenLayer Python SDK
 Author-email: HiddenLayer Integrations Team <integrations@hiddenlayer.com>
 Maintainer-email: HiddenLayer Integrations Team <integrations@hiddenlayer.com>

{hiddenlayer_sdk-2.0.6 → hiddenlayer_sdk-2.0.8}/hiddenlayer/__init__.py

@@ -1,5 +1,5 @@
 import os
-from typing import Optional
+from typing import Callable, Optional
 
 import requests
 from requests.auth import HTTPBasicAuth
@@ -36,6 +36,7 @@ class HiddenlayerServiceClient:
     ):
         self.host = host.strip()
         self.is_saas = is_saas(host)
+        refresh_jwt_func: Optional[Callable[[], str]] = None
 
         if self.is_saas:
             if not api_id:
@@ -50,13 +51,16 @@ class HiddenlayerServiceClient:
 
             jwt_token = self._get_jwt(api_id=api_id, api_key=api_key)
             self._config = Configuration(host=self.host, access_token=jwt_token)
+            refresh_jwt_func = lambda: self._get_jwt(api_id=api_id, api_key=api_key)
 
         else:
             self._config = Configuration(host=self.host)
 
         self._api_client = ApiClient(configuration=self._config)
         self._aidr_predictive = AIDRPredictive(self._api_client)
-        self._model_scan = ModelScanAPI(self._api_client)
+        self._model_scan = ModelScanAPI(
+            self._api_client, refresh_token_func=refresh_jwt_func
+        )
 
     def _get_jwt(self, *, api_id: str, api_key: str) -> str:
         "Get the JWT token to auth to the Hiddenlayer API."

{hiddenlayer_sdk-2.0.6 → hiddenlayer_sdk-2.0.8}/hiddenlayer/sdk/rest/api/model_supply_chain_api.py

@@ -2392,7 +2392,7 @@ class ModelSupplyChainApi:
     @validate_call
     def get_scan_results1(
         self,
-        scan_id: Optional[StrictStr] = None,
+        scan_id: StrictStr,
         cursor: Optional[StrictStr] = None,
         page_size: Optional[Annotated[int, Field(strict=True, ge=1)]] = None,
         _request_timeout: Union[
@@ -2411,7 +2411,7 @@ class ModelSupplyChainApi:
         """Retrieve Model Scan Results
 
 
-        :param scan_id:
+        :param scan_id: (required)
         :type scan_id: str
         :param cursor:
         :type cursor: str
@@ -2469,7 +2469,7 @@ class ModelSupplyChainApi:
     @validate_call
     def get_scan_results1_with_http_info(
         self,
-        scan_id: Optional[StrictStr] = None,
+        scan_id: StrictStr,
         cursor: Optional[StrictStr] = None,
         page_size: Optional[Annotated[int, Field(strict=True, ge=1)]] = None,
         _request_timeout: Union[
@@ -2488,7 +2488,7 @@ class ModelSupplyChainApi:
         """Retrieve Model Scan Results
 
 
-        :param scan_id:
+        :param scan_id: (required)
         :type scan_id: str
         :param cursor:
         :type cursor: str
@@ -2546,7 +2546,7 @@ class ModelSupplyChainApi:
     @validate_call
     def get_scan_results1_without_preload_content(
         self,
-        scan_id: Optional[StrictStr] = None,
+        scan_id: StrictStr,
         cursor: Optional[StrictStr] = None,
         page_size: Optional[Annotated[int, Field(strict=True, ge=1)]] = None,
         _request_timeout: Union[
@@ -2565,7 +2565,7 @@ class ModelSupplyChainApi:
         """Retrieve Model Scan Results
 
 
-        :param scan_id:
+        :param scan_id: (required)
         :type scan_id: str
         :param cursor:
         :type cursor: str

{hiddenlayer_sdk-2.0.6 → hiddenlayer_sdk-2.0.8}/hiddenlayer/sdk/rest/models/file_details_v3.py

@@ -50,8 +50,8 @@ class FileDetailsV3(BaseModel):
     @field_validator('sha256')
     def sha256_validate_regular_expression(cls, value):
         """Validates the regular expression"""
-        if not re.match(r"^[a-fA-F0-9]{64}$", value):
-            raise ValueError(r"must validate the regular expression /^[a-fA-F0-9]{64}$/")
+        if not re.match(r"^$|^[a-fA-F0-9]{64}$", value):
+            raise ValueError(r"must validate the regular expression /^$|^[a-fA-F0-9]{64}$/")
         return value
 
     @field_validator('tlsh')

{hiddenlayer_sdk-2.0.6 → hiddenlayer_sdk-2.0.8}/hiddenlayer/sdk/services/model_scan.py

@@ -4,13 +4,13 @@ import tempfile
 import time
 import zipfile
 from pathlib import Path
-from typing import List, Optional, Union
+from typing import Callable, List, Optional, Union
 
 from hiddenlayer.sdk.constants import CommunityScanSource, ScanStatus
 from hiddenlayer.sdk.models import EmptyScanResults, ScanResults
 from hiddenlayer.sdk.rest.api import ModelSupplyChainApi
 from hiddenlayer.sdk.rest.api_client import ApiClient
-from hiddenlayer.sdk.rest.exceptions import NotFoundException
+from hiddenlayer.sdk.rest.exceptions import NotFoundException, UnauthorizedException
 from hiddenlayer.sdk.rest.models import (
     MultiFileUploadRequestV3,
     ScanJob,
@@ -32,9 +32,14 @@ EXCLUDE_FILE_TYPES = [
 
 
 class ModelScanAPI:
-    def __init__(self, api_client: ApiClient) -> None:
+    def __init__(
+        self,
+        api_client: ApiClient,
+        refresh_token_func: Optional[Callable[[], str]] = None,
+    ) -> None:
         self._api_client = api_client
         self._model_supply_chain_api = ModelSupplyChainApi(api_client=api_client)
+        self._refresh_token_func = refresh_token_func
 
     def community_scan(
         self,
@@ -328,11 +333,21 @@ class ModelScanAPI:
 
         :returns: Scan results.
         """
-
-        try:
-            scan_report = self._model_supply_chain_api.get_scan_results(scan_id)
-        except NotFoundException:
-            return EmptyScanResults()
+        retry = False
+        while True:
+            try:
+                scan_report = self._model_supply_chain_api.get_scan_results(scan_id)
+                break
+            except NotFoundException:
+                return EmptyScanResults()
+            except UnauthorizedException as e:
+                if not retry and self._refresh_token_func:
+                    new_token = self._refresh_token_func()
+                    self._api_client.configuration.access_token = new_token
+                    self._api_client = ApiClient(self._api_client.configuration)
+                    retry = True
+                else:
+                    raise e
 
         return ScanResults.from_scanreportv3(scan_report_v3=scan_report)
 
@@ -461,6 +476,7 @@ class ModelScanAPI:
             delay = base_delay * 2**retries + random.uniform(
                 0, 1
             )  # exponential back off retry
+            delay = min(delay, 30)
             time.sleep(delay)
             scan_results = self.get_scan_results(scan_id=scan_id)
             print(f"scan status: {scan_results.status}")

hiddenlayer_sdk-2.0.8/hiddenlayer/sdk/version.py

@@ -0,0 +1 @@
+VERSION = "2.0.8"

{hiddenlayer_sdk-2.0.6 → hiddenlayer_sdk-2.0.8}/hiddenlayer_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hiddenlayer-sdk
-Version: 2.0.6
+Version: 2.0.8
 Summary: Official HiddenLayer Python SDK
 Author-email: HiddenLayer Integrations Team <integrations@hiddenlayer.com>
 Maintainer-email: HiddenLayer Integrations Team <integrations@hiddenlayer.com>

hiddenlayer_sdk-2.0.6/hiddenlayer/sdk/version.py

@@ -1 +0,0 @@
-VERSION = "2.0.6"