gptdiff 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

gptdiff/gptdiff.py

@@ -160,9 +160,9 @@ def call_gpt4_api(system_prompt, user_prompt, files_content, model, temperature=
     print(user_prompt, "+", len(files_content), "characters of file content")
 
     if api_key is None:
-        api_key = os.getenv('NANOGPT_API_KEY')
+        api_key = os.getenv('GPTDIFF_LLM_API_KEY')
     if base_url is None:
-        base_url = os.getenv('NANOGPT_BASE_URL', "https://nano-gpt.com/api/v1/")
+        base_url = os.getenv('GPTDIFF_LLM_BASE_URL', "https://nano-gpt.com/api/v1/")
     client = OpenAI(api_key=api_key, base_url=base_url)
     response = client.chat.completions.create(model=model,
         messages=messages,
@@ -198,15 +198,17 @@ def build_environment(files_dict):
         env.append(content)
     return '\n'.join(env)
 
-def generate_diff(environment, goal, model='deepseek-reasoner', temperature=0.7, max_tokens=32000, api_key=None, base_url=None, prepend=None):
+def generate_diff(environment, goal, model=None, temperature=0.7, max_tokens=32000, api_key=None, base_url=None, prepend=None):
     """API: Generate diff from environment and goal"""
+    if model is None:
+        model = os.getenv('GPTDIFF_MODEL', 'deepseek-reasoner')
     if prepend:
         prepend = load_prepend_file(args.prepend)
         print("Including prepend",len(enc.encode(json.dumps(prepend))), "tokens")
     else:
         prepend = ""
     
-    system_prompt = f"Output a git diff into a <diff> block."
+    system_prompt = prepend+f"Output a git diff into a <diff> block."
     _, diff_text, _, _, _, _ = call_gpt4_api(
         system_prompt, 
         goal, 
@@ -219,7 +221,7 @@ def generate_diff(environment, goal, model='deepseek-reasoner', temperature=0.7,
     )
     return diff_text
 
-def smartapply(diff_text, files, model='deepseek-reasoner', api_key=None, base_url=None):
+def smartapply(diff_text, files, model=None, api_key=None, base_url=None):
     """Applies unified diffs to file contents with AI-powered conflict resolution.
     
     Key features:
@@ -254,6 +256,8 @@ def smartapply(diff_text, files, model='deepseek-reasoner', api_key=None, base_u
         def new():
             pass
     """
+    if model is None:
+        model = os.getenv('GPTDIFF_MODEL', 'deepseek-reasoner')
     parsed_diffs = parse_diff_per_file(diff_text)    
     print("SMARTAPPLY", diff_text)
 
@@ -278,7 +282,6 @@ def apply_diff(project_dir, diff_text):
     with open(diff_file, 'w') as f:
         f.write(diff_text)
 
-    return False
     result = subprocess.run(["patch", "-p1", "--remove-empty-files", "--input", str(diff_file)], cwd=project_dir, capture_output=True, text=True)
     if result.returncode != 0:
         return False
@@ -297,7 +300,7 @@ def parse_arguments():
                         help='Call the GPT-4 API. Writes the full prompt to prompt.txt if not specified.')
     parser.add_argument('files', nargs='*', default=[], help='Specify additional files or directories to include.')
     parser.add_argument('--temperature', type=float, default=0.7, help='Temperature parameter for model creativity (0.0 to 2.0)')
-    parser.add_argument('--model', type=str, default='deepseek-reasoner', help='Model to use for the API call.')
+    parser.add_argument('--model', type=str, default=None, help='Model to use for the API call.')
 
     parser.add_argument('--nowarn', action='store_true', help='Disable large token warning')
 
@@ -420,9 +423,9 @@ Diff to apply:
     ]
 
     if api_key is None:
-        api_key = os.getenv('NANOGPT_API_KEY')
+        api_key = os.getenv('GPTDIFF_LLM_API_KEY')
     if base_url is None:
-        base_url = os.getenv('NANOGPT_BASE_URL', "https://nano-gpt.com/api/v1/")
+        base_url = os.getenv('GPTDIFF_LLM_BASE_URL', "https://nano-gpt.com/api/v1/")
     client = OpenAI(api_key=api_key, base_url=base_url)
     response = client.chat.completions.create(model=model,
         messages=messages,
@@ -496,6 +499,8 @@ def main():
 
     full_prompt = f"{system_prompt}\n\n{user_prompt}\n\n{files_content}"
     token_count = len(enc.encode(full_prompt))
+    if args.model is None:
+        args.model = os.getenv('GPTDIFF_MODEL', 'deepseek-reasoner')
 
     if not args.call and not args.apply:
         with open('prompt.txt', 'w') as f:
@@ -507,23 +512,23 @@ def main():
         exit(0)
     else:
         # Validate API key presence before any API operations
-        if not os.getenv('NANOGPT_API_KEY'):
-            print("\033[1;31mError: NANOGPT_API_KEY environment variable required\033[0m")
-            print("Set it with: export NANOGPT_API_KEY='your-key'")
+        if not os.getenv('GPTDIFF_LLM_API_KEY'):
+            print("\033[1;31mError: GPTDIFF_LLM_API_KEY environment variable required\033[0m")
+            print("Set it with: export GPTDIFF_LLM_API_KEY='your-key'")
             sys.exit(1)
 
         # Confirm large requests without specified files
         if (not args.nowarn) and (not args.files) and token_count > 10000 and (args.call or args.apply):
-            print(f"\033[1;33mThis is a larger request ({token_count} tokens). Are you sure you want to send it? [y/N]\033[0m")
+            print(f"\033[1;33mThis is a larger request ({token_count} tokens). Disable this warning with --nowarn. Are you sure you want to send it? [y/N]\033[0m")
             confirmation = input().strip().lower()
             if confirmation != 'y':
                 print("Request canceled")
                 sys.exit(0)
         full_text, diff_text, prompt_tokens, completion_tokens, total_tokens, cost = call_gpt4_api(system_prompt, user_prompt, files_content, args.model, 
                                                                                                     temperature=args.temperature,
-                                                                                                    api_key=os.getenv('NANOGPT_API_KEY'),
-                                                                                                    base_url=os.getenv('NANOGPT_BASE_URL', "https://nano-gpt.com/api/v1/")
-                                                                                                    )
+                                                                                                    api_key=os.getenv('GPTDIFF_LLM_API_KEY'),
+                                                                                                    base_url=os.getenv('GPTDIFF_LLM_BASE_URL', "https://nano-gpt.com/api/v1/") 
+                                                                                                    ) 
 
     if(diff_text.strip() == ""):
         print(f"\033[1;33mThere was no data in this diff. The LLM may have returned something invalid.\033[0m")

gptdiff-0.1.2.dist-info/LICENSE.txt

@@ -0,0 +1,10 @@
+# We help companies adapt to the AI age through product development and consulting. 255labs.xyz
+This is free and unencumbered software released into the public domain.
+
+Copyright 2025 255labs.xyz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

{gptdiff-0.1.0.dist-info → gptdiff-0.1.2.dist-info}/METADATA

@@ -1,8 +1,12 @@
 Metadata-Version: 2.2
 Name: gptdiff
-Version: 0.1.0
-Summary: A tool to generate git diffs using GPT-4
+Version: 0.1.2
+Summary: A tool to generate and apply git diffs using LLMs
 Author: 255labs
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+License-File: LICENSE.txt
 Requires-Dist: openai>=1.0.0
 Requires-Dist: tiktoken>=0.5.0
 Requires-Dist: ai_agent_toolbox>=0.1.0
@@ -13,6 +17,7 @@ Provides-Extra: docs
 Requires-Dist: mkdocs; extra == "docs"
 Requires-Dist: mkdocs-material; extra == "docs"
 Dynamic: author
+Dynamic: classifier
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

gptdiff-0.1.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+gptdiff/__init__.py,sha256=yGjgwv7tNvH1ZLPsQyoo1CxpTOl1iCAwwDBp-_17ksQ,89
+gptdiff/gptdiff.py,sha256=40LKJt8GfGpk6J0mhQgM88DA6w5QdWmEUXtys1keatk,23253
+gptdiff-0.1.2.dist-info/LICENSE.txt,sha256=zCJk7yUYpMjFvlipi1dKtaljF8WdZ2NASndBYYbU8BY,1228
+gptdiff-0.1.2.dist-info/METADATA,sha256=KwzE5yYyc3XAIY09YWxDezGVLLlBLPNQTMgl6lQ3Ttk,709
+gptdiff-0.1.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+gptdiff-0.1.2.dist-info/entry_points.txt,sha256=0yvXYEVAZFI-p32kQ4-h3qKVWS0a86jsM9FAwF89t9w,49
+gptdiff-0.1.2.dist-info/top_level.txt,sha256=XNkQkQGINaDndEwRxg8qToOrJ9coyfAb-EHrSUXzdCE,8
+gptdiff-0.1.2.dist-info/RECORD,,

gptdiff-0.1.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-gptdiff/__init__.py,sha256=yGjgwv7tNvH1ZLPsQyoo1CxpTOl1iCAwwDBp-_17ksQ,89
-gptdiff/gptdiff.py,sha256=MBSZgt43Qq3SRqGzlKwBawwIv1Uewm2NaA_DBx_IPB8,22965
-gptdiff-0.1.0.dist-info/METADATA,sha256=pf6BzIRLbLCeqVX3u_dwAG91WmPXKmVReTkwUWagPyk,508
-gptdiff-0.1.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-gptdiff-0.1.0.dist-info/entry_points.txt,sha256=0yvXYEVAZFI-p32kQ4-h3qKVWS0a86jsM9FAwF89t9w,49
-gptdiff-0.1.0.dist-info/top_level.txt,sha256=XNkQkQGINaDndEwRxg8qToOrJ9coyfAb-EHrSUXzdCE,8
-gptdiff-0.1.0.dist-info/RECORD,,