Merge pull request #131 from pieces-app/login-logic

add login logic

Author: bishoy-at-pieces

README.md

@@ -164,7 +164,7 @@ You can also logout from your account by going to the `Logout` option in the Aut
 
 ### `:PiecesLogin`
 
-Login to your Pieces account.
+Sign into your Pieces account.
 
 ```vim
 :PiecesLogin

lua/pieces/auth.lua

@@ -79,7 +79,7 @@ local function create_ui(content, default_hl)
 end
 
 local function login_page()
-  local choice = vim.fn.confirm("Note this command only works if you are logged in, Do you want to login?", "&Yes\n&No", 1)
+  local choice = vim.fn.confirm("Note this command only works if you are logged in, Do you want to sign in?", "&Yes\n&No", 1)
   if choice == 1 then
     vim.fn.PiecesLogin(true)
   end

lua/pieces/onboarding.lua

@@ -19,7 +19,7 @@ end
 
 local steps = {
 [=[
-**Step 1: Save a Material**
+**Step 2: Save a Material**
 
 - Let's get started by saving a material to Pieces.
 - Select the following material, then run `:PiecesCreateMaterial`
@@ -29,7 +29,7 @@ pip3 install pieces-cli
 ```
 ]=],
 [=[
-**Step 2: Manage your saved Materials**
+**Step 3: Manage your saved Materials**
 
 - Now, let's view all of your saved materials by typing **`:PiecesDrive`**.
 
@@ -43,36 +43,37 @@ pip3 install pieces-cli
       iv.  Type :q and press <Enter> to exit the material editor.
 ]=],
 [=[
-**Step 3: Activate Copilot**
+**Step 4: Activate Copilot**
 
 - Run **`:PiecesCopilot`** to Activate the Pieces Copilot to assist you with code.
   - Use /change_model in the Copilot input to change the model
   - Use /context to change the chat context
 
 ]=],
 [=[
-**Step 4: Manage Chats**
+**Step 5: Manage Chats**
 
 - Access your previous chat and interactions with the Pieces Copilot using **`:PiecesChats`**.
 ]=],
 [=[
-**Step 5: Check your account status**
+**Step 6: Check your account status**
 
 - Run **`:PiecesAccount`** to Manage your Pieces account settings directly from Neovim.
 ]=],
 [=[
-**Step 6: Sharing your Feedback**
+**Step 7: Sharing your Feedback**
 
 - Your feedback is very **important** to us. Please share some of your feedback by typing `:PiecesFeedback`.
 ]=],
 [=[
-**Step 7: Contributing**
+**Step 8: Contributing**
 
 - The Pieces for Neovim plugin is an **open source project** and you can contribute to it by creating a pull request or open an issue by typing **`:PiecesContribute`**.
 ]=]
 }
 
 local commands = {
+  "PiecesLogin",
   "'<,'>PiecesCreateMaterial",
   "PiecesDrive",
   "PiecesCopilot",

lua/pieces/utils.lua

@@ -17,7 +17,15 @@ local function notify_pieces_os()
       vim.cmd("PiecesOpenPiecesOS")
     end
 end
+
+local function notify_login()
+  local choice = vim.fn.confirm("You must login to use this feature, Do you want to open the login page?", "&Yes\n&No", 1)
+    if choice == 1 then
+      vim.cmd("PiecesLogin")
+    end
+end
 return {
   make_buffer_read_only=make_buffer_read_only,
+  notify_login=notify_login,
   notify_pieces_os=notify_pieces_os
-}
+}

rplugin/python3/pieces_python/_version.py

@@ -1 +1 @@
-__version__ = "1.4.2" 
+__version__ = "1.5.0"

rplugin/python3/pieces_python/main.py

@@ -155,13 +155,13 @@ def open_pieces(self):
         return self.nvim.async_call(self.nvim.err_write, "Could not start Pieces OS\n")
 
     @pynvim.command("PiecesClosePiecesOS")
-    @is_pieces_opened
+    @is_pieces_opened()
     def close_pieces_os(self):
         Settings.api_client.os_api.os_terminate()
         return self.nvim.out_write("Closed PiecesOS\n")
 
     @pynvim.command('PiecesOSVersion')
-    @is_pieces_opened
+    @is_pieces_opened(True)
     def get_version(self):
         self.nvim.out_write(f"{Settings.api_client.version}\n")
 
@@ -170,22 +170,22 @@ def get_plugin_version(self):
         self.nvim.out_write(f"{__version__}\n")
 
     @pynvim.command('PiecesLogin')
-    @is_pieces_opened
+    @is_pieces_opened(True)
     def login(self):
         self.auth.login()
 
     @pynvim.command('PiecesLogout')
-    @is_pieces_opened
+    @is_pieces_opened(True)
     def logout(self):
         self.auth.logout()
 
     @pynvim.command('PiecesConnectCloud')
-    @is_pieces_opened
+    @is_pieces_opened()
     def connect(self):
         self.auth.connect()
 
     @pynvim.command('PiecesDisconnectCloud')
-    @is_pieces_opened
+    @is_pieces_opened(True)
     def disconnect(self):
         self.auth.disconnect()
 
@@ -195,12 +195,12 @@ def install(self):
 
     # LUA COMMANDS
     @pynvim.command("PiecesDrive")
-    @is_pieces_opened
+    @is_pieces_opened()
     def open_snippets(self):
         self.nvim.exec_lua("require('pieces.assets').setup()")
 
     @pynvim.command("PiecesCopilot")
-    @is_pieces_opened
+    @is_pieces_opened()
     def open_copilot(self):
         if Settings.get_copilot_mode() == "BROWSER":
             return Settings.open_website(
@@ -214,17 +214,17 @@ def open_copilot(self):
             self.nvim.exec_lua("require('pieces.copilot').setup()")
 
     @pynvim.command("PiecesChats")
-    @is_pieces_opened
+    @is_pieces_opened()
     def open_conversations(self):
         self.nvim.exec_lua(
             "require('pieces.copilot.conversations_ui').setup()")
 
     @pynvim.command("PiecesAccount")
-    @is_pieces_opened
+    @is_pieces_opened(True)
     def auth_command(self):
         self.nvim.exec_lua("require('pieces.auth').setup()")
 
     @pynvim.command('PiecesCreateMaterial', range='', nargs='*')
-    @is_pieces_opened
+    @is_pieces_opened()
     def pieces_create_snippet(self, args, range):
-        self.nvim.exec_lua(f"require('pieces.assets.create').setup()")
+        self.nvim.exec_lua("require('pieces.assets.create').setup()")

rplugin/python3/pieces_python/settings.py

@@ -105,12 +105,12 @@ def get_os_id(cls):
 
     @classmethod
     def open_website(cls, url: str):
-        from .auth.auth_user import AuthUser
+        from .auth import Auth
         if (not cls.api_client.is_pos_stream_running) and ("pieces.app" not in url):
             return webbrowser.open(url)
         para = {}
-        if AuthUser.user_profile:
-            para["user"] = AuthUser.user_profile.id
+        if Auth.user_profile:
+            para["user"] = Auth.user_profile.id
         _id = cls.get_os_id()
         if _id:
             para["os"] = _id
@@ -121,5 +121,4 @@ def open_website(cls, url: str):
 
         url_parts[4] = urlencode(query)
         new_url = urlunparse(url_parts)
-        print(new_url)
         webbrowser.open(new_url)

rplugin/python3/pieces_python/utils.py

@@ -4,8 +4,8 @@
 from .settings import Settings
 import os
 
-PIECES_OS_MIN_VERSION = "11.0.0"  # Minium version (11.0.0)
-PIECES_OS_MAX_VERSION = "12.0.0"  # Maxium version (12.0.0)
+PIECES_OS_MIN_VERSION = "12.0.0"  # Minimum version (12.0.0)
+PIECES_OS_MAX_VERSION = "13.0.0"  # Maximum version (13.0.0)
 
 
 def convert_to_lua_table(python_dict):
@@ -84,22 +84,38 @@ def check_compatibility(notify_if_pos_off=False):
     else:
         return True
 
+def check_login() -> bool:
+    from .auth import Auth
 
-def is_pieces_opened(func):
-    def wrapper(*args, **kwargs):
-        if not check_compatibility(True):
-            return
+    if not Auth.user_profile:
+        Settings.nvim.exec_lua("require('pieces.utils').notify_login()")
+        return False
+    return True
 
-        if Settings.api_client.is_pos_stream_running:
-            return func(*args, **kwargs)
-        else:
-            # Run the health request to check if the server is running
-            if Settings.api_client.is_pieces_running():
-                HealthWS.get_instance().start()
+def is_pieces_opened(bypass_login=False):
+    """
+    Decorator that checks if POS is running and shows a notification if it's not.
+    It also checks if the user is logged in or allows bypass via parameter.
+    """
+    def decorator(func):
+        def wrapper(*args, **kwargs):
+            if not check_compatibility(True):
+                return
+
+            login_state = check_login() or bypass_login
+            if Settings.api_client.is_pos_stream_running and login_state:
                 return func(*args, **kwargs)
             else:
-                return Settings.nvim.exec_lua("require('pieces.utils').notify_pieces_os()")
-    return wrapper
+                # Run the health request to check if the server is running
+                if Settings.api_client.is_pieces_running():
+                    if not login_state:
+                        return
+                    HealthWS.get_instance().start()
+                    return func(*args, **kwargs)
+                else:
+                    return Settings.nvim.exec_lua("require('pieces.utils').notify_pieces_os()")
+        return wrapper
+    return decorator
 
 
 def install_pieces_os():