Parser held by config (AbanteAI#240)

mentat/code_feature.py

@@ -150,7 +150,7 @@ def _get_code_message(self) -> list[str]:
         session_context = SESSION_CONTEXT.get()
         code_file_manager = session_context.code_file_manager
         git_root = session_context.git_root
-        parser = session_context.parser
+        parser = session_context.config.parser
 
         code_message: list[str] = []
 

mentat/config.py

@@ -9,6 +9,7 @@
 from attr import validators
 
 from mentat.git_handler import get_shared_git_root_for_paths
+from mentat.parsers.parser import Parser
 from mentat.parsers.parser_map import parser_map
 from mentat.session_context import SESSION_CONTEXT
 from mentat.utils import mentat_dir_path
@@ -53,16 +54,16 @@ class Config:
         converter=int_or_none,
         validator=validators.optional(validators.ge(0)),
     )
-    format: str = attr.field(
+    parser: Parser = attr.field(  # pyright: ignore
         default="block",
         metadata={
             "description": (
                 "The format for the LLM to write code in. You probably don't want to"
                 " mess with this setting."
             ),
-            "no_midsession_change": True,
         },
-        validator=validators.optional(validators.in_(parser_map)),
+        converter=parser_map.get,  # pyright: ignore
+        validator=validators.instance_of(Parser),  # pyright: ignore
     )
 
     # Context specific settings

mentat/conversation.py

@@ -48,7 +48,7 @@ async def display_token_count(self):
         stream = session_context.stream
         config = session_context.config
         code_context = session_context.code_context
-        parser = session_context.parser
+        parser = config.parser
 
         if not is_model_available(config.model):
             raise MentatError(
@@ -158,7 +158,7 @@ async def get_model_response(self) -> list[FileEdit]:
         stream = session_context.stream
         config = session_context.config
         code_context = session_context.code_context
-        parser = session_context.parser
+        parser = config.parser
         cost_tracker = session_context.cost_tracker
 
         messages_snapshot = self.messages.copy()

mentat/session.py

@@ -16,7 +16,6 @@
 from mentat.git_handler import get_shared_git_root_for_paths
 from mentat.llm_api import CostTracker, setup_api_key
 from mentat.logging_config import setup_logging
-from mentat.parsers.parser_map import parser_map
 from mentat.session_context import SESSION_CONTEXT, SessionContext
 from mentat.session_input import collect_user_input
 from mentat.session_stream import SessionStream
@@ -45,20 +44,17 @@ def __init__(
 
         cost_tracker = CostTracker()
 
-        parser = parser_map[config.format]
-
         code_context = CodeContext(stream, git_root, diff, pr_diff)
 
         code_file_manager = CodeFileManager()
 
-        conversation = Conversation(parser)
+        conversation = Conversation(config.parser)
 
         session_context = SessionContext(
             stream,
             cost_tracker,
             git_root,
             config,
-            parser,
             code_context,
             code_file_manager,
             conversation,

mentat/session_context.py

@@ -12,7 +12,6 @@
     from mentat.config import Config
     from mentat.conversation import Conversation
     from mentat.llm_api import CostTracker
-    from mentat.parsers.parser import Parser
     from mentat.session_stream import SessionStream
 
 SESSION_CONTEXT: ContextVar[SessionContext] = ContextVar("mentat:session_context")
@@ -24,7 +23,6 @@ class SessionContext:
     cost_tracker: CostTracker = attr.field()
     git_root: Path = attr.field()
     config: Config = attr.field()
-    parser: Parser = attr.field()
     code_context: CodeContext = attr.field()
     code_file_manager: CodeFileManager = attr.field()
     conversation: Conversation = attr.field()

tests/config_test.py

@@ -6,6 +6,7 @@
 
 import mentat.config
 from mentat.config import Config, config_file_name
+from mentat.parsers.replacement_parser import ReplacementParser
 
 
 @pytest.mark.asyncio
@@ -31,7 +32,7 @@ async def test_config_creation():
     assert args.model == "model"
     assert args.temperature == 0.2
     assert args.maximum_context == "1"
-    assert args.format is None
+    assert args.parser is None
     assert args.use_embeddings
     assert args.auto_tokens == "2"
 
@@ -46,7 +47,7 @@ async def test_config_creation():
         user_config_file.write(dedent("""\
         {
             "model": "test",
-            "format": "replacement",
+            "parser": "replacement",
             "input_style": [[ "user", "yes" ]]
         }"""))
 
@@ -55,7 +56,7 @@ async def test_config_creation():
     assert config.model == "model"
     assert config.temperature == 0.2
     assert config.maximum_context == 1
-    assert config.format == "replacement"
+    assert type(config.parser) == ReplacementParser
     assert config.use_embeddings
     assert not config.no_code_map
     assert config.auto_tokens == 2

tests/conftest.py

@@ -17,7 +17,6 @@
 from mentat.config import Config, config_file_name
 from mentat.conversation import Conversation
 from mentat.llm_api import CostTracker
-from mentat.session import parser_map
 from mentat.session_context import SESSION_CONTEXT, SessionContext
 from mentat.session_stream import SessionStream, StreamMessage, StreamMessageSource
 from mentat.streaming_printer import StreamingPrinter
@@ -197,20 +196,17 @@ async def _mock_session_context(temp_testbed):
 
     config = Config()
 
-    parser = parser_map[config.format]
-
     code_context = CodeContext(stream, git_root)
 
     code_file_manager = CodeFileManager()
 
-    conversation = Conversation(parser)
+    conversation = Conversation(config.parser)
 
     session_context = SessionContext(
         stream,
         cost_tracker,
         git_root,
         config,
-        parser,
         code_context,
         code_file_manager,
         conversation,

tests/parser_tests/block_format_error_test.py

@@ -3,12 +3,13 @@
 import pytest
 
 from mentat.config import Config
+from mentat.parsers.block_parser import BlockParser
 from mentat.session import Session
 
 
 @pytest.fixture(autouse=True)
 def block_parser(mocker):
-    mocker.patch.object(Config, "format", new="block")
+    mocker.patch.object(Config, "parser", new=BlockParser())
 
 
 temp_file_name = "temp.py"

tests/parser_tests/block_format_test.py

@@ -11,7 +11,7 @@
 
 @pytest.fixture
 def block_parser(mocker):
-    mocker.patch.object(Config, "format", new="block")
+    mocker.patch.object(Config, "parser", new=BlockParser())
 
 
 @pytest.mark.asyncio

tests/parser_tests/replacement_format_error_test.py

@@ -3,12 +3,13 @@
 import pytest
 
 from mentat.config import Config
+from mentat.parsers.replacement_parser import ReplacementParser
 from mentat.session import Session
 
 
 @pytest.fixture(autouse=True)
 def replacement_parser(mocker):
-    mocker.patch.object(Config, "format", new="replacement")
+    mocker.patch.object(Config, "parser", new=ReplacementParser())
 
 
 @pytest.mark.asyncio

tests/parser_tests/replacement_format_test.py

@@ -11,7 +11,7 @@
 
 @pytest.fixture
 def replacement_parser(mocker):
-    mocker.patch.object(Config, "format", new="replacement")
+    mocker.patch.object(Config, "parser", new=ReplacementParser())
 
 
 @pytest.mark.asyncio

tests/parser_tests/split_diff_format_error_test.py

@@ -3,12 +3,13 @@
 import pytest
 
 from mentat.config import Config
+from mentat.parsers.split_diff_parser import SplitDiffParser
 from mentat.session import Session
 
 
 @pytest.fixture(autouse=True)
 def split_diff_parser(mocker):
-    mocker.patch.object(Config, "format", new="split-diff")
+    mocker.patch.object(Config, "parser", new=SplitDiffParser())
 
 
 @pytest.mark.asyncio

tests/parser_tests/split_diff_format_test.py

@@ -4,12 +4,13 @@
 import pytest
 
 from mentat.config import Config
+from mentat.parsers.split_diff_parser import SplitDiffParser
 from mentat.session import Session
 
 
 @pytest.fixture(autouse=True)
 def split_diff_parser(mocker):
-    mocker.patch.object(Config, "format", new="split-diff")
+    mocker.patch.object(Config, "parser", new=SplitDiffParser())
 
 
 @pytest.mark.asyncio

tests/parser_tests/unified_diff_format_error_test.py

@@ -1,13 +1,14 @@
 from pathlib import Path
 from textwrap import dedent
 
+from mentat.parsers.unified_diff_parser import UnifiedDiffParser
 from mentat.session import Session
 from tests.conftest import Config, pytest
 
 
 @pytest.fixture(autouse=True)
 def unified_diff_parser(mocker):
-    mocker.patch.object(Config, "format", new="unified-diff")
+    mocker.patch.object(Config, "parser", new=UnifiedDiffParser())
 
 
 @pytest.mark.asyncio

tests/parser_tests/unified_diff_format_test.py

@@ -4,12 +4,13 @@
 import pytest
 
 from mentat.config import Config
+from mentat.parsers.unified_diff_parser import UnifiedDiffParser
 from mentat.session import Session
 
 
 @pytest.fixture(autouse=True)
 def unified_diff_parser(mocker):
-    mocker.patch.object(Config, "format", new="unified-diff")
+    mocker.patch.object(Config, "parser", new=UnifiedDiffParser())
 
 
 @pytest.mark.asyncio