refactor

src/chatdbg/chatdbg_pdb.py

@@ -16,13 +16,13 @@
 from traitlets import TraitError
 
 from .assistant.assistant import Assistant
-from .util.capture import CaptureInput, CaptureOutput
+from .pdb.capture import CaptureInput, CaptureOutput
 from .util.config import chatdbg_config
-from .util.locals import extract_locals
+from .pdb.locals import extract_locals
 from .util.log import ChatDBGLog
 from .util.printer import ChatDBGPrinter
-from .util.prompts import pdb_instructions
-from .util.text import (format_limited, strip_color, truncate_proportionally)
+from .pdb.prompts import pdb_instructions
+from .pdb.text import (format_limited, strip_color, truncate_proportionally)
 
 
 def load_ipython_extension(ipython):

src/chatdbg/util/text.py → src/chatdbg/pdb/text.py

@@ -118,27 +118,3 @@ def truncate_proportionally(text, maxlen=32000, top_proportion=0.5):
         return text[:pre] + "..." + text[len(text) - post :]
     return text
 
-
-def word_wrap_except_code_blocks(text: str, width: int = 80) -> str:
-    """
-    Wraps text except for code blocks for nice terminal formatting.
-
-    Splits the text into paragraphs and wraps each paragraph,
-    except for paragraphs that are inside of code blocks denoted
-    by ` ``` `. Returns the updated text.
-
-    Args:
-        text (str): The text to wrap.
-        width (int): The width of the lines to wrap at, passed to `textwrap.fill`.
-
-    Returns:
-        The wrapped text.
-    """
-    blocks = text.split("```")
-    for i in range(len(blocks)):
-        if i % 2 == 0:
-            paras = blocks[i].split("\n")
-            wrapped = [textwrap.fill(para, width=width) for para in paras]
-            blocks[i] = "\n".join(wrapped)
-
-    return "```".join(blocks)

src/chatdbg/util/config.py

@@ -1,6 +1,6 @@
 import os
 
-from traitlets import Bool, Int, TraitError, Unicode
+from traitlets import Bool, Int, Unicode
 from traitlets.config import Configurable
 
 

src/chatdbg/util/log.py

@@ -5,8 +5,8 @@
 import yaml
 
 from ..assistant.listeners import BaseAssistantListener
-from ..util.capture import CaptureOutput
-from .text import word_wrap_except_code_blocks
+from ..pdb.capture import CaptureOutput
+from .wrap import word_wrap_except_code_blocks
 
 
 class ChatDBGLog(BaseAssistantListener):

src/chatdbg/util/printer.py

@@ -1,8 +1,8 @@
 
 import textwrap
-from assistant.listeners import BaseAssistantListener
-from util.streamwrap import StreamingTextWrapper
-from util.text import word_wrap_except_code_blocks
+from ..assistant.listeners import BaseAssistantListener
+from .stream import StreamingTextWrapper
+from .wrap import word_wrap_except_code_blocks
 
 
 class ChatDBGPrinter(BaseAssistantListener):

src/chatdbg/util/streamwrap.py → src/chatdbg/util/stream.py

@@ -1,7 +1,7 @@
 import textwrap
 import re
 import sys
-from .text import word_wrap_except_code_blocks
+from .wrap import word_wrap_except_code_blocks
 
 
 class StreamingTextWrapper:

src/chatdbg/util/wrap.py

@@ -0,0 +1,27 @@
+
+import textwrap
+
+
+def word_wrap_except_code_blocks(text: str, width: int = 80) -> str:
+    """
+    Wraps text except for code blocks for nice terminal formatting.
+
+    Splits the text into paragraphs and wraps each paragraph,
+    except for paragraphs that are inside of code blocks denoted
+    by ` ``` `. Returns the updated text.
+
+    Args:
+        text (str): The text to wrap.
+        width (int): The width of the lines to wrap at, passed to `textwrap.fill`.
+
+    Returns:
+        The wrapped text.
+    """
+    blocks = text.split("```")
+    for i in range(len(blocks)):
+        if i % 2 == 0:
+            paras = blocks[i].split("\n")
+            wrapped = [textwrap.fill(para, width=width) for para in paras]
+            blocks[i] = "\n".join(wrapped)
+
+    return "```".join(blocks)