hiddenlayer-sdk 2.0.5__py3-none-any.whl → 2.0.7__py3-none-any.whl

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/constants.py

@@ -1,6 +1,17 @@
 from enum import Enum
 
 
+class CommunityScanSource(str, Enum):
+    LOCAL = "LOCAL"
+    AWS_PRESIGNED = "AWS_PRESIGNED"
+    AWS_IAM_ROLE = "AWS_IAM_ROLE"
+    AZURE_BLOB_SAS = "AZURE_BLOB_SAS"
+    AZURE_BLOB_AD = "AZURE_BLOB_AD"
+    GOOGLE_SIGNED = "GOOGLE_SIGNED"
+    GOOGLE_OAUTH = "GOOGLE_OAUTH"
+    HUGGING_FACE = "HUGGING_FACE"
+
+
 class ScanStatus(str, Enum):
     DONE = "done"
     ACCEPTED = "accepted"

hiddenlayer/sdk/rest/__init__.py

@@ -103,8 +103,9 @@ from hiddenlayer.sdk.rest.models.scan_detection_v3 import ScanDetectionV3
 from hiddenlayer.sdk.rest.models.scan_detection_v31 import ScanDetectionV31
 from hiddenlayer.sdk.rest.models.scan_header_v3 import ScanHeaderV3
 from hiddenlayer.sdk.rest.models.scan_job import ScanJob
-from hiddenlayer.sdk.rest.models.scan_job_inventory import ScanJobInventory
+from hiddenlayer.sdk.rest.models.scan_job_access import ScanJobAccess
 from hiddenlayer.sdk.rest.models.scan_model_details_v3 import ScanModelDetailsV3
+from hiddenlayer.sdk.rest.models.scan_model_details_v31 import ScanModelDetailsV31
 from hiddenlayer.sdk.rest.models.scan_model_ids_v3 import ScanModelIdsV3
 from hiddenlayer.sdk.rest.models.scan_report_v3 import ScanReportV3
 from hiddenlayer.sdk.rest.models.scan_results_map_v3 import ScanResultsMapV3

hiddenlayer/sdk/rest/api/model_supply_chain_api.py

@@ -1166,7 +1166,7 @@ class ModelSupplyChainApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> None:
+    ) -> ScanReportV3:
         """Request a Model Scan Job
 
 
@@ -1203,7 +1203,7 @@ class ModelSupplyChainApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '201': None,
+            '201': "ScanReportV3",
             '400': None,
             '422': "ProblemDetails",
         }
@@ -1234,7 +1234,7 @@ class ModelSupplyChainApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[None]:
+    ) -> ApiResponse[ScanReportV3]:
         """Request a Model Scan Job
 
 
@@ -1271,7 +1271,7 @@ class ModelSupplyChainApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '201': None,
+            '201': "ScanReportV3",
             '400': None,
             '422': "ProblemDetails",
         }
@@ -1339,7 +1339,7 @@ class ModelSupplyChainApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '201': None,
+            '201': "ScanReportV3",
             '400': None,
             '422': "ProblemDetails",
         }
@@ -1383,6 +1383,7 @@ class ModelSupplyChainApi:
         # set the HTTP header `Accept`
         _header_params['Accept'] = self.api_client.select_header_accept(
             [
+                'application/json; charset=utf-8', 
                 'application/json'
             ]
         )
@@ -1409,7 +1410,7 @@ class ModelSupplyChainApi:
 
         return self.api_client.param_serialize(
             method='POST',
-            resource_path='/scans/v3/jobs',
+            resource_path='/scan/v3/jobs',
             path_params=_path_params,
             query_params=_query_params,
             header_params=_header_params,
@@ -1878,7 +1879,7 @@ class ModelSupplyChainApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> List[ScanJob]:
+    ) -> ScanJob:
         """List all Model Scan Jobs
 
 
@@ -1912,7 +1913,7 @@ class ModelSupplyChainApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "List[ScanJob]",
+            '200': "ScanJob",
             '400': None,
             '404': None,
         }
@@ -1942,7 +1943,7 @@ class ModelSupplyChainApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[List[ScanJob]]:
+    ) -> ApiResponse[ScanJob]:
         """List all Model Scan Jobs
 
 
@@ -1976,7 +1977,7 @@ class ModelSupplyChainApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "List[ScanJob]",
+            '200': "ScanJob",
             '400': None,
             '404': None,
         }
@@ -2040,7 +2041,7 @@ class ModelSupplyChainApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "List[ScanJob]",
+            '200': "ScanJob",
             '400': None,
             '404': None,
         }
@@ -2093,7 +2094,7 @@ class ModelSupplyChainApi:
 
         return self.api_client.param_serialize(
             method='GET',
-            resource_path='/scans/v3/jobs',
+            resource_path='/scan/v3/jobs',
             path_params=_path_params,
             query_params=_query_params,
             header_params=_header_params,

hiddenlayer/sdk/rest/models/__init__.py

@@ -81,8 +81,9 @@ from hiddenlayer.sdk.rest.models.scan_detection_v3 import ScanDetectionV3
 from hiddenlayer.sdk.rest.models.scan_detection_v31 import ScanDetectionV31
 from hiddenlayer.sdk.rest.models.scan_header_v3 import ScanHeaderV3
 from hiddenlayer.sdk.rest.models.scan_job import ScanJob
-from hiddenlayer.sdk.rest.models.scan_job_inventory import ScanJobInventory
+from hiddenlayer.sdk.rest.models.scan_job_access import ScanJobAccess
 from hiddenlayer.sdk.rest.models.scan_model_details_v3 import ScanModelDetailsV3
+from hiddenlayer.sdk.rest.models.scan_model_details_v31 import ScanModelDetailsV31
 from hiddenlayer.sdk.rest.models.scan_model_ids_v3 import ScanModelIdsV3
 from hiddenlayer.sdk.rest.models.scan_report_v3 import ScanReportV3
 from hiddenlayer.sdk.rest.models.scan_results_map_v3 import ScanResultsMapV3

hiddenlayer/sdk/rest/models/scan_job.py

@@ -19,7 +19,8 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
-from hiddenlayer.sdk.rest.models.scan_job_inventory import ScanJobInventory
+from hiddenlayer.sdk.rest.models.scan_job_access import ScanJobAccess
+from hiddenlayer.sdk.rest.models.scan_model_details_v31 import ScanModelDetailsV31
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -27,10 +28,11 @@ class ScanJob(BaseModel):
     """
     ScanJob
     """ # noqa: E501
+    access: Optional[ScanJobAccess] = None
+    inventory: Optional[ScanModelDetailsV31] = None
     scan_id: Optional[StrictStr] = Field(default=None, description="unique identifier for the scan")
     status: Optional[StrictStr] = Field(default=None, description="Status of the scan")
-    inventory: Optional[ScanJobInventory] = None
-    __properties: ClassVar[List[str]] = ["scan_id", "status", "inventory"]
+    __properties: ClassVar[List[str]] = ["access", "inventory", "scan_id", "status"]
 
     @field_validator('status')
     def status_validate_enum(cls, value):
@@ -85,6 +87,9 @@ class ScanJob(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
+        # override the default output from pydantic by calling `to_dict()` of access
+        if self.access:
+            _dict['access'] = self.access.to_dict()
         # override the default output from pydantic by calling `to_dict()` of inventory
         if self.inventory:
             _dict['inventory'] = self.inventory.to_dict()
@@ -100,9 +105,10 @@ class ScanJob(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
+            "access": ScanJobAccess.from_dict(obj["access"]) if obj.get("access") is not None else None,
+            "inventory": ScanModelDetailsV31.from_dict(obj["inventory"]) if obj.get("inventory") is not None else None,
             "scan_id": obj.get("scan_id"),
-            "status": obj.get("status"),
-            "inventory": ScanJobInventory.from_dict(obj["inventory"]) if obj.get("inventory") is not None else None
+            "status": obj.get("status")
         })
         return _obj
 

hiddenlayer/sdk/rest/models/scan_job_access.py

@@ -0,0 +1,97 @@
+# coding: utf-8
+
+"""
+    HiddenLayer-API
+
+    HiddenLayer-API
+
+    The version of the OpenAPI document: 1
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class ScanJobAccess(BaseModel):
+    """
+    ScanJobAccess
+    """ # noqa: E501
+    source: Optional[StrictStr] = None
+    __properties: ClassVar[List[str]] = ["source"]
+
+    @field_validator('source')
+    def source_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['LOCAL', 'AWS_PRESIGNED', 'AWS_IAM_ROLE', 'AZURE_BLOB_SAS', 'AZURE_BLOB_AD', 'GOOGLE_SIGNED', 'GOOGLE_OAUTH', 'HUGGING_FACE']):
+            raise ValueError("must be one of enum values ('LOCAL', 'AWS_PRESIGNED', 'AWS_IAM_ROLE', 'AZURE_BLOB_SAS', 'AZURE_BLOB_AD', 'GOOGLE_SIGNED', 'GOOGLE_OAUTH', 'HUGGING_FACE')")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of ScanJobAccess from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of ScanJobAccess from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "source": obj.get("source")
+        })
+        return _obj
+
+

hiddenlayer/sdk/rest/models/scan_model_details_v31.py

@@ -0,0 +1,93 @@
+# coding: utf-8
+
+"""
+    HiddenLayer-API
+
+    HiddenLayer-API
+
+    The version of the OpenAPI document: 1
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List
+from typing import Optional, Set
+from typing_extensions import Self
+
+class ScanModelDetailsV31(BaseModel):
+    """
+    ScanModelDetailsV31
+    """ # noqa: E501
+    model_name: StrictStr = Field(description="Name of the model")
+    model_version: StrictStr = Field(description="If you do not provide a version, one will be generated for you.")
+    requested_scan_location: StrictStr = Field(description="Location to be scanned")
+    requesting_entity: StrictStr = Field(description="Entity that requested the scan")
+    __properties: ClassVar[List[str]] = ["model_name", "model_version", "requested_scan_location", "requesting_entity"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of ScanModelDetailsV31 from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of ScanModelDetailsV31 from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "model_name": obj.get("model_name"),
+            "model_version": obj.get("model_version"),
+            "requested_scan_location": obj.get("requested_scan_location"),
+            "requesting_entity": obj.get("requesting_entity")
+        })
+        return _obj
+
+

hiddenlayer/sdk/services/model_scan.py

@@ -4,14 +4,19 @@ 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 ScanStatus
+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.models import MultiFileUploadRequestV3
+from hiddenlayer.sdk.rest.exceptions import NotFoundException, UnauthorizedException
+from hiddenlayer.sdk.rest.models import (
+    MultiFileUploadRequestV3,
+    ScanJob,
+    ScanJobAccess,
+    ScanModelDetailsV31,
+)
 from hiddenlayer.sdk.utils import filter_path_objects
 
 EXCLUDE_FILE_TYPES = [
@@ -27,9 +32,51 @@ 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,
+        model_name: str,
+        model_path: str,
+        model_source: CommunityScanSource,
+        model_version: str = "main",
+        wait_for_results: bool = True,
+    ) -> ScanResults:
+        """
+        Scan a model available at a remote location using the HiddenLayer Model Scanner.
+
+        :param model_name: Name of the model to be shown on the HiddenLayer UI.
+        :param model_path: Path to the model file in the remote location, e.g. a presigned S3 URL
+        :param model_source: type of remote location where the model is stored.
+        :param wait_for_results: True whether to wait for the scan to finish, defaults to True.
+        :param model_version: Version of the model to be shown on the HiddenLayer UI.
+
+        :returns: Scan Results
+        """
+        scan_job = ScanJob(
+            access=ScanJobAccess(source=model_source),
+            inventory=ScanModelDetailsV31(
+                model_name=model_name,
+                model_version=model_version,
+                requested_scan_location=model_path,
+                requesting_entity="hiddenlayer-python-sdk",
+            ),
+        )
+        result = self._model_supply_chain_api.create_scan_job(scan_job)
+        scan_id = result.scan_id
+        if scan_id is None:
+            raise Exception("scan_id must have a value")
+        if wait_for_results:
+            return self._wait_for_scan_results(scan_id=scan_id)
+        else:
+            return ScanResults.from_scanreportv3(scan_report_v3=result)
 
     def scan_file(
         self,
@@ -286,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)
 
@@ -419,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/version.py

@@ -1 +1 @@
-VERSION = "2.0.5"
+VERSION = "2.0.7"

{hiddenlayer_sdk-2.0.5.dist-info → hiddenlayer_sdk-2.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: hiddenlayer-sdk
-Version: 2.0.5
+Version: 2.0.7
 Summary: Official HiddenLayer Python SDK
 Author-email: HiddenLayer Integrations Team <integrations@hiddenlayer.com>
 Maintainer-email: HiddenLayer Integrations Team <integrations@hiddenlayer.com>
@@ -236,6 +236,7 @@ Requires-Dist: huggingface_hub; extra == "hf"
 Provides-Extra: azure
 Requires-Dist: azure-storage-blob; extra == "azure"
 Requires-Dist: azure-identity; extra == "azure"
+Dynamic: license-file
 
 # HiddenLayer SDK Python (Beta)
 

{hiddenlayer_sdk-2.0.5.dist-info → hiddenlayer_sdk-2.0.7.dist-info}/RECORD

@@ -1,11 +1,11 @@
-hiddenlayer/__init__.py,sha256=iRisM3FnxlTbMjuRy72BQcCTZcp2_9iWck4kY-S2yV8,3206
+hiddenlayer/__init__.py,sha256=TJLQ2sXIrJTzv04Cl7N1iHSEF5hycMaM1PsU4WnNocU,3421
 hiddenlayer/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hiddenlayer/sdk/constants.py,sha256=QwBZAQdF7FW9q4C-O8LyxrpqfJFBBlqRUDMjnJ-ouZQ,320
+hiddenlayer/sdk/constants.py,sha256=BytOHlVWk6lhWB4bpT7kDj3ctozZA9ftaB2D6lSGtGI,628
 hiddenlayer/sdk/exceptions.py,sha256=_Lelwk32LWxWuUPglfw8R8RuiX_Uxm_N7TP3BLhDLz0,226
 hiddenlayer/sdk/models.py,sha256=t92fK7xxuPm1XzazNsRg5AOAD17qnvNZiGaN1gM6lHk,1776
 hiddenlayer/sdk/utils.py,sha256=Ntao8hfsYuB7obZOanayIlrgJ98IWcPhs3sRi39IDkg,2997
-hiddenlayer/sdk/version.py,sha256=CF5-GE6YzGyHRbD2JDoMG91u33vJQfZJLi32ju9NWWw,18
-hiddenlayer/sdk/rest/__init__.py,sha256=dSLESB6qPKLmF4FseZH_XRnHOSuXaeYQHPDrlgTFHW4,8422
+hiddenlayer/sdk/version.py,sha256=P3xkxiU2SjdsjCR_fMhXDUtoWheuX3suVT8TGRznCoY,18
+hiddenlayer/sdk/rest/__init__.py,sha256=fL2dURfsADiHHxdxxbUyjrqQi5BPRVdd9p51XPrJhks,8499
 hiddenlayer/sdk/rest/api_client.py,sha256=Yd71Up1SHj5pPp4jB_gIsm5Y77jHph7T4iU9NiIhUak,26291
 hiddenlayer/sdk/rest/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
 hiddenlayer/sdk/rest/configuration.py,sha256=yWESM8qffwcficDVjX6SDiJISOWRJYLD3BX9RRgdyhM,14705
@@ -15,10 +15,10 @@ hiddenlayer/sdk/rest/api/__init__.py,sha256=dKrlNcnraOo_qcSNtyz4GYkS79YGkEcg8__T
 hiddenlayer/sdk/rest/api/aidr_predictive_api.py,sha256=_XBrwv2SjK9rsNyFuUQARMs4iplVigmRyDEZAo3Fm5k,11316
 hiddenlayer/sdk/rest/api/health_api.py,sha256=OO-snu3VvpBJWseRi4wdjk6poh5U1_t7WZf5V116wzE,10024
 hiddenlayer/sdk/rest/api/model_api.py,sha256=yZ3Rn-Sv5StPDDtrGPGtab8YqDxkWLph6bHuZEwUAs4,20107
-hiddenlayer/sdk/rest/api/model_supply_chain_api.py,sha256=JxDl0EulcJgrdcmKXv5YkOBjXRoUxFWfxvtAKaGLmE8,159229
+hiddenlayer/sdk/rest/api/model_supply_chain_api.py,sha256=WmxcEGZ6IBacNsmkj0Yf47D74k6HhHnKapO4tPhubRI,159295
 hiddenlayer/sdk/rest/api/readiness_api.py,sha256=PL3iDhS25SDmUmreLLlcEy1r6_iGrY8ejrZqPDqXwEc,10060
 hiddenlayer/sdk/rest/api/sensor_api.py,sha256=L5ZaEfvNublZbcUsL_LHsj2IV4DGr4lVfnHl6wsESkQ,55425
-hiddenlayer/sdk/rest/models/__init__.py,sha256=oAOggd_25EY0c2qajVPQCiiO1X5fzQh7r1xGRa7KXew,7433
+hiddenlayer/sdk/rest/models/__init__.py,sha256=Df9k4U_TOqWPBvCp2rjpYIehk44YFjjWPXvPz-tHfH4,7510
 hiddenlayer/sdk/rest/models/address.py,sha256=_KjrEeyq_1hvkKJnH-d4d7ocqPLQyS3t48MG9Sb_rMU,5243
 hiddenlayer/sdk/rest/models/artifact.py,sha256=QiuwqQj0ROPalIH_LvqB6Z2b3_IdXdlmvmRJ6DSlxwE,8096
 hiddenlayer/sdk/rest/models/artifact_change.py,sha256=Sc2Z24g7m3Rrht83-2w235WZPpnsfEFF-ff5HfrPmno,4094
@@ -85,9 +85,10 @@ hiddenlayer/sdk/rest/models/scan_create_request.py,sha256=s8xEol9DIH1MpTklL6fjWt
 hiddenlayer/sdk/rest/models/scan_detection_v3.py,sha256=sk65pt5rkvxOBgs5OZ090fZI-GNTY_SdHyibi4bSZ5Y,6426
 hiddenlayer/sdk/rest/models/scan_detection_v31.py,sha256=tTNRlggUmL-cY4ZRiC-2au6xwEbUqZlbjxSukY72nG0,6484
 hiddenlayer/sdk/rest/models/scan_header_v3.py,sha256=sgpiAE6NflJtLJhfUA4NmveUCHTPQN2JSsk7cEBMjVQ,5035
-hiddenlayer/sdk/rest/models/scan_job.py,sha256=36Izh6LR8KTu0GllhKMqDmXMVVIqLOfGIZ930awtltA,3568
-hiddenlayer/sdk/rest/models/scan_job_inventory.py,sha256=5ROvus3liVCnzuNmheeNy6nmI-LB0uPkHWzBS3zqJys,5328
+hiddenlayer/sdk/rest/models/scan_job.py,sha256=IADBv0WCXCZ8m2rUJ8Do7IPSc3aczICCdkLnz2g8FXs,3970
+hiddenlayer/sdk/rest/models/scan_job_access.py,sha256=Q9SWDj7u9ec5H03zlzPUeO_si1rxS_c7iL_YPc-FDxo,2956
 hiddenlayer/sdk/rest/models/scan_model_details_v3.py,sha256=KItM8K8oZASWFh1b8_5zWKuqmbX1UHdELCY7_MjrcTU,3177
+hiddenlayer/sdk/rest/models/scan_model_details_v31.py,sha256=7ykIhQz8OsgdIRmUkVs5RlgpBOuy_3Ztzs3Vi-puN0M,3023
 hiddenlayer/sdk/rest/models/scan_model_ids_v3.py,sha256=MzU_KNr5CXylDbakDOLv7qGz4naAJ2_56cuW9MATJpw,2639
 hiddenlayer/sdk/rest/models/scan_report_v3.py,sha256=n9oi5wXwdBNIKdPzg1-2wEOSilDARHalTMjTF6THtfg,5658
 hiddenlayer/sdk/rest/models/scan_results_map_v3.py,sha256=BQowU2WqGi0wlNqr9Oi3n_F-NEbfA4aPA-2QfdENwGQ,3363
@@ -117,9 +118,9 @@ hiddenlayer/sdk/rest/models/web_request.py,sha256=u9pmXP-NPDBKcW3ivNDa1I0i0vxQki
 hiddenlayer/sdk/rest/models/web_response.py,sha256=gSKHygOE25yvLKMk__Aga90cHfpFxWvmib1SwWGFTik,4704
 hiddenlayer/sdk/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hiddenlayer/sdk/services/aidr_predictive.py,sha256=S2MvN5qPyYhYXbYM3lvDmylhY71p4d07L36m-a1ZMyM,4773
-hiddenlayer/sdk/services/model_scan.py,sha256=uwHyQNWKwmUmAyGCT-u4Hpc-HXBf_-_v8GPg5JefFuA,15928
-hiddenlayer_sdk-2.0.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-hiddenlayer_sdk-2.0.5.dist-info/METADATA,sha256=ZW4WvrUY88_sjyQnPx0KQ55N_X2kRPEv8OeR4afRZ_A,18131
-hiddenlayer_sdk-2.0.5.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-hiddenlayer_sdk-2.0.5.dist-info/top_level.txt,sha256=8BxcmGvEN1RqsMvTWg9Q0vDmtBGcTmatnme6nzyPj2U,12
-hiddenlayer_sdk-2.0.5.dist-info/RECORD,,
+hiddenlayer/sdk/services/model_scan.py,sha256=tFqtMKaDl-oq2nSaqqOicK5sh3TqCk6hYP2-Zd5yNNY,18240
+hiddenlayer_sdk-2.0.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+hiddenlayer_sdk-2.0.7.dist-info/METADATA,sha256=JzWg5V3dbxtToBp4GzVuEciOgEPPru7GFGw26dDDKhg,18153
+hiddenlayer_sdk-2.0.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+hiddenlayer_sdk-2.0.7.dist-info/top_level.txt,sha256=8BxcmGvEN1RqsMvTWg9Q0vDmtBGcTmatnme6nzyPj2U,12
+hiddenlayer_sdk-2.0.7.dist-info/RECORD,,

{hiddenlayer_sdk-2.0.5.dist-info → hiddenlayer_sdk-2.0.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

hiddenlayer/sdk/rest/models/scan_job_inventory.py

@@ -1,137 +0,0 @@
-# coding: utf-8
-
-"""
-    HiddenLayer-API
-
-    HiddenLayer-API
-
-    The version of the OpenAPI document: 1
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
-
-    Do not edit the class manually.
-"""  # noqa: E501
-
-
-from __future__ import annotations
-import json
-import pprint
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
-from typing import Any, List, Optional
-from hiddenlayer.sdk.rest.models.scan_model_details_v3 import ScanModelDetailsV3
-from hiddenlayer.sdk.rest.models.scan_model_ids_v3 import ScanModelIdsV3
-from pydantic import StrictStr, Field
-from typing import Union, List, Set, Optional, Dict
-from typing_extensions import Literal, Self
-
-SCANJOBINVENTORY_ONE_OF_SCHEMAS = ["ScanModelDetailsV3", "ScanModelIdsV3"]
-
-class ScanJobInventory(BaseModel):
-    """
-    ScanJobInventory
-    """
-    # data type: ScanModelDetailsV3
-    oneof_schema_1_validator: Optional[ScanModelDetailsV3] = None
-    # data type: ScanModelIdsV3
-    oneof_schema_2_validator: Optional[ScanModelIdsV3] = None
-    actual_instance: Optional[Union[ScanModelDetailsV3, ScanModelIdsV3]] = None
-    one_of_schemas: Set[str] = { "ScanModelDetailsV3", "ScanModelIdsV3" }
-
-    model_config = ConfigDict(
-        validate_assignment=True,
-        protected_namespaces=(),
-    )
-
-
-    def __init__(self, *args, **kwargs) -> None:
-        if args:
-            if len(args) > 1:
-                raise ValueError("If a position argument is used, only 1 is allowed to set `actual_instance`")
-            if kwargs:
-                raise ValueError("If a position argument is used, keyword arguments cannot be used.")
-            super().__init__(actual_instance=args[0])
-        else:
-            super().__init__(**kwargs)
-
-    @field_validator('actual_instance')
-    def actual_instance_must_validate_oneof(cls, v):
-        instance = ScanJobInventory.model_construct()
-        error_messages = []
-        match = 0
-        # validate data type: ScanModelDetailsV3
-        if not isinstance(v, ScanModelDetailsV3):
-            error_messages.append(f"Error! Input type `{type(v)}` is not `ScanModelDetailsV3`")
-        else:
-            match += 1
-        # validate data type: ScanModelIdsV3
-        if not isinstance(v, ScanModelIdsV3):
-            error_messages.append(f"Error! Input type `{type(v)}` is not `ScanModelIdsV3`")
-        else:
-            match += 1
-        if match > 1:
-            # more than 1 match
-            raise ValueError("Multiple matches found when setting `actual_instance` in ScanJobInventory with oneOf schemas: ScanModelDetailsV3, ScanModelIdsV3. Details: " + ", ".join(error_messages))
-        elif match == 0:
-            # no match
-            raise ValueError("No match found when setting `actual_instance` in ScanJobInventory with oneOf schemas: ScanModelDetailsV3, ScanModelIdsV3. Details: " + ", ".join(error_messages))
-        else:
-            return v
-
-    @classmethod
-    def from_dict(cls, obj: Union[str, Dict[str, Any]]) -> Self:
-        return cls.from_json(json.dumps(obj))
-
-    @classmethod
-    def from_json(cls, json_str: str) -> Self:
-        """Returns the object represented by the json string"""
-        instance = cls.model_construct()
-        error_messages = []
-        match = 0
-
-        # deserialize data into ScanModelDetailsV3
-        try:
-            instance.actual_instance = ScanModelDetailsV3.from_json(json_str)
-            match += 1
-        except (ValidationError, ValueError) as e:
-            error_messages.append(str(e))
-        # deserialize data into ScanModelIdsV3
-        try:
-            instance.actual_instance = ScanModelIdsV3.from_json(json_str)
-            match += 1
-        except (ValidationError, ValueError) as e:
-            error_messages.append(str(e))
-
-        if match > 1:
-            # more than 1 match
-            raise ValueError("Multiple matches found when deserializing the JSON string into ScanJobInventory with oneOf schemas: ScanModelDetailsV3, ScanModelIdsV3. Details: " + ", ".join(error_messages))
-        elif match == 0:
-            # no match
-            raise ValueError("No match found when deserializing the JSON string into ScanJobInventory with oneOf schemas: ScanModelDetailsV3, ScanModelIdsV3. Details: " + ", ".join(error_messages))
-        else:
-            return instance
-
-    def to_json(self) -> str:
-        """Returns the JSON representation of the actual instance"""
-        if self.actual_instance is None:
-            return "null"
-
-        if hasattr(self.actual_instance, "to_json") and callable(self.actual_instance.to_json):
-            return self.actual_instance.to_json()
-        else:
-            return json.dumps(self.actual_instance)
-
-    def to_dict(self) -> Optional[Union[Dict[str, Any], ScanModelDetailsV3, ScanModelIdsV3]]:
-        """Returns the dict representation of the actual instance"""
-        if self.actual_instance is None:
-            return None
-
-        if hasattr(self.actual_instance, "to_dict") and callable(self.actual_instance.to_dict):
-            return self.actual_instance.to_dict()
-        else:
-            # primitive type
-            return self.actual_instance
-
-    def to_str(self) -> str:
-        """Returns the string representation of the actual instance"""
-        return pprint.pformat(self.model_dump())
-
-