cmt-cli 1.1.2__tar.gz → 1.2.0__tar.gz

{cmt_cli-1.1.2 → cmt_cli-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: cmt-cli
-Version: 1.1.2
+Version: 1.2.0
 Summary: AI-powered Git commit message generator
 Project-URL: Homepage, https://github.com/bijaydas/cmt
 Project-URL: Documentation, https://github.com/bijaydas/cmt#readme
@@ -19,6 +19,7 @@ Requires-Python: >=3.12
 Requires-Dist: langchain-openai>=1.6.0
 Requires-Dist: langchain>=1.3.18
 Requires-Dist: pydantic>=2.13.4
+Requires-Dist: rich>=15.0.0
 Requires-Dist: typer>=0.27.1
 Description-Content-Type: text/markdown
 

{cmt_cli-1.1.2 → cmt_cli-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cmt-cli"
-version = "1.1.2"
+version = "1.2.0"
 description = "AI-powered Git commit message generator"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -11,6 +11,7 @@ dependencies = [
     "langchain>=1.3.18",
     "langchain-openai>=1.6.0",
     "pydantic>=2.13.4",
+    "rich>=15.0.0",
     "typer>=0.27.1",
 ]
 classifiers = [

{cmt_cli-1.1.2 → cmt_cli-1.2.0}/src/cmt/ai/openai.py

@@ -95,4 +95,6 @@ class OpenAIProvider(AIProvider):
 
     @staticmethod
     def commit_command(commit_suggestion: CommitSuggestion) -> str:
+        if not commit_suggestion.description:
+            return commit_suggestion.message
         return f"{commit_suggestion.message} \n\n{commit_suggestion.description}"

{cmt_cli-1.1.2 → cmt_cli-1.2.0}/src/cmt/ai/prompt.py

@@ -31,13 +31,22 @@ such as `chore`.
 10. Use imperative mood.
 11. Do not mention individual files unless necessary.
 12. Do not generate multiple commit messages.
-13. Do not include a commit body.
-14. Return ONLY the commit message.
-15. Do not include markdown, quotes, explanations, or additional text.
+13. Only add a description if the change is complex enough that the short description alone is
+insufficient to understand it (e.g., multiple distinct changes, non-obvious rationale, or
+breaking changes).
+14. When a description is required, format it as a bullet list, with one point per notable
+change, placed after a blank line following the short description.
+15. Keep each bullet point concise and in imperative mood.
+16. Return ONLY the commit message.
+17. Do not include markdown formatting (headers, bold, code blocks, etc.), quotes, explanations,
+or additional text, other than the hyphen-prefixed bullet list described above.
 
 ## Commit message format
 
 <type>[optional scope]: <short description>
+
+- <description bullet point 1>
+- <description bullet point 2>
 """
 
 COMMIT_DATA_PROMPT = """## Change statistics

{cmt_cli-1.1.2 → cmt_cli-1.2.0}/src/cmt/cli.py

@@ -5,7 +5,11 @@ import typer
 
 from cmt.ai.openai import OpenAIProvider
 from cmt.analysis.analyzer import Analyzer
-from cmt.core import settings, setup_logging
+from cmt.core import (
+    console,
+    settings,
+    setup_logging,
+)
 from cmt.enums.config import ConfigTask
 from cmt.exceptions import CmtError
 from cmt.git.repository import Repository
@@ -22,7 +26,8 @@ app = typer.Typer(
 
 def version_callback(value: bool) -> None:
     if value:
-        typer.echo(f"cmt-cli version: {version(settings.APP_NAME)}")
+        console.print(f"[brand]cmt-cli[/brand] [muted]version {version(settings.APP_NAME)}[/muted]")
+        console.print("Run 'cmt update' to check for updates.")
         raise typer.Exit()
 
 
@@ -34,7 +39,7 @@ def main(
     setup_logging()
     if ctx.invoked_subcommand is None:
         logger.info("No subcommand invoked, displaying help.")
-        typer.echo(ctx.get_help())
+        console.print(ctx.get_help())
         raise typer.Exit(code=0)
 
 
@@ -55,57 +60,66 @@ def suggest() -> None:
             logger.warning(
                 "No staged files found. Please stage your changes before running this command."
             )
-            typer.echo(
+            console.print_warning(
                 "No staged files found. Please stage your changes before running this command."
             )
             raise typer.Exit(code=0)
 
-        analysis_result = analyzer.analyze(staged_files)
+        with console.get_console().status(
+            "[brand]Analyzing staged changes...[/brand]", spinner="dots"
+        ):
+            analysis_result = analyzer.analyze(staged_files)
 
-        open_ai = OpenAIProvider()
+            open_ai = OpenAIProvider()
 
-        commit = open_ai.generate_commit_message(staged_files, analysis_result)
+        with console.get_console().status(
+            "[brand]Generating commit message...[/brand]", spinner="dots"
+        ):
+            commit = open_ai.generate_commit_message(staged_files, analysis_result)
 
         commit_command = OpenAIProvider.commit_command(commit)
 
-        logger.info("Suggested commit:\n\n%s", commit_command)
-        typer.echo(f"Suggested commit:\n\n{commit_command}")
+        logger.info("Suggested commit:%s", commit_command)
+        console.print_suggested_commit(commit_command)
 
         while True:
             action = (
-                typer.prompt("Use this message? [y]es / [e]dit / [n]o", default="y")
+                typer.prompt(
+                    "Would you like to use this commit message? [y]es / [e]dit / [n]o",
+                    default="y",
+                )
                 .strip()
                 .lower()[0]
             )
 
             if action == "n":
-                typer.echo("Aborted.")
+                console.print_warning("Aborted.")
                 break
 
             if action == "e":
                 commit_command = edit_with_vim(commit_command)
-                typer.echo(f"Edited commit:\n\n{commit_command}")
+                console.print_suggested_commit(commit_command)
 
             if action == "y":
                 logger.info("Committing with message:\n\n%s", commit_command)
                 result = repository.commit(commit_command)
 
                 logger.info("Commit result:\n\n%s", result.stdout)
-                typer.echo(f"Commit result:\n\n{result.stdout}")
+                console.print_success("Code committed")
                 break
 
     except CmtError as e:
-        typer.echo(f"Error: {e}", err=True)
+        console.print_error(str(e))
         raise typer.Exit(code=1) from None
     except typer.Exit:
         raise
     except KeyboardInterrupt:
         logger.info("Operation cancelled by user.")
-        typer.echo("\nOperation cancelled by user.", err=True)
+        console.print_warning("Operation cancelled by user.")
         raise typer.Exit(code=1) from None
     except Exception as e:
         logger.error("Unexpected error: %s", e)
-        typer.echo(f"Unexpected error: {e}", err=True)
+        console.print_error(f"\nUnexpected error: {e}")
         raise typer.Exit(code=1) from None
 
 
@@ -115,11 +129,14 @@ def config(task: ConfigTask) -> None:
     if task == ConfigTask.set:
         open_ai_key = typer.prompt("Enter your OpenAI API key", default=None)
         open_ai_model = typer.prompt(
-            "Enter your OpenAI model", default=settings.OPEN_AI_DEFAULT_MODEL
+            "Enter your OpenAI model",
+            default=settings.OPEN_AI_DEFAULT_MODEL,
         )
         logger.info("Configuration updated with OpenAI API key and model.")
         settings.set(AIConfig(api_key=open_ai_key, model=open_ai_model))
 
+        console.print_success("Configuration updated.")
+
     if task == ConfigTask.get:
         setting_values = settings.get()
 
@@ -129,6 +146,8 @@ def config(task: ConfigTask) -> None:
         if setting_values.model:
             typer.echo(f"OpenAI model: {setting_values.model}")
 
+        typer.echo("Run `cmt config set` to update the configuration.")
+
         logger.info("Retrieved current configuration.")
 
         raise typer.Exit(code=0)
@@ -142,8 +161,9 @@ def update() -> None:
     current_version = version(settings.APP_NAME)
     logger.info("Current %s version: %s", settings.APP_NAME, current_version)
 
-    pypi_service = PyPIService()
-    latest_info_response = pypi_service.any_update(current_version=current_version)
+    with console.get_console().status("[brand]Checking for updates...[/brand]", spinner="dots"):
+        pypi_service = PyPIService()
+        latest_info_response = pypi_service.any_update(current_version=current_version)
 
     if latest_info_response.updated_required:
         logger.info(
@@ -151,17 +171,19 @@ def update() -> None:
             latest_info_response.current_version,
             latest_info_response.latest_version,
         )
-        typer.echo(
+        console.print(
             f"A new version of {settings.APP_NAME} is available: "
-            f"{latest_info_response.latest_version}.\n\n"
-            f"upgrade {settings.APP_NAME} using your package manager.",
+            f"[brand]{latest_info_response.latest_version}[/brand].\n\n"
+            f"upgrade {settings.APP_NAME} using your package manager."
         )
     else:
         logger.info(
             "No update required. You are using the latest version: %s",
             latest_info_response.current_version,
         )
-        typer.echo(f"You are using the latest version of {settings.APP_NAME}")
+        console.print_success(
+            f"You are using the latest version {latest_info_response.current_version}"
+        )
 
     raise typer.Exit(code=0)
 

cmt_cli-1.2.0/src/cmt/core/__init__.py

@@ -0,0 +1,9 @@
+from cmt.core.console import console
+from cmt.core.logging import setup_logging
+from cmt.core.settings import settings
+
+__all__ = [
+    "console",
+    "settings",
+    "setup_logging",
+]

cmt_cli-1.2.0/src/cmt/core/console.py

@@ -0,0 +1,66 @@
+from rich.console import Console as RichConsoleBase
+from rich.panel import Panel
+from rich.theme import Theme
+
+CMT_THEME = Theme(
+    {
+        "brand": "bold magenta",
+        "muted": "dim",
+        "info": "cyan",
+        "success": "bold green",
+        "warning": "bold yellow",
+        "error": "bold red",
+        "prompt.choices": "bold cyan",
+    }
+)
+
+
+class RichConsole:
+    def __init__(self) -> None:
+        self._console = RichConsoleBase(theme=CMT_THEME, highlight=False)
+        self._error_console = RichConsoleBase(theme=CMT_THEME, highlight=False, stderr=True)
+
+    def get_console(self) -> RichConsoleBase:
+        return self._console
+
+    def get_error_console(self) -> RichConsoleBase:
+        return self._error_console
+
+    def print(self, *args, **kwargs) -> None:
+        self._console.print(*args, **kwargs)
+
+    def print_banner(self, app_name: str, version: str | None = None) -> None:
+        label = f"[brand]✦ {app_name}[/brand]"
+        if version:
+            label += f" [muted]v{version}[/muted]"
+        self._console.print(label)
+
+    def print_success(self, message: str) -> None:
+        self._console.print(f"[success]✔[/success] {message}")
+
+    def print_warning(self, message: str) -> None:
+        self._console.print(f"[warning]⚠[/warning] {message}")
+
+    def print_info(self, message: str) -> None:
+        self._console.print(f"[info]ℹ[/info] {message}")
+
+    def print_error(self, message: str) -> None:
+        self._error_console.print(f"[error]✖ {message}[/error]")
+
+    def _render_commit_panel(self, commit_message: str, title: str = "Suggested commit") -> Panel:
+        return Panel(
+            commit_message,
+            title=f"[brand]{title}[/brand]",
+            title_align="left",
+            border_style="brand",
+            padding=(1, 2),
+        )
+
+    def print_suggested_commit(self, commit_message: str, title: str = "Suggested commit") -> None:
+        self._console.print(self._render_commit_panel(commit_message, title=title))
+
+    def print_loading(self, message: str) -> None:
+        self._console.status(f"[info]{message}[/info]", spinner="dots")
+
+
+console = RichConsole()

{cmt_cli-1.1.2 → cmt_cli-1.2.0}/uv.lock

@@ -175,12 +175,13 @@ wheels = [
 
 [[package]]
 name = "cmt-cli"
-version = "1.0.3"
+version = "1.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "langchain" },
     { name = "langchain-openai" },
     { name = "pydantic" },
+    { name = "rich" },
     { name = "typer" },
 ]
 
@@ -195,6 +196,7 @@ requires-dist = [
     { name = "langchain", specifier = ">=1.3.18" },
     { name = "langchain-openai", specifier = ">=1.6.0" },
     { name = "pydantic", specifier = ">=2.13.4" },
+    { name = "rich", specifier = ">=15.0.0" },
     { name = "typer", specifier = ">=0.27.1" },
 ]
 

cmt_cli-1.1.2/src/cmt/core/__init__.py

@@ -1,4 +0,0 @@
-from cmt.core.logging import setup_logging
-from cmt.core.settings import settings
-
-__all__ = ["settings", "setup_logging"]