kopipasta 0.22.0__py3-none-any.whl → 0.24.0__py3-none-any.whl

kopipasta/main.py

@@ -22,6 +22,7 @@ from pydantic import BaseModel, Field
 import traceback
 from google import genai
 from google.genai.types import GenerateContentConfig
+from prompt_toolkit import prompt # Added for multiline input
 
 FileTuple = Tuple[str, bool, Optional[List[str]], str]
 
@@ -682,65 +683,6 @@ def fetch_web_content(url: str) -> Tuple[Optional[FileTuple], Optional[str], Opt
         print(f"Error fetching content from {url}: {e}")
         return None, None, None
 
-def read_file_content(file_path):
-    _, ext = os.path.splitext(file_path)
-    if ext.lower() == '.json':
-        with open(file_path, 'r') as f:
-            return json.load(f), 'json'
-    elif ext.lower() == '.csv':
-        with open(file_path, 'r') as f:
-            return f.read(), 'csv'
-    else:
-        with open(file_path, 'r') as f:
-            return f.read(), 'text'
-
-def get_content_snippet(content, content_type, max_lines=50, max_chars=4096):
-    if content_type == 'json':
-        return json.dumps(content, indent=2)[:max_chars]
-    elif content_type == 'csv':
-        csv_content = content if isinstance(content, str) else content.getvalue()
-        csv_reader = csv.reader(io.StringIO(csv_content))
-        rows = list(csv_reader)[:max_lines]
-        output = io.StringIO()
-        csv.writer(output).writerows(rows)
-        return output.getvalue()[:max_chars]
-    else:
-        return '\n'.join(content.split('\n')[:max_lines])[:max_chars]
-
-def handle_content(content, content_type, file_or_url):
-    is_large = len(json.dumps(content)) > 102400 if content_type == 'json' else len(content) > 102400
-
-    if is_large:
-        while True:
-            choice = input(f"{file_or_url} is large. View (f)ull content, (s)nippet, or (p)review? ").lower()
-            if choice in ['f', 's', 'p']:
-                break
-            print("Invalid choice. Please enter 'f', 's', or 'p'.")
-
-        if choice == 'f':
-            return content, False
-        elif choice == 's':
-            return get_content_snippet(content, content_type), True
-        else:  # preview
-            preview = get_content_preview(content, content_type)
-            print(f"\nPreview of {file_or_url}:\n{preview}\n")
-            return handle_content(content, content_type, file_or_url)
-    else:
-        return content, False
-
-
-def get_content_preview(content, content_type):
-    if content_type == 'json':
-        return json.dumps(content, indent=2)[:1000] + "\n..."
-    elif content_type == 'csv':
-        csv_content = content if isinstance(content, str) else content.getvalue()
-        csv_reader = csv.reader(io.StringIO(csv_content))
-        rows = list(csv_reader)[:10]
-        output = io.StringIO()
-        csv.writer(output).writerows(rows)
-        return output.getvalue() + "\n..."
-    else:
-        return '\n'.join(content.split('\n')[:20]) + "\n..."
 
 def read_env_file():
     env_vars = {}
@@ -920,9 +862,14 @@ def start_chat_session(initial_prompt: str):
         print("\n" + "-"*20)
 
         while True:
+            is_patch_request = False
             try:
-                user_input = input("👤 You: ")
-            except EOFError: # Handle Ctrl+D
+                # Print the header on a separate line
+                print("👤 You (Submit with Esc+Enter):")
+                # Get input using prompt_toolkit with a minimal indicator
+                user_input = prompt(">> ", multiline=True)
+                 # prompt_toolkit raises EOFError on Ctrl+D, so this handler remains correct.
+            except EOFError:
                  print("\nExiting...")
                  break
             except KeyboardInterrupt: # Handle Ctrl+C
@@ -931,19 +878,33 @@ def start_chat_session(initial_prompt: str):
 
             if user_input.lower() == '/q':
                 break
-            elif user_input.strip() == '/patch':
-                print("\n🤖 Gemini: Thinking... (requesting code changes)")
-                # Prompt instructing the model to use the new JSON format
+            elif user_input.endswith('/patch'):
+                is_patch_request = True
+                # Extract message before /patch
+                user_message = user_input[:-len('/patch')].strip()
+                print(f"\n🛠️ Requesting patches... (Context: '{user_message}' if provided)")
+            elif not user_input:
+                continue # Ignore empty input
+            else:
+                user_message = user_input # Regular message
+
+
+            # --- Handle Patch Request ---
+            if is_patch_request:
+                print("🤖 Gemini: Thinking... (generating code changes)")
+                # Include user message part if it exists
+                patch_context = f"Based on our conversation and specifically: \"{user_message}\"\n\n" if user_message else "Based on our conversation,\n\n"
+
                 patch_request_prompt = (
-                    "Based on our conversation, generate the necessary code changes "
-                    "to fulfill my request. Provide the changes as a JSON list, where each item "
+                    patch_context +
+                    "Generate the necessary code changes to fulfill the request. Provide the changes as a JSON list, where each item "
                     "is an object with the following keys:\n"
                     "- 'reasoning': Explain why this specific change is needed.\n"
                     "- 'file_path': The relative path to the file to modify.\n"
                     "- 'original_text': The exact, unique block of text to replace.\n"
-                    "- 'new_text': The text to replace original_text with.\n"
+                    "- 'new_text': The text to replace original_text with. Do not include any temporary comments like '// CHANGE BEGINS' or '/* PATCH START */'.\n"
                     "Ensure 'original_text' is unique within the specified 'file_path'. "
-                    "Format the response strictly as: { \"patches\": [ { patch_item_1 }, { patch_item_2 }, ... ] }"
+                    "Respond ONLY with the JSON object conforming to this structure: { \"patches\": [ { patch_item_1 }, { patch_item_2 }, ... ] }"
                 )
 
                 try:

{kopipasta-0.22.0.dist-info → kopipasta-0.24.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kopipasta
-Version: 0.22.0
+Version: 0.24.0
 Summary: A CLI tool to generate prompts with project structure and file contents
 Home-page: https://github.com/mkorpela/kopipasta
 Author: Mikko Korpela
@@ -19,10 +19,11 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyperclip ==1.9.0
-Requires-Dist: requests ==2.32.3
-Requires-Dist: Pygments ==2.18.0
-Requires-Dist: google-genai ==1.8.0
+Requires-Dist: pyperclip==1.9.0
+Requires-Dist: requests==2.32.3
+Requires-Dist: Pygments==2.18.0
+Requires-Dist: google-genai==1.8.0
+Requires-Dist: prompt-toolkit==3.0.50
 
 # kopipasta
 

kopipasta-0.24.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+kopipasta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kopipasta/main.py,sha256=iJFQFiN-3udjud2byspXl8RZwZnTg6FPw_HW1exjPbg,53035
+kopipasta-0.24.0.dist-info/LICENSE,sha256=xw4C9TAU7LFu4r_MwSbky90uzkzNtRwAo3c51IWR8lk,1091
+kopipasta-0.24.0.dist-info/METADATA,sha256=EiMoa_TkI-4SMaMiyiUqroXAvwz1JFM8_ECINOw4fZM,8610
+kopipasta-0.24.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+kopipasta-0.24.0.dist-info/entry_points.txt,sha256=but54qDNz1-F8fVvGstq_QID5tHjczP7bO7rWLFkc6Y,50
+kopipasta-0.24.0.dist-info/top_level.txt,sha256=iXohixMuCdw8UjGDUp0ouICLYBDrx207sgZIJ9lxn0o,10
+kopipasta-0.24.0.dist-info/RECORD,,

{kopipasta-0.22.0.dist-info → kopipasta-0.24.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

kopipasta-0.22.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-kopipasta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kopipasta/main.py,sha256=RSoKARL9jnyikiXB1DvZz_lpWLhhQUovQuT6YUj7RGY,54292
-kopipasta-0.22.0.dist-info/LICENSE,sha256=xw4C9TAU7LFu4r_MwSbky90uzkzNtRwAo3c51IWR8lk,1091
-kopipasta-0.22.0.dist-info/METADATA,sha256=V2XrhJR8QIuCIa4iCDFuo5gyW1iJgihWK_Y6H3mVjMI,8576
-kopipasta-0.22.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kopipasta-0.22.0.dist-info/entry_points.txt,sha256=but54qDNz1-F8fVvGstq_QID5tHjczP7bO7rWLFkc6Y,50
-kopipasta-0.22.0.dist-info/top_level.txt,sha256=iXohixMuCdw8UjGDUp0ouICLYBDrx207sgZIJ9lxn0o,10
-kopipasta-0.22.0.dist-info/RECORD,,