From 1290a38237b6d3916b7ddc8c71632e6ae6be4bad Mon Sep 17 00:00:00 2001 From: Zion Leonahenahe Basque Date: Sat, 20 Jan 2024 15:03:04 -0700 Subject: [PATCH] Update libbs api use (#28) --- dailalib/__init__.py | 6 +++--- dailalib/api/ai_api.py | 6 ++---- setup.cfg | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dailalib/__init__.py b/dailalib/__init__.py index 36a9612..c6a4fd6 100644 --- a/dailalib/__init__.py +++ b/dailalib/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2.2.6" +__version__ = "2.2.7" from .api import AIAPI, OpenAIAPI from libbs.api import DecompilerInterface @@ -39,8 +39,8 @@ def create_plugin(*args, **kwargs): plugin_name="DAILA", init_plugin=True, gui_ctx_menu_actions=gui_ctx_menu_actions, - ui_init_args=args, - ui_init_kwargs=kwargs + gui_init_args=args, + gui_init_kwargs=kwargs ) openai_api.init_decompiler_interface(decompiler_interface=deci) diff --git a/dailalib/api/ai_api.py b/dailalib/api/ai_api.py index 643d5b3..24609c0 100644 --- a/dailalib/api/ai_api.py +++ b/dailalib/api/ai_api.py @@ -18,7 +18,7 @@ def __init__( model=None, ): # useful for initing after the creation of a decompiler interface - self._dec_interface: Optional[DecompilerInterface] = None + self._dec_interface: DecompilerInterface = None self._dec_name = None self._delay_init = delay_init if not self._delay_init: @@ -93,9 +93,7 @@ def _requires_function(*args, ai_api: "AIAPI" = None, **kwargs): # we must have a UI if we have no func if function is None: - function = ai_api._dec_interface.art_lifter.lower( - ai_api._dec_interface.functions[ai_api._dec_interface.active_context().addr] - ) + function = ai_api._dec_interface.functions[ai_api._dec_interface.gui_active_context().addr] # get new text with the function that is present if dec_text is None: diff --git a/setup.cfg b/setup.cfg index 6bfc626..9cc8931 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,9 +15,9 @@ long_description_content_type = text/markdown [options] install_requires = openai>=1.0.0 - libbs + libbs>=0.19.0 tiktoken - varbert + varbert>=2.0.10 python_requires = >= 3.6 include_package_data = True