kopipasta 0.15.0__py3-none-any.whl → 0.17.0__py3-none-any.whl

kopipasta/main.py

@@ -5,7 +5,7 @@ import json
 import os
 import argparse
 import re
-from typing import Dict, List, Optional, Tuple
+from typing import Dict, List, Optional, Set, Tuple
 import pyperclip
 import fnmatch
 
@@ -519,9 +519,9 @@ def select_files_in_directory(directory: str, ignore_patterns: List[str], curren
         else:
             print("Invalid choice. Please try again.")
 
-def process_directory(directory, ignore_patterns, current_char_count=0):
+def process_directory(directory: str, ignore_patterns: List[str], current_char_count: int = 0) -> Tuple[List[FileTuple], Set[str], int]:
     files_to_include: List[FileTuple] = []
-    processed_dirs = set()
+    processed_dirs: Set[str] = set()
 
     for root, dirs, files in os.walk(directory):
         dirs[:] = [d for d in dirs if not is_ignored(os.path.join(root, d), ignore_patterns)]
@@ -535,12 +535,8 @@ def process_directory(directory, ignore_patterns, current_char_count=0):
         if choice == 'y':
             selected_files, current_char_count = select_files_in_directory(root, ignore_patterns, current_char_count)
             for file_tuple in selected_files:
-                if len(file_tuple) == 3:
-                    f, use_snippet, chunks = file_tuple
-                    files_to_include.append((os.path.join(root, f), use_snippet, chunks))
-                else:
-                    f, use_snippet = file_tuple
-                    files_to_include.append((os.path.join(root, f), use_snippet))
+                full_path = os.path.join(root, file_tuple[0])
+                files_to_include.append((full_path, file_tuple[1], file_tuple[2], file_tuple[3]))
             processed_dirs.add(root)
         elif choice == 'n':
             dirs[:] = []  # Skip all subdirectories
@@ -553,20 +549,25 @@ def process_directory(directory, ignore_patterns, current_char_count=0):
 
     return files_to_include, processed_dirs, current_char_count
 
-def fetch_web_content(url):
+def fetch_web_content(url: str) -> Tuple[Optional[FileTuple], Optional[str], Optional[str]]:
     try:
         response = requests.get(url)
         response.raise_for_status()
         content_type = response.headers.get('content-type', '').lower()
+        full_content = response.text
+        snippet = full_content[:10000] + "..." if len(full_content) > 10000 else full_content
+        
         if 'json' in content_type:
-            return response.json(), 'json'
+            content_type = 'json'
         elif 'csv' in content_type:
-            return response.text, 'csv'
+            content_type = 'csv'
         else:
-            return response.text, 'text'
+            content_type = 'text'
+        
+        return (url, False, None, content_type), full_content, snippet
     except requests.RequestException as e:
         print(f"Error fetching content from {url}: {e}")
-        return None, None
+        return None, None, None
 
 def read_file_content(file_path):
     _, ext = os.path.splitext(file_path)
@@ -670,7 +671,7 @@ def handle_env_variables(content, env_vars):
 
     return content
 
-def generate_prompt(files_to_include: List[FileTuple], ignore_patterns: List[str], web_contents: Dict[str, Tuple[str, str]], env_vars: Dict[str, str]) -> str:
+def generate_prompt(files_to_include: List[FileTuple], ignore_patterns: List[str], web_contents: Dict[str, Tuple[FileTuple, str]], env_vars: Dict[str, str]) -> str:
     prompt = "# Project Overview\n\n"
     prompt += "## Project Structure\n\n"
     prompt += "```\n"
@@ -696,7 +697,8 @@ def generate_prompt(files_to_include: List[FileTuple], ignore_patterns: List[str
     
     if web_contents:
         prompt += "## Web Content\n\n"
-        for url, (content, is_snippet, content_type) in web_contents.items():
+        for url, (file_tuple, content) in web_contents.items():
+            _, is_snippet, _, content_type = file_tuple
             content = handle_env_variables(content, env_vars)
             language = content_type if content_type in ['json', 'csv'] else ''
             prompt += f"### {url}{' (snippet)' if is_snippet else ''}\n\n```{language}\n{content}\n```\n\n"
@@ -704,15 +706,36 @@ def generate_prompt(files_to_include: List[FileTuple], ignore_patterns: List[str
     prompt += "## Task Instructions\n\n"
     task_instructions = input("Enter the task instructions: ")
     prompt += f"{task_instructions}\n\n"
-    prompt += "## Task Analysis and Planning\n\n"
+    prompt += "## Instructions for Achieving the Task\n\n"
     analysis_text = (
-        "Before starting, explain the task back to me in your own words. "
-        "Ask for any clarifications if needed. Once you're clear, ask to proceed.\n\n"
-        "Then, outline a plan for the task. Finally, use your plan to complete the task."
+        "1. **Confirm and Understand the Task**:\n"
+        "   - Rephrase the task in your own words to ensure understanding.\n"
+        "   - Ask for any necessary clarifications.\n"
+        "   - Once everything is clear, ask to proceed.\n\n"
+        "2. **Outline a Plan**:\n"
+        "   - Provide a brief plan on how to approach the task.\n"
+        "   - Make minimal incremental changes to maintain a working codebase at each step.\n"
+        "   - This is an iterative process aimed at achieving the task step by step.\n\n"
+        "3. **Implement Changes Iteratively**:\n"
+        "   - Apply changes in small, manageable increments.\n"
+        "   - Ensure the codebase remains functional after each change.\n"
+        "   - After each increment, verify stability before proceeding to the next step.\n\n"
+        "4. **Present Code Changes Clearly**:\n"
+        "   - Specify the file being modified at the beginning of each code block.\n"
+        "   - Format changes for clarity:\n"
+        "     - For small changes: Show only the changed lines with clear comments.\n"
+        "     - For larger changes: Provide the full new implementation of changed parts, using placeholders like `'// ... (rest of the function)'` for unchanged code.\n"
+        "   - Provide context by including important unchanged parts as needed.\n"
+        "   - Use clear comments to explain the changes and reference old code if helpful.\n\n"
+        "5. **Encourage User Testing and Collaboration**:\n"
+        "   - Ask the user to test the code on their machine after each change.\n"
+        "   - If debugging is needed, include debugging messages in the code.\n"
+        "   - Request the user to share any error messages or outputs from debugging to assist further.\n"
     )
     prompt += analysis_text
     return prompt
 
+
 def main():
     parser = argparse.ArgumentParser(description="Generate a prompt with project structure, file contents, and web content.")
     parser.add_argument('inputs', nargs='+', help='Files, directories, or URLs to include in the prompt')
@@ -721,18 +744,45 @@ def main():
     ignore_patterns = read_gitignore()
     env_vars = read_env_file()
 
-    files_to_include:List[FileTuple] = []
+    files_to_include: List[FileTuple] = []
     processed_dirs = set()
-    web_contents = {}
+    web_contents: Dict[str, Tuple[FileTuple, str]] = {}
     current_char_count = 0
 
     for input_path in args.inputs:
         if input_path.startswith(('http://', 'https://')):
-            full_content, snippet = fetch_web_content(input_path)
-            if full_content:
-                web_contents[input_path] = (full_content, snippet)
-                current_char_count += len(snippet if len(full_content) > 10000 else full_content)
-                print(f"Added web content from: {input_path}")
+            result = fetch_web_content(input_path)
+            if result:
+                file_tuple, full_content, snippet = result
+                is_large = len(full_content) > 10000
+                if is_large:
+                    print(f"\nContent from {input_path} is large. Here's a snippet:\n")
+                    print(snippet)
+                    print("\n" + "-"*40 + "\n")
+                    
+                    while True:
+                        choice = input("Use (f)ull content or (s)nippet? ").lower()
+                        if choice in ['f', 's']:
+                            break
+                        print("Invalid choice. Please enter 'f' or 's'.")
+                    
+                    if choice == 'f':
+                        content = full_content
+                        is_snippet = False
+                        print("Using full content.")
+                    else:
+                        content = snippet
+                        is_snippet = True
+                        print("Using snippet.")
+                else:
+                    content = full_content
+                    is_snippet = False
+                    print(f"Content from {input_path} is not large. Using full content.")
+                
+                file_tuple = (file_tuple[0], is_snippet, file_tuple[2], file_tuple[3])
+                web_contents[input_path] = (file_tuple, content)
+                current_char_count += len(content)
+                print(f"Added {'snippet of ' if is_snippet else ''}web content from: {input_path}")
         elif os.path.isfile(input_path):
             if not is_ignored(input_path, ignore_patterns) and not is_binary(input_path):
                 while True:

{kopipasta-0.15.0.dist-info → kopipasta-0.17.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kopipasta
-Version: 0.15.0
+Version: 0.17.0
 Summary: A CLI tool to generate prompts with project structure and file contents
 Home-page: https://github.com/mkorpela/kopipasta
 Author: Mikko Korpela

kopipasta-0.17.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+kopipasta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kopipasta/main.py,sha256=jDcsdCYE3u2EuMKZbcpkyayxgj5soLLm7XWbhG46Poo,34657
+kopipasta-0.17.0.dist-info/LICENSE,sha256=xw4C9TAU7LFu4r_MwSbky90uzkzNtRwAo3c51IWR8lk,1091
+kopipasta-0.17.0.dist-info/METADATA,sha256=4JjrjvjRucGOIlIEP3PvPDLefJ-Dq7JTDGd1HIbiraA,5646
+kopipasta-0.17.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+kopipasta-0.17.0.dist-info/entry_points.txt,sha256=but54qDNz1-F8fVvGstq_QID5tHjczP7bO7rWLFkc6Y,50
+kopipasta-0.17.0.dist-info/top_level.txt,sha256=iXohixMuCdw8UjGDUp0ouICLYBDrx207sgZIJ9lxn0o,10
+kopipasta-0.17.0.dist-info/RECORD,,

kopipasta-0.15.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-kopipasta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kopipasta/main.py,sha256=51k6jZXChwZY_CYVnqCqeY_hoHCAj3flN8qnr0vEVQI,31652
-kopipasta-0.15.0.dist-info/LICENSE,sha256=xw4C9TAU7LFu4r_MwSbky90uzkzNtRwAo3c51IWR8lk,1091
-kopipasta-0.15.0.dist-info/METADATA,sha256=ehTVHvX8IWh7hISa0O3bxJqj4a7gBqX9H0JtU1xU2ys,5646
-kopipasta-0.15.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-kopipasta-0.15.0.dist-info/entry_points.txt,sha256=but54qDNz1-F8fVvGstq_QID5tHjczP7bO7rWLFkc6Y,50
-kopipasta-0.15.0.dist-info/top_level.txt,sha256=iXohixMuCdw8UjGDUp0ouICLYBDrx207sgZIJ9lxn0o,10
-kopipasta-0.15.0.dist-info/RECORD,,