tgit 0.11.2__tar.gz → 0.12.0__tar.gz

{tgit-0.11.2 → tgit-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tgit
-Version: 0.11.2
+Version: 0.12.0
 Summary: Tool for Git Interaction Temptation (tgit): An elegant CLI tool that simplifies and streamlines your Git workflow, making version control a breeze.
 Author-email: Jannchie <jannchie@gmail.com>
 License-Expression: MIT

{tgit-0.11.2 → tgit-0.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tgit"
-version = "0.11.2"
+version = "0.12.0"
 description = "Tool for Git Interaction Temptation (tgit): An elegant CLI tool that simplifies and streamlines your Git workflow, making version control a breeze."
 authors = [{ name = "Jannchie", email = "jannchie@gmail.com" }]
 dependencies = [

{tgit-0.11.2 → tgit-0.12.0}/tgit/commit.py

@@ -7,11 +7,15 @@ from pathlib import Path
 import git
 from jinja2 import Environment, FileSystemLoader
 from pydantic import BaseModel
-from rich import print  # noqa: A004
+from rich import (
+    get_console,
+    print,  # noqa: A004
+)
 
 from tgit.settings import settings
 from tgit.utils import get_commit_command, run_command, type_emojis
 
+console = get_console()
 with importlib.resources.path("tgit", "prompts") as prompt_path:
     env = Environment(loader=FileSystemLoader(prompt_path), autoescape=True)
 
@@ -56,7 +60,7 @@ class CommitData(BaseModel):
     is_breaking: bool
 
 
-def get_ai_command() -> str | None:
+def get_ai_command(specified_type: str | None = None) -> str | None:
     current_dir = Path.cwd()
     try:
         repo = git.Repo(current_dir, search_parent_directories=True)
@@ -64,32 +68,45 @@ def get_ai_command() -> str | None:
         print("[yellow]Not a git repository[/yellow]")
         return None
     diff = repo.git.diff("--cached")
+
+    current_branch = repo.active_branch.name
+
     if not diff:
         print("[yellow]No changes to commit, please add some changes before using AI[/yellow]")
         return None
     try:
         from litellm import completion
 
-        chat_completion = completion(
-            messages=[
-                {
-                    "role": "system",
-                    "content": commit_prompt_template.render(types=commit_types),
-                },
-                {"role": "user", "content": diff},
-            ],
-            model=settings.get("model", "openai/gpt-4o"),
-            api_key=settings.get("apiKey", None),
-            base_url=settings.get("apiUrl", None),
-            max_tokens=200,
-            response_format=CommitData,
-        )
+        # 准备模板渲染参数，如果用户指定了类型，则传递给模板
+        template_params = {"types": commit_types, "branch": current_branch}
+
+        if specified_type:
+            template_params["specified_type"] = specified_type
+        with console.status("[bold green]Generating commit message...[/bold green]"):
+            chat_completion = completion(
+                messages=[
+                    {
+                        "role": "system",
+                        "content": commit_prompt_template.render(**template_params),
+                    },
+                    {"role": "user", "content": diff},
+                ],
+                model=settings.get("model", "openai/gpt-4o"),
+                api_key=settings.get("apiKey", None),
+                base_url=settings.get("apiUrl", None),
+                max_tokens=200,
+                response_format=CommitData,
+            )
     except Exception:
         print("[red]Could not connect to AI provider[/red]")
         return None
     resp = CommitData.model_validate_json(chat_completion.choices[0].message.content)
+
+    # 如果用户指定了类型，则使用用户指定的类型
+    commit_type = specified_type or resp.type
+
     return get_commit_command(
-        resp.type,
+        commit_type,
         resp.scope,
         resp.msg,
         use_emoji=settings.get("commit", {}).get("emoji", False),
@@ -101,15 +118,26 @@ def handle_commit(args: CommitArgs) -> None:
     prefix = ["", "!"]
     choices = ["".join(data) for data in itertools.product(commit_types, prefix)] + ["ci", "test", "version"]
 
-    if args.ai:
+    if args.ai or len(args.message) == 0:
+        # 如果明确指定使用 AI
         command = get_ai_command()
         if not command:
             return
+    elif len(args.message) == 1:
+        # 如果只提供了一个参数（只有类型）
+        commit_type = args.message[0]
+        if commit_type not in choices:
+            print(f"Invalid type: {commit_type}")
+            print(f"Valid types: {choices}")
+            return
+
+        # 使用 AI 生成提交信息，但保留用户指定的类型
+        command = get_ai_command(specified_type=commit_type)
+        if not command:
+            return
     else:
+        # 正常的提交流程
         messages = args.message
-        if len(messages) == 0:
-            print("Please provide a commit message, or use --ai to generate by AI")
-            return
         commit_type = messages[0]
         if len(messages) > 2:  # noqa: PLR2004
             commit_scope = messages[1]
@@ -126,4 +154,5 @@ def handle_commit(args: CommitArgs) -> None:
             use_emoji = settings.get("commit", {}).get("emoji", False)
         is_breaking = args.breaking
         command = get_commit_command(commit_type, commit_scope, commit_msg, use_emoji=use_emoji, is_breaking=is_breaking)
+
     run_command(command)

{tgit-0.11.2 → tgit-0.12.0}/tgit/prompts/commit.txt

@@ -1,8 +1,11 @@
 You are a git bot. You should read the diff and suggest a commit message.
 
 Type:
-
+{% if specified_type is defined %}
+The user has specified the commit type as "{{ specified_type }}". You MUST honor this choice and generate a commit message that is appropriate for a "{{ specified_type }}" type of change.
+{% else %}
 The type should be one of {{ types | join(', ') }}.
+{% endif %}
 
 Scope:
 
@@ -25,6 +28,12 @@ Additional Considerations:
 Search the name and instruction online for the copyright content check.
 Make sure to search the name and instruction online for the copyright content check.
 
+The Current Branch is {{ branch }}. You should referrence the branch name.
+
+{% if specified_type is defined %}
+IMPORTANT: The user has explicitly chosen "{{ specified_type }}" as the commit type. Your response MUST use this type. Do not change it.
+{% endif %}
+
 The Json format you return should be parsed to the following class:
 
 ```