indent 0.0.8__py3-none-any.whl → 0.1.2__py3-none-any.whl

exponent/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.8"  # Keep in sync with pyproject.toml
+__version__ = "0.1.2"  # Keep in sync with pyproject.toml

exponent/core/remote_execution/cli_rpc_types.py

@@ -96,14 +96,17 @@ class GrepToolInput(ToolInput, tag=GREP_TOOL_NAME):
     pattern: str
     path: str | None = None
     include: str | None = None
+    multiline: bool | None = None
 
 
 class GrepToolResult(ToolResult, tag=GREP_TOOL_NAME):
     matches: list[str]
     truncated: bool = False
 
+
 WEB_FETCH_TOOL_NAME = "web_fetch"
 
+
 class WebFetchToolInput(ToolInput, tag=WEB_FETCH_TOOL_NAME):
     query: str
 

exponent/core/remote_execution/files.py

@@ -6,6 +6,7 @@ from anyio import Path as AsyncPath
 from python_ripgrep import PySortMode, PySortModeKind, files, search
 from rapidfuzz import process
 
+from exponent.core.remote_execution.cli_rpc_types import ErrorToolResult, GrepToolResult
 from exponent.core.remote_execution.types import (
     FileAttachment,
     FilePath,
@@ -28,6 +29,7 @@ FILE_NOT_FOUND: Final[str] = "File {} does not exist"
 MAX_FILES_TO_WALK: Final[int] = 10_000
 
 GLOB_MAX_COUNT: Final[int] = 1000
+GREP_MAX_RESULTS = 100
 
 
 class FileCache:
@@ -222,12 +224,32 @@ async def search_files(
     file_pattern: str | None,
     regex: str,
     working_directory: str,
-) -> list[str]:
+    multiline: bool | None = None,
+) -> GrepToolResult | ErrorToolResult:
     path = AsyncPath(working_directory) / path_str
+
+    if not await path.exists():
+        return ErrorToolResult(
+            error_message=f"Path does not exist: {path_str}",
+        )
+
     path_resolved = await path.resolve()
     globs = [file_pattern] if file_pattern else None
 
-    return await to_thread(
+    if globs:
+        matched_files = await to_thread(
+            files,
+            patterns=[],
+            paths=[str(path_resolved)],
+            globs=globs,
+            max_count=1,
+        )
+        if not matched_files:
+            return ErrorToolResult(
+                error_message=f"No files matched the include glob pattern: {file_pattern} at {path_str}",
+            )
+
+    results = await to_thread(
         search,
         patterns=[regex],
         paths=[str(path_resolved)],
@@ -238,6 +260,12 @@ async def search_files(
         separator_field_context="|",
         separator_field_match="|",
         separator_context="\n...\n",
+        multiline=multiline,
+    )
+
+    return GrepToolResult(
+        matches=results[:GREP_MAX_RESULTS],
+        truncated=bool(len(results) > GREP_MAX_RESULTS),
     )
 
 

exponent/core/remote_execution/tool_execution.py

@@ -37,8 +37,6 @@ from exponent.core.remote_execution.utils import (
     safe_read_file,
 )
 
-GREP_MAX_RESULTS = 100
-
 
 async def execute_tool(
     tool_input: ToolInputType, working_directory: str
@@ -247,16 +245,13 @@ async def execute_glob_files(
 
 async def execute_grep_files(
     tool_input: GrepToolInput, working_directory: str
-) -> GrepToolResult:
-    results = await files.search_files(
+) -> GrepToolResult | ErrorToolResult:
+    return await files.search_files(
         path_str=working_directory if tool_input.path is None else tool_input.path,
         file_pattern=tool_input.include,
         regex=tool_input.pattern,
         working_directory=working_directory,
-    )
-    return GrepToolResult(
-        matches=results[:GREP_MAX_RESULTS],
-        truncated=bool(len(results) > GREP_MAX_RESULTS),
+        multiline=tool_input.multiline,
     )
 
 

{indent-0.0.8.dist-info → indent-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: indent
-Version: 0.0.8
+Version: 0.1.2
 Summary: Indent is an AI Pair Programmer
 Author-email: Sashank Thupukari <sashank@exponent.run>
 Requires-Python: <3.13,>=3.10
@@ -12,7 +12,6 @@ Requires-Dist: click<9,>=8.1.7
 Requires-Dist: colour<0.2,>=0.1.5
 Requires-Dist: diff-match-patch<20230431,>=20230430
 Requires-Dist: eval-type-backport<0.3,>=0.2.0
-Requires-Dist: gevent==24.2.1
 Requires-Dist: git-python>=1.0.3
 Requires-Dist: gitignore-parser<0.2,>=0.1.11
 Requires-Dist: gql[httpx,websockets]<4,>=3.5.0

{indent-0.0.8.dist-info → indent-0.1.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-exponent/__init__.py,sha256=JPfGr3EVn4l866iqvmWsgCj8Ri_AYo-pmJSR6IzXoBU,58
+exponent/__init__.py,sha256=W4xwjAPdDCDNl1Z1bnYJwDlxi1NKhql6yqsZmX7rk_A,58
 exponent/cli.py,sha256=9FPB5bqqGn7qVA_q2XZL6B2kRngVQoPdyvUvC5BH1_0,3496
 exponent/py.typed,sha256=9XZl5avs8yHp89XP_1Fjtbeg_2rjYorCC9I0k_j-h2c,334
 exponent/commands/cloud_commands.py,sha256=4DgS7PjCtCFB5uNN-szzAzOj16UU1D9b9_qS7DskoLE,2026
@@ -23,18 +23,17 @@ exponent/core/graphql/mutations.py,sha256=WRwgJzMTETvry1yc9-EBlIRWkePjHIskBAm_6t
 exponent/core/graphql/queries.py,sha256=TXXHLGb7QpeICaofowVYsjyHDfqjCoQ3omLbesuw06s,2612
 exponent/core/graphql/subscriptions.py,sha256=gg42wG5HqEuNMJU7OUHruNCAGtM6FKPLRD7KfjcKjC4,9995
 exponent/core/remote_execution/checkpoints.py,sha256=3QGYMLa8vT7XmxMYTRcGrW8kNGHwRC0AkUfULribJWg,6354
-exponent/core/remote_execution/cli_rpc_types.py,sha256=zzV_PD9Oy3p4J4Ip1v0Mpy2BnJTFKI-Q2WT062tVdlY,4557
+exponent/core/remote_execution/cli_rpc_types.py,sha256=3Yj6kIkqPAf7FNNni5V4XNe8SLPoTgbcL6swesW7cw4,4593
 exponent/core/remote_execution/client.py,sha256=3QbSAsukuVHCwmGfkoZBaBwgy4DuRZQs7LGAJtmT068,21010
 exponent/core/remote_execution/code_execution.py,sha256=jYPB_7dJzS9BTPLX9fKQpsFPatwjbXuaFFSxT9tDTfI,2388
-exponent/core/remote_execution/command_execution.py,sha256=HC9NXJg1R2sq1-Co1_paCrYnGn06rb_kTh5APG_B39Y,3672
 exponent/core/remote_execution/error_info.py,sha256=Rd7OA3ps06qYejPVcOaMBB9AtftP3wqQoOfiILFASnc,1378
 exponent/core/remote_execution/exceptions.py,sha256=eT57lBnBhvh-KJ5lsKWcfgGA5-WisAxhjZx-Z6OupZY,135
 exponent/core/remote_execution/file_write.py,sha256=j9X4QfCBuZK6VIMfeu53WTN90G4w0AtN4U9GcoCJvJk,12531
-exponent/core/remote_execution/files.py,sha256=9zr2epIatoM0I2uvfXa9y1bxqUu4z5ulHoibFFNSbP0,11364
+exponent/core/remote_execution/files.py,sha256=0EmOP2OdreGHjkKEIhtB_nNcjvLLx_UJWbbxt7cGSNg,12225
 exponent/core/remote_execution/git.py,sha256=Yo4mhkl6LYzGhVco91j_E8WOUey5KL9437rk43VCCA8,7826
 exponent/core/remote_execution/session.py,sha256=cSJcCG1o74mBE6lZS_9VFmhyZdW6BeIOsbq4IVWH0t4,3863
 exponent/core/remote_execution/system_context.py,sha256=0FkbsSxEVjdjTF0tQpOkYK_VaVM126C3_K8QP0YXxOs,1510
-exponent/core/remote_execution/tool_execution.py,sha256=6rKRi_SqXB2vZUBMOKXLrxei3Ht2nNhomlSYUtOQdG0,9336
+exponent/core/remote_execution/tool_execution.py,sha256=G7wB_DA0jANqywhm_a6lbWtwjCcpQsuQHlExGohsgeY,9233
 exponent/core/remote_execution/truncation.py,sha256=rFQDfT7qf_u6lvhEADWSpoRe_GTPegXXqknk7OZp0uI,10093
 exponent/core/remote_execution/types.py,sha256=G-5EU-NtIj_zZbV305YMDZEcSacGK7QfzEdCYSHAGmA,17206
 exponent/core/remote_execution/utils.py,sha256=Hw2zGMq0NKVwkVzNOVekAvpM33rfIz2P36mEcJr43Ag,20688
@@ -50,7 +49,7 @@ exponent/migration-docs/login.md,sha256=KIeXy3m2nzSUgw-4PW1XzXfHael1D4Zu93CplLMb
 exponent/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 exponent/utils/colors.py,sha256=HBkqe_ZmhJ9YiL2Fpulqek4KvLS5mwBTY4LQSM5N8SM,2762
 exponent/utils/version.py,sha256=Q4txP7Rg_KO0u0tUpx8O0DoOt32wrX7ctNeDXVKaOfA,8835
-indent-0.0.8.dist-info/METADATA,sha256=90lhuY3XueNdgMxM0F14wMAjG8equx9b3OaOMVUAgCs,1313
-indent-0.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-indent-0.0.8.dist-info/entry_points.txt,sha256=q8q1t1sbl4NULGOR0OV5RmSG4KEjkpEQRU_RUXEGzcs,44
-indent-0.0.8.dist-info/RECORD,,
+indent-0.1.2.dist-info/METADATA,sha256=PHb_HZsTkfwbzHsnR5fo5P-iyi7JxA-T9VRuf_D1C5g,1283
+indent-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+indent-0.1.2.dist-info/entry_points.txt,sha256=q8q1t1sbl4NULGOR0OV5RmSG4KEjkpEQRU_RUXEGzcs,44
+indent-0.1.2.dist-info/RECORD,,

exponent/core/remote_execution/command_execution.py

@@ -1,105 +0,0 @@
-from pathlib import Path
-from typing import Any
-
-from exponent.core.remote_execution import files
-from exponent.core.remote_execution.types import (
-    CommandRequest,
-    CommandResponse,
-)
-from exponent.core.types.command_data import (
-    FileReadCommandData,
-    PrototypeCommandData,
-)
-
-# Intentionally split the separator into two parts
-# to avoid matching it in the content
-CONTEXT_BATCH_SEPARATOR = "\n<batch_sep" + "arator>\n"
-CONTEXT_FILE_SEPARATOR = "\n<file_sep" + "arator>\n"
-
-
-async def execute_command(
-    request: CommandRequest,
-    working_directory: str,
-) -> CommandResponse:
-    try:
-        if isinstance(request.data, FileReadCommandData):
-            correlation_id = request.correlation_id
-            file_path = request.data.file_path
-            path = Path(working_directory, file_path)
-            content, _ = await files.get_file_content(
-                path, request.data.offset, request.data.limit
-            )
-
-            return CommandResponse(
-                subcommand=request.data.type.value,
-                content=content,
-                correlation_id=correlation_id,
-            )
-        elif isinstance(request.data, PrototypeCommandData):
-            correlation_id = request.correlation_id
-            command_name = request.data.command_name
-            content_json = request.data.content_json
-            content_raw = request.data.content_raw
-            content_rendered = request.data.content_rendered
-
-            content = await execute_prototype_command(
-                command_name=command_name,
-                content_json=content_json,
-                content_raw=content_raw,
-                content_rendered=content_rendered,
-                working_directory=working_directory,
-            )
-
-            return CommandResponse(
-                subcommand=command_name,
-                content=content,
-                correlation_id=correlation_id,
-            )
-        else:
-            raise ValueError(f"Unknown command request: {request}")
-    except Exception as e:  # noqa: BLE001 - TODO (Josh): Specialize errors for execution
-        return CommandResponse(
-            content="An error occurred during command execution: " + str(e),
-            correlation_id=request.correlation_id,
-        )
-
-
-async def execute_prototype_command(
-    command_name: str,
-    content_json: dict[str, Any],
-    content_raw: str,
-    content_rendered: str,
-    working_directory: str,
-) -> str:
-    if command_name == "file_open":
-        return f'Successfully opened file "{content_json["file_path"]}"'
-    elif command_name == "search_files":
-        results = await files.search_files(
-            path_str=content_json["path"],
-            file_pattern=content_json["file_pattern"],
-            regex=content_json["regex"],
-            working_directory=working_directory,
-        )
-        return "\n".join(results)
-    elif command_name == "codebase_context":
-        batches = await files.get_all_file_contents(
-            working_directory=working_directory,
-        )
-
-        return CONTEXT_BATCH_SEPARATOR.join(
-            CONTEXT_FILE_SEPARATOR.join(batch) for batch in batches
-        )
-    elif command_name == "ls":
-        results = await files.file_walk(
-            directory=content_json["path"],
-            ignore_extra=files.DEFAULT_IGNORES,
-            max_files=1000,
-        )
-        return "\n".join(results)
-    elif command_name == "glob":
-        results = await files.glob(
-            path=content_json["path"],
-            glob_pattern=content_json["glob"],
-        )
-        return "\n".join(results)
-    raise ValueError(f"Unhandled prototype command: {command_name}")