use pyinstaller

Author: christso

README.md

@@ -12,18 +12,32 @@
 
 ## Usage
 
-To use GitDiff4LLM, run the following command:
+You can either provide commit hashes to compare directly, or use the -b option to compare the latest commit in the current branch with the latest common commit in another branch (e.g., `master`). You can also specify an output file, or let the script default to the system's temporary directory if no output file is provided.
+
+### Compare Latest Commit with Another Branch
+
+To compare the latest commit in the current branch with the latest common commit in another branch (e.g., `master`), use the `-b` option:
+```bash
+gitdiff4llm -b <branch> [-o /path/to/output_file.txt]
+```
+
+**Example:** 
+Compare the latest commit in the current branch with the latest common commit in master, and write the result to a default file in the system's temporary directory
 
 ```bash
-python gitdiff4llm.py <commit1> <commit2> /path/to/output_file.txt
+gitdiff4llm -b master
 ```
 
-### Example
+### Compare Two Commits
 
 ```bash
-python gitdiff4llm.py abc123 def456 combined_diff.txt
+gitdiff4llm -c1 <commit1> -c2 <commit2> [-o /path/to/output_file.txt]
 ```
 
+* `-c1`, `--commit1`: First commit hash.
+* `-c2`, `--commit2`: Second commit hash.
+* `-o`, `--output_file`: (Optional) Path to the output file. If not provided, the diff will be written to a default file in the system's temporary directory.
+
 ## Prerequisites
 
 - **PowerShell (Windows Only)**: If you're using Windows, you need to run the script in PowerShell. The pattern matching functionality in the script will not work properly in Command Prompt (`cmd`).
@@ -38,7 +52,15 @@ git clone https://github.com/EntityProcess/GitDiff4LLM.git
 cd GitDiff4LLM
 ```
 
-Make sure you have Python installed on your system, then you can run the script as outlined in the usage section.
+Install PyInstaller by running the following command:
+
+```bash
+pip install pyinstaller
+```
+
+Generate the executable by running `build.bat`.
+
+Add `./GitDiff4LLM/dist` to your `PATH` environmental variable.
 
 ## Contributing
 

build.bat

@@ -0,0 +1,2 @@
+pyinstaller --onefile --hidden-import=tiktoken --hidden-import=tiktoken_ext.openai_public --hidden-import=tiktoken_ext --add-data "config.json;." gitdiff4llm.py
+pause

gitdiff4llm.py

@@ -7,7 +7,7 @@
 import tempfile
 
 # Tokenizer function using OpenAI's tiktoken for LLMs (GPT-3/4)
-def count_tokens(text, model):
+def count_tokens(text, model="gpt-4o"):
     encoding = tiktoken.encoding_for_model(model)
     return len(encoding.encode(text))
 
@@ -25,13 +25,16 @@ def run_git_diff(commit1, commit2, diff_options):
 
 # Function to load config (diff options and tiktoken model) from JSON config file
 def load_config(config_file_name="config.json"):
-    # First try to find the config file in the current working directory
-    config_path = os.path.join(os.getcwd(), config_file_name)
-    
-    # If not found in the working directory, try to find it in the directory of the script or executable
-    if not os.path.exists(config_path):
+    # Check if running as a PyInstaller bundle (frozen)
+    if getattr(sys, 'frozen', False):
+        # If the application is run as a PyInstaller bundle, use the _MEIPASS directory
+        script_dir = sys._MEIPASS
+    else:
+        # If running in a normal Python environment, use the script directory
         script_dir = os.path.dirname(os.path.realpath(__file__))
-        config_path = os.path.join(script_dir, config_file_name)
+    
+    # Construct the path to config.json
+    config_path = os.path.join(script_dir, config_file_name)
 
     if os.path.exists(config_path):
         try:
@@ -41,7 +44,7 @@ def load_config(config_file_name="config.json"):
             print(f"Error loading config file: {e}")
             sys.exit(1)
     else:
-        print(f"Config file '{config_file_name}' not found in working directory or script directory.")
+        print(f"Config file '{config_file_name}' not found in script directory '{script_dir}'.")
         sys.exit(1)
 
 # Function to get the latest commit hash for the current branch
@@ -126,7 +129,7 @@ def main(commit1, commit2, output_file):
         output_file = args.output_file
     else:
         temp_dir = tempfile.gettempdir()
-        output_file = os.path.join(temp_dir, "gitdiff_output.txt")
+        output_file = os.path.join(temp_dir, "gitdiff4llm", "gitdiff_output.txt")
         print(f"No output file specified. Using temporary directory: {output_file}")
 
     # Make sure the output directory exists