Merge branch 'fix/linter-path-errors'

Author: andyvandaric

avcmt/ai.py

@@ -15,6 +15,7 @@
 # File: avcmt/ai.py
 import os
 from importlib import import_module
+from pathlib import Path
 
 from jinja2 import Environment, FileSystemLoader
 
@@ -53,7 +54,7 @@ def generate_with_ai(
 
 
 def render_prompt(group_name, diff_text):
-    template_dir = os.path.join(os.path.dirname(__file__), "prompt_templates")
+    template_dir = Path(__file__).parent / "prompt_templates"
     env = Environment(loader=FileSystemLoader(template_dir))
     template = env.get_template("commit_message.j2")
     return template.render(group_name=group_name, diff_text=diff_text)

avcmt/cli.py

@@ -20,17 +20,17 @@
 # Status: Ready to use with the new CommitManager.
 
 import argparse
-import os
+from pathlib import Path
 
 from dotenv import load_dotenv
 
 from .commit import run_commit_group_all
 from .utils import get_log_file, setup_logging
 
-PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
-dotenv_path = os.path.join(PROJECT_ROOT, ".env")
+PROJECT_ROOT = Path(__file__).resolve().parent.parent
+dotenv_path = PROJECT_ROOT / ".env"
 
-if os.path.exists(dotenv_path):
+if dotenv_path.exists():
     load_dotenv(dotenv_path)
 
 # --- API KEY CHECK BLOCK REMOVED FROM HERE ---

avcmt/commit.py

@@ -15,10 +15,10 @@
 # File: avcmt/commit.py
 # Revision v8 - Moved cleaning logic to utils.py
 
-import os
 import subprocess
 from collections import defaultdict
 from datetime import datetime
+from pathlib import Path
 from typing import Any
 
 from avcmt.ai import generate_with_ai, render_prompt
@@ -63,7 +63,7 @@ def __init__(
         self.model = model
         self.logger = logger or setup_logging("log/commit.log")
         self.kwargs = kwargs
-        self.dry_run_file = os.path.join("log", "commit_messages_dry_run.md")
+        self.dry_run_file = Path("log") / "commit_messages_dry_run.md"
 
     def _run_git_command(self, command: list[str]) -> str:
         """Helper to run a git command and handle potential errors."""
@@ -94,23 +94,25 @@ def _get_changed_files(self) -> list[str]:
     def _group_files_by_directory(files: list[str]) -> dict[str, list[str]]:
         grouped = defaultdict(list)
         for file_path in files:
-            parent_dir = os.path.dirname(file_path) or "root"
+            parent_dir = str(Path(file_path).parent)
+            if parent_dir == ".":
+                parent_dir = "root"
             grouped[parent_dir].append(file_path)
         return grouped
 
     def _get_diff_for_files(self, files: list[str]) -> str:
         return self._run_git_command(["git", "--no-pager", "diff", "--staged", *files])
 
     def _write_dry_run_header(self):
-        os.makedirs(os.path.dirname(self.dry_run_file), exist_ok=True)
-        with open(self.dry_run_file, "w", encoding="utf-8") as f:
+        self.dry_run_file.parent.mkdir(parents=True, exist_ok=True)
+        with self.dry_run_file.open("w", encoding="utf-8") as f:
             ts = datetime.now().astimezone().strftime("%Y-%m-%d %H:%M:%S (%Z)")
             f.write("# AI Semantic Release Commit Messages (Dry Run)\n")
             f.write(f"_Last generated: {ts}_\n\n")
             f.write("Automatically generated by `avcmt --dry-run`\n\n")
 
     def _write_dry_run_entry(self, group_name: str, commit_message: str):
-        with open(self.dry_run_file, "a", encoding="utf-8") as f:
+        with self.dry_run_file.open("a", encoding="utf-8") as f:
             f.write(
                 f"## Group: `{group_name}`\n\n```md\n{commit_message}\n```\n\n---\n\n"
             )

avcmt/release.py

@@ -20,6 +20,7 @@
 import subprocess
 from collections import defaultdict
 from datetime import datetime
+from pathlib import Path
 from typing import Any
 
 import toml
@@ -175,7 +176,7 @@ def _update_version_file(self):
         path, key_path = self.config["version_path"].split(":", 1)
         keys = key_path.split(".")
         try:
-            with open(path, "r+", encoding="utf-8") as f:
+            with Path(path).open("r+", encoding="utf-8") as f:
                 data = toml.load(f)
                 # Traverse to update the version
                 temp_data = data
@@ -246,14 +247,14 @@ def _update_changelog(self):
         Updates the changelog file by inserting the new formatted section
         at the correct position using a precise split method.
         """
-        path = self.config["changelog_file"]
+        path = Path(self.config["changelog_file"])
         new_section = self._generate_formatted_changelog_section()
         marker = "<!-- version list -->"
 
         try:
             content = ""
-            if os.path.exists(path):
-                with open(path, encoding="utf-8") as f:
+            if path.exists():
+                with path.open(encoding="utf-8") as f:
                     content = f.read()
             else:
                 logger.info(f"Changelog file not found at {path}. Creating a new one.")
@@ -268,7 +269,7 @@ def _update_changelog(self):
                 )
                 final_content = f"{new_section}\n{content}"
 
-            with open(path, "w", encoding="utf-8") as f:
+            with path.open("w", encoding="utf-8") as f:
                 f.write(final_content)
             logger.info(f"Updated {path} with version {self.new_version}")
         except Exception as e:

avcmt/utils.py

@@ -16,32 +16,33 @@
 # Revision v2 - Added clean_ai_response and simplified extraction logic.
 
 import logging
-import os
 import re
 import time
+from pathlib import Path
 
 
-def get_log_dir():
-    log_dir = os.path.join(os.path.dirname(os.path.dirname(__file__)), "log")
-    os.makedirs(log_dir, exist_ok=True)
+def get_log_dir() -> Path:
+    log_dir = Path(__file__).parent.parent / "log"
+    log_dir.mkdir(parents=True, exist_ok=True)
     return log_dir
 
 
-def get_log_file():
-    return os.path.join(get_log_dir(), "commit_group_all.log")
+def get_log_file() -> Path:
+    return get_log_dir() / "commit_group_all.log"
 
 
-def get_dry_run_file():
-    return os.path.join(get_log_dir(), "commit_messages_dry_run.md")
+def get_dry_run_file() -> Path:
+    return get_log_dir() / "commit_messages_dry_run.md"
 
 
-def is_recent_dry_run(file_path, max_age_minutes=10):
+def is_recent_dry_run(file_path: Path | str, max_age_minutes=10) -> bool:
     """
     Cek apakah file dry-run commit masih dalam rentang waktu tertentu (default 10 menit).
     """
-    if not os.path.exists(file_path):
+    path = Path(file_path)
+    if not path.exists():
         return False
-    mtime = os.path.getmtime(file_path)
+    mtime = path.stat().st_mtime
     return (time.time() - mtime) <= max_age_minutes * 60
 
 
@@ -76,15 +77,16 @@ def clean_ai_response(raw_message: str) -> str:
     return "\n".join(commit_lines).strip()
 
 
-def extract_commit_messages_from_md(filepath: str) -> dict[str, str]:
+def extract_commit_messages_from_md(filepath: Path | str) -> dict[str, str]:
     """
     Mengekstrak pesan commit per grup dari file Markdown dry-run.
     Versi ini lebih sederhana karena diasumsikan file sudah bersih.
     """
-    if not os.path.exists(filepath):
+    path = Path(filepath)
+    if not path.exists():
         return {}
 
-    with open(filepath, encoding="utf-8") as f:
+    with path.open(encoding="utf-8") as f:
         content = f.read()
 
     messages = {}
@@ -98,16 +100,16 @@ def extract_commit_messages_from_md(filepath: str) -> dict[str, str]:
     return messages
 
 
-def setup_logging(log_file="commit_group_all.log"):
+def setup_logging(log_file: Path | str = "commit_group_all.log"):
     logger = logging.getLogger(__name__)
     if not logger.hasHandlers():
-        log_dir = os.path.dirname(log_file)
-        if log_dir:
-            os.makedirs(log_dir, exist_ok=True)
+        log_path = Path(log_file)
+        log_path.parent.mkdir(parents=True, exist_ok=True)
+
         logger.setLevel(logging.INFO)
         formatter = logging.Formatter("%(asctime)s %(levelname)s: %(message)s")
 
-        fh = logging.FileHandler(log_file, mode="w", encoding="utf-8")
+        fh = logging.FileHandler(log_path, mode="w", encoding="utf-8")
         fh.setFormatter(formatter)
         logger.addHandler(fh)
 

poetry.lock

@@ -13,8 +13,12 @@ include = [ "avcmt/*",]
 [[tool.poetry.packages]]
 include = "avcmt"
 
-[tool.ruff]
-target-version = "py310"
+[tool.avcmt.release]
+version_path = "pyproject.toml:tool.poetry.version"
+changelog_file = "CHANGELOG.md"
+branch = "main"
+publish_to_pypi = true
+repo_url = "https://github.com/andyvandaric/avcmt-py"
 
 [tool.poetry.urls]
 Homepage = "https://avcmt.avandaric.live"
@@ -24,8 +28,6 @@ Documentation = "https://avcmt.avandaric.live/docs"
 [tool.poetry.dependencies]
 python = "^3.10"
 requests = "^2.32"
-jinja2 = "^3.1.4"
-python-dotenv = "^1.0.1"
 rich = "^14.0.0"
 
 [tool.poetry.scripts]
@@ -39,23 +41,19 @@ helper = "scripts.helper:main"
 preflight = "scripts.preflight:main"
 semrel = "scripts.semrel:main"
 
+[tool.ruff]
+target-version = "py310"
+
 [tool.ruff.lint]
 preview = true
 select = [ "E", "F", "I", "N", "UP", "B", "C90", "SIM", "TID", "PL", "PTH", "NPY", "PD", "PERF", "RUF",]
 fixable = [ "ALL",]
-ignore = [ "D", "ANN", "COM812", "ISC001", "T201", "S603", "S607", "S404", "PTH", "S701", "B904", "TRY003", "EM102", "E501", "PERF203", "PLR0913", "PLR0917",]
+ignore = [ "D", "ANN", "COM812", "ISC001", "T201", "S603", "S607", "S404", "S701", "B904", "TRY003", "EM102", "E501", "PERF203", "PLR0913", "PLR0917",]
 
 [tool.ruff.format]
 quote-style = "double"
 indent-style = "space"
 
-[tool.avcmt.release]
-version_path = "pyproject.toml:tool.poetry.version"
-changelog_file = "CHANGELOG.md"
-branch = "main"
-publish_to_pypi = true
-repo_url = "https://github.com/andyvandaric/avcmt-py"
-
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = [ "F401",]
 
@@ -67,9 +65,9 @@ known-first-party = [ "avcmt",]
 changelog_file = "CHANGELOG.md"
 
 [tool.poetry.group.dev.dependencies]
-python-dotenv = "^1.1.0"
+jinja2 = "^3.1.4"
+python-dotenv = "^1.0.1"
 ruff = "^0.11.13"
 pre-commit = "^4.2.0"
 python-semantic-release = "^10.1.0"
-rich = "^14.0.0"
 toml = "^0.10.2"