hiddenlayer-sdk 1.0.0__py3-none-any.whl → 1.1.1__py3-none-any.whl

hiddenlayer/sdk/constants.py

@@ -12,3 +12,4 @@ class ScanStatus(str, Enum):
 
 class ApiErrors(str, Enum):
     NON_ADHOC_SENSOR_DELETE = "only adhoc sensors may be deleted"
+    SENSOR_EXISTS = "already exists"

hiddenlayer/sdk/models.py

@@ -9,7 +9,7 @@ from hiddenlayer.sdk.rest.models import (
     ModelInventoryInfo,
     ScanReportV3,
 )
-from hiddenlayer.sdk.rest.models.file_results_inner import FileResultsInner
+from hiddenlayer.sdk.rest.models.file_scan_report_v3 import FileScanReportV3
 from hiddenlayer.sdk.rest.models.sarif210 import Sarif210
 
 
@@ -50,7 +50,7 @@ class EmptyScanResults(ScanResults):
     start_time: datetime = datetime.now()
     end_time: Optional[datetime] = datetime.now()
     severity: Optional[StrictStr] = ""
-    file_results: Optional[List[FileResultsInner]] = []
+    file_results: Optional[List[FileScanReportV3]] = []
 
 
 class Sarif(Sarif210):

hiddenlayer/sdk/rest/__init__.py

@@ -54,8 +54,8 @@ from hiddenlayer.sdk.rest.models.external_properties import ExternalProperties
 from hiddenlayer.sdk.rest.models.external_property_file_reference import ExternalPropertyFileReference
 from hiddenlayer.sdk.rest.models.external_property_file_references import ExternalPropertyFileReferences
 from hiddenlayer.sdk.rest.models.file_details_v3 import FileDetailsV3
-from hiddenlayer.sdk.rest.models.file_results_inner import FileResultsInner
 from hiddenlayer.sdk.rest.models.file_scan_report_v3 import FileScanReportV3
+from hiddenlayer.sdk.rest.models.file_scan_reports_v3 import FileScanReportsV3
 from hiddenlayer.sdk.rest.models.fix import Fix
 from hiddenlayer.sdk.rest.models.get_multipart_upload_response import GetMultipartUploadResponse
 from hiddenlayer.sdk.rest.models.graph import Graph

hiddenlayer/sdk/rest/api/sensor_api.py

@@ -16,8 +16,8 @@ from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union
 from typing_extensions import Annotated
 
-from pydantic import Field, StrictFloat, StrictInt, StrictStr, field_validator
-from typing import Any, Dict, Optional, Union
+from pydantic import Field, StrictInt, StrictStr, field_validator
+from typing import Any, Optional
 from typing_extensions import Annotated
 from hiddenlayer.sdk.rest.models.create_sensor_request import CreateSensorRequest
 from hiddenlayer.sdk.rest.models.get_multipart_upload_response import GetMultipartUploadResponse
@@ -48,7 +48,7 @@ class SensorApi:
     def begin_multipart_upload(
         self,
         sensor_id: StrictStr,
-        x_content_length: Annotated[Union[StrictFloat, StrictInt], Field(description="The total size of multipart upload.")],
+        x_content_length: Annotated[StrictInt, Field(description="The total size of multipart upload.")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -68,7 +68,7 @@ class SensorApi:
         :param sensor_id: (required)
         :type sensor_id: str
         :param x_content_length: The total size of multipart upload. (required)
-        :type x_content_length: float
+        :type x_content_length: int
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -119,7 +119,7 @@ class SensorApi:
     def begin_multipart_upload_with_http_info(
         self,
         sensor_id: StrictStr,
-        x_content_length: Annotated[Union[StrictFloat, StrictInt], Field(description="The total size of multipart upload.")],
+        x_content_length: Annotated[StrictInt, Field(description="The total size of multipart upload.")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -139,7 +139,7 @@ class SensorApi:
         :param sensor_id: (required)
         :type sensor_id: str
         :param x_content_length: The total size of multipart upload. (required)
-        :type x_content_length: float
+        :type x_content_length: int
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -190,7 +190,7 @@ class SensorApi:
     def begin_multipart_upload_without_preload_content(
         self,
         sensor_id: StrictStr,
-        x_content_length: Annotated[Union[StrictFloat, StrictInt], Field(description="The total size of multipart upload.")],
+        x_content_length: Annotated[StrictInt, Field(description="The total size of multipart upload.")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -210,7 +210,7 @@ class SensorApi:
         :param sensor_id: (required)
         :type sensor_id: str
         :param x_content_length: The total size of multipart upload. (required)
-        :type x_content_length: float
+        :type x_content_length: int
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -334,7 +334,7 @@ class SensorApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> object:
+    ) -> None:
         """Complete Multipart Upload
 
 
@@ -374,7 +374,7 @@ class SensorApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "object",
+            '200': None,
             '400': None,
         }
         response_data = self.api_client.call_api(
@@ -405,7 +405,7 @@ class SensorApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[object]:
+    ) -> ApiResponse[None]:
         """Complete Multipart Upload
 
 
@@ -445,7 +445,7 @@ class SensorApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "object",
+            '200': None,
             '400': None,
         }
         response_data = self.api_client.call_api(
@@ -516,7 +516,7 @@ class SensorApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "object",
+            '200': None,
             '400': None,
         }
         response_data = self.api_client.call_api(
@@ -559,12 +559,6 @@ class SensorApi:
         # process the body parameter
 
 
-        # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
 
 
         # authentication setting
@@ -1984,7 +1978,7 @@ class SensorApi:
         self,
         sensor_id: StrictStr,
         upload_id: StrictStr,
-        part: Union[StrictFloat, StrictInt],
+        part: StrictInt,
         body: Optional[Any],
         _request_timeout: Union[
             None,
@@ -1998,7 +1992,7 @@ class SensorApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> object:
+    ) -> None:
         """Upload part
 
 
@@ -2007,7 +2001,7 @@ class SensorApi:
         :param upload_id: (required)
         :type upload_id: str
         :param part: (required)
-        :type part: float
+        :type part: int
         :param body: (required)
         :type body: object
         :param _request_timeout: timeout setting for this request. If one
@@ -2044,7 +2038,7 @@ class SensorApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "object",
+            '200': None,
             '400': None,
         }
         response_data = self.api_client.call_api(
@@ -2063,7 +2057,7 @@ class SensorApi:
         self,
         sensor_id: StrictStr,
         upload_id: StrictStr,
-        part: Union[StrictFloat, StrictInt],
+        part: StrictInt,
         body: Optional[Any],
         _request_timeout: Union[
             None,
@@ -2077,7 +2071,7 @@ class SensorApi:
         _content_type: Optional[StrictStr] = None,
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[object]:
+    ) -> ApiResponse[None]:
         """Upload part
 
 
@@ -2086,7 +2080,7 @@ class SensorApi:
         :param upload_id: (required)
         :type upload_id: str
         :param part: (required)
-        :type part: float
+        :type part: int
         :param body: (required)
         :type body: object
         :param _request_timeout: timeout setting for this request. If one
@@ -2123,7 +2117,7 @@ class SensorApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "object",
+            '200': None,
             '400': None,
         }
         response_data = self.api_client.call_api(
@@ -2142,7 +2136,7 @@ class SensorApi:
         self,
         sensor_id: StrictStr,
         upload_id: StrictStr,
-        part: Union[StrictFloat, StrictInt],
+        part: StrictInt,
         body: Optional[Any],
         _request_timeout: Union[
             None,
@@ -2165,7 +2159,7 @@ class SensorApi:
         :param upload_id: (required)
         :type upload_id: str
         :param part: (required)
-        :type part: float
+        :type part: int
         :param body: (required)
         :type body: object
         :param _request_timeout: timeout setting for this request. If one
@@ -2202,7 +2196,7 @@ class SensorApi:
         )
 
         _response_types_map: Dict[str, Optional[str]] = {
-            '200': "object",
+            '200': None,
             '400': None,
         }
         response_data = self.api_client.call_api(
@@ -2251,12 +2245,6 @@ class SensorApi:
             _body_params = body
 
 
-        # set the HTTP header `Accept`
-        _header_params['Accept'] = self.api_client.select_header_accept(
-            [
-                'application/json'
-            ]
-        )
 
         # set the HTTP header `Content-Type`
         if _content_type:

hiddenlayer/sdk/rest/models/__init__.py

@@ -32,8 +32,8 @@ from hiddenlayer.sdk.rest.models.external_properties import ExternalProperties
 from hiddenlayer.sdk.rest.models.external_property_file_reference import ExternalPropertyFileReference
 from hiddenlayer.sdk.rest.models.external_property_file_references import ExternalPropertyFileReferences
 from hiddenlayer.sdk.rest.models.file_details_v3 import FileDetailsV3
-from hiddenlayer.sdk.rest.models.file_results_inner import FileResultsInner
 from hiddenlayer.sdk.rest.models.file_scan_report_v3 import FileScanReportV3
+from hiddenlayer.sdk.rest.models.file_scan_reports_v3 import FileScanReportsV3
 from hiddenlayer.sdk.rest.models.fix import Fix
 from hiddenlayer.sdk.rest.models.get_multipart_upload_response import GetMultipartUploadResponse
 from hiddenlayer.sdk.rest.models.graph import Graph

hiddenlayer/sdk/rest/models/file_scan_report_v3.py

@@ -17,9 +17,11 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict
+from datetime import datetime
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
-from hiddenlayer.sdk.rest.models.file_results_inner import FileResultsInner
+from hiddenlayer.sdk.rest.models.file_details_v3 import FileDetailsV3
+from hiddenlayer.sdk.rest.models.scan_detection_v3 import ScanDetectionV3
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -27,8 +29,23 @@ class FileScanReportV3(BaseModel):
     """
     FileScanReportV3
     """ # noqa: E501
-    file_results: Optional[List[FileResultsInner]] = None
-    __properties: ClassVar[List[str]] = ["file_results"]
+    file_instance_id: StrictStr = Field(description="unique ID of the file")
+    file_location: StrictStr = Field(description="full file path")
+    start_time: datetime = Field(description="time the scan started")
+    end_time: datetime = Field(description="time the scan ended")
+    details: FileDetailsV3
+    status: StrictStr = Field(description="status of the scan")
+    seen: datetime = Field(description="time the scan was seen at")
+    detections: Optional[List[ScanDetectionV3]] = None
+    file_results: Optional[List[FileScanReportV3]] = None
+    __properties: ClassVar[List[str]] = ["file_instance_id", "file_location", "start_time", "end_time", "details", "status", "seen", "detections", "file_results"]
+
+    @field_validator('status')
+    def status_validate_enum(cls, value):
+        """Validates the enum"""
+        if value not in set(['skipped', 'pending', 'running', 'done', 'failed', 'canceled']):
+            raise ValueError("must be one of enum values ('skipped', 'pending', 'running', 'done', 'failed', 'canceled')")
+        return value
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -69,6 +86,16 @@ class FileScanReportV3(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
+        # override the default output from pydantic by calling `to_dict()` of details
+        if self.details:
+            _dict['details'] = self.details.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of each item in detections (list)
+        _items = []
+        if self.detections:
+            for _item in self.detections:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['detections'] = _items
         # override the default output from pydantic by calling `to_dict()` of each item in file_results (list)
         _items = []
         if self.file_results:
@@ -88,8 +115,18 @@ class FileScanReportV3(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "file_results": [FileResultsInner.from_dict(_item) for _item in obj["file_results"]] if obj.get("file_results") is not None else None
+            "file_instance_id": obj.get("file_instance_id"),
+            "file_location": obj.get("file_location"),
+            "start_time": obj.get("start_time"),
+            "end_time": obj.get("end_time"),
+            "details": FileDetailsV3.from_dict(obj["details"]) if obj.get("details") is not None else None,
+            "status": obj.get("status"),
+            "seen": obj.get("seen"),
+            "detections": [ScanDetectionV3.from_dict(_item) for _item in obj["detections"]] if obj.get("detections") is not None else None,
+            "file_results": [FileScanReportV3.from_dict(_item) for _item in obj["file_results"]] if obj.get("file_results") is not None else None
         })
         return _obj
 
+# TODO: Rewrite to not use raise_errors
+FileScanReportV3.model_rebuild(raise_errors=False)
 

hiddenlayer/sdk/rest/models/file_scan_reports_v3.py

@@ -0,0 +1,95 @@
+# coding: utf-8
+
+"""
+    HiddenLayer ModelScan V2
+
+    HiddenLayer ModelScan API for scanning of models
+
+    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
+from typing import Any, ClassVar, Dict, List, Optional
+from hiddenlayer.sdk.rest.models.file_scan_report_v3 import FileScanReportV3
+from typing import Optional, Set
+from typing_extensions import Self
+
+class FileScanReportsV3(BaseModel):
+    """
+    FileScanReportsV3
+    """ # noqa: E501
+    file_results: Optional[List[FileScanReportV3]] = None
+    __properties: ClassVar[List[str]] = ["file_results"]
+
+    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 FileScanReportsV3 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,
+        )
+        # override the default output from pydantic by calling `to_dict()` of each item in file_results (list)
+        _items = []
+        if self.file_results:
+            for _item in self.file_results:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['file_results'] = _items
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of FileScanReportsV3 from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "file_results": [FileScanReportV3.from_dict(_item) for _item in obj["file_results"]] if obj.get("file_results") is not None else None
+        })
+        return _obj
+
+

hiddenlayer/sdk/rest/models/model_scan_api_v3_scan_query200_response.py

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 from pydantic import BaseModel, ConfigDict, Field
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
 from hiddenlayer.sdk.rest.models.scan_report_v3 import ScanReportV3
 from typing import Optional, Set
@@ -29,7 +29,7 @@ class ModelScanApiV3ScanQuery200Response(BaseModel):
     ModelScanApiV3ScanQuery200Response
     """ # noqa: E501
     items: Optional[List[ScanReportV3]] = None
-    total: Union[Annotated[float, Field(strict=True, ge=0)], Annotated[int, Field(strict=True, ge=0)]] = Field(description="Total number of items available based on the query criteria.")
+    total: Annotated[int, Field(strict=True, ge=0)] = Field(description="Total number of items available based on the query criteria.")
     limit: Annotated[int, Field(le=100, strict=True, ge=1)] = Field(description="Maximum number of items to return")
     offset: Annotated[int, Field(strict=True, ge=0)] = Field(description="Begin returning the results from this offset")
     __properties: ClassVar[List[str]] = ["items", "total", "limit", "offset"]

hiddenlayer/sdk/rest/models/multipart_upload_part.py

@@ -17,8 +17,8 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -26,9 +26,9 @@ class MultipartUploadPart(BaseModel):
     """
     MultipartUploadPart
     """ # noqa: E501
-    part_number: Union[StrictFloat, StrictInt]
-    start_offset: Union[StrictFloat, StrictInt]
-    end_offset: Union[StrictFloat, StrictInt]
+    part_number: StrictInt
+    start_offset: StrictInt
+    end_offset: StrictInt
     upload_url: Optional[StrictStr] = Field(default=None, description="only provided when part is to be directly uploaded to a cloud provider (adhoc)")
     __properties: ClassVar[List[str]] = ["part_number", "start_offset", "end_offset", "upload_url"]
 

hiddenlayer/sdk/rest/models/paged_response_with_total.py

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictStr
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
 from typing import Optional, Set
 from typing_extensions import Self
@@ -28,7 +28,7 @@ class PagedResponseWithTotal(BaseModel):
     PagedResponseWithTotal
     """ # noqa: E501
     items: Optional[List[StrictStr]] = Field(default=None, description="List of items. If no matching items are found, then `[]` will be returned.")
-    total: Union[Annotated[float, Field(strict=True, ge=0)], Annotated[int, Field(strict=True, ge=0)]] = Field(description="Total number of items available based on the query criteria.")
+    total: Annotated[int, Field(strict=True, ge=0)] = Field(description="Total number of items available based on the query criteria.")
     limit: Annotated[int, Field(le=100, strict=True, ge=1)] = Field(description="Maximum number of items to return")
     offset: Annotated[int, Field(strict=True, ge=0)] = Field(description="Begin returning the results from this offset")
     __properties: ClassVar[List[str]] = ["items", "total", "limit", "offset"]

hiddenlayer/sdk/rest/models/scan_detection_v3.py

@@ -66,8 +66,8 @@ class ScanDetectionV3(BaseModel):
         if value is None:
             return value
 
-        if not re.match(r"^CWE-\d{1,4}.*$", value):
-            raise ValueError(r"must validate the regular expression /^CWE-\d{1,4}.*$/")
+        if not re.match(r"^CWE-\d{1,4}.*$|^$", value):
+            raise ValueError(r"must validate the regular expression /^CWE-\d{1,4}.*$|^$/")
         return value
 
     model_config = ConfigDict(

hiddenlayer/sdk/rest/models/scan_report_v3.py

@@ -20,7 +20,7 @@ import json
 from datetime import datetime
 from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
-from hiddenlayer.sdk.rest.models.file_results_inner import FileResultsInner
+from hiddenlayer.sdk.rest.models.file_scan_report_v3 import FileScanReportV3
 from hiddenlayer.sdk.rest.models.model_inventory_info import ModelInventoryInfo
 from typing import Optional, Set
 from typing_extensions import Self
@@ -40,7 +40,7 @@ class ScanReportV3(BaseModel):
     end_time: Optional[datetime] = Field(default=None, description="time the scan ended")
     status: StrictStr = Field(description="status of the scan")
     severity: Optional[StrictStr] = Field(default=None, description="detection severity")
-    file_results: Optional[List[FileResultsInner]] = None
+    file_results: Optional[List[FileScanReportV3]] = None
     __properties: ClassVar[List[str]] = ["file_count", "files_with_detections_count", "detection_count", "detection_categories", "inventory", "version", "scan_id", "start_time", "end_time", "status", "severity", "file_results"]
 
     @field_validator('status')
@@ -132,7 +132,7 @@ class ScanReportV3(BaseModel):
             "end_time": obj.get("end_time"),
             "status": obj.get("status"),
             "severity": obj.get("severity"),
-            "file_results": [FileResultsInner.from_dict(_item) for _item in obj["file_results"]] if obj.get("file_results") is not None else None
+            "file_results": [FileScanReportV3.from_dict(_item) for _item in obj["file_results"]] if obj.get("file_results") is not None else None
         })
         return _obj
 

hiddenlayer/sdk/rest/models/sensor_sor_model_card_response.py

@@ -28,7 +28,7 @@ class SensorSORModelCardResponse(BaseModel):
     SensorSORModelCardResponse
     """ # noqa: E501
     model_id: StrictStr
-    created_at: StrictInt = Field(description="Unix timestamp")
+    created_at: StrictInt = Field(description="Unix Nano Epoch")
     plaintext_name: StrictStr
     active_versions: List[StrictInt]
     source: StrictStr

hiddenlayer/sdk/services/model.py

@@ -1,4 +1,6 @@
 import json
+import random
+import time
 from typing import Optional
 
 from hiddenlayer.sdk.constants import ApiErrors
@@ -37,6 +39,49 @@ class ModelAPI:
             )
         )
 
+    def create_or_get(self, *, model_name: str, model_version: Optional[int]) -> Model:
+        """
+        Creates a model in the HiddenLayer Platform if it does not exist.
+        If the model and version already exists, returns the existing model.
+
+        :params model_name: Name of the model
+        :params model_version: Version of the model
+
+        :returns: HiddenLayer ModelID
+        """
+        try:
+            return self.create(model_name=model_name, model_version=model_version)
+        except ApiException as e:
+            if e.status == 400 and str(e.body).find(ApiErrors.SENSOR_EXISTS) != -1:
+                return self.get_with_retry(
+                    model_name=model_name, version=model_version, retry=3
+                )
+            else:
+                raise e
+
+    def get_with_retry(
+        self, *, model_name: str, version: Optional[int], retry: int
+    ) -> Model:
+        """
+        Gets a HiddenLayer model object. If not version is supplied, the latest model is returned.
+        Retries if the model is not found.
+
+        :param model_name: Name of the model.
+        :param version: Version of the model to get.
+        :param retry: Number of retries
+
+        :returns: HiddenLayer Model object
+        """
+
+        base_delay = 0.1  # seconds
+        for retryCount in range(retry):
+            try:
+                return self.get(model_name=model_name, version=version)
+            except ModelDoesNotExistError:
+                time.sleep(base_delay * 2**retryCount + random.uniform(0, 1))
+                pass
+        raise ModelDoesNotExistError(f"Model {model_name} does not exist")
+
     def get(self, *, model_name: str, version: Optional[int] = None) -> Model:
         """
         Gets a HiddenLayer model object. If not version is supplied, the latest model is returned.
@@ -90,7 +135,7 @@ class ModelAPI:
             )
         )
 
-        if not models.results:
+        if not models.results or len(models.results) == 0:
             msg = f"Model {model_name} does not exist"
 
             if version:

hiddenlayer/sdk/services/model_scan.py

@@ -70,7 +70,7 @@ class ModelScanAPI:
         file_path = Path(model_path)
 
         filesize = file_path.stat().st_size
-        sensor = self._model_api.create(
+        sensor = self._model_api.create_or_get(
             model_name=model_name, model_version=model_version
         )
         upload = self._sensor_api.begin_multipart_upload(sensor.sensor_id, filesize)

hiddenlayer/sdk/version.py

@@ -1 +1 @@
-VERSION = "1.0.0"
+VERSION = "1.1.1"

{hiddenlayer_sdk-1.0.0.dist-info → hiddenlayer_sdk-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: hiddenlayer-sdk
-Version: 1.0.0
+Version: 1.1.1
 Summary: Official HiddenLayer Python SDK
 Author-email: HiddenLayer Integrations Team <integrations@hiddenlayer.com>
 Maintainer-email: HiddenLayer Integrations Team <integrations@hiddenlayer.com>

{hiddenlayer_sdk-1.0.0.dist-info → hiddenlayer_sdk-1.1.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 hiddenlayer/__init__.py,sha256=Uik1ha6cV_6MkpB0zpKn6f7Zsw7q6W_sh3MgGq2M3vU,3582
 hiddenlayer/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hiddenlayer/sdk/constants.py,sha256=517WH-MCaedeOK2yXDfJvjmuqWSpRFvuQzV6e22-3jg,283
+hiddenlayer/sdk/constants.py,sha256=QwBZAQdF7FW9q4C-O8LyxrpqfJFBBlqRUDMjnJ-ouZQ,320
 hiddenlayer/sdk/exceptions.py,sha256=LNkD6AvSwNwQjnTDrvY152DmvPKzSejrBsIu-qI44Ec,225
-hiddenlayer/sdk/models.py,sha256=FxNn_D9vHWjQW2t79UWWwwLLfkkVqMWsaEgmVLWS02I,1835
+hiddenlayer/sdk/models.py,sha256=T6GJTFCfBQgBteR0pl0eyYzan-iIFOSpcnlmlCuuQwc,1836
 hiddenlayer/sdk/utils.py,sha256=Ntao8hfsYuB7obZOanayIlrgJ98IWcPhs3sRi39IDkg,2997
-hiddenlayer/sdk/version.py,sha256=lzGFsymf0DtA_1oAZcPbeQ557iY-1BRkekhfA2qaFh8,18
-hiddenlayer/sdk/rest/__init__.py,sha256=5zmzsJXKVVfk-V6En3_0R0XjNu5HNESfM3Mtj7lgi24,7806
+hiddenlayer/sdk/version.py,sha256=mDldA753XXTzV03_TN3RwueHcj_1Dg00eIWo8LRZG5Y,18
+hiddenlayer/sdk/rest/__init__.py,sha256=Egcd1PM10KlYQww3y-HkVz0IqF3jnycvn5lYcE6uXVw,7809
 hiddenlayer/sdk/rest/api_client.py,sha256=Zd_yX0nQq06z0Ome2KcsNUcETnOxzhQK9js53qsN7aI,26333
 hiddenlayer/sdk/rest/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
 hiddenlayer/sdk/rest/configuration.py,sha256=0AzoYBOp3MzQvM9R3AkUWTycx1I3bcvNtn759JQ0fLo,14747
@@ -17,8 +17,8 @@ hiddenlayer/sdk/rest/api/health_api.py,sha256=oKHVksIqs_Vt_aQK-n9ZcQfbwW06pVeiYJ
 hiddenlayer/sdk/rest/api/model_scan_api.py,sha256=G32t9LzeDTCUF4QOMYYs3Vjm8bo0a2kZa3FXBAqPo6s,22047
 hiddenlayer/sdk/rest/api/model_supply_chain_api.py,sha256=kyay-8hob2E5HoGJPFQXYuffsZOKrg4yJ_S3wMuW030,116057
 hiddenlayer/sdk/rest/api/readiness_api.py,sha256=5SddYxvRA3GuwZ43DoVTRfPBeTkLXyBGbQtIdUyc2FA,10102
-hiddenlayer/sdk/rest/api/sensor_api.py,sha256=TKmqa5kuqCb1Ax_kIDkhoNCP3zMEOxPUxpilutn_Evg,87935
-hiddenlayer/sdk/rest/models/__init__.py,sha256=w7xG3tRuBAZDFB77NMjS5EwuIDnUYDLuELl13OmY9u8,6808
+hiddenlayer/sdk/rest/api/sensor_api.py,sha256=7pHFdPkeWTVkDx_Cr6e30TMSxGtK8q7h5d8Wiz52_CM,87375
+hiddenlayer/sdk/rest/models/__init__.py,sha256=-SO-mMt_gSxn-3hRXPeekUXEMe9hweu-ihepPrMNjXU,6811
 hiddenlayer/sdk/rest/models/address.py,sha256=amsl9GIcBhHswzfA8eQ0jbRw9zVEd6DmtDFSKRyQB9s,5285
 hiddenlayer/sdk/rest/models/artifact.py,sha256=FSV-aFgOpyZU3khHkbWXajenYLi_Zfn153cZTlz6TAI,8138
 hiddenlayer/sdk/rest/models/artifact_change.py,sha256=714PhIumUnwj1bBAtaFEFl78zoKbsiJfEGFQtkhFzgI,4136
@@ -37,8 +37,8 @@ hiddenlayer/sdk/rest/models/external_properties.py,sha256=_kr2izVVqjDaKAZYM9YljI
 hiddenlayer/sdk/rest/models/external_property_file_reference.py,sha256=CYWp1dkeTyONFxgyL1s9lgEIrL_WRLfCHu2uesTo0hM,3741
 hiddenlayer/sdk/rest/models/external_property_file_references.py,sha256=exYjkAMMKsWnj5PYAM9JvdrfnvoooeM1_-JKK0HEWtI,14776
 hiddenlayer/sdk/rest/models/file_details_v3.py,sha256=jnIDdpjngvEP29GTvVAbuAlonaDiIlsorpBKfsk8iH8,5419
-hiddenlayer/sdk/rest/models/file_results_inner.py,sha256=KpXwUU-7Gw4BLBTi7N9wLLwQk6F-MxZHuwcLMJhpvHk,4541
-hiddenlayer/sdk/rest/models/file_scan_report_v3.py,sha256=ppamPmZfb3KlugmYWQf8ukkFmQhutX54jyBzHVqaF1k,2991
+hiddenlayer/sdk/rest/models/file_scan_report_v3.py,sha256=SiHmoz13npUwPGxsfWtPIFhuFSBJ__l7MqnOcuUjKX8,5178
+hiddenlayer/sdk/rest/models/file_scan_reports_v3.py,sha256=eF39zwE-TQjbY0ChH28NyKlF285QqcTX5Hoiwk78FqE,2996
 hiddenlayer/sdk/rest/models/fix.py,sha256=IMGNyz-obFVq4xTNHxpwnlJhiSLI2ILg1XnmjrbqyFY,4397
 hiddenlayer/sdk/rest/models/get_multipart_upload_response.py,sha256=mSg6L4R_CoTNKtCNV2wDvCTk0dEkW8E6ChrRjBbdaDc,3049
 hiddenlayer/sdk/rest/models/graph.py,sha256=iMO4X58bcyPhrtMnnsVlRb2gbYtvkOoW8kLA7uwdQvM,4806
@@ -54,12 +54,12 @@ hiddenlayer/sdk/rest/models/model.py,sha256=P9KhYtnXYB6I5HWbwn7N3JDRwN-2mOl9FS0y
 hiddenlayer/sdk/rest/models/model_inventory_info.py,sha256=mVqFy64_6E9RPZlKBbiWpcmW-VOpRgCGNg5roQIZYVY,3550
 hiddenlayer/sdk/rest/models/model_query_response.py,sha256=rnJIq1VULoan4ACIbDAFQKptfKvQch0lG1GubpHxSzM,3163
 hiddenlayer/sdk/rest/models/model_scan_api_v3_scan_model_version_id_patch200_response.py,sha256=Kte2VZW9Sxg6iuQcUejMKgwu2o93enamPkn8AkmocPc,2639
-hiddenlayer/sdk/rest/models/model_scan_api_v3_scan_query200_response.py,sha256=EWHIzVE9kL_BqhK1iHO6RR3CFcaPRofjCEz221Nfqv8,3690
+hiddenlayer/sdk/rest/models/model_scan_api_v3_scan_query200_response.py,sha256=1ZwhiLPdUJ91wbXsZBReHStLPRy7MuypGA7TvuWUyCI,3632
 hiddenlayer/sdk/rest/models/multiformat_message_string.py,sha256=dCTBPDxsH82CsjG8Li1DQ3g7jVTElwK9Y40jsHfX6as,3188
-hiddenlayer/sdk/rest/models/multipart_upload_part.py,sha256=l-8F4iozfhxsRa3sZA2NnIXWV6eCRIDYQrDDjw6FGbU,2984
+hiddenlayer/sdk/rest/models/multipart_upload_part.py,sha256=YlQzUpdFPdLOI1eUINf5awh_ZEbLPfJ14kMD2GVuTxE,2904
 hiddenlayer/sdk/rest/models/node.py,sha256=ncjJUVzG3lHmZy214R-Mq1hMeI-i1QyaZPUTlluopdM,4552
 hiddenlayer/sdk/rest/models/notification.py,sha256=pAuZat0q2eUI8psHfYzlymF-ESJRuX2SS1kFCGuT6M8,7077
-hiddenlayer/sdk/rest/models/paged_response_with_total.py,sha256=O8KD2Ipvi9Gwm6eUg21FeLgtlV8tdB7JhMMWl9ip3Fs,3307
+hiddenlayer/sdk/rest/models/paged_response_with_total.py,sha256=6cg4f0n0sWm2KRuW_2N5jaRu60my84psVQwFD2PLCvA,3249
 hiddenlayer/sdk/rest/models/physical_location.py,sha256=5ZVAVRRcgPx0VtpPvAzE2zqivhOJeevxLbYiaDCx9Vs,3068
 hiddenlayer/sdk/rest/models/property_bag.py,sha256=AveUPrUpsS6ssiU3uq_gX0RBgte4bq7tyOhSV1XKRpo,3273
 hiddenlayer/sdk/rest/models/rectangle.py,sha256=EVfO4yTrzqLGg1w8NfTQ9MwS-hwUTntfCteQO7MK5wo,4295
@@ -76,19 +76,19 @@ hiddenlayer/sdk/rest/models/run.py,sha256=8BS3hXvOuIZybITl5epQUzlj4kOwoUjAQx0VCU
 hiddenlayer/sdk/rest/models/run_automation_details.py,sha256=r_v4HEGNv_WH7Rv2AW8jfh0nTAQd6lmnOvbL8To9WoY,5354
 hiddenlayer/sdk/rest/models/sarif210.py,sha256=c4yCBNKheoNkmLw7UOI5wMahO8fb9XDhq0KctcDnMGk,5019
 hiddenlayer/sdk/rest/models/scan_create_request.py,sha256=gxOl_N4_GjwwDT3VGg_d5uNKdxVxtQezcZcnkRg3N7o,2455
-hiddenlayer/sdk/rest/models/scan_detection_v3.py,sha256=_zLrBnMFMdh5So1V0cFqqL4t11ODsVbgNO8mxEhSlyQ,6386
+hiddenlayer/sdk/rest/models/scan_detection_v3.py,sha256=UY7mLBUyopY1MF61PxjBDqs_p_wYzEyQV7nwlICbBBE,6392
 hiddenlayer/sdk/rest/models/scan_header_v3.py,sha256=3jaA-8UQMhpaoobk-TD2gdvQpU-XxJunvEKLd3pFiEs,5077
 hiddenlayer/sdk/rest/models/scan_job.py,sha256=ELKdaLTGRs9M5PuX4VD8DB_K1JgUg9NkzOKy90gW2wg,3610
 hiddenlayer/sdk/rest/models/scan_job_inventory.py,sha256=OV1KAy1czwndF7h-OZg4KYwVjHRh1ie4fGfgSOWQgO0,5370
 hiddenlayer/sdk/rest/models/scan_model_details_v3.py,sha256=U63IEpPWJNnZfKoW4-G51m05iXjwoT8cXyP3Va-x3NI,3195
 hiddenlayer/sdk/rest/models/scan_model_ids_v3.py,sha256=FSJn2oVqEKd0YOF3xsKs1xnSgpYuVT5WBIEwAm5DcKY,2681
 hiddenlayer/sdk/rest/models/scan_model_request.py,sha256=vjIE1onx_OTS-wcpuFWcPpMe-wp9IU1fM7oWVJxBkEk,2451
-hiddenlayer/sdk/rest/models/scan_report_v3.py,sha256=3ArfJ_kOK-eYKKS_vgWnvTH0bQWg2ADTiYrbJ2eyeYE,5699
+hiddenlayer/sdk/rest/models/scan_report_v3.py,sha256=C3dMv1ndMLGerBB1bWgYnG7cjS2BhucljsU8-Ne2YAA,5700
 hiddenlayer/sdk/rest/models/scan_results.py,sha256=02__33uy5wf_LMDoJfaSnNr2wMv4b59IcVq9F9suWUA,4031
 hiddenlayer/sdk/rest/models/scan_results_v2.py,sha256=-JCwgKrbjpAhye0uAQGq9rg2M6L6cHL3dqkoM_tmDnc,4494
 hiddenlayer/sdk/rest/models/security_posture.py,sha256=QJAJzaqrL1R69-jUkLX8Hpjz7-aCw99doUIAgPR6n7w,2619
 hiddenlayer/sdk/rest/models/sensor_sor_model_card_query_response.py,sha256=axRm4bobSm-VfsBS9qRLo5IBT07OXfej24lEY-u6z2s,3303
-hiddenlayer/sdk/rest/models/sensor_sor_model_card_response.py,sha256=_O1QiTzF-d1FjwCHtv-mIme7rI-W8G4apji5CJ3I1ss,4693
+hiddenlayer/sdk/rest/models/sensor_sor_model_card_response.py,sha256=-tV9VWuN-bqOkOCuGcXT-QmKTqmeVe01jvEFt2Mmo0A,4694
 hiddenlayer/sdk/rest/models/sensor_sor_query_filter.py,sha256=t1ZdI4iwNk-mPjGX1j1oVCwrJ9qMAmEkMAxVkDE38yg,3406
 hiddenlayer/sdk/rest/models/sensor_sor_query_request.py,sha256=QdCmGShcIpQUVbFgLtzxtk9ucrmrwNfTLLwe78chuuY,3740
 hiddenlayer/sdk/rest/models/special_locations.py,sha256=FU5Y9nHrth5hixkeleSkxB3a9ZYALC4TI8BQXV4tWCw,3322
@@ -109,10 +109,10 @@ hiddenlayer/sdk/rest/models/web_request.py,sha256=0LKMRsAIg7oVOPso8DiaFgfsozpdKv
 hiddenlayer/sdk/rest/models/web_response.py,sha256=iwGQ5WjqAB4qGwe9nzGOwtxB1OSUc024pXSOaZM3Cdc,4746
 hiddenlayer/sdk/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hiddenlayer/sdk/services/aidr_predictive.py,sha256=aD2anFzWQzfLsR13NwwdQjt_X_iAlOkmss_yHy-154U,2958
-hiddenlayer/sdk/services/model.py,sha256=Lgx1_4I2u1aV6Az0yw1nFgi1q9-SYuVV9GXH2SycU-w,3180
-hiddenlayer/sdk/services/model_scan.py,sha256=FMwRwqHQ_VrrWyhl3OuDHNlcGGZWan1HnLtkVaxZNGg,17116
-hiddenlayer_sdk-1.0.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-hiddenlayer_sdk-1.0.0.dist-info/METADATA,sha256=9k9M9WvNBngYYo6KiJiTEshS3VlMpa0kdqhybXo5iwE,17342
-hiddenlayer_sdk-1.0.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-hiddenlayer_sdk-1.0.0.dist-info/top_level.txt,sha256=8BxcmGvEN1RqsMvTWg9Q0vDmtBGcTmatnme6nzyPj2U,12
-hiddenlayer_sdk-1.0.0.dist-info/RECORD,,
+hiddenlayer/sdk/services/model.py,sha256=qoVrwgL7E0raCUI0bNyim4SrmDEGBmcU1UaoJ-JNoCg,4871
+hiddenlayer/sdk/services/model_scan.py,sha256=xGHveChHA6pHArSNF8YKXFOi0FqaH9BnzfuKC_6VyBY,17123
+hiddenlayer_sdk-1.1.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+hiddenlayer_sdk-1.1.1.dist-info/METADATA,sha256=quGYg7HvsPUKSD3yu9tTxfTzS692TkN0MP253DrighI,17342
+hiddenlayer_sdk-1.1.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+hiddenlayer_sdk-1.1.1.dist-info/top_level.txt,sha256=8BxcmGvEN1RqsMvTWg9Q0vDmtBGcTmatnme6nzyPj2U,12
+hiddenlayer_sdk-1.1.1.dist-info/RECORD,,

{hiddenlayer_sdk-1.0.0.dist-info → hiddenlayer_sdk-1.1.1.dist-info}/WHEEL

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

hiddenlayer/sdk/rest/models/file_results_inner.py

@@ -1,121 +0,0 @@
-# coding: utf-8
-
-"""
-    HiddenLayer ModelScan V2
-
-    HiddenLayer ModelScan API for scanning of models
-
-    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 datetime import datetime
-from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
-from typing import Any, ClassVar, Dict, List, Optional
-from hiddenlayer.sdk.rest.models.file_details_v3 import FileDetailsV3
-from hiddenlayer.sdk.rest.models.scan_detection_v3 import ScanDetectionV3
-from typing import Optional, Set
-from typing_extensions import Self
-
-class FileResultsInner(BaseModel):
-    """
-    FileResultsInner
-    """ # noqa: E501
-    file_instance_id: StrictStr = Field(description="unique ID of the file")
-    file_location: StrictStr = Field(description="full file path")
-    start_time: datetime = Field(description="time the scan started")
-    end_time: datetime = Field(description="time the scan ended")
-    details: FileDetailsV3
-    status: StrictStr = Field(description="status of the scan")
-    seen: datetime = Field(description="time the scan was seen at")
-    detections: Optional[List[ScanDetectionV3]] = None
-    __properties: ClassVar[List[str]] = ["file_instance_id", "file_location", "start_time", "end_time", "details", "status", "seen", "detections"]
-
-    @field_validator('status')
-    def status_validate_enum(cls, value):
-        """Validates the enum"""
-        if value not in set(['skipped', 'pending', 'running', 'done', 'failed', 'canceled']):
-            raise ValueError("must be one of enum values ('skipped', 'pending', 'running', 'done', 'failed', 'canceled')")
-        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 FileResultsInner 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,
-        )
-        # override the default output from pydantic by calling `to_dict()` of details
-        if self.details:
-            _dict['details'] = self.details.to_dict()
-        # override the default output from pydantic by calling `to_dict()` of each item in detections (list)
-        _items = []
-        if self.detections:
-            for _item in self.detections:
-                if _item:
-                    _items.append(_item.to_dict())
-            _dict['detections'] = _items
-        return _dict
-
-    @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of FileResultsInner from a dict"""
-        if obj is None:
-            return None
-
-        if not isinstance(obj, dict):
-            return cls.model_validate(obj)
-
-        _obj = cls.model_validate({
-            "file_instance_id": obj.get("file_instance_id"),
-            "file_location": obj.get("file_location"),
-            "start_time": obj.get("start_time"),
-            "end_time": obj.get("end_time"),
-            "details": FileDetailsV3.from_dict(obj["details"]) if obj.get("details") is not None else None,
-            "status": obj.get("status"),
-            "seen": obj.get("seen"),
-            "detections": [ScanDetectionV3.from_dict(_item) for _item in obj["detections"]] if obj.get("detections") is not None else None
-        })
-        return _obj
-
-