tgit 0.11.2__tar.gz → 0.13.0__tar.gz

tgit-0.13.0/.github/workflows/build.yml

@@ -0,0 +1,35 @@
+name: Build Python package with uv
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          python-version: "3.12"
+          activate-environment: true
+      - name: Install dependencies
+        run: |
+          uv sync
+
+      - name: Build package (wheel and sdist)
+        run: |
+          python -m build
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-packages
+          path: dist/

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tgit
-Version: 0.11.2
+Version: 0.13.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
@@ -18,7 +18,6 @@ Requires-Dist: gitpython>=3.1.43
 Requires-Dist: gitpython>=3.1.44
 Requires-Dist: inquirer>=3.4.0
 Requires-Dist: jinja2>=3.1.4
-Requires-Dist: litellm>=1.59.9
 Requires-Dist: openai>=1.52.0
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=13.9.4

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

@@ -1,65 +1,65 @@
-[project]
-name = "tgit"
-version = "0.11.2"
-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 = [
-    "rich>=13.9.4",
-    "pyyaml>=6.0.2",
-    "inquirer>=3.4.0",
-    "gitpython>=3.1.43",
-    "openai>=1.52.0",
-    "jinja2>=3.1.4",
-    "litellm>=1.59.9",
-    "gitpython>=3.1.44",
-    "inquirer>=3.4.0",
-    "beautifulsoup4>=4.13.3",
-]
-readme = { content-type = "text/markdown", file = "README.md" }
-requires-python = ">= 3.11"
-classifiers = [
-    "Development Status :: 3 - Alpha",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python :: 3",
-    "Topic :: Software Development :: Version Control",
-    "Topic :: Utilities",
-    "Typing :: Typed",
-]
-keywords = ["git", "tool", "changelog", "version", "commit"]
-license = "MIT"
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.uv]
-upgrade = true
-
-[tool.hatch.metadata]
-allow-direct-references = true
-
-[tool.hatch.build.targets.wheel]
-packages = ["tgit"]
-
-[project.scripts]
-tgit = "tgit:cli.main"
-
-[tool.ruff]
-line-length = 140
-select = ["ALL"]
-
-ignore = [
-    "PGH",
-    "RUF003",
-    "BLE001",
-    "ERA001",
-    "FIX002",
-    "TD002",
-    "TD003",
-    "D",
-    "TRY300",
-]
-
-[dependency-groups]
-dev = ["ruff>=0.9.4"]
+[project]
+name = "tgit"
+version = "0.13.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 = [
+    "rich>=13.9.4",
+    "pyyaml>=6.0.2",
+    "inquirer>=3.4.0",
+    "gitpython>=3.1.43",
+    "openai>=1.52.0",
+    "jinja2>=3.1.4",
+    "gitpython>=3.1.44",
+    "inquirer>=3.4.0",
+    "beautifulsoup4>=4.13.3",
+]
+readme = { content-type = "text/markdown", file = "README.md" }
+requires-python = ">= 3.11"
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+    "Topic :: Software Development :: Version Control",
+    "Topic :: Utilities",
+    "Typing :: Typed",
+]
+keywords = ["git", "tool", "changelog", "version", "commit"]
+license = "MIT"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.uv]
+upgrade = true
+package = true
+
+[tool.hatch.metadata]
+allow-direct-references = true
+
+[tool.hatch.build.targets.wheel]
+packages = ["tgit"]
+
+[project.scripts]
+tgit = "tgit:cli.main"
+
+[tool.ruff]
+line-length = 140
+select = ["ALL"]
+
+ignore = [
+    "PGH",
+    "RUF003",
+    "BLE001",
+    "ERA001",
+    "FIX002",
+    "TD002",
+    "TD003",
+    "D",
+    "TRY300",
+]
+
+[dependency-groups]
+dev = ["ruff>=0.9.4"]

{tgit-0.11.2 → tgit-0.13.0}/tgit/changelog.py

@@ -7,6 +7,7 @@ from dataclasses import dataclass
 from pathlib import Path
 
 import git
+from rich.progress import Progress
 
 logger = logging.getLogger("tgit")
 
@@ -232,26 +233,52 @@ def generate_changelog(commits_by_type: dict[str, list[TGITCommit]], from_ref: s
 def handle_changelog(args: ChangelogArgs) -> None:
     repo = git.Repo(args.path)
 
-    if args.output:
-        with Path(args.output).open("w") as output_file:
-            # 获取所有 tags
-            tags = repo.tags
-            # 获取第一个 commit
-            first_commit = get_first_commit_hash(repo)
-            points = [first_commit] + [tag.name for tag in tags]
-            points.reverse()
-            changelogs = ""
-            for i in range(len(points) - 1):
-                to_ref = points[i]
-                from_ref = points[i + 1]
-                changelog = get_changelog_by_range(repo, from_ref, to_ref)
-                changelogs += changelog
-            output_file.write(changelogs.strip("\n") + "\n")
     from_raw = args.from_raw
     to_raw = args.to_raw
 
+    # 如果未指定 from/to，聚合所有 tag 版本的 changelog，优化性能
+    if from_raw is None and to_raw is None:
+        tags = sorted(repo.tags, key=lambda t: t.commit.committed_datetime)
+        first_commit = get_first_commit_hash(repo)
+        points = [first_commit] + [tag.commit.hexsha for tag in tags] + [repo.head.commit.hexsha]
+        point_names = [first_commit] + [tag.name for tag in tags] + ["HEAD"]
+        changelogs = ""
+        with Progress() as progress:
+            task = progress.add_task("Generating changelog...", total=len(points) - 1)
+            # 反向遍历区间，实现反向输出
+            for i in reversed(range(len(points) - 1)):
+                from_hash = points[i]
+                to_hash = points[i + 1]
+                from_name = point_names[i]
+                to_name = point_names[i + 1]
+                raw_commits = list(repo.iter_commits(f"{from_hash}...{to_hash}"))
+                tgit_commits = []
+                for commit in raw_commits:
+                    if m := commit_pattern.match(commit.message):
+                        message_dict = m.groupdict()
+                        tgit_commits.append(TGITCommit(repo, commit, message_dict))
+                commits_by_type = group_commits_by_type(tgit_commits)
+                try:
+                    origin_url = repo.remote().url
+                    remote_uri = get_remote_uri(origin_url)
+                except ValueError:
+                    remote_uri = None
+                changelog = generate_changelog(commits_by_type, from_name, to_name, remote_uri)
+                changelogs += changelog
+                progress.update(task, advance=1)
+        if args.output:
+            with Path(args.output).open("w") as output_file:
+                output_file.write(changelogs.strip("\n") + "\n")
+        print()  # noqa: T201
+        print(changelogs.strip("\n"))  # noqa: T201
+        return
+
+    # 否则输出指定范围的 changelog
     from_ref, to_ref = get_git_commits_range(repo, from_raw, to_raw)
     changelog = get_changelog_by_range(repo, from_ref, to_ref)
+    if args.output:
+        with Path(args.output).open("w") as output_file:
+            output_file.write(changelog.strip("\n") + "\n")
     print()  # noqa: T201
     print(changelog)  # noqa: T201
 

{tgit-0.11.2 → tgit-0.13.0}/tgit/cli.py

@@ -1,5 +1,6 @@
 import argparse
 import importlib.metadata
+import threading
 
 import rich
 import rich.traceback
@@ -30,6 +31,12 @@ def main() -> None:
     define_config_parser(subparsers)
 
     args = parser.parse_args()
+
+    def import_openai() -> None:
+        import openai  # noqa: F401
+
+    threading.Thread(target=import_openai).start()
+
     handle(parser, args)
 
 

{tgit-0.11.2 → tgit-0.13.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)
 
@@ -19,6 +23,9 @@ commit_types = ["feat", "fix", "chore", "docs", "style", "refactor", "perf", "wi
 commit_file = "commit.txt"
 commit_prompt_template = env.get_template("commit.txt")
 
+MAX_DIFF_LINES = 1000
+NUMSTAT_PARTS = 3
+
 
 def define_commit_parser(subparsers: argparse._SubParsersAction) -> None:
     commit_type = ["feat", "fix", "chore", "docs", "style", "refactor", "perf"]
@@ -56,40 +63,85 @@ class CommitData(BaseModel):
     is_breaking: bool
 
 
-def get_ai_command() -> str | None:
+def get_filtered_diff_files(repo: git.Repo) -> tuple[list[str], list[str]]:
+    diff_numstat = repo.git.diff("--cached", "--numstat")
+    files_to_include = []
+    lock_files = []
+    for line in diff_numstat.splitlines():
+        parts = line.split("\t")
+        if len(parts) >= NUMSTAT_PARTS:
+            added, deleted, filename = parts[0], parts[1], parts[2]
+            if filename.endswith(".lock"):
+                lock_files.append(filename)
+                continue
+            try:
+                added = int(added) if added != "-" else 0
+                deleted = int(deleted) if deleted != "-" else 0
+            except ValueError:
+                continue
+            if added + deleted <= MAX_DIFF_LINES:
+                files_to_include.append(filename)
+    return files_to_include, lock_files
+
+
+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)
     except git.InvalidGitRepositoryError:
         print("[yellow]Not a git repository[/yellow]")
         return None
-    diff = repo.git.diff("--cached")
+    files_to_include, lock_files = get_filtered_diff_files(repo)
+    if not files_to_include and not lock_files:
+        print(f"[yellow]No files with diff lines <= {MAX_DIFF_LINES} to commit[/yellow]")
+        return None
+    diff = ""
+    if lock_files:
+        diff += f"[INFO] The following lock files were modified but are not included in the diff: {', '.join(lock_files)}\n"
+    if files_to_include:
+        diff += repo.git.diff("--cached", "--", *files_to_include)
+    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,
-        )
-    except Exception:
+        import openai
+
+        client = openai.Client()
+        if settings.get("apiUrl", None):
+            client.api_base = settings.get("apiUrl", None)
+        if settings.get("apiKey", None):
+            client.api_key = settings.get("apiKey", None)
+        # 准备模板渲染参数，如果用户指定了类型，则传递给模板
+        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 = client.responses.parse(
+                input=[
+                    {
+                        "role": "system",
+                        "content": commit_prompt_template.render(**template_params),
+                    },
+                    {"role": "user", "content": diff},
+                ],
+                model=settings.get("model", "gpt-4.1"),
+                max_output_tokens=50,
+                text_format=CommitData,
+            )
+    except Exception as e:
         print("[red]Could not connect to AI provider[/red]")
+        print(e)
         return None
-    resp = CommitData.model_validate_json(chat_completion.choices[0].message.content)
+    resp = chat_completion.output_parsed
+
+    # 如果用户指定了类型，则使用用户指定的类型
+    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 +153,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 +189,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.13.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:
 
 ```