From 5fe0bec4462f62e2047222e16f15ad8abc065be7 Mon Sep 17 00:00:00 2001 From: bagel897 Date: Wed, 19 Mar 2025 10:05:30 -0700 Subject: [PATCH 1/2] add relace workaround --- src/codegen/extensions/tools/relace_edit.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/codegen/extensions/tools/relace_edit.py b/src/codegen/extensions/tools/relace_edit.py index 276a4c946..12e2d1c21 100644 --- a/src/codegen/extensions/tools/relace_edit.py +++ b/src/codegen/extensions/tools/relace_edit.py @@ -2,7 +2,7 @@ import difflib import os -from typing import ClassVar, Optional +from typing import ClassVar import requests from pydantic import Field @@ -19,15 +19,15 @@ class RelaceEditObservation(Observation): filepath: str = Field( description="Path to the edited file", ) - diff: Optional[str] = Field( + diff: str | None = Field( default=None, description="Unified diff showing the changes made", ) - new_content: Optional[str] = Field( + new_content: str | None = Field( default=None, description="New content with line numbers", ) - line_count: Optional[int] = Field( + line_count: int | None = Field( default=None, description="Total number of lines in file", ) @@ -104,7 +104,7 @@ def apply_relace_edit(api_key: str, initial_code: str, edit_snippet: str, stream raise Exception(msg) -def relace_edit(codebase: Codebase, filepath: str, edit_snippet: str, api_key: Optional[str] = None) -> RelaceEditObservation: +def relace_edit(codebase: Codebase, filepath: str, edit_snippet: str, api_key: str | None = None) -> RelaceEditObservation: """Edit a file using the Relace Instant Apply API. Args: @@ -145,6 +145,8 @@ def relace_edit(codebase: Codebase, filepath: str, edit_snippet: str, api_key: O # Apply the edit using Relace API try: merged_code = apply_relace_edit(api_key, original_content, edit_snippet) + if original_content.endswith("\n") and not merged_code.endswith("\n"): + merged_code += "\n" except Exception as e: return RelaceEditObservation( status="error", From f468a9a68579675cf4611a39c52863518423d7f7 Mon Sep 17 00:00:00 2001 From: bagel897 <57874654+bagel897@users.noreply.github.com> Date: Wed, 19 Mar 2025 17:14:51 +0000 Subject: [PATCH 2/2] Automated pre-commit update --- src/codegen/extensions/tools/relace_edit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codegen/extensions/tools/relace_edit.py b/src/codegen/extensions/tools/relace_edit.py index 88c70a72c..0f7637bb8 100644 --- a/src/codegen/extensions/tools/relace_edit.py +++ b/src/codegen/extensions/tools/relace_edit.py @@ -2,7 +2,7 @@ import difflib import os -from typing import TYPE_CHECKING, ClassVar, Optional +from typing import TYPE_CHECKING, ClassVar import requests from langchain_core.messages import ToolMessage