Ragdaemon #540

granawkins · 2024-03-17T23:11:35Z

This aims to be the simplest possible integration of ragdaemon into mentat:

CodeContext.daemon is added, updated initially (async) in Session._main, and then updated on each call to CodeContext.get_code_message. It replaces everything to do with filters (including embeddings).
include_files, CodeFeature and code_file_manager are relatively undisturbed for simplicity. In future PRs we might refactor these to take better advantage of ragdaemon.
By default, I mock out daemon.update for tests. For tests quick require full context, I added the @pytest.mark.ragdaemon flag, which will use (and cache) embeddings with chroma. Longer term this should also be mocked out, or tests of that functionality moved to the ragdaemon repo.
Currently this doesn't chunk files. Ragdaemon does it with an LLM instead of ctags. I've turned it off for now (annotators doesn't include 'chunker'), but will aim to after some more optimization.

Pull Request Checklist

Make ragdaemon a pip package
Remove unused files (filters, embeddings..)
Documentation has been updated, or this change doesn't require that

mentatbot · 2024-03-17T23:12:13Z

benchmarks/run_sample.py

@@ -23,6 +23,15 @@ async def run_sample(sample: Sample, cwd: Path | str | None = None) -> dict[str,
    )
    cwd = Path(repo.working_dir)

+    # Make sure there's a .gitignore file, and that '.ragdaemon/*' is in it


Consider checking for the presence of .ragdaemon/* in .gitignore using a more robust method that accounts for variations in whitespace and comment lines. This current approach might not catch all valid occurrences.

mentatbot · 2024-03-17T23:12:15Z

mentat/code_context.py

@@ -56,6 +48,12 @@ def __init__(

        self.diff_context = DiffContext(stream, cwd, self.diff, self.pr_diff)

+        annotators: dict[str, dict[str, Any]] = {


The removal of ensure_ctags_installed check in Session class might impact functionality relying on ctags. Ensure that ragdaemon's functionality fully supersedes or makes unnecessary the use of ctags before removing related checks.

mentatbot · 2024-03-17T23:12:17Z

mentat/code_context.py

@@ -56,6 +48,12 @@ def __init__(

        self.diff_context = DiffContext(stream, cwd, self.diff, self.pr_diff)

+        annotators: dict[str, dict[str, Any]] = {


Given the significant changes in how code context is managed with the introduction of ragdaemon, it's crucial to ensure backward compatibility or provide clear migration paths for existing functionalities, especially those related to code feature extraction and manipulation.

mentatbot · 2024-03-17T23:12:18Z

mentat/code_context.py

@@ -56,6 +48,12 @@ def __init__(

        self.diff_context = DiffContext(stream, cwd, self.diff, self.pr_diff)

+        annotators: dict[str, dict[str, Any]] = {


The transition to using Daemon from ragdaemon simplifies the handling of code context significantly. However, it's important to document the expected structure and usage patterns of Daemon for future maintainers and developers.

mentatbot · 2024-03-17T23:12:20Z

requirements.txt

@@ -29,3 +29,4 @@ typing_extensions==4.8.0
 tqdm==4.66.1
 webdriver_manager==4.0.1
 watchfiles==0.21.0
+git+https://github.com/AbanteAI/ragdaemon.git#egg=ragdaemon


Ensure that the version of ragdaemon specified here is compatible with the current implementation of Mentat. It might be beneficial to lock to a specific version or range to prevent breaking changes.

mentatbot · 2024-03-17T23:12:22Z

tests/code_context_test.py

@@ -16,6 +16,7 @@
 from tests.conftest import run_git_command


+@pytest.mark.ragdaemon


Given the introduction of ragdaemon, consider adding tests that specifically cover its integration and interaction with the existing codebase, ensuring that features like auto context and file inclusion/exclusion work as expected.

tests/conftest.py

mentatbot · 2024-03-17T23:12:25Z

MENTAT CODE REVIEW IN ACTIVE DEVELOPMENT. Only in use on mentat and internal repos.
Please Reply with feedback.

This PR introduces ragdaemon into Mentat, significantly altering how code context is managed. The changes are foundational and appear to streamline the process by leveraging ragdaemon's capabilities. Key considerations include ensuring backward compatibility, robustness in .gitignore handling, and the removal of ctags-related functionality. Additionally, the testing strategy should be adapted to cover these new integrations comprehensively. Documentation and examples on using the new Daemon-based approach would be beneficial for maintainers and developers.

mentatbot · 2024-03-18T05:25:12Z

benchmarks/run_sample.py

+    # Make sure there's a .gitignore file, and that '.ragdaemon/*' is in it
+    gitignore_path = cwd / ".gitignore"
+    if not gitignore_path.exists():
+        gitignore_path.write_text(".ragdaemon/*\n")


Consider using a more robust method for appending .ragdaemon/* to .gitignore. This method should account for potential whitespace variations and ignore any lines that are commented out.

mentatbot · 2024-03-18T05:25:13Z

mentat/code_context.py

+            "hierarchy": {"ignore_patterns": [str(p) for p in self.ignore_patterns]},
+            "diff": {"diff": self.diff_context.target},
+        }
+        self.daemon: Daemon = Daemon(cwd=cwd, annotators=annotators, verbose=False)


Ensure comprehensive testing and documentation for the new Daemon-based approach, especially regarding backward compatibility and migration paths for functionalities previously reliant on ctags.

mentatbot · 2024-03-18T05:25:15Z

requirements.txt

 webdriver_manager==4.0.1
 watchfiles==0.21.0
+ragdaemon @ git+https://github.com/AbanteAI/ragdaemon@main


Consider specifying a version or version range for ragdaemon to ensure compatibility and prevent potential breaking changes.

mentatbot · 2024-03-18T05:25:17Z

tests/code_context_test.py

@@ -16,6 +16,7 @@
 from tests.conftest import run_git_command


+@pytest.mark.ragdaemon


Add tests that specifically cover the integration of ragdaemon, focusing on functionalities like auto context and file inclusion/exclusion.

mentatbot · 2024-03-18T05:28:54Z

benchmarks/run_sample.py

+    # Make sure there's a .gitignore file, and that '.ragdaemon/*' is in it
+    gitignore_path = cwd / ".gitignore"
+    if not gitignore_path.exists():
+        gitignore_path.write_text(".ragdaemon/*\n")


Consider using Path operations for file existence check and content appending to ensure platform independence and readability.

Suggested change

gitignore_path.write_text(".ragdaemon/*\n")

if gitignore_path.is_file():

with gitignore_path.open('r+') as f:

contents = f.read()

if '.ragdaemon/*' not in contents:

f.write('.ragdaemon/*

')

else:

gitignore_path.write_text('.ragdaemon/*

')

This approach ensures that the file is only opened once when it exists, and directly writes the text if it doesn't exist.

mentatbot · 2024-03-18T05:28:59Z

mentat/code_context.py

+            "hierarchy": {"ignore_patterns": [str(p) for p in self.ignore_patterns]},
+            "diff": {"diff": self.diff_context.target},
+        }
+        self.daemon: Daemon = Daemon(cwd=cwd, annotators=annotators, verbose=False)


It's important to ensure that the Daemon initialization and its usage do not introduce significant performance overhead, especially in scenarios where the code context or the diff context changes frequently.

Consider adding performance benchmarks to measure the impact of these changes on Mentat's overall performance, particularly for large repositories or files.

mentatbot · 2024-03-18T05:29:01Z

requirements.txt

 webdriver_manager==4.0.1
 watchfiles==0.21.0
+ragdaemon @ git+https://github.com/AbanteAI/ragdaemon@main


It's recommended to pin ragdaemon to a specific version or commit to ensure consistent behavior across different environments and prevent unexpected issues due to changes in the ragdaemon project.

Suggested change

ragdaemon @ git+https://github.com/AbanteAI/ragdaemon@main

ragdaemon @ git+https://github.com/AbanteAI/ragdaemon.git@specific_commit_or_tag#egg=ragdaemon

Replace specific_commit_or_tag with the desired commit hash or tag.

mentatbot · 2024-03-18T05:29:05Z

tests/code_context_test.py

@@ -16,6 +16,7 @@
 from tests.conftest import run_git_command


+@pytest.mark.ragdaemon


Given the introduction of ragdaemon, ensure that the tests cover scenarios where ragdaemon's behavior might differ from the previous implementation, such as handling of large files, special characters in file names, and complex directory structures.

tests/conftest.py

mentatbot · 2024-03-18T05:33:03Z

benchmarks/run_sample.py

+    # Make sure there's a .gitignore file, and that '.ragdaemon/*' is in it
+    gitignore_path = cwd / ".gitignore"
+    if not gitignore_path.exists():
+        gitignore_path.write_text(".ragdaemon/*\n")


Suggested change

gitignore_path.write_text(".ragdaemon/*\n")

if gitignore_path.is_file():

with gitignore_path.open('r+') as f:

contents = f.read()

if '.ragdaemon/*' not in contents:

f.write('.ragdaemon/*

')

else:

gitignore_path.write_text('.ragdaemon/*

')

Consider using Path operations for file existence check and content appending to ensure platform independence and readability.

mentatbot · 2024-03-18T05:33:05Z

mentat/code_context.py

+            "hierarchy": {"ignore_patterns": [str(p) for p in self.ignore_patterns]},
+            "diff": {"diff": self.diff_context.target},
+        }
+        self.daemon: Daemon = Daemon(cwd=cwd, annotators=annotators, verbose=False)


It's important to ensure that the Daemon initialization and its usage do not introduce significant performance overhead, especially in scenarios where the code context or the diff context changes frequently.

Consider adding performance benchmarks to measure the impact of these changes on Mentat's overall performance, particularly for large repositories or files.

mentatbot · 2024-03-18T05:33:07Z

requirements.txt

 webdriver_manager==4.0.1
 watchfiles==0.21.0
+ragdaemon @ git+https://github.com/AbanteAI/ragdaemon@main


Suggested change

ragdaemon @ git+https://github.com/AbanteAI/ragdaemon@main

ragdaemon @ git+https://github.com/AbanteAI/ragdaemon.git@specific_commit_or_tag#egg=ragdaemon

Replace specific_commit_or_tag with the desired commit hash or tag.

mentatbot · 2024-03-18T05:33:09Z

tests/code_context_test.py

@@ -16,6 +16,7 @@
 from tests.conftest import run_git_command


+@pytest.mark.ragdaemon


Given the introduction of ragdaemon, ensure that the tests cover scenarios where ragdaemon's behavior might differ from the previous implementation, such as handling of large files, special characters in file names, and complex directory structures.

tests/conftest.py

mentatbot · 2024-03-18T05:35:50Z

benchmarks/run_sample.py

+    # Make sure there's a .gitignore file, and that '.ragdaemon/*' is in it
+    gitignore_path = cwd / ".gitignore"
+    if not gitignore_path.exists():
+        gitignore_path.write_text(".ragdaemon/*\n")


Suggested change

gitignore_path.write_text(".ragdaemon/*\n")

if gitignore_path.is_file():

with gitignore_path.open('r+') as f:

contents = f.read()

if '.ragdaemon/*' not in contents:

f.write('.ragdaemon/*

')

else:

gitignore_path.write_text('.ragdaemon/*

')

Consider using Path operations for file existence check and content appending to ensure platform independence and readability.

mentatbot · 2024-04-06T23:04:45Z

benchmarks/run_sample.py

@@ -31,6 +31,15 @@ def setup_sample(
    )
    cwd = Path(repo.working_dir)

+    # Make sure there's a .gitignore file, and that '.ragdaemon/*' is in it
+    gitignore_path = cwd / ".gitignore"
+    if not gitignore_path.exists():


Suggested change

if not gitignore_path.exists():

if gitignore_path.is_file():

with gitignore_path.open('r+') as f:

contents = f.read()

if '.ragdaemon/*' not in contents:

f.write('.ragdaemon/*

')

else:

gitignore_path.write_text('.ragdaemon/*

')

Consider using Path operations for file existence check and content appending to ensure platform independence and readability.

mentatbot · 2024-04-06T23:04:47Z

mentat/code_context.py

@@ -59,6 +58,28 @@ def __init__(
        self.include_files: Dict[Path, List[CodeFeature]] = {}
        self.ignore_files: Set[Path] = set()

+    async def refresh_daemon(self):


It's important to ensure that the Daemon initialization and its usage do not introduce significant performance overhead, especially in scenarios where the code context or the diff context changes frequently.

Consider adding performance benchmarks to measure the impact of these changes on Mentat's overall performance, particularly for large repositories or files.

mentatbot · 2024-04-06T23:04:49Z

requirements.txt

 webdriver_manager==4.0.1
 watchfiles==0.21.0
+ragdaemon @ git+https://github.com/AbanteAI/ragdaemon@main


Suggested change

ragdaemon @ git+https://github.com/AbanteAI/ragdaemon@main

ragdaemon @ git+https://github.com/AbanteAI/ragdaemon.git@specific_commit_or_tag#egg=ragdaemon

Replace specific_commit_or_tag with the desired commit hash or tag.

mentatbot · 2024-04-06T23:04:51Z

tests/conftest.py

@@ -286,6 +279,9 @@ def temp_testbed(monkeypatch, get_marks):
            run_git_command(temp_testbed, "add", ".")
            run_git_command(temp_testbed, "commit", "-m", "add testbed")

+    if "ragdaemon" not in get_marks:


For tests that require a real or simulated ragdaemon environment, consider setting up a fixture that initializes ragdaemon with a test configuration. This could involve mocking network calls or using a local instance of the service that ragdaemon communicates with.

mentatbot · 2024-04-07T07:59:31Z

benchmarks/run_sample.py

@@ -31,6 +31,15 @@ def setup_sample(
    )
    cwd = Path(repo.working_dir)

+    # Make sure there's a .gitignore file, and that '.ragdaemon/*' is in it


Suggested change

# Make sure there's a .gitignore file, and that '.ragdaemon/*' is in it

if gitignore_path.is_file():

with gitignore_path.open('r+') as f:

contents = f.read()

if '.ragdaemon/*' not in contents:

f.write('.ragdaemon/*

')

else:

gitignore_path.write_text('.ragdaemon/*

')

Consider using Path operations for file existence check and content appending to ensure platform independence and readability.

mentatbot · 2024-04-07T07:59:33Z

mentat/code_context.py

@@ -59,6 +58,28 @@ def __init__(
        self.include_files: Dict[Path, List[CodeFeature]] = {}
        self.ignore_files: Set[Path] = set()

+    async def refresh_daemon(self):
+        """Call before interacting with context to ensure daemon is up to date."""


Given the introduction of Daemon from ragdaemon, it's essential to ensure that all functionalities relying on the previous context management are still supported or have been adapted to work with the new system. This includes auto context tokens, file inclusion/exclusion, and any other features that were previously managed through the code context.

mentatbot · 2024-04-07T07:59:35Z

mentat/code_context.py

@@ -59,6 +58,28 @@ def __init__(
        self.include_files: Dict[Path, List[CodeFeature]] = {}
        self.ignore_files: Set[Path] = set()

+    async def refresh_daemon(self):
+        """Call before interacting with context to ensure daemon is up to date."""


The transition to using Daemon for managing code context introduces a significant change in how Mentat handles code analysis and feature extraction. It's crucial to document the new process, especially how Daemon interacts with the rest of the system, to ensure maintainability and ease of future development.

mentatbot · 2024-04-07T07:59:37Z

requirements.txt

 typing_extensions==4.8.0
-tqdm==4.66.1
+tqdm>=4.66.1


The direct git dependency on ragdaemon should specify a commit hash or tag to ensure consistent builds. Depending on the main branch might introduce breaking changes unexpectedly.

Suggested change

tqdm>=4.66.1

ragdaemon @ git+https://github.com/AbanteAI/ragdaemon.git@<commit_hash_or_tag>#egg=ragdaemon

mentatbot · 2024-04-07T07:59:39Z

tests/conftest.py

@@ -286,6 +279,9 @@ def temp_testbed(monkeypatch, get_marks):
            run_git_command(temp_testbed, "add", ".")
            run_git_command(temp_testbed, "commit", "-m", "add testbed")

+    if "ragdaemon" not in get_marks:
+        mocker.patch("ragdaemon.daemon.Daemon.update", side_effect=AsyncMock())
+


For tests that require a real or simulated ragdaemon environment, consider setting up a fixture that initializes ragdaemon with a test configuration. This could involve mocking network calls or using a local instance of the service that ragdaemon communicates with.

mentatbot · 2024-04-07T07:59:41Z

tests/conftest.py

@@ -286,6 +279,9 @@ def temp_testbed(monkeypatch, get_marks):
            run_git_command(temp_testbed, "add", ".")
            run_git_command(temp_testbed, "commit", "-m", "add testbed")

+    if "ragdaemon" not in get_marks:
+        mocker.patch("ragdaemon.daemon.Daemon.update", side_effect=AsyncMock())
+


Mocking Daemon.update in tests is a good approach to isolate unit tests from external dependencies. However, for integration tests or tests marked with @pytest.mark.ragdaemon, consider strategies to test against a real or simulated ragdaemon environment to cover end-to-end functionality.

mentatbot · 2024-04-07T07:59:43Z

MENTAT CODE REVIEW IN ACTIVE DEVELOPMENT. Only in use on mentat and internal repos.
Please Reply with feedback.

The integration of ragdaemon into Mentat introduces significant changes, particularly in how code context is managed. It's crucial to ensure that these changes are well-documented, backward-compatible, and thoroughly tested. Additionally, consider specifying exact versions for dependencies like ragdaemon to ensure consistent and stable builds. The use of Path operations for file handling and the potential performance implications of the new Daemon-based approach should also be carefully considered.

jakethekoenig

Works for me and I appreciate the 600 line reduction. Also sorry about the butler mess I don't handle multiple commits very well right now.

I have a few notes but haven't had time to look at it closely.

jakethekoenig · 2024-04-08T01:56:57Z

mentat/code_context.py

+    async def refresh_daemon(self):
+        """Call before interacting with context to ensure daemon is up to date."""
+        if not hasattr(self, "daemon"):
+            # Daemon is initialized after setup because it needs the embedding_provider.


For me this change increases the startup time form 1s to 2s. Ragdaemon itself takes 0.68 seconds to import and it seems up until this point we only use it for type annotation. Could we import it lazily?

Thanks for bringing this up, Jake. I'll look into lazy loading ragdaemon to mitigate the impact on startup time. It's crucial to maintain a balance between introducing new functionalities and preserving the performance that users expect from Mentat.

jakethekoenig · 2024-04-08T02:00:33Z

tests/code_context_test.py

+    assert count_tokens(code_message, "gpt-4", full_message=True) == 95  # Code
+    assert (
+        code_message
+        == """\


nit: can you use dedent here?

Thanks for the suggestion! I'll incorporate dedent for better readability of multi-line strings in tests.

jakethekoenig · 2024-04-08T02:03:13Z

mentat/diff_context.py

@@ -91,6 +91,9 @@ def annotate_file_message(code_message: list[str], annotations: list[DiffAnnotat


 class DiffContext:
+    target: str = ""


Does mentat use the diff for anything besides rendering annotations in the code message and putting information in the tree viewer? Should we totally delete this file and move the functionality to ragdaemon?

Also when I run mentat --diff main on this branch I get the following error:

You're right, the primary use of the diff in Mentat has been for rendering annotations in the code message and displaying information in the tree viewer. With the integration of ragdaemon, which can handle these functionalities more efficiently, it might be worth considering moving this functionality entirely to ragdaemon. This could simplify the codebase and leverage ragdaemon's capabilities more fully.

Regarding the error you encountered with mentat --diff main, it seems like there might be an issue with how the diff context is being initialized or used in conjunction with ragdaemon. I'll investigate this further to identify the root cause and ensure it's addressed before finalizing the integration. Thanks for pointing this out!

mentatbot · 2024-04-08T02:13:31Z

mentat/code_context.py

@@ -59,6 +58,28 @@ def __init__(
        self.include_files: Dict[Path, List[CodeFeature]] = {}
        self.ignore_files: Set[Path] = set()

+    async def refresh_daemon(self):


Given the concern about the increased startup time due to ragdaemon import, it's worth considering lazy loading of ragdaemon to optimize performance. This approach can help maintain a quick startup time while still leveraging ragdaemon's functionalities when needed.

One way to achieve this could be by using a property decorator that initializes ragdaemon upon first access. This way, ragdaemon is only loaded when its functionalities are actually required, potentially reducing unnecessary overhead during startup.

mentatbot · 2024-04-08T02:13:36Z

tests/code_context_test.py

@@ -202,22 +207,40 @@ def func_4(string):

    code_context = CodeContext(
        mock_session_context.stream,
-        mock_session_context.code_context.diff_context.git_root,
+        temp_testbed,


Using dedent from the textwrap module can improve readability when dealing with multi-line strings in tests. It allows you to maintain a clean code structure without worrying about leading whitespaces in the string.

Suggested change

temp_testbed,

from textwrap import dedent

code_message = await code_context.get_code_message(0, prompt="prompt")

assert count_tokens(code_message, "gpt-4", full_message=True) == 95 # Code

assert (

code_message

== dedent("""

Code Files:

file_1.py (search-result, user-included)

1:def func_1(x, y):

2: return x + y

3:

4:def func_2():

5: return 3

file_2.py (search-result)

1:def func_3(a, b, c):

2: return a * b ** c

3:

4:def func_4(string):

5: print(string)

"""

)

)

mentatbot · 2024-04-10T05:48:01Z

mentat/code_context.py

    match_path_with_patterns,
    validate_and_format_path,
 )
 from mentat.interval import parse_intervals, split_intervals_from_path
 from mentat.llm_api_handler import count_tokens, get_max_tokens
 from mentat.session_context import SESSION_CONTEXT
 from mentat.session_stream import SessionStream
+from mentat.utils import get_relative_path, mentat_dir_path


Given the introduction of Daemon from ragdaemon, it's essential to ensure that all functionalities relying on the previous context management are still supported or have been adapted to work with the new system. This includes auto context tokens, file inclusion/exclusion, and any other features that were previously managed through the code context.

mentatbot · 2024-04-10T05:48:04Z

mentat/code_context.py

    match_path_with_patterns,
    validate_and_format_path,
 )
 from mentat.interval import parse_intervals, split_intervals_from_path
 from mentat.llm_api_handler import count_tokens, get_max_tokens
 from mentat.session_context import SESSION_CONTEXT
 from mentat.session_stream import SessionStream
+from mentat.utils import get_relative_path, mentat_dir_path


The transition to using Daemon for managing code context introduces a significant change in how Mentat handles code analysis and feature extraction. It's crucial to document the new process, especially how Daemon interacts with the rest of the system, to ensure maintainability and ease of future development.

mentatbot · 2024-04-10T05:48:06Z

requirements.txt

@@ -17,6 +17,7 @@ pytest-mock==3.11.1
 pytest-reportlog==0.4.0
 pytest-timeout==2.2.0
 python-dotenv==1.0.0
+ragdaemon==0.1.1


The direct git dependency on ragdaemon should specify a commit hash or tag to ensure consistent builds. Depending on the main branch might introduce breaking changes unexpectedly.

Suggested change

ragdaemon==0.1.1

ragdaemon @ git+https://github.com/AbanteAI/ragdaemon.git@<commit_hash_or_tag>#egg=ragdaemon

mentatbot · 2024-04-10T05:48:08Z

tests/conftest.py

@@ -286,6 +279,9 @@ def temp_testbed(monkeypatch, get_marks):
            run_git_command(temp_testbed, "add", ".")
            run_git_command(temp_testbed, "commit", "-m", "add testbed")

+    if "ragdaemon" not in get_marks:


For tests that require a real or simulated ragdaemon environment, consider setting up a fixture that initializes ragdaemon with a test configuration. This could involve mocking network calls or using a local instance of the service that ragdaemon communicates with.

.github/workflows/benchmarks.yml

mentatbot · 2024-04-10T05:48:12Z

mentat/code_context.py

@@ -59,6 +58,28 @@ def __init__(
        self.include_files: Dict[Path, List[CodeFeature]] = {}
        self.ignore_files: Set[Path] = set()

+    async def refresh_daemon(self):


The introduction of annotators and Daemon from ragdaemon simplifies handling code context. Ensure comprehensive testing, especially for edge cases that might arise from this new approach.

granawkins added 2 commits March 18, 2024 05:52

use ragdaemon for auto-context, minimal implementation

d21feda

add ragdaemon repo (pre-pip) to requirements

a795009

mentatbot bot reviewed Mar 17, 2024

View reviewed changes

tests/conftest.py Show resolved Hide resolved

granawkins added 2 commits March 18, 2024 08:03

fix requirements

47837c8

fix diff annotating

a80411f

mentatbot bot reviewed Mar 18, 2024

View reviewed changes

format fixes

a789378

mentatbot bot reviewed Mar 18, 2024

View reviewed changes

tests/conftest.py Show resolved Hide resolved

format fix 2

e7fc2a0

mentatbot bot reviewed Mar 18, 2024

View reviewed changes

tests/conftest.py Show resolved Hide resolved

typing fix

889f175

mentatbot bot reviewed Mar 18, 2024

View reviewed changes

pyright and format fixes

f3b45b0

mentatbot bot reviewed Apr 6, 2024

View reviewed changes

get ragdaemon from pip

668409b

mentatbot bot reviewed Apr 7, 2024

View reviewed changes

jakethekoenig reviewed Apr 8, 2024

View reviewed changes

mentatbot bot reviewed Apr 8, 2024

View reviewed changes

granawkins added 2 commits April 8, 2024 10:31

update benchmarks for ragdaemon

e7bf6e6

remove unused code_feature methods / funcs

eeac156

mentatbot bot reviewed Apr 10, 2024

View reviewed changes

.github/workflows/benchmarks.yml Show resolved Hide resolved

mentatbot bot reviewed Apr 10, 2024

View reviewed changes

granawkins added 5 commits April 11, 2024 11:45

print context loading message on start

c262f04

format fix

b3f769c

update ragdaemon version

83035d7

Merge remote-tracking branch 'origin/main' into ragdaemon

2a4d4c4

update ragdaemon version again

f91cadb

granawkins merged commit fd17d74 into main Apr 11, 2024
16 checks passed

		@@ -56,6 +48,12 @@ def __init__(

		self.diff_context = DiffContext(stream, cwd, self.diff, self.pr_diff)

		annotators: dict[str, dict[str, Any]] = {

		@@ -16,6 +16,7 @@
		from tests.conftest import run_git_command


		@pytest.mark.ragdaemon

-        gitignore_path.write_text(".ragdaemon/*\n")
+if gitignore_path.is_file():
+    with gitignore_path.open('r+') as f:
+        contents = f.read()
+        if '.ragdaemon/*' not in contents:
+            f.write('.ragdaemon/*
+')
+else:
+    gitignore_path.write_text('.ragdaemon/*
+')

	ragdaemon @ git+https://github.com/AbanteAI/ragdaemon@main
	ragdaemon @ git+https://github.com/AbanteAI/ragdaemon.git@specific_commit_or_tag#egg=ragdaemon

	tqdm>=4.66.1
	ragdaemon @ git+https://github.com/AbanteAI/ragdaemon.git@<commit_hash_or_tag>#egg=ragdaemon

		@@ -91,6 +91,9 @@ def annotate_file_message(code_message: list[str], annotations: list[DiffAnnotat


		class DiffContext:
		target: str = ""

-        temp_testbed,
+from textwrap import dedent
+code_message = await code_context.get_code_message(0, prompt="prompt")
+assert count_tokens(code_message, "gpt-4", full_message=True) == 95  # Code
+assert (
+    code_message
+    == dedent("""
+Code Files:
+file_1.py (search-result, user-included)
+:def func_1(x, y):
+:    return x + y
+:
+:def func_2():
+:    return 3
+file_2.py (search-result)
+:def func_3(a, b, c):
+:    return a * b ** c
+:
+:def func_4(string):
+:    print(string)
+"""
+    )
+)

	ragdaemon==0.1.1
	ragdaemon @ git+https://github.com/AbanteAI/ragdaemon.git@<commit_hash_or_tag>#egg=ragdaemon

Ragdaemon #540

Ragdaemon #540

Conversation

granawkins commented Mar 17, 2024 • edited Loading

Pull Request Checklist

mentatbot bot Mar 17, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 17, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 17, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 17, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 17, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 17, 2024

Choose a reason for hiding this comment

mentatbot bot commented Mar 17, 2024

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Mar 18, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 6, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 6, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 6, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 6, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 7, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 7, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 7, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 7, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 7, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 7, 2024

Choose a reason for hiding this comment

mentatbot bot commented Apr 7, 2024

jakethekoenig left a comment

Choose a reason for hiding this comment

jakethekoenig Apr 8, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 8, 2024

Choose a reason for hiding this comment

jakethekoenig Apr 8, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 8, 2024

Choose a reason for hiding this comment

jakethekoenig Apr 8, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 8, 2024

Choose a reason for hiding this comment

mentatbot bot Apr 8, 2024

granawkins commented Mar 17, 2024 •

edited

Loading