revengai 1.88.0__py3-none-any.whl → 1.89.4__py3-none-any.whl

revengai/__init__.py

@@ -13,7 +13,7 @@
 """  # noqa: E501
 
 
-__version__ = "v1.88.0"
+__version__ = "v1.89.4"
 
 # Define package exports
 __all__ = [
@@ -242,10 +242,10 @@ __all__ = [
     "FunctionLocalVariableResponse",
     "FunctionMapping",
     "FunctionMappingFull",
-    "FunctionMatchingBatchRequest",
     "FunctionMatchingBatchResponse",
+    "FunctionMatchingFilters",
+    "FunctionMatchingRequest",
     "FunctionMatchingResultWithBestMatch",
-    "FunctionMatchingScopeRequest",
     "FunctionNameConfidenceBody",
     "FunctionNameHistory",
     "FunctionNameInput",
@@ -285,6 +285,7 @@ __all__ = [
     "MetaModel",
     "ModelName",
     "ModelsResponse",
+    "NameConfidence",
     "NearestNeighbor",
     "NetworkOverviewDns",
     "NetworkOverviewDnsAnswer",
@@ -590,10 +591,10 @@ from revengai.models.function_info_output import FunctionInfoOutput as FunctionI
 from revengai.models.function_local_variable_response import FunctionLocalVariableResponse as FunctionLocalVariableResponse
 from revengai.models.function_mapping import FunctionMapping as FunctionMapping
 from revengai.models.function_mapping_full import FunctionMappingFull as FunctionMappingFull
-from revengai.models.function_matching_batch_request import FunctionMatchingBatchRequest as FunctionMatchingBatchRequest
 from revengai.models.function_matching_batch_response import FunctionMatchingBatchResponse as FunctionMatchingBatchResponse
+from revengai.models.function_matching_filters import FunctionMatchingFilters as FunctionMatchingFilters
+from revengai.models.function_matching_request import FunctionMatchingRequest as FunctionMatchingRequest
 from revengai.models.function_matching_result_with_best_match import FunctionMatchingResultWithBestMatch as FunctionMatchingResultWithBestMatch
-from revengai.models.function_matching_scope_request import FunctionMatchingScopeRequest as FunctionMatchingScopeRequest
 from revengai.models.function_name_confidence_body import FunctionNameConfidenceBody as FunctionNameConfidenceBody
 from revengai.models.function_name_history import FunctionNameHistory as FunctionNameHistory
 from revengai.models.function_name_input import FunctionNameInput as FunctionNameInput
@@ -633,6 +634,7 @@ from revengai.models.matched_function_suggestion import MatchedFunctionSuggestio
 from revengai.models.meta_model import MetaModel as MetaModel
 from revengai.models.model_name import ModelName as ModelName
 from revengai.models.models_response import ModelsResponse as ModelsResponse
+from revengai.models.name_confidence import NameConfidence as NameConfidence
 from revengai.models.nearest_neighbor import NearestNeighbor as NearestNeighbor
 from revengai.models.network_overview_dns import NetworkOverviewDns as NetworkOverviewDns
 from revengai.models.network_overview_dns_answer import NetworkOverviewDnsAnswer as NetworkOverviewDnsAnswer

revengai/api/functions_core_api.py

@@ -29,8 +29,8 @@ from revengai.models.base_response_function_capability_response import BaseRespo
 from revengai.models.base_response_function_strings_response import BaseResponseFunctionStringsResponse
 from revengai.models.base_response_functions_detail_response import BaseResponseFunctionsDetailResponse
 from revengai.models.base_response_list_similar_functions_response import BaseResponseListSimilarFunctionsResponse
-from revengai.models.function_matching_batch_request import FunctionMatchingBatchRequest
 from revengai.models.function_matching_batch_response import FunctionMatchingBatchResponse
+from revengai.models.function_matching_request import FunctionMatchingRequest
 
 from revengai.api_client import ApiClient, RequestSerialized
 from revengai.api_response import ApiResponse
@@ -378,7 +378,7 @@ class FunctionsCoreApi:
     ) -> FunctionMatchingBatchResponse:
         """Perform matching for the functions of an analysis
 
-        Takes in an analysis id and settings and finds the nearest functions for each function that's within the system
+        Takes in an analysis id and settings and matches the nearest functions to the ones associated with it. Results can optionally be filtered by collection, binary, debug type or (other) function ids
 
         :param analysis_id: (required)
         :type analysis_id: int
@@ -454,7 +454,7 @@ class FunctionsCoreApi:
     ) -> ApiResponse[FunctionMatchingBatchResponse]:
         """Perform matching for the functions of an analysis
 
-        Takes in an analysis id and settings and finds the nearest functions for each function that's within the system
+        Takes in an analysis id and settings and matches the nearest functions to the ones associated with it. Results can optionally be filtered by collection, binary, debug type or (other) function ids
 
         :param analysis_id: (required)
         :type analysis_id: int
@@ -530,7 +530,7 @@ class FunctionsCoreApi:
     ) -> RESTResponseType:
         """Perform matching for the functions of an analysis
 
-        Takes in an analysis id and settings and finds the nearest functions for each function that's within the system
+        Takes in an analysis id and settings and matches the nearest functions to the ones associated with it. Results can optionally be filtered by collection, binary, debug type or (other) function ids
 
         :param analysis_id: (required)
         :type analysis_id: int
@@ -974,7 +974,7 @@ class FunctionsCoreApi:
     @validate_call
     def batch_function_matching(
         self,
-        function_matching_batch_request: FunctionMatchingBatchRequest,
+        function_matching_request: FunctionMatchingRequest,
         authorization: Annotated[Optional[StrictStr], Field(description="API Key bearer token")] = None,
         _request_timeout: Union[
             None,
@@ -993,8 +993,8 @@ class FunctionsCoreApi:
 
         Takes in an input of functions ID's and settings and finds the nearest functions for each function that's within the system
 
-        :param function_matching_batch_request: (required)
-        :type function_matching_batch_request: FunctionMatchingBatchRequest
+        :param function_matching_request: (required)
+        :type function_matching_request: FunctionMatchingRequest
         :param authorization: API Key bearer token
         :type authorization: str
         :param _request_timeout: timeout setting for this request. If one
@@ -1020,7 +1020,7 @@ class FunctionsCoreApi:
         """ # noqa: E501
 
         _param = self._batch_function_matching_serialize(
-            function_matching_batch_request=function_matching_batch_request,
+            function_matching_request=function_matching_request,
             authorization=authorization,
             _request_auth=_request_auth,
             _content_type=_content_type,
@@ -1046,7 +1046,7 @@ class FunctionsCoreApi:
     @validate_call
     def batch_function_matching_with_http_info(
         self,
-        function_matching_batch_request: FunctionMatchingBatchRequest,
+        function_matching_request: FunctionMatchingRequest,
         authorization: Annotated[Optional[StrictStr], Field(description="API Key bearer token")] = None,
         _request_timeout: Union[
             None,
@@ -1065,8 +1065,8 @@ class FunctionsCoreApi:
 
         Takes in an input of functions ID's and settings and finds the nearest functions for each function that's within the system
 
-        :param function_matching_batch_request: (required)
-        :type function_matching_batch_request: FunctionMatchingBatchRequest
+        :param function_matching_request: (required)
+        :type function_matching_request: FunctionMatchingRequest
         :param authorization: API Key bearer token
         :type authorization: str
         :param _request_timeout: timeout setting for this request. If one
@@ -1092,7 +1092,7 @@ class FunctionsCoreApi:
         """ # noqa: E501
 
         _param = self._batch_function_matching_serialize(
-            function_matching_batch_request=function_matching_batch_request,
+            function_matching_request=function_matching_request,
             authorization=authorization,
             _request_auth=_request_auth,
             _content_type=_content_type,
@@ -1118,7 +1118,7 @@ class FunctionsCoreApi:
     @validate_call
     def batch_function_matching_without_preload_content(
         self,
-        function_matching_batch_request: FunctionMatchingBatchRequest,
+        function_matching_request: FunctionMatchingRequest,
         authorization: Annotated[Optional[StrictStr], Field(description="API Key bearer token")] = None,
         _request_timeout: Union[
             None,
@@ -1137,8 +1137,8 @@ class FunctionsCoreApi:
 
         Takes in an input of functions ID's and settings and finds the nearest functions for each function that's within the system
 
-        :param function_matching_batch_request: (required)
-        :type function_matching_batch_request: FunctionMatchingBatchRequest
+        :param function_matching_request: (required)
+        :type function_matching_request: FunctionMatchingRequest
         :param authorization: API Key bearer token
         :type authorization: str
         :param _request_timeout: timeout setting for this request. If one
@@ -1164,7 +1164,7 @@ class FunctionsCoreApi:
         """ # noqa: E501
 
         _param = self._batch_function_matching_serialize(
-            function_matching_batch_request=function_matching_batch_request,
+            function_matching_request=function_matching_request,
             authorization=authorization,
             _request_auth=_request_auth,
             _content_type=_content_type,
@@ -1185,7 +1185,7 @@ class FunctionsCoreApi:
 
     def _batch_function_matching_serialize(
         self,
-        function_matching_batch_request,
+        function_matching_request,
         authorization,
         _request_auth,
         _content_type,
@@ -1214,8 +1214,8 @@ class FunctionsCoreApi:
             _header_params['authorization'] = authorization
         # process the form parameters
         # process the body parameter
-        if function_matching_batch_request is not None:
-            _body_params = function_matching_batch_request
+        if function_matching_request is not None:
+            _body_params = function_matching_request
 
 
         # set the HTTP header `Accept`

revengai/api_client.py

@@ -90,7 +90,7 @@ class ApiClient:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/v1.88.0/python'
+        self.user_agent = 'OpenAPI-Generator/v1.89.4/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):

revengai/configuration.py

@@ -529,8 +529,8 @@ conf = revengai.Configuration(
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "Version of the API: v1.88.0\n"\
-               "SDK Package Version: v1.88.0".\
+               "Version of the API: v1.89.4\n"\
+               "SDK Package Version: v1.89.4".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self) -> List[HostSetting]:

revengai/models/__init__.py

@@ -208,10 +208,10 @@ from revengai.models.function_info_output import FunctionInfoOutput
 from revengai.models.function_local_variable_response import FunctionLocalVariableResponse
 from revengai.models.function_mapping import FunctionMapping
 from revengai.models.function_mapping_full import FunctionMappingFull
-from revengai.models.function_matching_batch_request import FunctionMatchingBatchRequest
 from revengai.models.function_matching_batch_response import FunctionMatchingBatchResponse
+from revengai.models.function_matching_filters import FunctionMatchingFilters
+from revengai.models.function_matching_request import FunctionMatchingRequest
 from revengai.models.function_matching_result_with_best_match import FunctionMatchingResultWithBestMatch
-from revengai.models.function_matching_scope_request import FunctionMatchingScopeRequest
 from revengai.models.function_name_confidence_body import FunctionNameConfidenceBody
 from revengai.models.function_name_history import FunctionNameHistory
 from revengai.models.function_name_input import FunctionNameInput
@@ -251,6 +251,7 @@ from revengai.models.matched_function_suggestion import MatchedFunctionSuggestio
 from revengai.models.meta_model import MetaModel
 from revengai.models.model_name import ModelName
 from revengai.models.models_response import ModelsResponse
+from revengai.models.name_confidence import NameConfidence
 from revengai.models.nearest_neighbor import NearestNeighbor
 from revengai.models.network_overview_dns import NetworkOverviewDns
 from revengai.models.network_overview_dns_answer import NetworkOverviewDnsAnswer

revengai/models/analysis_function_matching_request.py

@@ -19,6 +19,7 @@ import json
 from pydantic import BaseModel, ConfigDict, Field
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing_extensions import Annotated
+from revengai.models.function_matching_filters import FunctionMatchingFilters
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -26,8 +27,12 @@ class AnalysisFunctionMatchingRequest(BaseModel):
     """
     AnalysisFunctionMatchingRequest
     """ # noqa: E501
-    min_similarity: Optional[Union[Annotated[float, Field(le=1.0, strict=True, ge=0.0)], Annotated[int, Field(le=1, strict=True, ge=0)]]] = Field(default=0.9, description="Minimum similarity expected for a match, default is 0.9")
-    __properties: ClassVar[List[str]] = ["min_similarity"]
+    min_similarity: Optional[Union[Annotated[float, Field(le=100.0, strict=True, ge=0.0)], Annotated[int, Field(le=100, strict=True, ge=0)]]] = Field(default=90.0, description="Minimum similarity expected for a match as a percentage, default is 90")
+    filters: Optional[FunctionMatchingFilters] = None
+    results_per_function: Optional[Annotated[int, Field(le=10, strict=True, ge=1)]] = Field(default=1, description="Maximum number of matches to return per function, default is 1, max is 10")
+    page: Optional[Annotated[int, Field(strict=True, ge=1)]] = Field(default=1, description="Page number for paginated results, default is 1 (first page)")
+    page_size: Optional[Annotated[int, Field(le=1000, strict=True, ge=0)]] = Field(default=0, description="Number of functions to return per page, default is 0 (all functions), max is 1000")
+    __properties: ClassVar[List[str]] = ["min_similarity", "filters", "results_per_function", "page", "page_size"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -68,6 +73,14 @@ class AnalysisFunctionMatchingRequest(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
+        # override the default output from pydantic by calling `to_dict()` of filters
+        if self.filters:
+            _dict['filters'] = self.filters.to_dict()
+        # set to None if filters (nullable) is None
+        # and model_fields_set contains the field
+        if self.filters is None and "filters" in self.model_fields_set:
+            _dict['filters'] = None
+
         return _dict
 
     @classmethod
@@ -80,7 +93,11 @@ class AnalysisFunctionMatchingRequest(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "min_similarity": obj.get("min_similarity") if obj.get("min_similarity") is not None else 0.9
+            "min_similarity": obj.get("min_similarity") if obj.get("min_similarity") is not None else 90.0,
+            "filters": FunctionMatchingFilters.from_dict(obj["filters"]) if obj.get("filters") is not None else None,
+            "results_per_function": obj.get("results_per_function") if obj.get("results_per_function") is not None else 1,
+            "page": obj.get("page") if obj.get("page") is not None else 1,
+            "page_size": obj.get("page_size") if obj.get("page_size") is not None else 0
         })
         return _obj
 

revengai/models/auto_unstrip_request.py

@@ -26,9 +26,9 @@ class AutoUnstripRequest(BaseModel):
     """
     AutoUnstripRequest
     """ # noqa: E501
-    min_similarity: Optional[Union[Annotated[float, Field(le=1.0, strict=True, ge=0.0)], Annotated[int, Field(le=1, strict=True, ge=0)]]] = Field(default=0.9, description="Minimum similarity expected for a match, default is 0.9")
+    min_similarity: Optional[Union[Annotated[float, Field(le=100.0, strict=True, ge=0.0)], Annotated[int, Field(le=100, strict=True, ge=0)]]] = Field(default=90.0, description="Minimum similarity expected for a match as a percentage, default is 90")
     apply: Optional[StrictBool] = Field(default=False, description="Whether to apply the matched function names to the target binary, default is False")
-    confidence_threshold: Optional[Union[Annotated[float, Field(le=1.0, strict=True, ge=0.0)], Annotated[int, Field(le=1, strict=True, ge=0)]]] = Field(default=0.9, description="Confidence threshold for applying function names, default is 0.9")
+    confidence_threshold: Optional[Union[Annotated[float, Field(le=100.0, strict=True, ge=0.0)], Annotated[int, Field(le=100, strict=True, ge=0)]]] = Field(default=90.0, description="Confidence threshold for applying function names as a percentage, default is 90")
     min_group_size: Optional[Annotated[int, Field(le=20, strict=True, ge=1)]] = Field(default=10, description="Minimum number of matching functions required to consider for a match, default is 10")
     __properties: ClassVar[List[str]] = ["min_similarity", "apply", "confidence_threshold", "min_group_size"]
 
@@ -83,9 +83,9 @@ class AutoUnstripRequest(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "min_similarity": obj.get("min_similarity") if obj.get("min_similarity") is not None else 0.9,
+            "min_similarity": obj.get("min_similarity") if obj.get("min_similarity") is not None else 90.0,
             "apply": obj.get("apply") if obj.get("apply") is not None else False,
-            "confidence_threshold": obj.get("confidence_threshold") if obj.get("confidence_threshold") is not None else 0.9,
+            "confidence_threshold": obj.get("confidence_threshold") if obj.get("confidence_threshold") is not None else 90.0,
             "min_group_size": obj.get("min_group_size") if obj.get("min_group_size") is not None else 10
         })
         return _obj

revengai/models/function_matching_batch_response.py

@@ -30,8 +30,10 @@ class FunctionMatchingBatchResponse(BaseModel):
     status: Optional[StrictStr] = None
     total_time: Optional[StrictInt] = None
     error_message: Optional[StrictStr] = None
+    current_page: Optional[StrictInt] = None
+    total_pages: Optional[StrictInt] = None
     matches: List[FunctionMatchingResultWithBestMatch]
-    __properties: ClassVar[List[str]] = ["progress", "status", "total_time", "error_message", "matches"]
+    __properties: ClassVar[List[str]] = ["progress", "status", "total_time", "error_message", "current_page", "total_pages", "matches"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -94,6 +96,16 @@ class FunctionMatchingBatchResponse(BaseModel):
         if self.error_message is None and "error_message" in self.model_fields_set:
             _dict['error_message'] = None
 
+        # set to None if current_page (nullable) is None
+        # and model_fields_set contains the field
+        if self.current_page is None and "current_page" in self.model_fields_set:
+            _dict['current_page'] = None
+
+        # set to None if total_pages (nullable) is None
+        # and model_fields_set contains the field
+        if self.total_pages is None and "total_pages" in self.model_fields_set:
+            _dict['total_pages'] = None
+
         return _dict
 
     @classmethod
@@ -110,6 +122,8 @@ class FunctionMatchingBatchResponse(BaseModel):
             "status": obj.get("status"),
             "total_time": obj.get("total_time"),
             "error_message": obj.get("error_message"),
+            "current_page": obj.get("current_page"),
+            "total_pages": obj.get("total_pages"),
             "matches": [FunctionMatchingResultWithBestMatch.from_dict(_item) for _item in obj["matches"]] if obj.get("matches") is not None else None
         })
         return _obj

revengai/models/{function_matching_scope_request.py → function_matching_filters.py}

@@ -17,21 +17,19 @@ import re  # noqa: F401
 import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator
-from typing import Any, ClassVar, Dict, List, Optional, Union
-from typing_extensions import Annotated
+from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
 
-class FunctionMatchingScopeRequest(BaseModel):
+class FunctionMatchingFilters(BaseModel):
     """
-    FunctionMatchingScopeRequest
+    FunctionMatchingFilters
     """ # noqa: E501
     binary_ids: Optional[List[StrictInt]] = Field(default=None, description="ID's of binaries to limit the search to, if empty, search all scoped binaries")
     collection_ids: Optional[List[StrictInt]] = Field(default=None, description="ID's of collections to limit the search to, if empty, search all scoped collections")
     function_ids: Optional[List[StrictInt]] = Field(default=None, description="ID's of functions to limit the search to, if empty, search all scoped functions")
-    min_similarity: Optional[Union[Annotated[float, Field(le=1.0, strict=True, ge=0.0)], Annotated[int, Field(le=1, strict=True, ge=0)]]] = Field(default=0.9, description="Minimum similarity expected for a match, default is 0.9")
     debug_types: Optional[List[StrictStr]] = Field(default=None, description="Limit the search to specific debug types, if empty, search all scoped debug & non-debug functions")
-    __properties: ClassVar[List[str]] = ["binary_ids", "collection_ids", "function_ids", "min_similarity", "debug_types"]
+    __properties: ClassVar[List[str]] = ["binary_ids", "collection_ids", "function_ids", "debug_types"]
 
     @field_validator('debug_types')
     def debug_types_validate_enum(cls, value):
@@ -62,7 +60,7 @@ class FunctionMatchingScopeRequest(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of FunctionMatchingScopeRequest from a JSON string"""
+        """Create an instance of FunctionMatchingFilters from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -87,7 +85,7 @@ class FunctionMatchingScopeRequest(BaseModel):
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of FunctionMatchingScopeRequest from a dict"""
+        """Create an instance of FunctionMatchingFilters from a dict"""
         if obj is None:
             return None
 
@@ -98,7 +96,6 @@ class FunctionMatchingScopeRequest(BaseModel):
             "binary_ids": obj.get("binary_ids"),
             "collection_ids": obj.get("collection_ids"),
             "function_ids": obj.get("function_ids"),
-            "min_similarity": obj.get("min_similarity") if obj.get("min_similarity") is not None else 0.9,
             "debug_types": obj.get("debug_types")
         })
         return _obj

revengai/models/function_matching_request.py

@@ -0,0 +1,108 @@
+# coding: utf-8
+
+"""
+    RevEng.AI API
+
+    RevEng.AI is Similarity Search Engine for executable binaries
+
+    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, StrictInt
+from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing_extensions import Annotated
+from revengai.models.function_matching_filters import FunctionMatchingFilters
+from typing import Optional, Set
+from typing_extensions import Self
+
+class FunctionMatchingRequest(BaseModel):
+    """
+    FunctionMatchingRequest
+    """ # noqa: E501
+    model_id: StrictInt = Field(description="ID of the model used for function matching, used to determine the embedding model")
+    function_ids: List[StrictInt] = Field(description="ID's of functions to find matches for, must be at least one function ID")
+    min_similarity: Optional[Union[Annotated[float, Field(le=100.0, strict=True, ge=0.0)], Annotated[int, Field(le=100, strict=True, ge=0)]]] = Field(default=90.0, description="Minimum similarity expected for a match as a percentage, default is 90")
+    filters: Optional[FunctionMatchingFilters] = None
+    results_per_function: Optional[Annotated[int, Field(le=10, strict=True, ge=1)]] = Field(default=1, description="Maximum number of matches to return per function, default is 1, max is 10")
+    page: Optional[Annotated[int, Field(strict=True, ge=1)]] = Field(default=1, description="Page number for paginated results, default is 1 (first page)")
+    page_size: Optional[Annotated[int, Field(le=1000, strict=True, ge=0)]] = Field(default=0, description="Number of functions to return per page, default is 0 (all functions), max is 1000")
+    __properties: ClassVar[List[str]] = ["model_id", "function_ids", "min_similarity", "filters", "results_per_function", "page", "page_size"]
+
+    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 FunctionMatchingRequest 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 filters
+        if self.filters:
+            _dict['filters'] = self.filters.to_dict()
+        # set to None if filters (nullable) is None
+        # and model_fields_set contains the field
+        if self.filters is None and "filters" in self.model_fields_set:
+            _dict['filters'] = None
+
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of FunctionMatchingRequest from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "model_id": obj.get("model_id"),
+            "function_ids": obj.get("function_ids"),
+            "min_similarity": obj.get("min_similarity") if obj.get("min_similarity") is not None else 90.0,
+            "filters": FunctionMatchingFilters.from_dict(obj["filters"]) if obj.get("filters") is not None else None,
+            "results_per_function": obj.get("results_per_function") if obj.get("results_per_function") is not None else 1,
+            "page": obj.get("page") if obj.get("page") is not None else 1,
+            "page_size": obj.get("page_size") if obj.get("page_size") is not None else 0
+        })
+        return _obj
+
+

revengai/models/function_matching_result_with_best_match.py

@@ -16,9 +16,10 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictFloat, StrictInt, StrictStr
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from pydantic import BaseModel, ConfigDict, StrictInt
+from typing import Any, ClassVar, Dict, List, Optional
 from revengai.models.matched_function import MatchedFunction
+from revengai.models.name_confidence import NameConfidence
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -27,10 +28,9 @@ class FunctionMatchingResultWithBestMatch(BaseModel):
     FunctionMatchingResultWithBestMatch
     """ # noqa: E501
     function_id: StrictInt
-    similarity: Union[StrictFloat, StrictInt]
-    matched_function: MatchedFunction
-    suggested_name: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["function_id", "similarity", "matched_function", "suggested_name"]
+    matched_functions: List[MatchedFunction]
+    confidences: Optional[List[NameConfidence]] = None
+    __properties: ClassVar[List[str]] = ["function_id", "matched_functions", "confidences"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -71,13 +71,24 @@ class FunctionMatchingResultWithBestMatch(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of matched_function
-        if self.matched_function:
-            _dict['matched_function'] = self.matched_function.to_dict()
-        # set to None if suggested_name (nullable) is None
+        # override the default output from pydantic by calling `to_dict()` of each item in matched_functions (list)
+        _items = []
+        if self.matched_functions:
+            for _item_matched_functions in self.matched_functions:
+                if _item_matched_functions:
+                    _items.append(_item_matched_functions.to_dict())
+            _dict['matched_functions'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in confidences (list)
+        _items = []
+        if self.confidences:
+            for _item_confidences in self.confidences:
+                if _item_confidences:
+                    _items.append(_item_confidences.to_dict())
+            _dict['confidences'] = _items
+        # set to None if confidences (nullable) is None
         # and model_fields_set contains the field
-        if self.suggested_name is None and "suggested_name" in self.model_fields_set:
-            _dict['suggested_name'] = None
+        if self.confidences is None and "confidences" in self.model_fields_set:
+            _dict['confidences'] = None
 
         return _dict
 
@@ -92,9 +103,8 @@ class FunctionMatchingResultWithBestMatch(BaseModel):
 
         _obj = cls.model_validate({
             "function_id": obj.get("function_id"),
-            "similarity": obj.get("similarity"),
-            "matched_function": MatchedFunction.from_dict(obj["matched_function"]) if obj.get("matched_function") is not None else None,
-            "suggested_name": obj.get("suggested_name")
+            "matched_functions": [MatchedFunction.from_dict(_item) for _item in obj["matched_functions"]] if obj.get("matched_functions") is not None else None,
+            "confidences": [NameConfidence.from_dict(_item) for _item in obj["confidences"]] if obj.get("confidences") is not None else None
         })
         return _obj
 

revengai/models/matched_function.py

@@ -35,7 +35,8 @@ class MatchedFunction(BaseModel):
     sha_256_hash: StrictStr
     analysis_id: StrictInt
     similarity: Optional[Union[StrictFloat, StrictInt]] = None
-    __properties: ClassVar[List[str]] = ["function_id", "binary_id", "function_name", "function_vaddr", "mangled_name", "debug", "binary_name", "sha_256_hash", "analysis_id", "similarity"]
+    confidence: Optional[Union[StrictFloat, StrictInt]] = None
+    __properties: ClassVar[List[str]] = ["function_id", "binary_id", "function_name", "function_vaddr", "mangled_name", "debug", "binary_name", "sha_256_hash", "analysis_id", "similarity", "confidence"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -86,6 +87,11 @@ class MatchedFunction(BaseModel):
         if self.similarity is None and "similarity" in self.model_fields_set:
             _dict['similarity'] = None
 
+        # set to None if confidence (nullable) is None
+        # and model_fields_set contains the field
+        if self.confidence is None and "confidence" in self.model_fields_set:
+            _dict['confidence'] = None
+
         return _dict
 
     @classmethod
@@ -107,7 +113,8 @@ class MatchedFunction(BaseModel):
             "binary_name": obj.get("binary_name"),
             "sha_256_hash": obj.get("sha_256_hash"),
             "analysis_id": obj.get("analysis_id"),
-            "similarity": obj.get("similarity")
+            "similarity": obj.get("similarity"),
+            "confidence": obj.get("confidence")
         })
         return _obj
 

revengai/models/{function_matching_batch_request.py → name_confidence.py}

@@ -16,19 +16,19 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictInt
-from typing import Any, ClassVar, Dict, List, Optional
-from revengai.models.function_matching_scope_request import FunctionMatchingScopeRequest
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List, Union
+from typing_extensions import Annotated
 from typing import Optional, Set
 from typing_extensions import Self
 
-class FunctionMatchingBatchRequest(BaseModel):
+class NameConfidence(BaseModel):
     """
-    FunctionMatchingBatchRequest
+    NameConfidence
     """ # noqa: E501
-    model_id: Optional[StrictInt] = None
-    scope: FunctionMatchingScopeRequest = Field(description="Scope of the function matching request, used to limit the search to specific binaries, collections, and functions")
-    __properties: ClassVar[List[str]] = ["model_id", "scope"]
+    name: StrictStr = Field(description="The suggested function name")
+    confidence: Union[Annotated[float, Field(le=100.0, strict=True, ge=0.0)], Annotated[int, Field(le=100, strict=True, ge=0)]] = Field(description="Confidence score as a percentage")
+    __properties: ClassVar[List[str]] = ["name", "confidence"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -48,7 +48,7 @@ class FunctionMatchingBatchRequest(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of FunctionMatchingBatchRequest from a JSON string"""
+        """Create an instance of NameConfidence from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -69,14 +69,11 @@ class FunctionMatchingBatchRequest(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of scope
-        if self.scope:
-            _dict['scope'] = self.scope.to_dict()
         return _dict
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of FunctionMatchingBatchRequest from a dict"""
+        """Create an instance of NameConfidence from a dict"""
         if obj is None:
             return None
 
@@ -84,8 +81,8 @@ class FunctionMatchingBatchRequest(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "model_id": obj.get("model_id"),
-            "scope": FunctionMatchingScopeRequest.from_dict(obj["scope"]) if obj.get("scope") is not None else None
+            "name": obj.get("name"),
+            "confidence": obj.get("confidence")
         })
         return _obj
 

{revengai-1.88.0.dist-info → revengai-1.89.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: revengai
-Version: 1.88.0
+Version: 1.89.4
 Summary: RevEng.AI API
 Project-URL: Repository, https://github.com/RevEngAI/revengai-python
 Keywords: RevEng.AI API
@@ -372,10 +372,10 @@ Class | Method | HTTP request | Description
  - [FunctionLocalVariableResponse](docs/FunctionLocalVariableResponse.md)
  - [FunctionMapping](docs/FunctionMapping.md)
  - [FunctionMappingFull](docs/FunctionMappingFull.md)
- - [FunctionMatchingBatchRequest](docs/FunctionMatchingBatchRequest.md)
  - [FunctionMatchingBatchResponse](docs/FunctionMatchingBatchResponse.md)
+ - [FunctionMatchingFilters](docs/FunctionMatchingFilters.md)
+ - [FunctionMatchingRequest](docs/FunctionMatchingRequest.md)
  - [FunctionMatchingResultWithBestMatch](docs/FunctionMatchingResultWithBestMatch.md)
- - [FunctionMatchingScopeRequest](docs/FunctionMatchingScopeRequest.md)
  - [FunctionNameConfidenceBody](docs/FunctionNameConfidenceBody.md)
  - [FunctionNameHistory](docs/FunctionNameHistory.md)
  - [FunctionNameInput](docs/FunctionNameInput.md)
@@ -415,6 +415,7 @@ Class | Method | HTTP request | Description
  - [MetaModel](docs/MetaModel.md)
  - [ModelName](docs/ModelName.md)
  - [ModelsResponse](docs/ModelsResponse.md)
+ - [NameConfidence](docs/NameConfidence.md)
  - [NearestNeighbor](docs/NearestNeighbor.md)
  - [NetworkOverviewDns](docs/NetworkOverviewDns.md)
  - [NetworkOverviewDnsAnswer](docs/NetworkOverviewDnsAnswer.md)

{revengai-1.88.0.dist-info → revengai-1.89.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-revengai/__init__.py,sha256=_KhODX4mC5rGW-lY85afxaagC8E-taZYD4orDETrfL0,44111
-revengai/api_client.py,sha256=JXp94hTVTMK3l1O7kmVfjyBrmfDyBCQwFLxZySvAQ0c,27670
+revengai/__init__.py,sha256=yiB74i4IOzPCNvobaVqC5hRTgnqQNEgziE6qEZbumCY,44168
+revengai/api_client.py,sha256=OHrdHHNqIxEV4Wdc9qgLIrnmdBvMRMCZCUflGq8Usk8,27670
 revengai/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
-revengai/configuration.py,sha256=Wq_tH7EvqS6l71GKCmmxrsP1WuqcNe_tpAr1sHJ3PJ0,18749
+revengai/configuration.py,sha256=qh0HPuR5K7tGPdjUhzABtaG1v414lcvwyc_RT2okYsg,18749
 revengai/exceptions.py,sha256=IvdI9ZIZ9b2lSSKtIKMQDlG-5UPAedrjm3U4xfmGkso,6385
 revengai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 revengai/rest.py,sha256=T6Q2dcazhntqm288H33BKC1hf8NVdvmQWgaymlJo158,9376
@@ -19,14 +19,14 @@ revengai/api/external_sources_api.py,sha256=JMyVAoivo6AsgeNekXnSk5BZh02APn9bzojo
 revengai/api/firmware_api.py,sha256=IPkGAJ-gxmuNcz2sUM6ip-9N2DZujqLJWwhiLvUQBOA,24150
 revengai/api/functions_ai_decompilation_api.py,sha256=ecFO-ENq9W7EoikKueY3McecKAw2fz44ZchYw6QJ29c,109824
 revengai/api/functions_block_comments_api.py,sha256=SilDkZYrrJ2_6j-Hh-ZNTUZKp1G9XE9aUwVbDzev5Co,35480
-revengai/api/functions_core_api.py,sha256=bLfWVWEv37WlYBGiwIVwVRMhflTDRIZPS2TYrA72Sl0,162885
+revengai/api/functions_core_api.py,sha256=aK3szgh3LRltaMoUt2_8fiPWUFS9GBPKotcPYoRvkbs,162988
 revengai/api/functions_data_types_api.py,sha256=Fzu4oI6kTwSE820_cGjr09N_G3uGOa4DUiyPFwOqvx4,73869
 revengai/api/functions_decompilation_api.py,sha256=nEvYHPFoonmKSAf_t4_voC3SfoDd-O9sisSfA-5hiJo,83262
 revengai/api/functions_renaming_history_api.py,sha256=L2CDadLnZrA0oNxhJfTSLLiMDz0Z4583Q8zLEj-Ze2I,47441
 revengai/api/functions_threat_score_api.py,sha256=RYbCaX71r2ssv7VxUrcezT8dSdU5K5ipHD6yR592k6I,23867
 revengai/api/models_api.py,sha256=bqukeUMctErkaX5mH8Rm3iPKEHQOCx-JT-P8_KV_iP8,11319
 revengai/api/search_api.py,sha256=Kzo7KfP4nY1-YsoCHxVOQm3Vn89kFjcnUV7oNdaw5z0,65835
-revengai/models/__init__.py,sha256=as1xTAygTAl78qz6MuhGayFHGeQNwL_kd0c4caiK4M0,23768
+revengai/models/__init__.py,sha256=fzkAbG6D0iS6dPRokOKzJLrBsMixM8QIECWGV9LVCq4,23805
 revengai/models/addr.py,sha256=-2N-UQsOiZ0eyEAQ7ssk0of8W2fBrXeYdTZXuVt3SZs,4787
 revengai/models/ai_decompilation_rating.py,sha256=gyay27QJwToUNtK9NARyw731Sg8GFRTufGGUABVYyfo,722
 revengai/models/ai_unstrip_request.py,sha256=loSXNdHATJmY5yttiUCE-lLEOkuE63qVDTz8U0eCAIc,2596
@@ -36,7 +36,7 @@ revengai/models/analysis_create_request.py,sha256=6hU94Fi47hrxXQ-wX1jRuDrDi1GQym
 revengai/models/analysis_create_response.py,sha256=aaO3-lJ65iBGe5lnyW8exHb9qByDaWfF2hOVKrWkN-I,2628
 revengai/models/analysis_detail_response.py,sha256=KPyzlSbu9TU7itVlhGusJVSszrZAkuC8dMg1welYZeM,4170
 revengai/models/analysis_function_mapping.py,sha256=_8LOSaBOgsFKLeqvoizbU2FSHtekA7aNrM7deIJyM4k,2886
-revengai/models/analysis_function_matching_request.py,sha256=75L4lftAF3V82OEF7_PrJPGFMF2zrnPnxFmbM78CvS8,2797
+revengai/models/analysis_function_matching_request.py,sha256=gKIPk3xTwcQ5uBGVvSzwga9g8s5o1u_CTpbx-5YYZFU,4327
 revengai/models/analysis_functions.py,sha256=N1TKQuw33I9dw-i07kLus36k2bcAXQVm2oc1Ycfrgdw,3067
 revengai/models/analysis_record.py,sha256=DxnERhF-s5AilH804yKtMAOyXhhjWQsq0ned1ji5t5Q,5516
 revengai/models/analysis_scope.py,sha256=azpsUux2axe4QKwQ4FbW30HbazYYVFP-e68F9zp33-4,668
@@ -57,7 +57,7 @@ revengai/models/app_api_rest_v2_similarity_schema_ann_function.py,sha256=atfQz2t
 revengai/models/app_services_binary_ann_schema_tag_item.py,sha256=m25sIz8KEsPES0XGjmOZFhmLNLmB-jsakfRUpRfiMks,2977
 revengai/models/app_services_dynamic_execution_schemas_dynamic_execution_status.py,sha256=9e3LDnw0iNCbowQPFTkNyIqkzsCQyJLZrx6tqRska6o,2562
 revengai/models/argument.py,sha256=QmWpJiohyzTVC1GLHg1IlgM5QyONnBF6FGK_mOYQL_Y,3148
-revengai/models/auto_unstrip_request.py,sha256=GCFMWRyyNhs3brpXwynAY6xVVQj2Quw2ChjAJLD1w34,3717
+revengai/models/auto_unstrip_request.py,sha256=Z_jmV5WnTIzdldBQPYBcKB-vlFxGEsxD2611HnBPDPo,3759
 revengai/models/auto_unstrip_response.py,sha256=g37ANqNsVIM_BCb-kHNDak6E-8fNVUyPOh03YFjm2O8,4737
 revengai/models/base_response.py,sha256=U1Hwv1TXztjpxHxXGwGk46egAYs49jfzEfr1nTajMjg,4526
 revengai/models/base_response_analysis_create_response.py,sha256=bwA1vMqKgLUDcElBvuvTH2jo8tvx0mjfbMOnoniswbE,4682
@@ -223,10 +223,10 @@ revengai/models/function_info_output.py,sha256=iIxkZ6_KFSoz0NhbBXyNi7knPvWcIp-hm
 revengai/models/function_local_variable_response.py,sha256=llv5alvfVXqxE3Cs6vt7qnQNyfwj4PBoxq_Sim65jic,2733
 revengai/models/function_mapping.py,sha256=X4fa-lcMfO-40eVMtSTUPRpJlxdSZNEdzPTEOR0uAlg,2924
 revengai/models/function_mapping_full.py,sha256=dax345vnk25zSPVVpAmCFrrOWXzFXW6OnhSs9zVIKpI,11948
-revengai/models/function_matching_batch_request.py,sha256=5weNPPU3rmXbZtBJZaQT8_Rh16vskWTI9xBOAw9g3pI,3041
-revengai/models/function_matching_batch_response.py,sha256=VT-WIbiOfLl2HPbRUTyKC8a5l6D1XLgNsJQfgiaW1_I,4270
-revengai/models/function_matching_result_with_best_match.py,sha256=F-XmQjBoM1imsTMoNOsI40vqOHG_XG-Xeg1Nxw-Fbjk,3466
-revengai/models/function_matching_scope_request.py,sha256=_ggfcz8fYyEkNUmqgpJRMFTVWzuhiFPBhmiTcs1cTdQ,4132
+revengai/models/function_matching_batch_response.py,sha256=oBglZULIjMvbrlzjymWNKSNERVzftWH7hHBRC3uMoP0,4952
+revengai/models/function_matching_filters.py,sha256=O5F1PIcPhbumH8z-4KbG7JNoUsx_H3wBZQU9kCZ_boI,3710
+revengai/models/function_matching_request.py,sha256=V9SvbVDHayM21ZWjXbKJa4ggDOWhQTRN7r8E-12SjaU,4690
+revengai/models/function_matching_result_with_best_match.py,sha256=87nF8Dq7b0bTmbpB_j5Upfsnv_hqAs_dZJ69zpLmQjs,4050
 revengai/models/function_name_confidence_body.py,sha256=Dz8HvTUDn5YcyCie-KMXmOdy8yF8PD-m0XzwpRyyQmg,3415
 revengai/models/function_name_history.py,sha256=INu3KWYUpQMFfWy6oWl5iSaxrlayKr-wvuiahRCzinI,3265
 revengai/models/function_name_input.py,sha256=zKzb0qAJBZKadixsWnRfkTnFHdNGtS2i13QgSeHr4c0,2538
@@ -261,11 +261,12 @@ revengai/models/list_collection_results.py,sha256=ZYGFTvOQfI234u67tURX8J0jwb6q-A
 revengai/models/login_request.py,sha256=48uYtkWFL_Q-hN64P1f15ExGJvbab9XLymBtDduQvg0,2684
 revengai/models/login_response.py,sha256=O35cqntoQ68IdYCBtHTYhPXlDqw8CIlnK-bNjf6QMO0,2461
 revengai/models/logs.py,sha256=cV_V-xN6q-yTd7eL-X89ugqz5ifWPsFPo6qYFgpS_Pw,2419
-revengai/models/matched_function.py,sha256=PaGTuFUlpR_jLL8JZGA4Raa-wGtcoeGuyyIwB4EYX5w,3802
+revengai/models/matched_function.py,sha256=UTMIoMa0xUSffexqQ5bjjSsehwFtjZ3-NDemz56Q1fM,4151
 revengai/models/matched_function_suggestion.py,sha256=eNMKuAyJ94joT5It020lSujrporie50-ii_OCOk3KhY,2900
 revengai/models/meta_model.py,sha256=GbyFJZ9kwvK1Gqg8QnJ1GHpaMs8cMht6j-MY1k0YSt0,2943
 revengai/models/model_name.py,sha256=lVKok5pWyLcN1rhq1IYccC7uQQrPdyz1oohYRUMRrmw,1271
 revengai/models/models_response.py,sha256=Ooo2HYuSI4llHg1wUMmyOsisPAXkPhR1y5BSiKh9ckg,2472
+revengai/models/name_confidence.py,sha256=aVLK7raUE9IQcTEYW7GGjWDh2ciwkLHhlTWST-ZsD7s,2738
 revengai/models/nearest_neighbor.py,sha256=iNNOEi_5Byh4lBshr77N7OWKx3hyFW47cxJNjnKwqKg,3980
 revengai/models/network_overview_dns.py,sha256=Opx12khPVljqHvNf1nJaYV1_HBixed54602xPltzq54,3072
 revengai/models/network_overview_dns_answer.py,sha256=-kL0ZdVz2xIxp5wOVsJre7Nh048UjD1mKLBbrVI5So0,2491
@@ -339,6 +340,6 @@ revengai/models/vulnerabilities.py,sha256=9t6uoZd3svWyfcZJjmj6zP731Dp47Apb25y8Qt
 revengai/models/vulnerability.py,sha256=P7rAOAYU5JLLpcRr824-YJgZba5kPb_J9ALV3tSNfLQ,3688
 revengai/models/vulnerability_type.py,sha256=SyOgfMmELYYc_H84oPkikBpjwngtG5Qw9Q_86a2TPr8,866
 revengai/models/workspace.py,sha256=chjU62GFvByEmaNd6luMNQVQLP3wlPx1zJgGJ_yyMLA,676
-revengai-1.88.0.dist-info/METADATA,sha256=IdwVmgEkns5jwaxUnI5tXms4nSXKRAFYpq0knLiL1C8,42436
-revengai-1.88.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-revengai-1.88.0.dist-info/RECORD,,
+revengai-1.89.4.dist-info/METADATA,sha256=lIfou4ap8Pn0TuJlHMdVA9wR7cJbVqgObYqexHdAWW0,42460
+revengai-1.89.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+revengai-1.89.4.dist-info/RECORD,,