Minor restructure for pynvim 0.4.3 backwards compatibility

lua/CopilotChat/health.lua

@@ -53,7 +53,7 @@ function M.check()
     return
   end
 
-  file:write('import pynvim; print(pynvim.__version__)')
+  file:write('import pynvim; v = pynvim.VERSION; print("{0}.{1}.{2}".format(v.major, v.minor, v.patch))')
   file:close()
 
   -- Run the temporary Python script and capture the output
@@ -67,7 +67,7 @@ function M.check()
   -- Delete the temporary Python script
   os.remove(temp_file)
 
-  if pynvim_version ~= '0.5.0' then
+  if vim.version.lt(pynvim_version, "0.4.3") then
     warn('pynvim version ' .. pynvim_version .. ' is not supported')
   else
     ok('pynvim version ' .. pynvim_version .. ' is supported')

rplugin/python3/CopilotChat/__init__.py

@@ -0,0 +1 @@
+from .copilot_plugin import CopilotPlugin as CopilotPlugin

rplugin/python3/copilot.py → rplugin/python3/CopilotChat/copilot.py

@@ -5,10 +5,10 @@
 from typing import Dict, List
 
 import dotenv
-import prompts
+import CopilotChat.prompts as prompts
 import requests
-import typings
-import utilities
+import CopilotChat.typings as typings
+import CopilotChat.utilities as utilities
 from prompt_toolkit import PromptSession
 from prompt_toolkit.history import InMemoryHistory
 

rplugin/python3/copilot-plugin.py → rplugin/python3/CopilotChat/copilot_plugin.py

@@ -1,7 +1,7 @@
 import pynvim
-from handlers.inplace_chat_handler import InPlaceChatHandler
-from handlers.vsplit_chat_handler import VSplitChatHandler
-from mypynvim.core.nvim import MyNvim
+from CopilotChat.handlers.inplace_chat_handler import InPlaceChatHandler
+from CopilotChat.handlers.vsplit_chat_handler import VSplitChatHandler
+from CopilotChat.mypynvim.core.nvim import MyNvim
 
 PLUGIN_MAPPING_CMD = "CopilotChatMapping"
 PLUGIN_AUTOCMD_CMD = "CopilotChatAutocmd"

rplugin/python3/handlers/chat_handler.py → rplugin/python3/CopilotChat/handlers/chat_handler.py

@@ -3,10 +3,10 @@
 from typing import Optional, cast
 import os
 
-import prompts as system_prompts
-from copilot import Copilot
-from mypynvim.core.buffer import MyBuffer
-from mypynvim.core.nvim import MyNvim
+import CopilotChat.prompts as system_prompts
+from CopilotChat.copilot import Copilot
+from CopilotChat.mypynvim.core.buffer import MyBuffer
+from CopilotChat.mypynvim.core.nvim import MyNvim
 
 
 def is_module_installed(name):

rplugin/python3/handlers/inplace_chat_handler.py → rplugin/python3/CopilotChat/handlers/inplace_chat_handler.py

@@ -1,9 +1,9 @@
-import prompts as system_prompts
-from handlers.chat_handler import ChatHandler
-from mypynvim.core.buffer import MyBuffer
-from mypynvim.core.nvim import MyNvim
-from mypynvim.ui_components.layout import Box, Layout
-from mypynvim.ui_components.popup import PopUp
+import CopilotChat.prompts as system_prompts
+from CopilotChat.handlers.chat_handler import ChatHandler
+from CopilotChat.mypynvim.core.buffer import MyBuffer
+from CopilotChat.mypynvim.core.nvim import MyNvim
+from CopilotChat.mypynvim.ui_components.layout import Box, Layout
+from CopilotChat.mypynvim.ui_components.popup import PopUp
 
 # Define constants for the models
 MODEL_GPT4 = "gpt-4"

rplugin/python3/handlers/vsplit_chat_handler.py → rplugin/python3/CopilotChat/handlers/vsplit_chat_handler.py

@@ -1,6 +1,6 @@
-from handlers.chat_handler import ChatHandler
-from mypynvim.core.buffer import MyBuffer
-from mypynvim.core.nvim import MyNvim
+from CopilotChat.handlers.chat_handler import ChatHandler
+from CopilotChat.mypynvim.core.buffer import MyBuffer
+from CopilotChat.mypynvim.core.nvim import MyNvim
 
 
 class VSplitChatHandler(ChatHandler):

rplugin/python3/mypynvim/core/autocmdmapper.py → rplugin/python3/CopilotChat/mypynvim/core/autocmdmapper.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING, Callable, Union
 
 if TYPE_CHECKING:
-    from .nvim import MyNvim
+    from CopilotChat.mypynvim.core.nvim import MyNvim
 
 
 class AutocmdMapper:

rplugin/python3/mypynvim/core/buffer.py → rplugin/python3/CopilotChat/mypynvim/core/buffer.py

@@ -5,7 +5,7 @@
 from pynvim.api import Buffer
 
 if TYPE_CHECKING:
-    from .nvim import MyNvim
+    from Copilotchat.mypynvim.core.nvim import MyNvim
 
 
 class MyBuffer(Buffer):

rplugin/python3/mypynvim/core/keymapper.py → rplugin/python3/CopilotChat/mypynvim/core/keymapper.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING, Callable, Union
 
 if TYPE_CHECKING:
-    from .nvim import MyNvim
+    from CopilotChat.mypynvim.core.nvim import MyNvim
 
 
 class Keymapper:

rplugin/python3/mypynvim/core/nvim.py → rplugin/python3/CopilotChat/mypynvim/core/nvim.py

@@ -3,10 +3,10 @@
 from pynvim import Nvim
 from pynvim.api.nvim import Current
 
-from .autocmdmapper import AutocmdMapper
-from .buffer import MyBuffer
-from .keymapper import Keymapper
-from .window import MyWindow
+from CopilotChat.mypynvim.core.autocmdmapper import AutocmdMapper
+from CopilotChat.mypynvim.core.buffer import MyBuffer
+from CopilotChat.mypynvim.core.keymapper import Keymapper
+from CopilotChat.mypynvim.core.window import MyWindow
 
 
 class MyNvim(Nvim):

rplugin/python3/mypynvim/core/window.py → rplugin/python3/CopilotChat/mypynvim/core/window.py

@@ -4,10 +4,10 @@
 
 from pynvim.api import Window
 
-from .buffer import MyBuffer
+from CopilotChat.mypynvim.core.buffer import MyBuffer
 
 if TYPE_CHECKING:
-    from .nvim import MyNvim
+    from CopilotChat.mypynvim.core.nvim import MyNvim
 
 
 class MyWindow(Window):

rplugin/python3/mypynvim/ui_components/calculator.py → rplugin/python3/CopilotChat/mypynvim/ui_components/calculator.py

@@ -3,10 +3,10 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Literal, Union
 
-from mypynvim.core.nvim import MyNvim
+from CopilotChat.mypynvim.core.nvim import MyNvim
 
 if TYPE_CHECKING:
-    from .popup import PopUpConfiguration
+    from CopilotChat.mypynvim.ui_components.popup import PopUpConfiguration
 
 
 @dataclass

rplugin/python3/mypynvim/ui_components/layout.py → rplugin/python3/CopilotChat/mypynvim/ui_components/layout.py

@@ -1,11 +1,11 @@
 from dataclasses import dataclass
 from typing import Callable, Literal, Optional, Union, cast
 
-from mypynvim.core.nvim import MyNvim
+from CopilotChat.mypynvim.core.nvim import MyNvim
 
-from .calculator import Calculator
-from .popup import PopUp
-from .types import PopUpConfiguration, Relative
+from CopilotChat.mypynvim.ui_components.calculator import Calculator
+from CopilotChat.mypynvim.ui_components.popup import PopUp
+from CopilotChat.mypynvim.ui_components.types import PopUpConfiguration, Relative
 
 
 class Box:

rplugin/python3/mypynvim/ui_components/popup.py → rplugin/python3/CopilotChat/mypynvim/ui_components/popup.py

@@ -5,16 +5,16 @@
 from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Union
 
 if TYPE_CHECKING:
-    from mypynvim.core.nvim import MyNvim
+    from CopilotChat.mypynvim.core.nvim import MyNvim
 
-    from .layout import Layout
+    from CopilotChat.mypynvim.ui_components.layout import Layout
 
 
-from mypynvim.core.buffer import MyBuffer
-from mypynvim.core.window import MyWindow
+from CopilotChat.mypynvim.core.buffer import MyBuffer
+from CopilotChat.mypynvim.core.window import MyWindow
 
-from .calculator import Calculator
-from .types import PaddingKeys, PopUpConfiguration, Relative
+from CopilotChat.mypynvim.ui_components.calculator import Calculator
+from CopilotChat.mypynvim.ui_components.types import PaddingKeys, PopUpConfiguration, Relative
 
 
 @dataclass

rplugin/python3/utilities.py → rplugin/python3/CopilotChat/utilities.py

@@ -2,8 +2,8 @@
 import os
 import random
 
-import prompts
-import typings
+import CopilotChat.prompts as prompts
+import CopilotChat.typings as typings
 
 
 def random_hex(length: int = 65):