indent 0.1.10__tar.gz → 0.1.11__tar.gz

{indent-0.1.10 → indent-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: indent
-Version: 0.1.10
+Version: 0.1.11
 Summary: Indent is an AI Pair Programmer
 Author-email: Sashank Thupukari <sashank@exponent.run>
 Requires-Python: <3.13,>=3.10

{indent-0.1.10 → indent-0.1.11}/exponent/__init__.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.10'
-__version_tuple__ = version_tuple = (0, 1, 10)
+__version__ = version = '0.1.11'
+__version_tuple__ = version_tuple = (0, 1, 11)
+
+__commit_id__ = commit_id = None

{indent-0.1.10 → indent-0.1.11}/exponent/commands/config_commands.py

@@ -13,11 +13,6 @@ from exponent.commands.settings import use_settings
 from exponent.commands.types import exponent_cli_group
 from exponent.core.config import Settings
 from exponent.core.graphql.client import GraphQLClient
-from exponent.core.graphql.cloud_config_queries import (
-    CREATE_CLOUD_CONFIG_MUTATION,
-    GET_CLOUD_CONFIGS_QUERY,
-    UPDATE_CLOUD_CONFIG_MUTATION,
-)
 from exponent.core.graphql.get_chats_query import GET_CHATS_QUERY
 from exponent.core.graphql.github_config_queries import (
     CHECK_GITHUB_CONFIG_VALIDITY_QUERY,
@@ -185,7 +180,7 @@ async def repos_for_github_config_task(
     help="Clear use default colors",
 )
 @use_settings
-def config(
+def config(  # noqa: PLR0913
     settings: Settings,
     set_git_warning_disabled: bool,
     set_git_warning_enabled: bool,
@@ -394,34 +389,6 @@ async def get_authenticated_user_task(
         click.echo(it)
 
 
-@config_cli.command(hidden=True)
-@use_settings
-def get_cloud_configs(
-    settings: Settings,
-) -> None:
-    if not settings.api_key:
-        redirect_to_login(settings)
-        return
-
-    run_until_complete(
-        get_cloud_configs_task(
-            api_key=settings.api_key,
-            base_api_url=settings.get_base_api_url(),
-            base_ws_url=settings.get_base_ws_url(),
-        )
-    )
-
-
-async def get_cloud_configs_task(
-    api_key: str,
-    base_api_url: str,
-    base_ws_url: str,
-) -> None:
-    graphql_client = GraphQLClient(api_key, base_api_url, base_ws_url)
-    result = await graphql_client.execute(GET_CLOUD_CONFIGS_QUERY)
-    click.echo(result)
-
-
 async def create_github_config_task(
     api_key: str,
     base_api_url: str,
@@ -436,133 +403,6 @@ async def create_github_config_task(
     click.echo(result)
 
 
-@config_cli.command(hidden=True)
-@click.option("--github-pat", required=True, help="Github personal access token")
-@use_settings
-def create_github_config(
-    settings: Settings,
-    github_pat: str,
-) -> None:
-    if not settings.api_key:
-        redirect_to_login(settings)
-        return
-
-    run_until_complete(
-        create_github_config_task(
-            api_key=settings.api_key,
-            base_api_url=settings.get_base_api_url(),
-            base_ws_url=settings.get_base_ws_url(),
-            github_pat=github_pat,
-        )
-    )
-
-
-@config_cli.command(hidden=True)
-@click.option("--github-org-name", required=True, help="GitHub organization name")
-@click.option("--github-repo-name", required=True, help="GitHub repository name")
-@click.option(
-    "--setup_commands",
-    required=False,
-    help="List of commands to set up and build your repo",
-    multiple=True,
-)
-@use_settings
-def create_cloud_config(
-    settings: Settings,
-    github_org_name: str,
-    github_repo_name: str,
-    setup_commands: list[str] | None = None,
-) -> None:
-    if not settings.api_key:
-        redirect_to_login(settings)
-        return
-
-    run_until_complete(
-        create_cloud_config_task(
-            api_key=settings.api_key,
-            base_api_url=settings.get_base_api_url(),
-            base_ws_url=settings.get_base_ws_url(),
-            github_org_name=github_org_name,
-            github_repo_name=github_repo_name,
-            setup_commands=setup_commands,
-        )
-    )
-
-
-async def create_cloud_config_task(
-    api_key: str,
-    base_api_url: str,
-    base_ws_url: str,
-    github_org_name: str,
-    github_repo_name: str,
-    setup_commands: list[str] | None,
-) -> None:
-    graphql_client = GraphQLClient(api_key, base_api_url, base_ws_url)
-    variables = {
-        "githubOrgName": github_org_name,
-        "githubRepoName": github_repo_name,
-        "setupCommands": setup_commands,
-    }
-    result = await graphql_client.execute(CREATE_CLOUD_CONFIG_MUTATION, variables)
-    click.echo(result)
-
-
-@config_cli.command(hidden=True)
-@click.option("--cloud-config-uuid", required=True, help="Cloud config UUID")
-@click.option("--github-org-name", required=True, help="GitHub organization name")
-@click.option("--github-repo-name", required=True, help="GitHub repository name")
-@click.option(
-    "--setup_commands",
-    required=False,
-    help="List of commands to set up and build your repo",
-    multiple=True,
-)
-@use_settings
-def update_cloud_config(
-    settings: Settings,
-    cloud_config_uuid: str,
-    github_org_name: str,
-    github_repo_name: str,
-    setup_commands: list[str] | None = None,
-) -> None:
-    if not settings.api_key:
-        redirect_to_login(settings)
-        return
-
-    run_until_complete(
-        update_cloud_config_task(
-            api_key=settings.api_key,
-            base_api_url=settings.get_base_api_url(),
-            base_ws_url=settings.get_base_ws_url(),
-            cloud_config_uuid=cloud_config_uuid,
-            github_org_name=github_org_name,
-            github_repo_name=github_repo_name,
-            setup_commands=setup_commands,
-        )
-    )
-
-
-async def update_cloud_config_task(
-    api_key: str,
-    base_api_url: str,
-    base_ws_url: str,
-    cloud_config_uuid: str,
-    github_org_name: str,
-    github_repo_name: str,
-    setup_commands: list[str] | None,
-) -> None:
-    graphql_client = GraphQLClient(api_key, base_api_url, base_ws_url)
-    variables = {
-        "cloudConfigUuid": cloud_config_uuid,
-        "githubOrgName": github_org_name,
-        "githubRepoName": github_repo_name,
-        "setupCommands": setup_commands,
-    }
-
-    result = await graphql_client.execute(UPDATE_CLOUD_CONFIG_MUTATION, variables)
-    click.echo(result)
-
-
 @config_cli.command(hidden=True)
 @use_settings
 def refresh_key(settings: Settings) -> None:

{indent-0.1.10 → indent-0.1.11}/exponent/commands/utils.py

@@ -98,9 +98,9 @@ class Spinner:
             while True:
                 t = time.time() - base_time
                 i = round(t * self.animation_speed) % len(self.animation_chars)
-                print(
+                click.echo(
                     f"\r{style_start}{self.animation_chars[i]} {self.text}{style_end}",
-                    end="",
+                    nl=False,
                 )
                 await asyncio.sleep(0.1)
 
@@ -112,7 +112,7 @@ class Spinner:
 
         self.task.cancel()
         self.task = None
-        print("\r\x1b[0m\x1b[2K", end="")
+        click.echo("\r\x1b[0m\x1b[2K", nl=False)
         sys.stdout.flush()
 
 

{indent-0.1.10 → indent-0.1.11}/exponent/commands/workflow_commands.py

@@ -56,7 +56,7 @@ def trigger(settings: Settings, workflow_type: str) -> None:
                 click.secho(f"Error: {result.error_message}", fg="red")
                 sys.exit(10)
             else:
-                print("Disconnected upon user request, shutting down...")
+                click.echo("Disconnected upon user request, shutting down...")
                 break
         else:
             raise click.ClickException("Workflow run exited unexpectedly")

{indent-0.1.10 → indent-0.1.11}/exponent/core/config.py

@@ -24,7 +24,6 @@ logger = logging.getLogger(__name__)
 
 
 def is_editable_install() -> bool:
-
     if os.getenv("ENVIRONMENT") == "test" or os.getenv("EXPONENT_TEST_AUTO_UPGRADE"):
         # We should explicitly set these variables
         # in test when needed

indent-0.1.11/exponent/core/graphql/subscriptions.py

@@ -0,0 +1,16 @@
+AUTHENTICATED_USER_SUBSCRIPTION = """
+    subscription {
+            testAuthenticatedUser {
+                __typename
+                ... on UnauthenticatedError {
+                    message
+                }
+                ...on Error {
+                    message
+                }
+                ... on User {
+                    userUuid
+                }
+            }
+        }
+"""

{indent-0.1.10 → indent-0.1.11}/exponent/core/remote_execution/cli_rpc_types.py

@@ -1,6 +1,12 @@
+from typing import TYPE_CHECKING, Any
+
 import msgspec
 import yaml
-from typing import Any
+
+if TYPE_CHECKING:
+    from exponent_server.core.tools.edit_tool import (
+        EditToolInput as ServerSideEditToolInput,
+    )
 
 
 class PartialToolResult(msgspec.Struct, tag_field="tool_name", omit_defaults=True):
@@ -46,11 +52,17 @@ class ReadToolInput(ToolInput, tag=READ_TOOL_NAME):
     limit: int | None = None
 
 
+class FileMetadata(msgspec.Struct):
+    modified_timestamp: float
+    file_mode: str
+
+
 class ReadToolResult(ToolResult, tag=READ_TOOL_NAME):
     content: str
     num_lines: int
     start_line: int
     total_lines: int
+    metadata: FileMetadata | None = None
 
     def to_text(self) -> str:
         lines = self.content.splitlines()
@@ -99,6 +111,7 @@ class WriteToolInput(ToolInput, tag=WRITE_TOOL_NAME):
 
 class WriteToolResult(ToolResult, tag=WRITE_TOOL_NAME):
     message: str
+    metadata: FileMetadata | None = None
 
 
 GREP_TOOL_NAME = "grep"
@@ -125,10 +138,27 @@ class EditToolInput(ToolInput, tag=EDIT_TOOL_NAME):
     old_string: str
     new_string: str
     replace_all: bool = False
+    # The last retrieved modified timestamp. This is used to check if the file has been modified since the last read/write that we are aware of (in which case we should re-read the file before editing).
+    last_known_modified_timestamp: float | None = None
+
+    @classmethod
+    def from_server_side_input(
+        cls,
+        server_side_input: "ServerSideEditToolInput",
+        last_known_modified_timestamp: float | None,
+    ) -> "EditToolInput":
+        return cls(
+            file_path=server_side_input.file_path,
+            old_string=server_side_input.old_string,
+            new_string=server_side_input.new_string,
+            replace_all=server_side_input.replace_all,
+            last_known_modified_timestamp=last_known_modified_timestamp,
+        )
 
 
 class EditToolResult(ToolResult, tag=EDIT_TOOL_NAME):
     message: str
+    metadata: FileMetadata | None = None
 
 
 BASH_TOOL_NAME = "bash"

{indent-0.1.10 → indent-0.1.11}/exponent/core/remote_execution/client.py

@@ -6,7 +6,7 @@ import logging
 from collections.abc import AsyncGenerator, Callable
 from contextlib import asynccontextmanager
 from dataclasses import dataclass
-from typing import Any, TypeVar, Union, cast
+from typing import Any, TypeVar, cast
 
 import msgspec
 import websockets.client
@@ -29,15 +29,14 @@ from exponent.core.remote_execution.cli_rpc_types import (
     ErrorResponse,
     GetAllFilesRequest,
     GetAllFilesResponse,
-    HttpResponse,
     HttpRequest,
+    SwitchCLIChatRequest,
+    SwitchCLIChatResponse,
     TerminateRequest,
     TerminateResponse,
     ToolExecutionRequest,
     ToolExecutionResponse,
     ToolResultType,
-    SwitchCLIChatRequest,
-    SwitchCLIChatResponse,
 )
 from exponent.core.remote_execution.code_execution import (
     execute_code_streaming,
@@ -87,7 +86,7 @@ class SwitchCLIChat:
     new_chat_uuid: str
 
 
-REMOTE_EXECUTION_CLIENT_EXIT_INFO = Union[WSDisconnected, SwitchCLIChat]
+REMOTE_EXECUTION_CLIENT_EXIT_INFO = WSDisconnected | SwitchCLIChat
 
 
 class RemoteExecutionClient:
@@ -302,7 +301,7 @@ class RemoteExecutionClient:
                     async with results_lock:
                         logger.info(f"Putting response {response}")
                         await results.put(response)
-                except Exception as e:  # noqa: BLE001
+                except Exception as e:
                     logger.info(f"Error handling request {request}:\n\n{e}")
                     async with results_lock:
                         await results.put(
@@ -550,7 +549,7 @@ class RemoteExecutionClient:
                             )
                         tool_result = truncate_result(raw_result)
                         results.append(tool_result)
-                    except Exception as e:  # noqa: BLE001
+                    except Exception as e:
                         logger.error(f"Error executing tool {tool_input}: {e}")
                         from exponent.core.remote_execution.cli_rpc_types import (
                             ErrorToolResult,

{indent-0.1.10 → indent-0.1.11}/exponent/core/remote_execution/file_write.py

@@ -77,7 +77,7 @@ def lint_file(file_path: str, working_directory: str) -> str:
 
         # If the subprocess ran successfully, return a success message
         return f"Lint results:\n\n{result.stdout}\n\n{result.stderr}"
-    except Exception as e:  # noqa: BLE001
+    except Exception as e:
         # For any other errors, return a generic error message
         return f"An error occurred while linting: {e!s}"
 
@@ -103,7 +103,7 @@ async def execute_full_file_rewrite(
 
         return result
 
-    except Exception as e:  # noqa: BLE001
+    except Exception as e:
         return f"An error occurred: {e!s}"
 
 

{indent-0.1.10 → indent-0.1.11}/exponent/core/remote_execution/files.py

@@ -1,21 +1,13 @@
 import os
-from asyncio import gather, to_thread
+from asyncio import to_thread
 from typing import Final, cast
 
 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,
-    GetFileAttachmentRequest,
-    GetFileAttachmentResponse,
-    GetFileAttachmentsRequest,
-    GetFileAttachmentsResponse,
-    GetMatchingFilesRequest,
-    GetMatchingFilesResponse,
     ListFilesRequest,
     ListFilesResponse,
     RemoteFile,
@@ -114,99 +106,6 @@ async def get_file_content(
     return content, exists
 
 
-async def get_file_attachments(
-    get_file_attachments_request: GetFileAttachmentsRequest,
-    client_working_directory: str,
-) -> GetFileAttachmentsResponse:
-    """Get the content of the files at the specified paths.
-
-    Args:
-        get_file_attachments_request: An object containing the file paths.
-        client_working_directory:  The working directory of the client.
-
-    Returns:
-        A list of FileAttachment objects containing the content of the files.
-    """
-    remote_files = get_file_attachments_request.files
-    attachments = await gather(
-        *[
-            get_file_content(
-                AsyncPath(client_working_directory) / remote_file.file_path
-            )
-            for remote_file in remote_files
-        ]
-    )
-
-    files = [
-        FileAttachment(attachment_type="file", file=remote_file, content=content)
-        for remote_file, (content, _) in zip(remote_files, attachments)
-    ]
-
-    return GetFileAttachmentsResponse(
-        correlation_id=get_file_attachments_request.correlation_id,
-        file_attachments=files,
-    )
-
-
-async def get_file_attachment(
-    get_file_attachment_request: GetFileAttachmentRequest, client_working_directory: str
-) -> GetFileAttachmentResponse:
-    """Get the content of the file at the specified path.
-
-    Args:
-        get_file_attachment_request: An object containing the file path.
-        client_working_directory: The working directory of the client.
-
-    Returns:
-        A FileAttachment object containing the content of the file.
-    """
-    file = get_file_attachment_request.file
-    absolute_path = await file.resolve(client_working_directory)
-
-    content, exists = await get_file_content(absolute_path)
-
-    return GetFileAttachmentResponse(
-        content=content,
-        exists=exists,
-        file=file,
-        correlation_id=get_file_attachment_request.correlation_id,
-    )
-
-
-async def get_matching_files(
-    search_term: GetMatchingFilesRequest,
-    file_cache: FileCache,
-) -> GetMatchingFilesResponse:
-    """Get the files that match the search term.
-
-    Args:
-        search_term: The search term to match against the files.
-        file_cache: A cache of the files in the working directory.
-
-    Returns:
-        A list of RemoteFile objects that match the search term.
-    """
-    # Use rapidfuzz to find the best matching files
-    matching_files = await to_thread(
-        process.extract,
-        search_term.search_term,
-        await file_cache.get_files(),
-        limit=MAX_MATCHING_FILES,
-        score_cutoff=0,
-    )
-
-    directory = file_cache.working_directory
-    files: list[RemoteFile] = [
-        RemoteFile(file_path=file, working_directory=directory)
-        for file, _, _ in matching_files
-    ]
-
-    return GetMatchingFilesResponse(
-        files=files,
-        correlation_id=search_term.correlation_id,
-    )
-
-
 async def search_files(
     path_str: str,
     file_pattern: str | None,

{indent-0.1.10 → indent-0.1.11}/exponent/core/remote_execution/git.py

@@ -167,7 +167,7 @@ async def _get_git_branch(repo: Repository) -> str | None:
         else:
             return None
 
-    except Exception:  # noqa: BLE001
+    except Exception:
         return None
 
 

{indent-0.1.10 → indent-0.1.11}/exponent/core/remote_execution/http_fetch.py

@@ -1,13 +1,12 @@
 """HTTP fetch implementation for remote execution client."""
 
 import logging
-from typing import Any
 
 import httpx
 
 from exponent.core.remote_execution.cli_rpc_types import (
-    HttpResponse,
     HttpRequest,
+    HttpResponse,
 )
 
 logger = logging.getLogger(__name__)
@@ -79,7 +78,7 @@ async def fetch_http_content(http_request: HttpRequest) -> HttpResponse:
         )
 
     except httpx.RequestError as e:
-        error_msg = f"Request error for {http_request.url}: {str(e)}"
+        error_msg = f"Request error for {http_request.url}: {e!s}"
         return HttpResponse(
             status_code=None,
             content="",
@@ -87,7 +86,7 @@ async def fetch_http_content(http_request: HttpRequest) -> HttpResponse:
         )
 
     except Exception as e:
-        error_msg = f"Unexpected error fetching {http_request.url}: {str(e)}"
+        error_msg = f"Unexpected error fetching {http_request.url}: {e!s}"
         return HttpResponse(
             status_code=None,
             content="",

{indent-0.1.10 → indent-0.1.11}/exponent/core/remote_execution/languages/python_execution.py

@@ -140,7 +140,7 @@ class Kernel:
                 except queue.Empty:
                     continue
 
-            except Exception as e:  # noqa: BLE001 - TODO: Deep audit potential exceptions
+            except Exception as e:
                 logger.info(f"Error getting message from kernel: {e}")
                 break
 

{indent-0.1.10 → indent-0.1.11}/exponent/core/remote_execution/languages/shell_streaming.py

@@ -75,7 +75,7 @@ async def read_stream(
             break
 
 
-async def execute_shell_streaming(
+async def execute_shell_streaming(  # noqa: PLR0915
     code: str,
     working_directory: str,
     timeout: int,

{indent-0.1.10 → indent-0.1.11}/exponent/core/remote_execution/session.py

@@ -120,7 +120,7 @@ async def get_session(
     )
     try:
         yield session
-    except Exception as exc:  # noqa: BLE001
+    except Exception as exc:
         await send_exception_log(exc, session=session, settings=None)
         raise ExponentError(str(exc))
     finally:

{indent-0.1.10 → indent-0.1.11}/exponent/core/remote_execution/system_context.py

@@ -2,14 +2,11 @@ import getpass
 import os
 import platform
 
-from anyio import Path as AsyncPath
-
 from exponent.core.remote_execution.git import get_git_info
 from exponent.core.remote_execution.languages import python_execution
 from exponent.core.remote_execution.types import (
     SystemInfo,
 )
-from exponent.core.remote_execution.utils import safe_read_file
 
 
 async def get_system_info(working_directory: str) -> SystemInfo: