From f09150617ed2454f3074bcf93f53aae5ae637d40 Mon Sep 17 00:00:00 2001 From: Nate Sesti <33237525+sestinj@users.noreply.github.com> Date: Mon, 9 Oct 2023 18:37:27 -0700 Subject: Preview (#541) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Strong typing (#533) * refactor: :recycle: get rid of continuedev.src.continuedev structure * refactor: :recycle: switching back to server folder * feat: :sparkles: make config.py imports shorter * feat: :bookmark: publish as pre-release vscode extension * refactor: :recycle: refactor and add more completion params to ui * build: :building_construction: download from preview S3 * fix: :bug: fix paths * fix: :green_heart: package:pre-release * ci: :green_heart: more time for tests * fix: :green_heart: fix build scripts * fix: :bug: fix import in run.py * fix: :bookmark: update version to try again * ci: 💚 Update package.json version [skip ci] * refactor: :fire: don't check for old extensions version * fix: :bug: small bug fixes * fix: :bug: fix config.py import paths * ci: 💚 Update package.json version [skip ci] * ci: :green_heart: platform-specific builds test #1 * feat: :green_heart: ship with binary * fix: :green_heart: fix copy statement to include.exe for windows * fix: :green_heart: cd extension before packaging * chore: :loud_sound: count tokens generated * fix: :green_heart: remove npm_config_arch * fix: :green_heart: publish as pre-release! * chore: :bookmark: update version * perf: :green_heart: hardcode distro paths * fix: :bug: fix yaml syntax error * chore: :bookmark: update version * fix: :green_heart: update permissions and version * feat: :bug: kill old server if needed * feat: :lipstick: update marketplace icon for pre-release * ci: 💚 Update package.json version [skip ci] * feat: :sparkles: auto-reload for config.py * feat: :wrench: update default config.py imports * feat: :sparkles: codelens in config.py * feat: :sparkles: select model param count from UI * ci: 💚 Update package.json version [skip ci] * feat: :sparkles: more model options, ollama error handling * perf: :zap: don't show server loading immediately * fix: :bug: fixing small UI details * ci: 💚 Update package.json version [skip ci] * feat: :rocket: headers param on LLM class * fix: :bug: fix headers for openai.;y * feat: :sparkles: highlight code on cmd+shift+L * ci: 💚 Update package.json version [skip ci] * feat: :lipstick: sticky top bar in gui.tsx * fix: :loud_sound: websocket logging and horizontal scrollbar * ci: 💚 Update package.json version [skip ci] * feat: :sparkles: allow AzureOpenAI Service through GGML * ci: 💚 Update package.json version [skip ci] * fix: :bug: fix automigration * ci: 💚 Update package.json version [skip ci] * ci: :green_heart: upload binaries in ci, download apple silicon * chore: :fire: remove notes * fix: :green_heart: use curl to download binary * fix: :green_heart: set permissions on apple silicon binary * fix: :green_heart: testing * fix: :green_heart: cleanup file * fix: :green_heart: fix preview.yaml * fix: :green_heart: only upload once per binary * fix: :green_heart: install rosetta * ci: :green_heart: download binary after tests * ci: 💚 Update package.json version [skip ci] * ci: :green_heart: prepare ci for merge to main --------- Co-authored-by: GitHub Action --- server/continuedev/models/filesystem_edit.py | 164 +++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 server/continuedev/models/filesystem_edit.py (limited to 'server/continuedev/models/filesystem_edit.py') diff --git a/server/continuedev/models/filesystem_edit.py b/server/continuedev/models/filesystem_edit.py new file mode 100644 index 00000000..9316ff46 --- /dev/null +++ b/server/continuedev/models/filesystem_edit.py @@ -0,0 +1,164 @@ +import os +from abc import abstractmethod +from typing import Generator, List + +from pydantic import BaseModel + +from ..libs.util.map_path import map_path +from .main import Position, Range + + +class FileSystemEdit(BaseModel): + @abstractmethod + def next_edit(self) -> Generator["FileSystemEdit", None, None]: + raise NotImplementedError + + @abstractmethod + def with_mapped_paths(self, orig_root: str, copy_root: str) -> "FileSystemEdit": + raise NotImplementedError + + +class AtomicFileSystemEdit(FileSystemEdit): + def next_edit(self) -> Generator["FileSystemEdit", None, None]: + yield self + + +class FileEdit(AtomicFileSystemEdit): + filepath: str + range: Range + replacement: str + + def with_mapped_paths(self, orig_root: str, copy_root: str) -> "FileSystemEdit": + return FileEdit( + map_path(self.filepath, orig_root, copy_root), self.range, self.replacement + ) + + @staticmethod + def from_deletion(filepath: str, range: Range) -> "FileEdit": + return FileEdit(filepath=filepath, range=range, replacement="") + + @staticmethod + def from_insertion(filepath: str, position: Position, content: str) -> "FileEdit": + return FileEdit( + filepath=filepath, + range=Range.from_shorthand( + position.line, position.character, position.line, position.character + ), + replacement=content, + ) + + @staticmethod + def from_append( + filepath: str, previous_content: str, appended_content: str + ) -> "FileEdit": + return FileEdit( + filepath=filepath, + range=Range.from_position(Position.from_end_of_file(previous_content)), + replacement=appended_content, + ) + + +class FileEditWithFullContents(BaseModel): + fileEdit: FileEdit + fileContents: str + + +class AddFile(AtomicFileSystemEdit): + filepath: str + content: str + + def with_mapped_paths(self, orig_root: str, copy_root: str) -> "FileSystemEdit": + return AddFile( + self, map_path(self.filepath, orig_root, copy_root), self.content + ) + + +class DeleteFile(AtomicFileSystemEdit): + filepath: str + + def with_mapped_paths(self, orig_root: str, copy_root: str) -> "FileSystemEdit": + return DeleteFile(map_path(self.filepath, orig_root, copy_root)) + + +class RenameFile(AtomicFileSystemEdit): + filepath: str + new_filepath: str + + def with_mapped_paths(self, orig_root: str, copy_root: str) -> "FileSystemEdit": + return RenameFile( + map_path(self.filepath, orig_root, copy_root), + map_path(self.new_filepath, orig_root, copy_root), + ) + + +class AddDirectory(AtomicFileSystemEdit): + path: str + + def with_mapped_paths(self, orig_root: str, copy_root: str) -> "FileSystemEdit": + return AddDirectory(map_path(self.path, orig_root, copy_root)) + + +class DeleteDirectory(AtomicFileSystemEdit): + path: str + + def with_mapped_paths(self, orig_root: str, copy_root: str) -> "FileSystemEdit": + return DeleteDirectory(map_path(self.path, orig_root, copy_root)) + + +class RenameDirectory(AtomicFileSystemEdit): + path: str + new_path: str + + def with_mapped_paths(self, orig_root: str, copy_root: str) -> "FileSystemEdit": + return RenameDirectory( + map_path(self.filepath, orig_root, copy_root), + map_path(self.new_path, orig_root, copy_root), + ) + + +class DeleteDirectoryRecursive(FileSystemEdit): + path: str + + def with_mapped_paths(self, orig_root: str, copy_root: str) -> "FileSystemEdit": + return DeleteDirectoryRecursive(map_path(self.path, orig_root, copy_root)) + + def next_edit(self) -> Generator[FileSystemEdit, None, None]: + yield DeleteDirectory(path=self.path) + for child in os.listdir(self.path): + child_path = os.path.join(self.path, child) + if os.path.isdir(child_path): + yield DeleteDirectoryRecursive(path=child_path) + else: + yield DeleteFile(filepath=child_path) + + +class SequentialFileSystemEdit(FileSystemEdit): + edits: List[FileSystemEdit] + + def with_mapped_paths(self, orig_root: str, copy_root: str) -> "FileSystemEdit": + return SequentialFileSystemEdit( + [edit.with_mapped_paths(orig_root, copy_root) for edit in self.edits] + ) + + def next_edit(self) -> Generator["FileSystemEdit", None, None]: + for edit in self.edits: + yield from edit.next_edit() + + +class EditDiff(BaseModel): + """A reversible edit that can be applied to a file.""" + + forward: FileSystemEdit + backward: FileSystemEdit + + @classmethod + def from_sequence(cls, diffs: List["EditDiff"]) -> "EditDiff": + forwards = [] + backwards = [] + for diff in diffs: + forwards.append(diff.forward) + backwards.insert(0, diff.backward) + return cls( + forward=SequentialFileSystemEdit(edits=forwards), + backward=SequentialFileSystemEdit(edits=backwards), + ) -- cgit v1.2.3-70-g09d2