diff --git a/lua/pieces/copilot/init.lua b/lua/pieces/copilot/init.lua index 6980fe8..9ce26f7 100644 --- a/lua/pieces/copilot/init.lua +++ b/lua/pieces/copilot/init.lua @@ -73,7 +73,15 @@ end local function update_status_bar() if split ~= nil and type(split.winid) == "number" and vim.api.nvim_win_is_valid(split.winid) == true then - vim.api.nvim_win_set_option(split.winid, 'statusline', 'Pieces Model: '.. vim.fn.PiecesGetModel()) + local success, model_name = pcall(vim.fn.PiecesGetModel) + if success and model_name then + local status_success, _ = pcall(vim.api.nvim_win_set_option, split.winid, 'statusline', 'Pieces Model: ' .. model_name) + if not status_success then + print("Failed to set statusline option") + end + end + else + print("Failed to get model name") end end diff --git a/plugin/pieces.lua b/plugin/pieces.lua index 55cdf7a..4aa91f1 100644 --- a/plugin/pieces.lua +++ b/plugin/pieces.lua @@ -1,6 +1,6 @@ -require("pieces.copilot") -require("pieces.assets") -require("pieces.copilot.slash_commands") -require("pieces.onboarding") -require("pieces.feedback") -require("pieces.tutor") +require("pieces.copilot") +require("pieces.assets") +require("pieces.copilot.slash_commands") +require("pieces.onboarding") +require("pieces.feedback") +require("pieces.tutor") diff --git a/rplugin/python3/pieces_python/__init__.py b/rplugin/python3/pieces_python/__init__.py index c878f1d..87d8f62 100644 --- a/rplugin/python3/pieces_python/__init__.py +++ b/rplugin/python3/pieces_python/__init__.py @@ -2,24 +2,31 @@ import pynvim import pip + def update_sdks(): - pip.main(["install","pieces_os_client","--upgrade"]) + pip.main(["install", "pieces_os_client", "--upgrade"]) + -MIN_SDKS_VERSION = "4.4.0" +MIN_SDKS_VERSION = "4.4.1" try: - from pieces_os_client import __version__ as pieces_os_client_version + from pieces_os_client import __version__ as pieces_os_client_version + + try: # If there is any issue in the version checker then it is outdated + from pieces_os_client.wrapper.version_compatibility import VersionChecker - try: # If there is any issue in the version checker then it is outdated - from pieces_os_client.wrapper.version_compatibility import VersionChecker - VersionChecker.compare("1.0.0","1.0.0") # Check also that the compare is working too - except (AttributeError, ModuleNotFoundError): - update_sdks() - raise ModuleNotFoundError + VersionChecker.compare( + "1.0.0", "1.0.0" + ) # Check also that the compare is working too + except (AttributeError, ModuleNotFoundError): + update_sdks() + raise ModuleNotFoundError - if VersionChecker.compare(pieces_os_client_version,MIN_SDKS_VERSION) < 0: # We need to be above 4.0.0 - update_sdks() - raise ModuleNotFoundError - from .main import Pieces + if ( + VersionChecker.compare(pieces_os_client_version, MIN_SDKS_VERSION) < 0 + ): # We need to be above 4.0.0 + update_sdks() + raise ModuleNotFoundError + from .main import Pieces except ModuleNotFoundError: - pip.main(["install","pieces_os_client"]) - from .main import Pieces + pip.main(["install", "pieces_os_client"]) + from .main import Pieces diff --git a/rplugin/python3/pieces_python/_version.py b/rplugin/python3/pieces_python/_version.py index 7d5303a..ead0287 100644 --- a/rplugin/python3/pieces_python/_version.py +++ b/rplugin/python3/pieces_python/_version.py @@ -1 +1 @@ -__version__ = "1.5.1" +__version__ = "1.5.2"