cli-comet 1.2.2__tar.gz → 1.2.3__tar.gz

{cli_comet-1.2.2/cli_comet.egg-info → cli_comet-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-comet
-Version: 1.2.2
+Version: 1.2.3
 Summary: A terminal UI that automatically generates git commit messages using local language models via Ollama.
 Home-page: https://github.com/razoring/CometCLI
 Author: razoring

{cli_comet-1.2.2 → cli_comet-1.2.3/cli_comet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-comet
-Version: 1.2.2
+Version: 1.2.3
 Summary: A terminal UI that automatically generates git commit messages using local language models via Ollama.
 Home-page: https://github.com/razoring/CometCLI
 Author: razoring

{cli_comet-1.2.2 → cli_comet-1.2.3}/comet/cli.py

@@ -7,6 +7,7 @@ import os
 import json
 import urllib.request
 import urllib.error
+import importlib.metadata
 
 def get_settings_path():
     return os.path.join(os.path.dirname(__file__), "settings.json")
@@ -70,11 +71,6 @@ class CustomTextArea(TextArea):
         Binding("escape", "exit_action", "Terminate", priority=True)
     ]
 
-    def on_key(self, event: events.Key) -> None:
-        if event.key == "enter":
-            self.app.action_commit_action()
-            event.prevent_default()
-
     def action_cursor_down(self, select: bool = False) -> None:
         if self.cursor_location[0] == self.document.line_count - 1:
             loc = self.cursor_location
@@ -127,7 +123,18 @@ class CometTUI(App):
         height: auto;
         padding: 1;
         background: $surface;
-        border: $primary;
+        border: solid $panel;
+        border-title-color: $text-muted;
+    }
+
+    #input_row:focus-within {
+        border: solid $primary;
+        border-title-color: $primary;
+    }
+
+    #input_row.committed {
+        border: solid $panel;
+        border-title-color: $text-muted;
     }
 
     #input {
@@ -178,7 +185,7 @@ class CometTUI(App):
     #shortcuts {
         width: 100%;
         text-align: center;
-        color: white;
+        color: $text-muted;
         margin-top: 1;
     }
 
@@ -194,7 +201,8 @@ class CometTUI(App):
         Binding("ctrl+r", "regenerate_action", "Regenerate", priority=True),
         Binding("escape", "exit_action", "Quit", priority=True),
         Binding("ctrl+z", "undo_commit", "Undo Commit", priority=True),
-        Binding("tab", "swap_model", "Swap Model", priority=True)
+        Binding("tab", "swap_model", "Swap Model", priority=True),
+        Binding("enter", "commit_action", "Continue", priority=True)
     ]
 
     def __init__(self, commit: str, model: str, diff: str, commits: str, allModels: list[str], provider: str = "ollama", client = None):
@@ -215,14 +223,16 @@ class CometTUI(App):
                 yield CustomTextArea(self.commit, id="input", show_line_numbers=False)
                 yield Button(" ₊✦  Regenerate  ", id="regenBtn")
             with Horizontal(id="action_row"):
-                yield Button(" ✔   Commit ", id="commitBtn")
                 undo = Button(" ↺   Undo ", id="undoBtn")
+                yield Button(" ✔   Commit ", id="commitBtn")
                 undo.display = False
                 yield undo
                 yield Button(" 🗙   Quit ", id="cancelBtn")
-            yield Label("[white][b]ctrl+r[/b][/white] [gray]regenerate[/gray]    [white][b]enter[/b][/white] [gray]continue[/gray]    [white][b]tab[/b][/white] [gray]swap model[/gray]    [white][b]ctrl+z[/b][/white] [gray]undo[/gray]    [white][b]↓/↑[/b][/white] [gray]move lines[/gray]    [white][b]esc[/b][/white] [gray]quit[/gray]", id="shortcuts")
+            yield Label("[$text][b]ctrl+r[/b][/] regenerate    [$text][b]enter[/b][/] continue    [$text][b]tab[/b][/] swap model    [$text][b]ctrl+z[/b][/] undo    [$text][b]↓/↑[/b][/] move lines    [$text][b]esc[/b][/] quit", id="shortcuts")
 
     def action_swap_model(self) -> None:
+        if self.query_one("#input_row").has_class("committed"):
+            return
         if not self.allModels: return
         try:
             currentIndex = self.allModels.index(self.model)
@@ -253,12 +263,65 @@ class CometTUI(App):
             commitBtn.label = " ✔   Commit "
             self.query_one("#undoBtn").display = False
             self.query_one("#cancelBtn").display = True
+            
+            textArea = self.query_one("#input", TextArea)
+            textArea.disabled = False
+            input_row = self.query_one("#input_row")
+            input_row.remove_class("committed")
+            self.query_one("#regenBtn").disabled = False
 
     def on_mount(self) -> None:
+        if self.provider == "auto" or self.model == "Loading...":
+            self.notify("Welcome! This is the longest it'll take to load. :D", title="Scanning Providers", severity="information", timeout=3.0)
         self.query_one("#input_row").border_title = f"{self.model}"
         self.query_one("#regenBtn").disabled = True
         self.query_one("#commitBtn").disabled = True
+        
+        try:
+            from textual.color import Color
+            v = self.get_css_variables()
+            
+            def resolve_color(val, default_hex):
+                if val.startswith("auto") or not val: return default_hex
+                return val
+                
+            # Default to dark mode colors (#1e1e1e surface, #ffffff text) if unresolved
+            surface_str = resolve_color(v.get("surface", "#1E1E1E"), "#1E1E1E")
+            text_str = resolve_color(v.get("text", "#ffffff"), "#ffffff")
+            
+            surface = Color.parse(surface_str)
+            text = Color.parse(text_str)
+            blended = surface.blend(text, 0.6)
+            
+            css = f"""
+            #input_row {{ border: solid {blended.hex}; }}
+            #input_row.committed {{ border: solid {blended.hex}; }}
+            #input_row:focus-within {{ border: solid $primary; border-title-color: $primary; }}
+            """
+            self.stylesheet.add_source(css)
+            self.stylesheet.update(self)
+        except Exception:
+            pass
+
         self.initialize_llm()
+        self.check_for_updates()
+
+    @work(thread=True)
+    def check_for_updates(self) -> None:
+        try:
+            current_version = importlib.metadata.version("cli-comet")
+            req = urllib.request.Request("https://pypi.org/pypi/cli-comet/json")
+            with urllib.request.urlopen(req, timeout=2.0) as response:
+                data = json.loads(response.read().decode())
+                latest_version = data["info"]["version"]
+                
+                curr_tuple = tuple(map(int, current_version.split(".")))
+                latest_tuple = tuple(map(int, latest_version.split(".")))
+                
+                if latest_tuple > curr_tuple:
+                    self.call_from_thread(self.notify, f"Update available: v{latest_version}! Run `pipx upgrade cli-comet` to install.", title="Update Available", severity="warning", timeout=15.0)
+        except Exception:
+            pass
 
     @work(thread=True)
     def initialize_llm(self) -> None:
@@ -321,6 +384,11 @@ class CometTUI(App):
             self.query_one("#undoBtn").display = True
             self.query_one("#cancelBtn").display = False
             
+            textArea.disabled = True
+            input_row = self.query_one("#input_row")
+            input_row.add_class("committed")
+            self.query_one("#regenBtn").disabled = True
+            
         elif event.button.id == "cancelBtn":
             self.exit(f"{colorama.Fore.RED}User cancelled the operation. {colorama.Style.RESET_ALL}")
 

{cli_comet-1.2.2 → cli_comet-1.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cli-comet"
-version = "1.2.2"
+version = "1.2.3"
 description = "A terminal UI that automatically generates git commit messages using local language models via Ollama."
 readme = "README.md"
 requires-python = ">=3.10"

{cli_comet-1.2.2 → cli_comet-1.2.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = cli-comet
-version = 1.2.2
+version = 1.2.3
 description = A terminal UI that automatically generates git commit messages using local language models via Ollama.
 long_description = file: README.md
 long_description_content_type = text/markdown