-
-
Notifications
You must be signed in to change notification settings - Fork 197
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: refactor tools, codeblock, and tooluse (#113)
* refactor: refactor tools, streamline amending __doc__ for tools, refactor type_o_tooluse to ToolUse.from_type * Apply suggestions from code review * refactor: move Codeblock to new file codeblock.py * Apply suggestions from code review * misc fixes * fix: more codeblock refactoring * Apply suggestions from code review * fixed tests * more fixes * fix: removed save command * Apply suggestions from code review * removed unused test * Apply suggestions from code review * fix: more refactoring, use block_types to register commands for python, shell, etc * fix: minor improvements to /help and /tools formatting * fix: misc improvements to docs * Apply suggestions from code review
- Loading branch information
Showing
25 changed files
with
429 additions
and
422 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| from collections.abc import Generator | ||
| from dataclasses import dataclass | ||
| from xml.etree import ElementTree | ||
|
|
||
|
|
||
| @dataclass | ||
| class Codeblock: | ||
| lang: str | ||
| content: str | ||
| path: str | None = None | ||
|
|
||
| # init path in __post_init__ if path is None and lang is pathy | ||
| def __post_init__(self): | ||
| if self.path is None and self.is_filename: | ||
| self.path = self.lang | ||
|
|
||
| def to_markdown(self) -> str: | ||
| return f"```{self.lang}\n{self.content}\n```" | ||
|
|
||
| def to_xml(self) -> str: | ||
| return f'<codeblock lang="{self.lang}" path="{self.path}">\n{self.content}\n</codeblock>' | ||
|
|
||
| @classmethod | ||
| def from_markdown(cls, content: str) -> "Codeblock": | ||
| if content.strip().startswith("```"): | ||
| content = content[3:] | ||
| if content.strip().endswith("```"): | ||
| content = content[:-3] | ||
| lang = content.splitlines()[0].strip() | ||
| return cls(lang, content[len(lang) :]) | ||
|
|
||
| @classmethod | ||
| def from_xml(cls, content: str) -> "Codeblock": | ||
| """ | ||
| Example: | ||
| <codeblock lang="python" path="example.py"> | ||
| print("Hello, world!") | ||
| </codeblock> | ||
| """ | ||
| root = ElementTree.fromstring(content) | ||
| return cls(root.attrib["lang"], root.text or "", root.attrib.get("path")) | ||
|
|
||
| @property | ||
| def is_filename(self) -> bool: | ||
| return "." in self.lang or "/" in self.lang | ||
|
|
||
| @classmethod | ||
| def iter_from_markdown(cls, markdown: str) -> list["Codeblock"]: | ||
| return list(_extract_codeblocks(markdown)) | ||
|
|
||
|
|
||
| def _extract_codeblocks(markdown: str) -> Generator[Codeblock, None, None]: | ||
| # speed check (early exit): check if message contains a code block | ||
| backtick_count = markdown.count("```") | ||
| if backtick_count < 2: | ||
| return | ||
|
|
||
| lines = markdown.split("\n") | ||
| stack: list[str] = [] | ||
| current_block = [] | ||
| current_lang = "" | ||
|
|
||
| for line in lines: | ||
| stripped_line = line.strip() | ||
| if stripped_line.startswith("```"): | ||
| if not stack: # Start of a new block | ||
| stack.append(stripped_line[3:]) | ||
| current_lang = stripped_line[3:] | ||
| elif stripped_line[3:] and stack[-1] != stripped_line[3:]: # Nested start | ||
| current_block.append(line) | ||
| stack.append(stripped_line[3:]) | ||
| else: # End of a block | ||
| if len(stack) == 1: # Outermost block | ||
| yield Codeblock(current_lang, "\n".join(current_block)) | ||
| current_block = [] | ||
| current_lang = "" | ||
| else: # Nested end | ||
| current_block.append(line) | ||
| stack.pop() | ||
| elif stack: | ||
| current_block.append(line) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.