🔧 chore: refactor imports and improve code structure

🔧 chore: refactor imports and improve code structure

🔧 Refactoring:
- Reordered import statements for consistency in several files.
- Changed type annotations from 'List' and 'Dict' to 'list' and 'dict' for better readability.

✨ Code Improvements:
- Enhanced readability by adjusting whitespace and formatting in multiple files.
- Removed redundant imports to streamline the codebase.

These changes improve the code structure and readability, making future development easier.

Author: Arakiss

commitloom/__init__.py

@@ -1,8 +1,8 @@
 """CommitLoom - Weave perfect git commits with AI-powered intelligence."""
 
 from .cli.main import CommitLoom, main
-from .core.git import GitOperations, GitFile, GitError
-from .core.analyzer import CommitAnalyzer, CommitAnalysis, Warning, WarningLevel
+from .core.analyzer import CommitAnalysis, CommitAnalyzer, Warning, WarningLevel
+from .core.git import GitError, GitFile, GitOperations
 from .services.ai_service import AIService, CommitSuggestion, TokenUsage
 
 __version__ = "0.1.0"

commitloom/__main__.py

@@ -2,8 +2,8 @@
 """Entry point for running commitloom as a module."""
 
 from pathlib import Path
+
 from dotenv import load_dotenv
-import os
 
 # Load environment variables before any imports
 env_path = Path(__file__).parent.parent / ".env"

commitloom/cli/console.py

@@ -1,22 +1,21 @@
 """Console output formatting and user interaction."""
 
+
 from rich.console import Console
 from rich.panel import Panel
-from rich.prompt import Confirm, Prompt
-from rich.text import Text
 from rich.progress import (
+    BarColumn,
     Progress,
     SpinnerColumn,
-    TextColumn,
-    BarColumn,
     TaskProgressColumn,
+    TextColumn,
 )
-from typing import List, Optional
+from rich.prompt import Confirm, Prompt
+from rich.text import Text
 
-from ..core.analyzer import CommitAnalysis, WarningLevel
+from ..core.analyzer import CommitAnalysis, CommitAnalyzer, WarningLevel
 from ..core.git import GitFile
 from ..services.ai_service import TokenUsage
-from ..core.analyzer import CommitAnalyzer
 
 console = Console()
 
@@ -32,7 +31,7 @@ def create_progress() -> Progress:
     )
 
 
-def print_changed_files(files: List[GitFile]) -> None:
+def print_changed_files(files: list[GitFile]) -> None:
     """Print list of changed files."""
     console.print(
         "\n[bold blue]📜 Changes detected in the following files:[/bold blue]"
@@ -57,7 +56,7 @@ def print_warnings(analysis: CommitAnalysis) -> None:
     console.print(f"  • Files changed: {analysis.num_files}")
 
 
-def print_batch_start(batch_num: int, total_batches: int, files: List[GitFile]) -> None:
+def print_batch_start(batch_num: int, total_batches: int, files: list[GitFile]) -> None:
     """Print information about starting a new batch."""
     console.print(
         f"\n[bold blue]📦 Processing Batch {batch_num}/{total_batches}[/bold blue]"
@@ -76,7 +75,7 @@ def print_batch_complete(batch_num: int, total_batches: int) -> None:
 
 def print_batch_summary(total_files: int, total_batches: int) -> None:
     """Print summary of batch processing plan."""
-    console.print(f"\n[bold blue]🔄 Batch Processing Summary:[/bold blue]")
+    console.print("\n[bold blue]🔄 Batch Processing Summary:[/bold blue]")
     console.print(f"  • Total files: [cyan]{total_files}[/cyan]")
     console.print(f"  • Number of batches: [cyan]{total_batches}[/cyan]")
     console.print(f"  • Files per batch: [cyan]~{total_files // total_batches}[/cyan]")
@@ -89,7 +88,7 @@ def format_cost(cost: float) -> str:
     return f"{human_cost} {precise_cost}"
 
 
-def print_token_usage(usage: TokenUsage, batch_num: Optional[int] = None) -> None:
+def print_token_usage(usage: TokenUsage, batch_num: int | None = None) -> None:
     """Print token usage summary."""
     batch_info = f" (Batch {batch_num})" if batch_num is not None else ""
     console.print(
@@ -112,7 +111,7 @@ def print_commit_message(message: str) -> None:
     console.print(Panel(Text(message), expand=False, border_style="green"))
 
 
-def print_batch_info(batch_number: int, files: List[str]) -> None:
+def print_batch_info(batch_number: int, files: list[str]) -> None:
     """Print information about a batch of files."""
     console.print(f"\n[bold blue]📑 Batch {batch_number} Summary:[/bold blue]")
     for file in files:

commitloom/cli/main.py

@@ -1,23 +1,22 @@
 #!/usr/bin/env python3
 """Main CLI module for CommitLoom."""
 
-import os
-import sys
-import subprocess
-import logging
 import argparse
+import logging
+import subprocess
+import sys
 from pathlib import Path
-from typing import List, Dict
+
 from dotenv import load_dotenv
 
 # Load environment variables at module level
 env_path = Path(__file__).parent.parent.parent / ".env"
 load_dotenv(dotenv_path=env_path)
 
-from ..core.git import GitOperations, GitFile, GitError
-from ..core.analyzer import CommitAnalyzer, CommitAnalysis
-from ..services.ai_service import AIService, CommitSuggestion
 from ..config.settings import config
+from ..core.analyzer import CommitAnalyzer
+from ..core.git import GitError, GitFile, GitOperations
+from ..services.ai_service import AIService, CommitSuggestion
 from . import console
 
 # Configure logging
@@ -40,8 +39,8 @@ def __init__(self):
         self.ai_service = AIService()
 
     def process_files_in_batches(
-        self, changed_files: List[GitFile], auto_commit: bool = False
-    ) -> List[Dict]:
+        self, changed_files: list[GitFile], auto_commit: bool = False
+    ) -> list[dict]:
         """Process files in batches for better commit organization."""
         total_files = len(changed_files)
         total_batches = (
@@ -177,7 +176,7 @@ def run(self, auto_commit: bool = False, combine_commits: bool = False) -> None:
             console.print_error(f"An error occurred: {str(e)}")
 
     def _create_individual_commit(
-        self, batch: Dict, auto_confirm: bool = False
+        self, batch: dict, auto_confirm: bool = False
     ) -> None:
         """Create an individual commit for a batch."""
         files = [f.path for f in batch["files"]]
@@ -220,7 +219,7 @@ def _create_individual_commit(
                 except Exception:
                     pass  # Ignore status check errors
 
-    def _create_combined_commit(self, batches: List[Dict]) -> None:
+    def _create_combined_commit(self, batches: list[dict]) -> None:
         """Create a combined commit from all batches."""
         all_changes = {}
         summary_points = []

commitloom/config/settings.py

@@ -1,10 +1,10 @@
 """Configuration settings for CommitLoom."""
 
 import os
+from dataclasses import dataclass
 from pathlib import Path
+
 from dotenv import load_dotenv
-from dataclasses import dataclass
-from typing import List, Dict
 
 # Load environment variables at module level
 env_path = Path(__file__).parent.parent.parent / ".env"
@@ -28,8 +28,8 @@ class Config:
     cost_warning_threshold: float
     default_model: str
     token_estimation_ratio: int
-    ignored_patterns: List[str]
-    model_costs: Dict[str, ModelCosts]
+    ignored_patterns: list[str]
+    model_costs: dict[str, ModelCosts]
     api_key: str
 
     @classmethod

commitloom/core/analyzer.py

@@ -1,7 +1,6 @@
 """Analyzer module for commit complexity and cost estimation."""
 
 from dataclasses import dataclass
-from typing import List
 from enum import Enum
 
 from ..config.settings import config
@@ -31,7 +30,7 @@ class CommitAnalysis:
     estimated_tokens: int
     estimated_cost: float
     num_files: int
-    warnings: List[Warning]
+    warnings: list[Warning]
     is_complex: bool
 
 
@@ -60,7 +59,7 @@ def estimate_tokens_and_cost(
 
     @staticmethod
     def analyze_diff_complexity(
-        diff: str, changed_files: List[GitFile]
+        diff: str, changed_files: list[GitFile]
     ) -> CommitAnalysis:
         """
         Analyzes the complexity of changes and returns warnings if necessary.
@@ -72,7 +71,7 @@ def analyze_diff_complexity(
         Returns:
             CommitAnalysis object containing analysis results
         """
-        warnings: List[Warning] = []
+        warnings: list[Warning] = []
         estimated_tokens, estimated_cost = CommitAnalyzer.estimate_tokens_and_cost(diff)
 
         # Check token limit

commitloom/core/git.py

@@ -1,11 +1,9 @@
 """Git operations and utilities."""
 
-import subprocess
 import logging
-from typing import List, Optional
+import subprocess
 from dataclasses import dataclass
 from fnmatch import fnmatch
-import os
 
 from ..config.settings import config
 
@@ -18,8 +16,8 @@ class GitFile:
     """Represents a git file with its metadata."""
 
     path: str
-    size: Optional[int] = None
-    hash: Optional[str] = None
+    size: int | None = None
+    hash: str | None = None
 
 
 class GitError(Exception):
@@ -40,7 +38,7 @@ def should_ignore_file(file_path: str) -> bool:
         )
 
     @staticmethod
-    def get_changed_files() -> List[GitFile]:
+    def get_changed_files() -> list[GitFile]:
         """Get list of staged files, excluding ignored files."""
         try:
             files = (
@@ -90,7 +88,7 @@ def get_changed_files() -> List[GitFile]:
             raise GitError(f"Failed to get changed files: {str(e)}")
 
     @staticmethod
-    def get_diff(files: Optional[List[GitFile]] = None) -> str:
+    def get_diff(files: list[GitFile] | None = None) -> str:
         """Get the staged diff, handling binary files."""
         try:
             if files is None:
@@ -137,7 +135,7 @@ def format_file_size(size: int) -> str:
         return f"{size:.2f} TB"
 
     @staticmethod
-    def stage_files(files: List[str]) -> None:
+    def stage_files(files: list[str]) -> None:
         """Stage specific files for commit."""
         try:
             # Get status of files to handle deleted ones correctly
@@ -202,7 +200,7 @@ def stage_files(files: List[str]) -> None:
 
     @staticmethod
     def create_commit(
-        title: str, message: str, files: Optional[List[str]] = None
+        title: str, message: str, files: list[str] | None = None
     ) -> bool:
         """Create a git commit with the specified message."""
         try:
@@ -297,7 +295,7 @@ def pop_stashed_changes() -> None:
             )
 
     @staticmethod
-    def get_staged_files() -> List[str]:
+    def get_staged_files() -> list[str]:
         """Get list of currently staged files."""
         try:
             return (

commitloom/services/ai_service.py

@@ -1,9 +1,9 @@
 """AI service for generating commit messages using OpenAI."""
 
 import json
-import requests
 from dataclasses import dataclass
-from typing import Dict, List, Tuple
+
+import requests
 
 from ..config.settings import config
 from ..core.git import GitFile
@@ -22,7 +22,7 @@ class TokenUsage:
 
     @classmethod
     def from_api_usage(
-        cls, usage: Dict[str, int], model: str = config.default_model
+        cls, usage: dict[str, int], model: str = config.default_model
     ) -> "TokenUsage":
         """Create TokenUsage from API response usage data."""
         prompt_tokens = usage["prompt_tokens"]
@@ -49,7 +49,7 @@ class CommitSuggestion:
     """Generated commit message suggestion."""
 
     title: str
-    body: Dict[str, Dict[str, List[str]]]
+    body: dict[str, dict[str, list[str]]]
     summary: str
 
 
@@ -74,7 +74,7 @@ def format_commit_message(self, commit_data: CommitSuggestion) -> str:
         formatted_message += f"{commit_data.summary}\n"
         return formatted_message
 
-    def _generate_prompt(self, diff: str, changed_files: List[GitFile]) -> str:
+    def _generate_prompt(self, diff: str, changed_files: list[GitFile]) -> str:
         """Generate a prompt for commit message generation."""
         files_summary = ", ".join(f.path for f in changed_files[:3])
         if len(changed_files) > 3:
@@ -144,8 +144,8 @@ def _generate_prompt(self, diff: str, changed_files: List[GitFile]) -> str:
 }}"""
 
     def generate_commit_message(
-        self, diff: str, changed_files: List[GitFile]
-    ) -> Tuple[CommitSuggestion, TokenUsage]:
+        self, diff: str, changed_files: list[GitFile]
+    ) -> tuple[CommitSuggestion, TokenUsage]:
         """Generate a commit message using the OpenAI API."""
         prompt = self._generate_prompt(diff, changed_files)
 

tests/conftest.py

@@ -1,4 +1,5 @@
 import os
+
 import pytest
 
 
@@ -9,4 +10,4 @@ def mock_env_vars():
     yield
     # Clean up
     if "OPENAI_API_KEY" in os.environ:
-        del os.environ["OPENAI_API_KEY"] 
+        del os.environ["OPENAI_API_KEY"]

tests/test_ai_service.py

@@ -1,17 +1,18 @@
 """Tests for AI service module."""
 
-import pytest
-from unittest.mock import patch, MagicMock
 import json
+from unittest.mock import MagicMock, patch
+
+import pytest
 import requests
 
+from commitloom.config.settings import config
+from commitloom.core.git import GitFile
 from commitloom.services.ai_service import (
     AIService,
-    TokenUsage,
     CommitSuggestion,
+    TokenUsage,
 )
-from commitloom.core.git import GitFile
-from commitloom.config.settings import config
 
 
 @pytest.fixture

tests/test_analyzer.py

@@ -1,13 +1,14 @@
 """Tests for analyzer module."""
 
 import pytest
+
+from commitloom.config.settings import config
 from commitloom.core.analyzer import (
-    CommitAnalyzer,
     CommitAnalysis,
+    CommitAnalyzer,
     WarningLevel,
 )
 from commitloom.core.git import GitFile
-from commitloom.config.settings import config
 
 
 @pytest.fixture