revengai 1.96.1__py3-none-any.whl → 2.0.0__py3-none-any.whl

revengai/__init__.py

@@ -13,7 +13,7 @@
 """  # noqa: E501
 
 
-__version__ = "v1.96.1"
+__version__ = "v2.0.0"
 
 # Define package exports
 __all__ = [
@@ -45,6 +45,7 @@ __all__ = [
     "ApiKeyError",
     "ApiAttributeError",
     "ApiException",
+    "ANNFunction",
     "Addr",
     "AiDecompilationRating",
     "AiUnstripRequest",
@@ -63,14 +64,12 @@ __all__ = [
     "AnalysisUpdateRequest",
     "AnalysisUpdateTagsRequest",
     "AnalysisUpdateTagsResponse",
-    "AppApiRestV1AnnSchemaANNFunction",
     "AppApiRestV2AnalysesEnumsDynamicExecutionStatus",
     "AppApiRestV2AnalysesEnumsOrderBy",
     "AppApiRestV2AnalysesResponsesTagItem",
     "AppApiRestV2CollectionsEnumsOrderBy",
     "AppApiRestV2FunctionsResponsesFunction",
     "AppApiRestV2FunctionsTypesFunction",
-    "AppApiRestV2SimilaritySchemaANNFunction",
     "AppServicesBinaryAnnSchemaTagItem",
     "AppServicesDynamicExecutionSchemasDynamicExecutionStatus",
     "Argument",
@@ -216,7 +215,6 @@ __all__ = [
     "FileHashes",
     "FileMetadata",
     "Filters",
-    "FunctionBatchAnn",
     "FunctionBlockDestinationResponse",
     "FunctionBlockResponse",
     "FunctionBlocksResponse",
@@ -307,8 +305,6 @@ __all__ = [
     "SBOMPackage",
     "SandboxOptions",
     "ScrapeThirdPartyConfig",
-    "SearchBinaryIds",
-    "SearchFunctionIds",
     "SectionModel",
     "SecurityChecksResponse",
     "SecurityChecksResult",
@@ -387,6 +383,7 @@ from revengai.exceptions import ApiAttributeError as ApiAttributeError
 from revengai.exceptions import ApiException as ApiException
 
 # import models into sdk package
+from revengai.models.ann_function import ANNFunction as ANNFunction
 from revengai.models.addr import Addr as Addr
 from revengai.models.ai_decompilation_rating import AiDecompilationRating as AiDecompilationRating
 from revengai.models.ai_unstrip_request import AiUnstripRequest as AiUnstripRequest
@@ -405,14 +402,12 @@ from revengai.models.analysis_tags import AnalysisTags as AnalysisTags
 from revengai.models.analysis_update_request import AnalysisUpdateRequest as AnalysisUpdateRequest
 from revengai.models.analysis_update_tags_request import AnalysisUpdateTagsRequest as AnalysisUpdateTagsRequest
 from revengai.models.analysis_update_tags_response import AnalysisUpdateTagsResponse as AnalysisUpdateTagsResponse
-from revengai.models.app_api_rest_v1_ann_schema_ann_function import AppApiRestV1AnnSchemaANNFunction as AppApiRestV1AnnSchemaANNFunction
 from revengai.models.app_api_rest_v2_analyses_enums_dynamic_execution_status import AppApiRestV2AnalysesEnumsDynamicExecutionStatus as AppApiRestV2AnalysesEnumsDynamicExecutionStatus
 from revengai.models.app_api_rest_v2_analyses_enums_order_by import AppApiRestV2AnalysesEnumsOrderBy as AppApiRestV2AnalysesEnumsOrderBy
 from revengai.models.app_api_rest_v2_analyses_responses_tag_item import AppApiRestV2AnalysesResponsesTagItem as AppApiRestV2AnalysesResponsesTagItem
 from revengai.models.app_api_rest_v2_collections_enums_order_by import AppApiRestV2CollectionsEnumsOrderBy as AppApiRestV2CollectionsEnumsOrderBy
 from revengai.models.app_api_rest_v2_functions_responses_function import AppApiRestV2FunctionsResponsesFunction as AppApiRestV2FunctionsResponsesFunction
 from revengai.models.app_api_rest_v2_functions_types_function import AppApiRestV2FunctionsTypesFunction as AppApiRestV2FunctionsTypesFunction
-from revengai.models.app_api_rest_v2_similarity_schema_ann_function import AppApiRestV2SimilaritySchemaANNFunction as AppApiRestV2SimilaritySchemaANNFunction
 from revengai.models.app_services_binary_ann_schema_tag_item import AppServicesBinaryAnnSchemaTagItem as AppServicesBinaryAnnSchemaTagItem
 from revengai.models.app_services_dynamic_execution_schemas_dynamic_execution_status import AppServicesDynamicExecutionSchemasDynamicExecutionStatus as AppServicesDynamicExecutionSchemasDynamicExecutionStatus
 from revengai.models.argument import Argument as Argument
@@ -558,7 +553,6 @@ from revengai.models.file_format import FileFormat as FileFormat
 from revengai.models.file_hashes import FileHashes as FileHashes
 from revengai.models.file_metadata import FileMetadata as FileMetadata
 from revengai.models.filters import Filters as Filters
-from revengai.models.function_batch_ann import FunctionBatchAnn as FunctionBatchAnn
 from revengai.models.function_block_destination_response import FunctionBlockDestinationResponse as FunctionBlockDestinationResponse
 from revengai.models.function_block_response import FunctionBlockResponse as FunctionBlockResponse
 from revengai.models.function_blocks_response import FunctionBlocksResponse as FunctionBlocksResponse
@@ -649,8 +643,6 @@ from revengai.models.sbom import SBOM as SBOM
 from revengai.models.sbom_package import SBOMPackage as SBOMPackage
 from revengai.models.sandbox_options import SandboxOptions as SandboxOptions
 from revengai.models.scrape_third_party_config import ScrapeThirdPartyConfig as ScrapeThirdPartyConfig
-from revengai.models.search_binary_ids import SearchBinaryIds as SearchBinaryIds
-from revengai.models.search_function_ids import SearchFunctionIds as SearchFunctionIds
 from revengai.models.section_model import SectionModel as SectionModel
 from revengai.models.security_checks_response import SecurityChecksResponse as SecurityChecksResponse
 from revengai.models.security_checks_result import SecurityChecksResult as SecurityChecksResult

revengai/api/analyses_core_api.py

@@ -18,12 +18,11 @@ from typing_extensions import Annotated
 from pydantic import Field, StrictBool, StrictBytes, StrictInt, StrictStr
 from typing import Any, List, Optional, Tuple, Union
 from typing_extensions import Annotated
+from revengai.models.ann_function import ANNFunction
 from revengai.models.analysis_create_request import AnalysisCreateRequest
 from revengai.models.analysis_update_request import AnalysisUpdateRequest
 from revengai.models.analysis_update_tags_request import AnalysisUpdateTagsRequest
-from revengai.models.app_api_rest_v1_ann_schema_ann_function import AppApiRestV1AnnSchemaANNFunction
 from revengai.models.app_api_rest_v2_analyses_enums_order_by import AppApiRestV2AnalysesEnumsOrderBy
-from revengai.models.app_api_rest_v2_similarity_schema_ann_function import AppApiRestV2SimilaritySchemaANNFunction
 from revengai.models.base_response_analysis_create_response import BaseResponseAnalysisCreateResponse
 from revengai.models.base_response_analysis_detail_response import BaseResponseAnalysisDetailResponse
 from revengai.models.base_response_analysis_function_mapping import BaseResponseAnalysisFunctionMapping
@@ -40,7 +39,6 @@ from revengai.models.base_response_status import BaseResponseStatus
 from revengai.models.base_response_upload_response import BaseResponseUploadResponse
 from revengai.models.binary_ann_form import BinaryAnnForm
 from revengai.models.dynamic_execution_status_input import DynamicExecutionStatusInput
-from revengai.models.function_batch_ann import FunctionBatchAnn
 from revengai.models.model_name import ModelName
 from revengai.models.order import Order
 from revengai.models.re_analysis_form import ReAnalysisForm
@@ -66,283 +64,6 @@ class AnalysesCoreApi:
         self.api_client = api_client
 
 
-    @validate_call
-    def batch_symbol_ann(
-        self,
-        app_api_rest_v1_ann_schema_ann_function: AppApiRestV1AnnSchemaANNFunction,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[
-                Annotated[StrictFloat, Field(gt=0)],
-                Annotated[StrictFloat, Field(gt=0)]
-            ]
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> FunctionBatchAnn:
-        """Batch Symbol ANN using function IDs
-
-        Takes in an input of functions ID's and settings and finds the nearest functions for each function that's within the database
-
-        :param app_api_rest_v1_ann_schema_ann_function: (required)
-        :type app_api_rest_v1_ann_schema_ann_function: AppApiRestV1AnnSchemaANNFunction
-        :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
-                                 (connection, read) timeouts.
-        :type _request_timeout: int, tuple(int, int), optional
-        :param _request_auth: set to override the auth_settings for an a single
-                              request; this effectively ignores the
-                              authentication in the spec for a single request.
-        :type _request_auth: dict, optional
-        :param _content_type: force content-type for the request.
-        :type _content_type: str, Optional
-        :param _headers: set to override the headers for a single
-                         request; this effectively ignores the headers
-                         in the spec for a single request.
-        :type _headers: dict, optional
-        :param _host_index: set to override the host_index for a single
-                            request; this effectively ignores the host_index
-                            in the spec for a single request.
-        :type _host_index: int, optional
-        :return: Returns the result object.
-        """ # noqa: E501
-
-        _param = self._batch_symbol_ann_serialize(
-            app_api_rest_v1_ann_schema_ann_function=app_api_rest_v1_ann_schema_ann_function,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index
-        )
-
-        _response_types_map: Dict[str, Optional[str]] = {
-            '200': "FunctionBatchAnn",
-            '422': "BaseResponse",
-        }
-        response_data = self.api_client.call_api(
-            *_param,
-            _request_timeout=_request_timeout
-        )
-        response_data.read()
-        return self.api_client.response_deserialize(
-            response_data=response_data,
-            response_types_map=_response_types_map,
-        ).data
-
-
-    @validate_call
-    def batch_symbol_ann_with_http_info(
-        self,
-        app_api_rest_v1_ann_schema_ann_function: AppApiRestV1AnnSchemaANNFunction,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[
-                Annotated[StrictFloat, Field(gt=0)],
-                Annotated[StrictFloat, Field(gt=0)]
-            ]
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[FunctionBatchAnn]:
-        """Batch Symbol ANN using function IDs
-
-        Takes in an input of functions ID's and settings and finds the nearest functions for each function that's within the database
-
-        :param app_api_rest_v1_ann_schema_ann_function: (required)
-        :type app_api_rest_v1_ann_schema_ann_function: AppApiRestV1AnnSchemaANNFunction
-        :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
-                                 (connection, read) timeouts.
-        :type _request_timeout: int, tuple(int, int), optional
-        :param _request_auth: set to override the auth_settings for an a single
-                              request; this effectively ignores the
-                              authentication in the spec for a single request.
-        :type _request_auth: dict, optional
-        :param _content_type: force content-type for the request.
-        :type _content_type: str, Optional
-        :param _headers: set to override the headers for a single
-                         request; this effectively ignores the headers
-                         in the spec for a single request.
-        :type _headers: dict, optional
-        :param _host_index: set to override the host_index for a single
-                            request; this effectively ignores the host_index
-                            in the spec for a single request.
-        :type _host_index: int, optional
-        :return: Returns the result object.
-        """ # noqa: E501
-
-        _param = self._batch_symbol_ann_serialize(
-            app_api_rest_v1_ann_schema_ann_function=app_api_rest_v1_ann_schema_ann_function,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index
-        )
-
-        _response_types_map: Dict[str, Optional[str]] = {
-            '200': "FunctionBatchAnn",
-            '422': "BaseResponse",
-        }
-        response_data = self.api_client.call_api(
-            *_param,
-            _request_timeout=_request_timeout
-        )
-        response_data.read()
-        return self.api_client.response_deserialize(
-            response_data=response_data,
-            response_types_map=_response_types_map,
-        )
-
-
-    @validate_call
-    def batch_symbol_ann_without_preload_content(
-        self,
-        app_api_rest_v1_ann_schema_ann_function: AppApiRestV1AnnSchemaANNFunction,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[
-                Annotated[StrictFloat, Field(gt=0)],
-                Annotated[StrictFloat, Field(gt=0)]
-            ]
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> RESTResponseType:
-        """Batch Symbol ANN using function IDs
-
-        Takes in an input of functions ID's and settings and finds the nearest functions for each function that's within the database
-
-        :param app_api_rest_v1_ann_schema_ann_function: (required)
-        :type app_api_rest_v1_ann_schema_ann_function: AppApiRestV1AnnSchemaANNFunction
-        :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
-                                 (connection, read) timeouts.
-        :type _request_timeout: int, tuple(int, int), optional
-        :param _request_auth: set to override the auth_settings for an a single
-                              request; this effectively ignores the
-                              authentication in the spec for a single request.
-        :type _request_auth: dict, optional
-        :param _content_type: force content-type for the request.
-        :type _content_type: str, Optional
-        :param _headers: set to override the headers for a single
-                         request; this effectively ignores the headers
-                         in the spec for a single request.
-        :type _headers: dict, optional
-        :param _host_index: set to override the host_index for a single
-                            request; this effectively ignores the host_index
-                            in the spec for a single request.
-        :type _host_index: int, optional
-        :return: Returns the result object.
-        """ # noqa: E501
-
-        _param = self._batch_symbol_ann_serialize(
-            app_api_rest_v1_ann_schema_ann_function=app_api_rest_v1_ann_schema_ann_function,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index
-        )
-
-        _response_types_map: Dict[str, Optional[str]] = {
-            '200': "FunctionBatchAnn",
-            '422': "BaseResponse",
-        }
-        response_data = self.api_client.call_api(
-            *_param,
-            _request_timeout=_request_timeout
-        )
-        return response_data.response
-
-
-    def _batch_symbol_ann_serialize(
-        self,
-        app_api_rest_v1_ann_schema_ann_function,
-        _request_auth,
-        _content_type,
-        _headers,
-        _host_index,
-    ) -> RequestSerialized:
-
-        _host = None
-
-        _collection_formats: Dict[str, str] = {
-        }
-
-        _path_params: Dict[str, str] = {}
-        _query_params: List[Tuple[str, str]] = []
-        _header_params: Dict[str, Optional[str]] = _headers or {}
-        _form_params: List[Tuple[str, str]] = []
-        _files: Dict[
-            str, Union[str, bytes, List[str], List[bytes], List[Tuple[str, bytes]]]
-        ] = {}
-        _body_params: Optional[bytes] = None
-
-        # process the path parameters
-        # process the query parameters
-        # process the header parameters
-        # process the form parameters
-        # process the body parameter
-        if app_api_rest_v1_ann_schema_ann_function is not None:
-            _body_params = app_api_rest_v1_ann_schema_ann_function
-
-
-        # set the HTTP header `Accept`
-        if 'Accept' not in _header_params:
-            _header_params['Accept'] = self.api_client.select_header_accept(
-                [
-                    'application/json'
-                ]
-            )
-
-        # set the HTTP header `Content-Type`
-        if _content_type:
-            _header_params['Content-Type'] = _content_type
-        else:
-            _default_content_type = (
-                self.api_client.select_header_content_type(
-                    [
-                        'application/json'
-                    ]
-                )
-            )
-            if _default_content_type is not None:
-                _header_params['Content-Type'] = _default_content_type
-
-        # authentication setting
-        _auth_settings: List[str] = [
-            'APIKey'
-        ]
-
-        return self.api_client.param_serialize(
-            method='POST',
-            resource_path='/v1/ann/symbol/batch',
-            path_params=_path_params,
-            query_params=_query_params,
-            header_params=_header_params,
-            body=_body_params,
-            post_params=_form_params,
-            files=_files,
-            auth_settings=_auth_settings,
-            collection_formats=_collection_formats,
-            _host=_host,
-            _request_auth=_request_auth
-        )
-
-
-
-
     @validate_call
     def create_analysis(
         self,
@@ -900,7 +621,7 @@ class AnalysesCoreApi:
     def find_similar_functions_batch(
         self,
         analysis_id: StrictInt,
-        app_api_rest_v2_similarity_schema_ann_function: AppApiRestV2SimilaritySchemaANNFunction,
+        ann_function: ANNFunction,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -920,8 +641,8 @@ class AnalysesCoreApi:
 
         :param analysis_id: (required)
         :type analysis_id: int
-        :param app_api_rest_v2_similarity_schema_ann_function: (required)
-        :type app_api_rest_v2_similarity_schema_ann_function: AppApiRestV2SimilaritySchemaANNFunction
+        :param ann_function: (required)
+        :type ann_function: ANNFunction
         :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
@@ -946,7 +667,7 @@ class AnalysesCoreApi:
 
         _param = self._find_similar_functions_batch_serialize(
             analysis_id=analysis_id,
-            app_api_rest_v2_similarity_schema_ann_function=app_api_rest_v2_similarity_schema_ann_function,
+            ann_function=ann_function,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -972,7 +693,7 @@ class AnalysesCoreApi:
     def find_similar_functions_batch_with_http_info(
         self,
         analysis_id: StrictInt,
-        app_api_rest_v2_similarity_schema_ann_function: AppApiRestV2SimilaritySchemaANNFunction,
+        ann_function: ANNFunction,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -992,8 +713,8 @@ class AnalysesCoreApi:
 
         :param analysis_id: (required)
         :type analysis_id: int
-        :param app_api_rest_v2_similarity_schema_ann_function: (required)
-        :type app_api_rest_v2_similarity_schema_ann_function: AppApiRestV2SimilaritySchemaANNFunction
+        :param ann_function: (required)
+        :type ann_function: ANNFunction
         :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
@@ -1018,7 +739,7 @@ class AnalysesCoreApi:
 
         _param = self._find_similar_functions_batch_serialize(
             analysis_id=analysis_id,
-            app_api_rest_v2_similarity_schema_ann_function=app_api_rest_v2_similarity_schema_ann_function,
+            ann_function=ann_function,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -1044,7 +765,7 @@ class AnalysesCoreApi:
     def find_similar_functions_batch_without_preload_content(
         self,
         analysis_id: StrictInt,
-        app_api_rest_v2_similarity_schema_ann_function: AppApiRestV2SimilaritySchemaANNFunction,
+        ann_function: ANNFunction,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -1064,8 +785,8 @@ class AnalysesCoreApi:
 
         :param analysis_id: (required)
         :type analysis_id: int
-        :param app_api_rest_v2_similarity_schema_ann_function: (required)
-        :type app_api_rest_v2_similarity_schema_ann_function: AppApiRestV2SimilaritySchemaANNFunction
+        :param ann_function: (required)
+        :type ann_function: ANNFunction
         :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
@@ -1090,7 +811,7 @@ class AnalysesCoreApi:
 
         _param = self._find_similar_functions_batch_serialize(
             analysis_id=analysis_id,
-            app_api_rest_v2_similarity_schema_ann_function=app_api_rest_v2_similarity_schema_ann_function,
+            ann_function=ann_function,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -1111,7 +832,7 @@ class AnalysesCoreApi:
     def _find_similar_functions_batch_serialize(
         self,
         analysis_id,
-        app_api_rest_v2_similarity_schema_ann_function,
+        ann_function,
         _request_auth,
         _content_type,
         _headers,
@@ -1139,8 +860,8 @@ class AnalysesCoreApi:
         # process the header parameters
         # process the form parameters
         # process the body parameter
-        if app_api_rest_v2_similarity_schema_ann_function is not None:
-            _body_params = app_api_rest_v2_similarity_schema_ann_function
+        if ann_function is not None:
+            _body_params = ann_function
 
 
         # 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.96.1/python'
+        self.user_agent = 'OpenAPI-Generator/v2.0.0/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.96.1\n"\
-               "SDK Package Version: v1.96.1".\
+               "Version of the API: v2.0.0\n"\
+               "SDK Package Version: v2.0.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self) -> List[HostSetting]:

revengai/models/__init__.py

@@ -12,6 +12,7 @@
 """  # noqa: E501
 
 # import models into model package
+from revengai.models.ann_function import ANNFunction
 from revengai.models.addr import Addr
 from revengai.models.ai_decompilation_rating import AiDecompilationRating
 from revengai.models.ai_unstrip_request import AiUnstripRequest
@@ -30,14 +31,12 @@ from revengai.models.analysis_tags import AnalysisTags
 from revengai.models.analysis_update_request import AnalysisUpdateRequest
 from revengai.models.analysis_update_tags_request import AnalysisUpdateTagsRequest
 from revengai.models.analysis_update_tags_response import AnalysisUpdateTagsResponse
-from revengai.models.app_api_rest_v1_ann_schema_ann_function import AppApiRestV1AnnSchemaANNFunction
 from revengai.models.app_api_rest_v2_analyses_enums_dynamic_execution_status import AppApiRestV2AnalysesEnumsDynamicExecutionStatus
 from revengai.models.app_api_rest_v2_analyses_enums_order_by import AppApiRestV2AnalysesEnumsOrderBy
 from revengai.models.app_api_rest_v2_analyses_responses_tag_item import AppApiRestV2AnalysesResponsesTagItem
 from revengai.models.app_api_rest_v2_collections_enums_order_by import AppApiRestV2CollectionsEnumsOrderBy
 from revengai.models.app_api_rest_v2_functions_responses_function import AppApiRestV2FunctionsResponsesFunction
 from revengai.models.app_api_rest_v2_functions_types_function import AppApiRestV2FunctionsTypesFunction
-from revengai.models.app_api_rest_v2_similarity_schema_ann_function import AppApiRestV2SimilaritySchemaANNFunction
 from revengai.models.app_services_binary_ann_schema_tag_item import AppServicesBinaryAnnSchemaTagItem
 from revengai.models.app_services_dynamic_execution_schemas_dynamic_execution_status import AppServicesDynamicExecutionSchemasDynamicExecutionStatus
 from revengai.models.argument import Argument
@@ -183,7 +182,6 @@ from revengai.models.file_format import FileFormat
 from revengai.models.file_hashes import FileHashes
 from revengai.models.file_metadata import FileMetadata
 from revengai.models.filters import Filters
-from revengai.models.function_batch_ann import FunctionBatchAnn
 from revengai.models.function_block_destination_response import FunctionBlockDestinationResponse
 from revengai.models.function_block_response import FunctionBlockResponse
 from revengai.models.function_blocks_response import FunctionBlocksResponse
@@ -274,8 +272,6 @@ from revengai.models.sbom import SBOM
 from revengai.models.sbom_package import SBOMPackage
 from revengai.models.sandbox_options import SandboxOptions
 from revengai.models.scrape_third_party_config import ScrapeThirdPartyConfig
-from revengai.models.search_binary_ids import SearchBinaryIds
-from revengai.models.search_function_ids import SearchFunctionIds
 from revengai.models.section_model import SectionModel
 from revengai.models.security_checks_response import SecurityChecksResponse
 from revengai.models.security_checks_result import SecurityChecksResult

revengai/models/{app_api_rest_v2_similarity_schema_ann_function.py → ann_function.py}

@@ -19,21 +19,19 @@ import json
 from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing_extensions import Annotated
-from revengai.models.search_binary_ids import SearchBinaryIds
-from revengai.models.search_function_ids import SearchFunctionIds
 from typing import Optional, Set
 from typing_extensions import Self
 
-class AppApiRestV2SimilaritySchemaANNFunction(BaseModel):
+class ANNFunction(BaseModel):
     """
-    AppApiRestV2SimilaritySchemaANNFunction
+    ANNFunction
     """ # noqa: E501
     limit: Optional[StrictInt] = Field(default=5, description="The amount of neighbours per function ID")
     distance: Optional[Union[StrictFloat, StrictInt]] = Field(default=0.1, description="The distance between two neighbours")
     analysis_search_ids: Optional[List[Optional[StrictInt]]] = Field(default=None, description="Perform a search on functions within a list of analyses")
     collection_search_ids: Optional[Annotated[List[Optional[StrictInt]], Field(max_length=5)]] = Field(default=None, description="Search only within these collections")
-    search_binary_ids: Optional[SearchBinaryIds] = None
-    search_function_ids: Optional[SearchFunctionIds] = None
+    search_binary_ids: Optional[List[StrictInt]] = None
+    search_function_ids: Optional[List[StrictInt]] = None
     debug_only: Optional[StrictBool] = Field(default=False, description="Searches for only functions which are debug")
     additional_properties: Dict[str, Any] = {}
     __properties: ClassVar[List[str]] = ["limit", "distance", "analysis_search_ids", "collection_search_ids", "search_binary_ids", "search_function_ids", "debug_only"]
@@ -56,7 +54,7 @@ class AppApiRestV2SimilaritySchemaANNFunction(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of AppApiRestV2SimilaritySchemaANNFunction from a JSON string"""
+        """Create an instance of ANNFunction from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -79,22 +77,26 @@ class AppApiRestV2SimilaritySchemaANNFunction(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of search_binary_ids
-        if self.search_binary_ids:
-            _dict['search_binary_ids'] = self.search_binary_ids.to_dict()
-        # override the default output from pydantic by calling `to_dict()` of search_function_ids
-        if self.search_function_ids:
-            _dict['search_function_ids'] = self.search_function_ids.to_dict()
         # puts key-value pairs in additional_properties in the top level
         if self.additional_properties is not None:
             for _key, _value in self.additional_properties.items():
                 _dict[_key] = _value
 
+        # set to None if search_binary_ids (nullable) is None
+        # and model_fields_set contains the field
+        if self.search_binary_ids is None and "search_binary_ids" in self.model_fields_set:
+            _dict['search_binary_ids'] = None
+
+        # set to None if search_function_ids (nullable) is None
+        # and model_fields_set contains the field
+        if self.search_function_ids is None and "search_function_ids" in self.model_fields_set:
+            _dict['search_function_ids'] = None
+
         return _dict
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of AppApiRestV2SimilaritySchemaANNFunction from a dict"""
+        """Create an instance of ANNFunction from a dict"""
         if obj is None:
             return None
 
@@ -106,8 +108,8 @@ class AppApiRestV2SimilaritySchemaANNFunction(BaseModel):
             "distance": obj.get("distance") if obj.get("distance") is not None else 0.1,
             "analysis_search_ids": obj.get("analysis_search_ids"),
             "collection_search_ids": obj.get("collection_search_ids"),
-            "search_binary_ids": SearchBinaryIds.from_dict(obj["search_binary_ids"]) if obj.get("search_binary_ids") is not None else None,
-            "search_function_ids": SearchFunctionIds.from_dict(obj["search_function_ids"]) if obj.get("search_function_ids") is not None else None,
+            "search_binary_ids": obj.get("search_binary_ids"),
+            "search_function_ids": obj.get("search_function_ids"),
             "debug_only": obj.get("debug_only") if obj.get("debug_only") is not None else False
         })
         # store additional fields in additional_properties

revengai/models/app_api_rest_v2_functions_responses_function.py

@@ -16,7 +16,7 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, StrictInt
+from pydantic import BaseModel, ConfigDict, Field, StrictInt
 from typing import Any, ClassVar, Dict, List
 from typing import Optional, Set
 from typing_extensions import Self
@@ -26,7 +26,7 @@ class AppApiRestV2FunctionsResponsesFunction(BaseModel):
     Function schema used in function strings response.
     """ # noqa: E501
     function_id: StrictInt
-    function_vaddr: StrictInt
+    function_vaddr: StrictInt = Field(description="Function virtual address")
     __properties: ClassVar[List[str]] = ["function_id", "function_vaddr"]
 
     model_config = ConfigDict(