indent 0.1.14__tar.gz → 0.1.16__tar.gz

{indent-0.1.14 → indent-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: indent
-Version: 0.1.14
+Version: 0.1.16
 Summary: Indent is an AI Pair Programmer
 Author-email: Sashank Thupukari <sashank@exponent.run>
 Requires-Python: <3.13,>=3.10
@@ -22,6 +22,7 @@ Requires-Dist: msgspec>=0.19.0
 Requires-Dist: packaging~=24.1
 Requires-Dist: pip<26,>=25.0.1
 Requires-Dist: prompt-toolkit<4,>=3.0.36
+Requires-Dist: pydantic-ai==0.0.30
 Requires-Dist: pydantic-settings<3,>=2.2.1
 Requires-Dist: pydantic[email]<3,>=2.6.4
 Requires-Dist: pygit2<2,>=1.15.0

{indent-0.1.14 → indent-0.1.16}/exponent/__init__.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.14'
-__version_tuple__ = version_tuple = (0, 1, 14)
+__version__ = version = '0.1.16'
+__version_tuple__ = version_tuple = (0, 1, 16)
 
 __commit_id__ = commit_id = None

{indent-0.1.14 → indent-0.1.16}/exponent/core/remote_execution/cli_rpc_types.py

@@ -2,6 +2,7 @@ from typing import TYPE_CHECKING, Any
 
 import msgspec
 import yaml
+from pydantic_ai.format_as_xml import format_as_xml
 
 if TYPE_CHECKING:
     from exponent_server.core.tools.edit_tool import (
@@ -28,6 +29,7 @@ class ToolInput(msgspec.Struct, tag_field="tool_name", omit_defaults=True):
         return msgspec.to_builtins(self)  # type: ignore[no-any-return]
 
     def to_text(self) -> str:
+        """This text is purely used for human debugging, it's not fed to the llm"""
         d = msgspec.to_builtins(self)
         del d["tool_name"]
         return yaml.dump(d)
@@ -41,7 +43,7 @@ class ToolResult(msgspec.Struct, tag_field="tool_name", omit_defaults=True):
         This provides a default textual representation of the tool result. Override it as needed for your tool."""
         d = msgspec.to_builtins(self)
         del d["tool_name"]
-        return yaml.dump(d)
+        return format_as_xml(d, include_root_tag=False, item_tag="item")
 
 
 class ErrorToolResult(ToolResult, tag="error"):

{indent-0.1.14 → indent-0.1.16}/exponent/core/remote_execution/client.py

@@ -5,7 +5,7 @@ import json
 import logging
 import time
 import uuid
-from collections.abc import AsyncGenerator, Callable, Generator
+from collections.abc import AsyncGenerator, Callable, Coroutine, Generator
 from contextlib import asynccontextmanager
 from dataclasses import dataclass
 from typing import Any, TypeVar, cast
@@ -30,6 +30,7 @@ from exponent.core.remote_execution.cli_rpc_types import (
     CliRpcRequest,
     CliRpcResponse,
     ErrorResponse,
+    ErrorToolResult,
     GetAllFilesRequest,
     GetAllFilesResponse,
     HttpRequest,
@@ -611,33 +612,36 @@ class RemoteExecutionClient:
                     response=GetAllFilesResponse(files=files),
                 )
             elif isinstance(request.request, BatchToolExecutionRequest):
-                results: list[ToolResultType] = []
+                coros: list[Coroutine[Any, Any, ToolResultType]] = []
                 for tool_input in request.request.tool_inputs:
-                    try:
-                        if isinstance(tool_input, BashToolInput):
-                            raw_result = await execute_bash_tool(
+                    if isinstance(tool_input, BashToolInput):
+                        coros.append(
+                            execute_bash_tool(
                                 tool_input,
                                 self.working_directory,
                                 should_halt=self.get_halt_check(request.request_id),
                             )
-                        else:
-                            raw_result = await execute_tool(  # type: ignore[assignment]
-                                tool_input, self.working_directory
-                            )
-                        tool_result = truncate_result(raw_result)
-                        results.append(tool_result)
-                    except Exception as e:
-                        logger.error(f"Error executing tool {tool_input}: {e}")
-                        from exponent.core.remote_execution.cli_rpc_types import (
-                            ErrorToolResult,
                         )
+                    else:
+                        coros.append(execute_tool(tool_input, self.working_directory))
+
+                results: list[ToolResultType | BaseException] = await asyncio.gather(
+                    *coros, return_exceptions=True
+                )
 
-                        results.append(ErrorToolResult(error_message=str(e)))
+                processed_results: list[ToolResultType] = []
+                for result in results:
+                    if not isinstance(result, BaseException):
+                        processed_results.append(truncate_result(result))
+                    else:
+                        processed_results.append(
+                            ErrorToolResult(error_message=str(result))
+                        )
 
                 return CliRpcResponse(
                     request_id=request.request_id,
                     response=BatchToolExecutionResponse(
-                        tool_results=results,
+                        tool_results=processed_results,
                     ),
                 )
             elif isinstance(request.request, HttpRequest):

indent-0.1.16/exponent/core/remote_execution/tool_type_utils.py

@@ -0,0 +1,39 @@
+from typing import Any
+
+import msgspec
+
+from exponent.core.remote_execution.cli_rpc_types import ToolResult
+
+
+def to_mostly_xml(tool_result: ToolResult) -> str:
+    """
+    This provides a default textual representation of the tool result. Override it as needed for your tool."""
+    d = msgspec.to_builtins(tool_result)
+    del d["tool_name"]
+    return to_mostly_xml_helper(d)
+
+
+def to_mostly_xml_helper(
+    d: Any,
+) -> str:
+    if isinstance(d, dict):
+        # No outer wrapper at top level, each field gets XML tags
+        parts = []
+        for key, value in d.items():
+            if isinstance(value, list):
+                # Handle lists with item tags
+                list_items = "\n".join(
+                    f"<item>\n{to_mostly_xml_helper(item)}\n</item>" for item in value
+                )
+                parts.append(f"<{key}>\n{list_items}\n</{key}>")
+            elif isinstance(value, dict):
+                # Nested dict
+                parts.append(f"<{key}>\n{to_mostly_xml_helper(value)}\n</{key}>")
+            else:
+                # Scalar value
+                parts.append(f"<{key}>\n{value!s}\n</{key}>")
+        return "\n".join(parts)
+    elif isinstance(d, list):
+        raise ValueError("Lists are not allowed at the top level")
+    else:
+        return str(d)

{indent-0.1.14 → indent-0.1.16}/exponent/core/remote_execution/types.py

@@ -517,6 +517,10 @@ class ChatMode(str, Enum):
     DATABASE = "DATABASE"  # chat with database connection
     WORKFLOW = "WORKFLOW"
 
+    @classmethod
+    def requires_cli(cls, mode: "ChatMode") -> bool:
+        return mode not in [cls.DATABASE]
+
 
 class ChatSource(str, Enum):
     CLI_SHELL = "CLI_SHELL"

{indent-0.1.14 → indent-0.1.16}/pyproject.toml

@@ -21,6 +21,7 @@ dependencies = [
     "prompt-toolkit>=3.0.36,<4",
     "pydantic[email]>=2.6.4,<3",
     "pydantic-settings>=2.2.1,<3",
+    "pydantic-ai==0.0.30",
     "pygit2>=1.15.0,<2",
     "questionary>=2.0.1,<3",
     "rapidfuzz>=3.9.0,<4",