thonny-codemate 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

{thonny_codemate-0.1.4.dist-info → thonny_codemate-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thonny-codemate
-Version: 0.1.4
+Version: 0.1.5
 Summary: A Thonny IDE plugin that provides AI-powered coding assistance using local and cloud LLMs
 Author-email: tokoroten <shinta.nakayama@gmail.com>
 License: MIT
@@ -174,8 +174,15 @@ huggingface-cli download bartowski/Llama-3.2-1B-Instruct-GGUF Llama-3.2-1B-Instr
 4. **Code Generation**:
    - Write a comment describing what you want
    - Right-click and choose "Generate from Comment"
-   - Or use the AI Assistant panel for interactive chat
-5. **Error Fixing**:
+5. **Edit Mode (New in v0.1.5)**:
+   - Switch to "Edit" mode in the LLM Assistant panel
+   - Type your modification request (e.g., "Add error handling to this function")
+   - The AI will modify your code directly in the editor
+   - Works with selected text or entire file
+6. **Interactive Chat**:
+   - Use the AI Assistant panel for general questions
+   - Include context from your current file with the checkbox
+7. **Error Fixing**:
    - When you encounter an error, click "Explain Error" in the assistant panel
    - The AI will analyze the error and suggest fixes
 

{thonny_codemate-0.1.4.dist-info → thonny_codemate-0.1.5.dist-info}/RECORD

@@ -1,8 +1,8 @@
-thonny_codemate-0.1.4.dist-info/licenses/LICENSE,sha256=f6YK7MRRtaWl2brMAtg_aGrsLK_i4rVyho0y1PdnFi0,1065
-thonnycontrib/__init__.py,sha256=7INAjyU8ojDRVyo0y1OQh3ynMPRGqBJZL4fa--i3elk,33
-thonnycontrib/thonny_codemate/__init__.py,sha256=vslo9LDAl7QUJD5DAM6RjelXiu1_nIvLtS2FTzhskgU,13487
+thonny_codemate-0.1.5.dist-info/licenses/LICENSE,sha256=6Mww21sIIHwlMy-By5wl0oPcegzkWF2wE0vi_ZSzz3g,1065
+thonnycontrib/thonny_codemate/__init__.py,sha256=5uJvG0Oah15EVvARAZxN4neMm2xJcsOBRw_xRcaEG4g,13487
 thonnycontrib/thonny_codemate/api.py,sha256=YLXjPsB6cykgRwyjzrUBOGFtw0eu4BQgr1AiMbj8e7c,4259
 thonnycontrib/thonny_codemate/context_manager.py,sha256=K83M-VlBy7DR1xzedyPT8NViqnR9CmX95YmXnDBzRFM,11274
+thonnycontrib/thonny_codemate/edit_mode_handler.py,sha256=7i-FTETFcIOu7lWjPa-zXH27gWY4w9VRg5YcSQ_wzDQ,7612
 thonnycontrib/thonny_codemate/external_providers.py,sha256=PmIRY_lLOILCAZa4mpP3yB9PU7ZWSddWjYPf2S7vkyY,29016
 thonnycontrib/thonny_codemate/i18n.py,sha256=tq1pBwNLYgQtJBXH36MmTOl1sRuaPaXgSyMaAXVIIPU,28846
 thonnycontrib/thonny_codemate/llm_client.py,sha256=Ojk8oxNI7tKAzVEtaoSwOLVisT1cOYdXf9Qw56eC2L4,33767
@@ -12,7 +12,7 @@ thonnycontrib/thonny_codemate/performance_monitor.py,sha256=L6gIin6oBzplRgZB676A
 thonnycontrib/thonny_codemate/prompts.py,sha256=bV4Qjr8SjqWBnnUIk-g-R58sRGbyZOauvlWvNO9GkGg,3885
 thonnycontrib/thonny_codemate/ui/__init__.py,sha256=SDKZ1vYdsb14_jHIP4wTeM8Vqkog8z0PkWquS3-mQIY,43
 thonnycontrib/thonny_codemate/ui/chat_view.py,sha256=veyFSCJUOPVFUt1qJochKTvHQi49u3fzxKQ0Nti0NNc,29203
-thonnycontrib/thonny_codemate/ui/chat_view_html.py,sha256=86UFq4imEeYgPRU4QuXzKa_u2GG4GvoA9xQVpmLe7dg,53661
+thonnycontrib/thonny_codemate/ui/chat_view_html.py,sha256=yul_leokkFdf_LGEME8FYVfPSA_JNP_f3Hv4QyFvDew,60866
 thonnycontrib/thonny_codemate/ui/custom_prompt_dialog.py,sha256=LEemjMmHM_KcidEsUhOOffa1DzCauOXNiUqlH2wGjts,5973
 thonnycontrib/thonny_codemate/ui/markdown_renderer.py,sha256=K1vHLTn6EocPRxb7fXMKGsSFD6iY-OhFTqMY_dBkiRw,15649
 thonnycontrib/thonny_codemate/ui/model_download_dialog.py,sha256=1qzqCL_2J_cXCh9OvUdaPAyouBm76BgfyUlPRkNCDGw,13701
@@ -21,7 +21,7 @@ thonnycontrib/thonny_codemate/utils/__init__.py,sha256=xjA_6r7WFCf3RbCNnZhwFOSap
 thonnycontrib/thonny_codemate/utils/constants.py,sha256=l6KKItPClPy7IWZKH53Kpq-PNMfJogTYIZ2OGKTZO8w,3159
 thonnycontrib/thonny_codemate/utils/error_messages.py,sha256=kOucGfSwBIOE23GsVAIcQYY7YbKjezIuOxiIM1wTKY4,3601
 thonnycontrib/thonny_codemate/utils/unified_error_handler.py,sha256=yvrSiXC3Kzro4KLL6lDLMBRfdff79PLvBF1yjHFhv9E,10769
-thonny_codemate-0.1.4.dist-info/METADATA,sha256=jHCA9FGbVa8l4HkHJuUJXPxePpPK7BuI_Jp-VmVplkU,10870
-thonny_codemate-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thonny_codemate-0.1.4.dist-info/top_level.txt,sha256=thF9WQtY_lcNKOOR4SQeeWLAVWb4i8XhdGC7pEMAOHY,14
-thonny_codemate-0.1.4.dist-info/RECORD,,
+thonny_codemate-0.1.5.dist-info/METADATA,sha256=g1mOYKzg0jD93DgLMlOMsY35otT9PCIEewvjf8NraDg,11227
+thonny_codemate-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thonny_codemate-0.1.5.dist-info/top_level.txt,sha256=thF9WQtY_lcNKOOR4SQeeWLAVWb4i8XhdGC7pEMAOHY,14
+thonny_codemate-0.1.5.dist-info/RECORD,,

{thonny_codemate-0.1.4.dist-info → thonny_codemate-0.1.5.dist-info}/licenses/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 tokoroten
+Copyright (c) 2025 tokoroten
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

thonnycontrib/thonny_codemate/__init__.py

@@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)
 logger.disabled = True
 
 # プラグインのバージョン
-__version__ = "0.1.4"
+__version__ = "0.1.5"
 
 # グローバル変数でプラグインの状態を管理
 _plugin_loaded = False

thonnycontrib/thonny_codemate/edit_mode_handler.py

@@ -0,0 +1,218 @@
+"""
+Edit mode handler for single file editing
+Inspired by VSCode Copilot Chat's edit functionality
+"""
+import re
+import tkinter as tk
+from typing import Optional, Tuple, List
+from pathlib import Path
+import difflib
+import logging
+
+from thonny import get_workbench
+from .i18n import tr
+
+logger = logging.getLogger(__name__)
+
+
+class EditModeHandler:
+    """Handles edit mode functionality for modifying code in the current file"""
+    
+    # Prompt template for edit mode
+    EDIT_PROMPT_TEMPLATE = """You are an AI programming assistant specialized in modifying code.
+
+Instructions:
+1. Provide the complete modified code
+2. Use '# ...existing code...' to represent unchanged regions (this saves tokens)
+3. Preserve the original indentation and coding style
+4. Focus only on the requested changes
+5. Include helpful comments for significant changes
+
+Current file: {filename}
+Language: {language}
+
+Current code:
+```{language}
+{content}
+```
+
+{selection_info}
+
+User request: {user_prompt}
+
+Please provide the modified code. Start your response with a code block containing the updated code:
+"""
+
+    SELECTION_TEMPLATE = """Selected region (lines {start_line}-{end_line}):
+```{language}
+{selected_text}
+```
+
+Focus your changes primarily on the selected region, but you may modify other parts if necessary.
+"""
+
+    def __init__(self, llm_client):
+        self.llm_client = llm_client
+        self.workbench = get_workbench()
+        
+    def build_edit_prompt(self, user_prompt: str, filename: str, content: str, 
+                         selection: Optional[Tuple[str, int, int]] = None) -> str:
+        """Build the prompt for edit mode"""
+        # Detect language from filename
+        language = self._detect_language(filename)
+        
+        # Handle selection if provided
+        selection_info = ""
+        if selection:
+            selected_text, start_line, end_line = selection
+            selection_info = self.SELECTION_TEMPLATE.format(
+                language=language,
+                selected_text=selected_text,
+                start_line=start_line,
+                end_line=end_line
+            )
+        
+        return self.EDIT_PROMPT_TEMPLATE.format(
+            filename=filename or "Untitled",
+            language=language,
+            content=content,
+            selection_info=selection_info,
+            user_prompt=user_prompt
+        )
+    
+    def _detect_language(self, filename: str) -> str:
+        """Detect programming language from filename"""
+        if not filename:
+            return "python"
+            
+        ext = Path(filename).suffix.lower()
+        language_map = {
+            '.py': 'python',
+            '.js': 'javascript',
+            '.java': 'java',
+            '.cpp': 'cpp',
+            '.c': 'c',
+            '.cs': 'csharp',
+            '.rb': 'ruby',
+            '.go': 'go',
+            '.rs': 'rust',
+            '.php': 'php',
+            '.html': 'html',
+            '.css': 'css',
+            '.sql': 'sql',
+            '.sh': 'bash',
+            '.yml': 'yaml',
+            '.yaml': 'yaml',
+            '.json': 'json',
+            '.xml': 'xml'
+        }
+        return language_map.get(ext, 'text')
+    
+    def extract_code_block(self, response: str) -> Optional[str]:
+        """Extract the first code block from LLM response"""
+        # Pattern to match code blocks with optional language specifier
+        pattern = r'```(?:\w+)?\s*\n(.*?)```'
+        matches = re.findall(pattern, response, re.DOTALL)
+        
+        if matches:
+            return matches[0].strip()
+        
+        # If no code block found, check if the entire response might be code
+        # (sometimes LLMs return code without backticks)
+        lines = response.strip().split('\n')
+        if len(lines) > 3 and any(line.strip().startswith(('def ', 'class ', 'import ', 'from ')) for line in lines):
+            return response.strip()
+            
+        return None
+    
+    def expand_existing_code_markers(self, modified_code: str, original_code: str) -> str:
+        """Expand '# ...existing code...' markers with actual code"""
+        if '# ...existing code...' not in modified_code:
+            return modified_code
+            
+        original_lines = original_code.split('\n')
+        modified_lines = modified_code.split('\n')
+        result_lines = []
+        
+        original_idx = 0
+        
+        for line in modified_lines:
+            if '# ...existing code...' in line.strip():
+                # Skip this marker
+                indent = len(line) - len(line.lstrip())
+                
+                # Find the next matching line in modified code
+                next_modified_idx = modified_lines.index(line) + 1
+                next_modified_line = None
+                while next_modified_idx < len(modified_lines):
+                    next_line = modified_lines[next_modified_idx]
+                    if next_line.strip() and '# ...existing code...' not in next_line:
+                        next_modified_line = next_line.strip()
+                        break
+                    next_modified_idx += 1
+                
+                # Copy original lines until we find the next modified line
+                while original_idx < len(original_lines):
+                    orig_line = original_lines[original_idx]
+                    if next_modified_line and orig_line.strip() == next_modified_line:
+                        break
+                    result_lines.append(orig_line)
+                    original_idx += 1
+            else:
+                result_lines.append(line)
+                # Advance original_idx if this line matches
+                if original_idx < len(original_lines) and line.strip() == original_lines[original_idx].strip():
+                    original_idx += 1
+        
+        return '\n'.join(result_lines)
+    
+    def create_diff(self, original: str, modified: str) -> List[str]:
+        """Create a unified diff between original and modified code"""
+        original_lines = original.splitlines(keepends=True)
+        modified_lines = modified.splitlines(keepends=True)
+        
+        diff = list(difflib.unified_diff(
+            original_lines,
+            modified_lines,
+            fromfile='Original',
+            tofile='Modified',
+            lineterm=''
+        ))
+        
+        return diff
+    
+    def apply_edit(self, editor, new_code: str) -> bool:
+        """Apply the edit to the editor"""
+        try:
+            text_widget = editor.get_text_widget()
+            
+            # Save cursor position
+            cursor_pos = text_widget.index("insert")
+            
+            # Replace content
+            text_widget.delete("1.0", tk.END)
+            text_widget.insert("1.0", new_code)
+            
+            # Restore cursor position if possible
+            try:
+                text_widget.mark_set("insert", cursor_pos)
+            except:
+                pass
+                
+            return True
+            
+        except Exception as e:
+            logger.error(f"Failed to apply edit: {e}")
+            return False
+    
+    def get_selection_info(self, editor) -> Optional[Tuple[str, int, int]]:
+        """Get selected text and line numbers if any"""
+        text_widget = editor.get_text_widget()
+        
+        if text_widget.tag_ranges("sel"):
+            selected_text = text_widget.get("sel.first", "sel.last")
+            start_line = int(text_widget.index("sel.first").split(".")[0])
+            end_line = int(text_widget.index("sel.last").split(".")[0])
+            return (selected_text, start_line, end_line)
+            
+        return None

thonnycontrib/thonny_codemate/ui/chat_view_html.py

@@ -105,6 +105,9 @@ class LLMChatViewHTML(ttk.Frame):
         
         # 会話履歴を読み込む
         self._load_chat_history()
+        
+        # EditModeHandlerを初期化
+        self.edit_mode_handler = None
     
     def _show_fallback_ui(self):
         """tkinterwebが利用できない場合のフォールバックUI"""
@@ -248,6 +251,27 @@ class LLMChatViewHTML(ttk.Frame):
     
     def _create_buttons(self, button_frame):
         """ボタン類を作成"""
+        # モード選択フレーム
+        mode_frame = ttk.LabelFrame(button_frame, text=tr("Mode"), padding=2)
+        mode_frame.pack(side=tk.LEFT, padx=5)
+        
+        self.mode_var = tk.StringVar(value="chat")
+        ttk.Radiobutton(
+            mode_frame,
+            text=tr("Chat"),
+            variable=self.mode_var,
+            value="chat",
+            command=self._on_mode_change
+        ).pack(side=tk.LEFT, padx=2)
+        
+        ttk.Radiobutton(
+            mode_frame,
+            text=tr("Edit"),
+            variable=self.mode_var,
+            value="edit",
+            command=self._on_mode_change
+        ).pack(side=tk.LEFT, padx=2)
+        
         # Sendボタン
         self.send_button = ttk.Button(
             button_frame,
@@ -651,6 +675,12 @@ class LLMChatViewHTML(ttk.Frame):
         # UIをクリア
         self.input_text.delete("1.0", tk.END)
         
+        # Edit modeの場合は特別な処理
+        if self.mode_var.get() == "edit":
+            self._handle_edit_mode(message)
+            return
+        
+        # Chat mode（通常の処理）
         # コンテキスト情報を取得して表示メッセージを作成
         context_info = self._get_context_info()
         display_message = self._format_display_message(message, context_info)
@@ -913,6 +943,8 @@ Full file content:
                     self._handle_token(content)
                 elif msg_type == "complete":
                     self._handle_completion()
+                elif msg_type == "edit_complete":
+                    self._handle_edit_completion(content)
                 elif msg_type == "error":
                     self._handle_error(content)
                 elif msg_type == "info":
@@ -980,6 +1012,56 @@ Full file content:
         if self._stop_generation:
             self._add_message("system", tr("[Generation stopped by user]"))
     
+    def _handle_edit_completion(self, full_response: str):
+        """Edit mode完了時の処理"""
+        # 通常の完了処理
+        self._handle_completion()
+        
+        # 中止された場合のチェック
+        if self._stop_generation:
+            self._add_message("system", tr("⚠️ Edit generation was stopped. Changes were not applied."))
+            return
+        
+        # コードブロックを抽出
+        new_code = self.edit_mode_handler.extract_code_block(full_response)
+        
+        if not new_code:
+            self._add_message("system", tr("No code changes were generated. Please try rephrasing your request."))
+            return
+        
+        # エディタを取得
+        workbench = get_workbench()
+        editor = workbench.get_editor_notebook().get_current_editor()
+        if not editor:
+            self._add_message("system", tr("Editor was closed. Cannot apply changes."))
+            return
+        
+        # 現在のコードを取得
+        text_widget = editor.get_text_widget()
+        original_code = text_widget.get("1.0", tk.END).strip()
+        
+        # "# ...existing code..." マーカーを展開
+        try:
+            expanded_code = self.edit_mode_handler.expand_existing_code_markers(new_code, original_code)
+        except Exception as e:
+            logger.error(f"Failed to expand code markers: {e}")
+            expanded_code = new_code  # フォールバック
+        
+        # 差分を作成して表示（オプション）
+        diff_lines = self.edit_mode_handler.create_diff(original_code, expanded_code)
+        
+        # 変更を適用
+        if self.edit_mode_handler.apply_edit(editor, expanded_code):
+            self._add_message("system", tr("✅ Changes applied successfully!"))
+            
+            # 差分のサマリーを表示
+            added = sum(1 for line in diff_lines if line.startswith('+') and not line.startswith('+++'))
+            removed = sum(1 for line in diff_lines if line.startswith('-') and not line.startswith('---'))
+            if added or removed:
+                self._add_message("system", f"📊 {added} lines added, {removed} lines removed")
+        else:
+            self._add_message("system", tr("❌ Failed to apply changes."))
+    
     def _handle_error(self, error_message: str):
         """エラーを処理"""
         # ストリーミングエリアを非表示
@@ -1194,6 +1276,98 @@ Full file content:
         # 履歴もクリア
         self._save_chat_history()
     
+    def _handle_edit_mode(self, user_prompt: str):
+        """Edit modeでのメッセージ処理"""
+        # エディタの情報を取得
+        workbench = get_workbench()
+        editor = workbench.get_editor_notebook().get_current_editor()
+        if not editor:
+            self._add_message("system", tr("No active editor. Please open a file to edit."))
+            return
+        
+        # ファイル情報を取得
+        filename = editor.get_filename() or "Untitled"
+        text_widget = editor.get_text_widget()
+        content = text_widget.get("1.0", tk.END).strip()
+        
+        if not content:
+            self._add_message("system", tr("The editor is empty. Please write some code first."))
+            return
+        
+        # 選択範囲を取得（あれば）
+        selection_info = self.edit_mode_handler.get_selection_info(editor)
+        
+        # メッセージを表示
+        selection_text = ""
+        if selection_info:
+            _, start_line, end_line = selection_info
+            selection_text = f" (lines {start_line}-{end_line})"
+        self._add_message("user", f"{user_prompt}\n\n[Edit Mode: {Path(filename).name}{selection_text}]")
+        
+        # 生成を開始
+        self._start_edit_generation(user_prompt, filename, content, selection_info)
+    
+    def _start_edit_generation(self, user_prompt: str, filename: str, content: str, selection_info):
+        """Edit mode用の生成を開始"""
+        if self._processing:
+            return
+        
+        self._processing = True
+        self._stop_generation = False
+        self.send_button.config(text=tr("Stop"), state=tk.NORMAL)  # Stop ボタンを有効化
+        
+        # ストリーミングの準備
+        self._start_generating_animation()
+        
+        # バックグラウンドで生成
+        def generate():
+            try:
+                # Edit用のプロンプトを構築
+                prompt = self.edit_mode_handler.build_edit_prompt(
+                    user_prompt, filename, content, selection_info
+                )
+                
+                # LLMで生成
+                from .. import get_llm_client
+                llm_client = get_llm_client()
+                
+                # 応答を収集
+                full_response = ""
+                for token in llm_client.generate_stream(prompt):
+                    if self._stop_generation:
+                        # 中止された場合もedit_completeを送信（部分的な応答で処理）
+                        self.message_queue.put(("edit_complete", full_response))
+                        return
+                    full_response += token
+                    self.message_queue.put(("token", token))
+                
+                # コードブロックを抽出
+                self.message_queue.put(("edit_complete", full_response))
+                
+            except Exception as e:
+                self.message_queue.put(("error", str(e)))
+        
+        import threading
+        thread = threading.Thread(target=generate, daemon=True)
+        thread.start()
+    
+    def _on_mode_change(self):
+        """モード変更時の処理"""
+        mode = self.mode_var.get()
+        if mode == "edit":
+            # Edit modeに切り替え
+            self.context_check.config(state=tk.DISABLED)
+            self.context_var.set(True)  # Edit modeでは常にコンテキストを含む
+            
+            # EditModeHandlerを初期化（必要な場合）
+            if not self.edit_mode_handler:
+                from ..edit_mode_handler import EditModeHandler
+                from .. import get_llm_client
+                self.edit_mode_handler = EditModeHandler(get_llm_client())
+        else:
+            # Chat modeに戻る
+            self.context_check.config(state=tk.NORMAL)
+    
     def _toggle_context(self):
         """コンテキストの有効/無効を切り替え"""
         if self.context_var.get():

thonnycontrib/__init__.py

@@ -1 +0,0 @@
-# thonnycontrib namespace package