auto-coder 0.1.352__py3-none-any.whl → 0.1.353__py3-none-any.whl

{auto_coder-0.1.352.dist-info → auto_coder-0.1.353.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.352
+Version: 0.1.353
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.352.dist-info → auto_coder-0.1.353.dist-info}/RECORD

@@ -14,7 +14,7 @@ autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,1
 autocoder/lang.py,sha256=PFtATuOhHRnfpqHQkXr6p4C893JvpsgwTMif3l-GEi0,14321
 autocoder/models.py,sha256=W-IboD3wv6-P4U4I2o2vXOasD3pUAL8DTGhwJqL2AvI,13428
 autocoder/run_context.py,sha256=IUfSO6_gp2Wt1blFWAmOpN0b0nDrTTk4LmtCYUBIoro,1643
-autocoder/version.py,sha256=Fh3YsTo0l3qG9GksFll-ePdOjVFGl8rV-HKkh8lca08,23
+autocoder/version.py,sha256=URYMbZX7bnhE4C9LpFn-XkzqSqHAptfB4MYvmtImMcM,23
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/agentic_edit.py,sha256=XsfePZ-t6M-uBSdG1VLZXk1goqXk2HPeJ_A8IYyBuWQ,58896
 autocoder/agent/agentic_edit_types.py,sha256=oFcDd_cxJ2yH9Ed1uTpD3BipudgoIEWDMPb5pAkq4gI,3288
@@ -80,7 +80,7 @@ autocoder/common/const.py,sha256=eTjhjh4Aj4CUzviJ81jaf3Y5cwqsLATySn2wJxaS6RQ,291
 autocoder/common/context_pruner.py,sha256=HlU5BmxpCX7uVTJUsTFLlXvkwcOQuidI9uCKZaFxh6s,19874
 autocoder/common/conversation_pruner.py,sha256=pzmrQEa7pFzA66eYSS_h7VqP6ZwUABeooDQzm0PGu0A,5770
 autocoder/common/files.py,sha256=nPiKcnUcYZbSUn3TskKeTVnAxCJRtuehPuB_5d2imX8,4618
-autocoder/common/git_utils.py,sha256=SU66RwNTBanG4XdX_dVH9z7sFd2XzlOG7ETTOGLaTEo,27077
+autocoder/common/git_utils.py,sha256=lGFLxxoyMKjIRgLeE_9176T3rdKI13DZMd28Lowk218,27093
 autocoder/common/global_cancel.py,sha256=TyjYQPESwo04D1BOTmC9hH7IbkKDDM-b2zPacEHGIQ8,3264
 autocoder/common/image_to_page.py,sha256=yWiTJQ49Lm3j0FngiJhQ9u7qayqE_bOGb8Rk0TmSWx0,14123
 autocoder/common/index_import_export.py,sha256=h758AYY1df6JMTKUXYmMkSgxItfymDt82XT7O-ygEuw,4565
@@ -129,7 +129,7 @@ autocoder/common/v2/code_editblock_manager.py,sha256=G0CIuV9Ki0FqMLnpA8nBT4pnkCN
 autocoder/common/v2/code_manager.py,sha256=C403bS-f6urixwitlKHcml-J03hci-UyNwHJOqBiY6Q,9182
 autocoder/common/v2/code_strict_diff_manager.py,sha256=v-J1kDyLg7tLGg_6_lbO9S4fNkx7M_L8Xr2G7fPptiU,9347
 autocoder/common/v2/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/common/v2/agent/agentic_edit.py,sha256=e2ekrknA34CNpx4HrLRTK8rsKVp_bYu4rdO_rpvFGvc,98209
+autocoder/common/v2/agent/agentic_edit.py,sha256=yGG8csvDppZ5VilV7FuF0nhBLzj1hDR3GMVONPD3vXA,99880
 autocoder/common/v2/agent/agentic_edit_conversation.py,sha256=pFgWPWHKhZ4J9EcFmIdiGsrSolTZuYcH1qkgKdD8nwk,7726
 autocoder/common/v2/agent/agentic_edit_types.py,sha256=VJMrictg6hJ3mC45VgQGRd43DyDUPDUvPV1Rf3z72NI,4776
 autocoder/common/v2/agent/agentic_tool_display.py,sha256=WKirt-2V346KLnbHgH3NVJiK3xvriD9oaCWj2IdvzLU,7309
@@ -146,6 +146,7 @@ autocoder/common/v2/agent/agentic_edit_tools/plan_mode_respond_tool_resolver.py,
 autocoder/common/v2/agent/agentic_edit_tools/read_file_tool_resolver.py,sha256=9Bh0KVbL0qiIqwChlb77biiBiETQ3zekxGe5Fj7hXAg,2800
 autocoder/common/v2/agent/agentic_edit_tools/replace_in_file_tool_resolver.py,sha256=lpD4fCbVR8GTrynqXON69IjM94nPy3nuUL62Ashm5O4,7988
 autocoder/common/v2/agent/agentic_edit_tools/search_files_tool_resolver.py,sha256=mKztNjR5dmbyJ2aPcMkOuf5krhYPWbNRvIGY8Qp8dWU,5502
+autocoder/common/v2/agent/agentic_edit_tools/test_search_files_tool_resolver.py,sha256=9eBo3WLkrr77iNotwIwVmH1ZL3UY0JQgLpdAIc9wTTM,6127
 autocoder/common/v2/agent/agentic_edit_tools/use_mcp_tool_resolver.py,sha256=wM2Xy4bcnD0TSLEmcM8rvvyyWenN5_KQnJMO6hJ8lTE,1716
 autocoder/common/v2/agent/agentic_edit_tools/write_to_file_tool_resolver.py,sha256=UO4SrkDek3WDlRdlHH022W1roSNMdMcipJqDxRBlheM,3044
 autocoder/compilers/__init__.py,sha256=C0HOms70QA747XD0uZEMmGtRFcIPenohyqECNStv0Bw,1647
@@ -289,9 +290,9 @@ autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=KW0mlmcHlStXi8-_6fXZ2-ifeJ5mgP0OV7DQFzCtIsw,14008
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.352.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.352.dist-info/METADATA,sha256=BnIcPQS0Q6YOueGvTg9Y-NujNFcXan24iFF0IzxxpDw,2751
-auto_coder-0.1.352.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.352.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.352.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.352.dist-info/RECORD,,
+auto_coder-0.1.353.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.353.dist-info/METADATA,sha256=NFUb4YANaxUxKYGsaxYoCntgWok0LCW5sSZv1WRpxLs,2751
+auto_coder-0.1.353.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.353.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.353.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.353.dist-info/RECORD,,

autocoder/common/git_utils.py

@@ -64,7 +64,7 @@ def commit_changes(repo_path: str, message: str) -> CommitResult:
     try:
         repo.git.add(all=True)
         if repo.is_dirty():
-            commit = repo.index.commit(message)
+            commit = repo.index.commit(message,skip_hooks=True)
             result = CommitResult(
                 success=True,
                 commit_message=message,

autocoder/common/v2/agent/agentic_edit.py

@@ -1177,6 +1177,8 @@ Below are some files the user is focused on, and the content is up to date. Thes
                 # If no event was processed in this iteration, break inner loop
                 if not found_event:
                     break
+        
+        yield TokenUsageEvent(usage=meta_holder.meta)        
 
         # After generator exhausted, yield any remaining content
         if in_thinking_block:
@@ -1440,6 +1442,37 @@ Below are some files the user is focused on, and the content is up to date. Thes
             self.apply_pre_changes()
             event_stream = self.analyze(request)
             for event in event_stream:
+                if isinstance(event, TokenUsageEvent):
+                    last_meta: SingleOutputMeta = event.usage
+                    # Get model info for pricing
+                    from autocoder.utils import llms as llm_utils
+                    model_name = ",".join(llm_utils.get_llm_names(self.llm))
+                    model_info = llm_utils.get_model_info(
+                        model_name, self.args.product_mode) or {}
+                    input_price = model_info.get(
+                        "input_price", 0.0) if model_info else 0.0
+                    output_price = model_info.get(
+                        "output_price", 0.0) if model_info else 0.0
+
+                    # Calculate costs
+                    input_cost = (last_meta.input_tokens_count *
+                                  input_price) / 1000000  # Convert to millions
+                    # Convert to millions
+                    output_cost = (
+                        last_meta.generated_tokens_count * output_price) / 1000000
+
+                    self.printer.print_in_terminal(
+                            "code_generation_complete",
+                            duration=0.0,
+                            input_tokens=last_meta.input_tokens_count,
+                            output_tokens=last_meta.generated_tokens_count,
+                            input_cost=input_cost,
+                            output_cost=output_cost,
+                            speed=0.0,
+                            model_names=model_name,
+                            sampling_count=1
+                        )
+                    
                 if isinstance(event, LLMThinkingEvent):
                     # Render thinking within a less prominent style, maybe grey?
                     console.print(f"[grey50]{event.text}[/grey50]", end="")

autocoder/common/v2/agent/agentic_edit_tools/test_search_files_tool_resolver.py

@@ -0,0 +1,163 @@
+import pytest
+import os
+import tempfile
+import shutil
+from unittest.mock import patch, MagicMock
+
+from autocoder.common.v2.agent.agentic_edit_tools.search_files_tool_resolver import SearchFilesToolResolver
+from autocoder.common.v2.agent.agentic_edit_types import SearchFilesTool, ToolResult
+from autocoder.common import AutoCoderArgs
+
+# Helper function to create a directory structure with files for testing
+def create_test_files(base_dir, structure):
+    """
+    Creates a directory structure with files based on the provided dictionary.
+    Keys are filenames (relative to base_dir), values are file contents.
+    Directories are created automatically.
+    """
+    for path, content in structure.items():
+        full_path = os.path.join(base_dir, path)
+        os.makedirs(os.path.dirname(full_path), exist_ok=True)
+        with open(full_path, 'w') as f:
+            f.write(content)
+
+@pytest.fixture
+def search_tool_resolver(temp_search_dir):
+    """Fixture to provide an instance of SearchFilesToolResolver."""
+    # Create AutoCoderArgs with the temp directory as source_dir to allow the security check to pass
+    args = AutoCoderArgs()
+    args.source_dir = temp_search_dir  # Set the source_dir to our temp directory
+    return SearchFilesToolResolver(None, SearchFilesTool(path="", regex=""), args)
+
+@pytest.fixture(scope="function")
+def temp_search_dir():
+    """Fixture to create a temporary directory with test files for searching."""
+    temp_dir = tempfile.mkdtemp()
+    test_structure = {
+        "file1.txt": "Hello world\nThis is a test file.",
+        "subdir/file2.py": "import sys\n\ndef main():\n    print('Python script')\n",
+        "subdir/another.txt": "Another text file with world.",
+        ".hiddenfile": "This should be ignored by default",
+        "no_match.md": "Markdown file."
+    }
+    create_test_files(temp_dir, test_structure)
+    yield temp_dir # Provide the path to the test function
+    shutil.rmtree(temp_dir) # Cleanup after test
+
+# --- Test Cases ---
+
+def test_resolve_finds_matches(search_tool_resolver, temp_search_dir):
+    """Test that resolve finds matches correctly."""
+    # Set up the tool with the pattern we want to search for
+    tool = SearchFilesTool(
+        path="",  # Use empty path to search in the source_dir itself
+        regex="world",
+        file_pattern="*.txt"
+    )
+    search_tool_resolver.tool = tool
+
+    # Call the resolve method directly
+    response = search_tool_resolver.resolve()
+
+    # Check the response
+    assert isinstance(response, ToolResult)
+    assert response.success
+    assert "Search completed. Found 2 matches" in response.message
+    
+    # Check that the correct files were found
+    assert len(response.content) == 2
+    paths = [result["path"] for result in response.content]
+    assert any("file1.txt" in path for path in paths)
+    assert any("another.txt" in path for path in paths)
+    
+    # Check that the match lines contain our search pattern
+    for result in response.content:
+        assert "world" in result["match_line"]
+
+def test_resolve_no_matches(search_tool_resolver, temp_search_dir):
+    """Test that resolve handles no matches correctly."""
+    tool = SearchFilesTool(
+        path="",  # Use empty path to search in the source_dir itself
+        regex="nonexistent_pattern",
+        file_pattern="*"
+    )
+    search_tool_resolver.tool = tool
+
+    response = search_tool_resolver.resolve()
+
+    assert isinstance(response, ToolResult)
+    assert response.success  # Still success, just no results
+    assert "Search completed. Found 0 matches" in response.message
+    assert len(response.content) == 0
+
+def test_resolve_file_pattern(search_tool_resolver, temp_search_dir):
+    """Test that the file_pattern is correctly applied."""
+    # Test .txt pattern
+    tool_txt = SearchFilesTool(
+        path="",  # Use empty path to search in the source_dir itself
+        regex="world",
+        file_pattern="*.txt"  # Only search .txt files
+    )
+    search_tool_resolver.tool = tool_txt
+    
+    response_txt = search_tool_resolver.resolve()
+    
+    assert isinstance(response_txt, ToolResult)
+    assert response_txt.success
+    assert "Search completed. Found 2 matches" in response_txt.message
+    # Ensure only .txt files were matched
+    for result in response_txt.content:
+        assert result["path"].endswith(".txt")
+    
+    # Test .py pattern
+    tool_py = SearchFilesTool(
+        path="",  # Use empty path to search in the source_dir itself
+        regex="print",
+        file_pattern="*.py"  # Only search .py files
+    )
+    search_tool_resolver.tool = tool_py
+    
+    response_py = search_tool_resolver.resolve()
+    
+    assert isinstance(response_py, ToolResult)
+    assert response_py.success
+    assert "Search completed. Found 1 matches" in response_py.message
+    # Ensure only .py files were matched
+    for result in response_py.content:
+        assert result["path"].endswith(".py")
+
+def test_invalid_regex(search_tool_resolver, temp_search_dir):
+    """Test that an invalid regex pattern is properly handled."""
+    tool = SearchFilesTool(
+        path="",  # Use empty path to search in the source_dir itself
+        regex="[invalid regex",  # Invalid regex pattern
+        file_pattern="*"
+    )
+    search_tool_resolver.tool = tool
+
+    response = search_tool_resolver.resolve()
+
+    assert isinstance(response, ToolResult)
+    assert not response.success
+    assert "Invalid regex pattern" in response.message
+
+def test_nonexistent_path(search_tool_resolver, temp_search_dir):
+    """Test that a nonexistent path is properly handled."""
+    # Create a path that we know doesn't exist under temp_search_dir
+    nonexistent_path = "nonexistent_subdirectory"
+    
+    tool = SearchFilesTool(
+        path=nonexistent_path,  # This path doesn't exist in our temp directory
+        regex="pattern",
+        file_pattern="*"
+    )
+    search_tool_resolver.tool = tool
+
+    response = search_tool_resolver.resolve()
+
+    assert isinstance(response, ToolResult)
+    assert not response.success
+    assert "Error: Search path not found" in response.message
+
+# Add more tests as needed
+

autocoder/version.py

@@ -1 +1 @@
-__version__ = "0.1.352"
+__version__ = "0.1.353"