Merge pull request #78 from Grigorij-Dudnik/dev

release 0.3.11

Author: Grigorij-Dudnik

manager.py

@@ -17,9 +17,12 @@
 from langchain_core.load import dumps
 from langgraph.graph import StateGraph
 from src.tools.tools_project_manager import add_task, modify_task, finish_project_planning, reorder_tasks
-from src.tools.tools_coder_pipeline import prepare_list_dir_tool, prepare_see_file_tool, ask_human_tool, retrieve_files_by_semantic_query
+from src.tools.tools_coder_pipeline import (
+    prepare_list_dir_tool, prepare_see_file_tool, see_image,
+    ask_human_tool, retrieve_files_by_semantic_query
+)
 from src.tools.rag.index_file_descriptions import prompt_index_project_files
-from src.utilities.util_functions import save_state_history_to_disk, join_paths
+from src.utilities.util_functions import save_state_history_to_disk, join_paths, convert_image
 from src.utilities.manager_utils import (
     actualize_tasks_list_and_progress_description,
     setup_todoist_project_if_needed,
@@ -83,6 +86,9 @@ def call_model_manager(self, state):
         state = call_tool(state, self.tools)
         if len(last_ai_message.tool_calls) == 0:
             state["messages"].append(HumanMessage(content=no_tools_msg))
+        for tool_call in last_ai_message.tool_calls:
+            if tool_call["name"] == "see_image":
+                state["messages"].append(HumanMessage(content=convert_image(tool_call["args"]["filename"])))
         state = actualize_tasks_list_and_progress_description(state)
         return state
 
@@ -96,6 +102,10 @@ def after_agent_condition(self, state):
 
     # just functions
     def cut_off_context(self, state):
+        """
+        Trims the message history in the state to keep only the most recent context for the agent.
+        Keeps the last ~30 messages, starting from the most recent 'ai' message, and always includes the system message at the beginning.
+        """
         approx_nr_msgs_to_save = 30
         if len(state["messages"]) > approx_nr_msgs_to_save:
             last_messages = state["messages"][-approx_nr_msgs_to_save:]
@@ -134,6 +144,7 @@ def prepare_tools(self):
             finish_project_planning,
             list_dir,
             see_file,
+            see_image,
         ]
         if vdb_available():
             tools.append(retrieve_files_by_semantic_query)

non_src/assets/logo_wide_2.png

@@ -12,7 +12,8 @@
 load_dotenv(find_dotenv())
 
 folder_with_project_files = repo_directory.joinpath(
-    "non_src/tests/manual_tests/projects_files", "debugger_scenario_1_files"
+    "non_src/tests/manual_tests/projects_files", "executoro"
+                                                 "_scenario_1_files"
 )
 tmp_folder = pathlib.Path(__file__).parent.resolve().joinpath("sandbox_work_dir")
 setup_work_dir(manual_tests_folder=tmp_folder, test_files_dir=folder_with_project_files)

non_src/tests/manual_tests/executor_scenario1.py

@@ -21,6 +21,8 @@
     read_coderrules,
     convert_images,
     list_directory_tree,
+    exchange_file_contents,
+    TOOL_NOT_EXECUTED_WORD,
 )
 from src.utilities.llms import init_llms_medium_intelligence
 from src.utilities.langgraph_common_functions import (
@@ -106,6 +108,10 @@ def call_model_debugger(self, state):
                 new_file = CodeFile(tool_call["args"]["filename"], is_modified=True)
                 self.files.add(new_file)
             elif tool_call["name"] in ["replace_code", "insert_code"]:
+                last_tool_message = [msg for msg in state["messages"] if msg.type == "tool"][-1]
+                # do not mark as modified if tool was not executed
+                if last_tool_message.content.startswith(TOOL_NOT_EXECUTED_WORD):
+                    continue
                 filename = tool_call["args"]["filename"]
                 for file in self.files:
                     if file.filename == filename:
@@ -117,6 +123,7 @@ def call_model_debugger(self, state):
                 if analysis_result:
                     state["messages"].append(HumanMessage(content=analysis_result))
 
+        state = exchange_file_contents(state, self.files, self.work_dir)
 
         return state
 

src/agents/debugger_agent.py

@@ -12,7 +12,7 @@
 from langchain.tools import tool
 from src.utilities.llms import init_llms_medium_intelligence
 from src.utilities.print_formatters import print_formatted
-from src.utilities.util_functions import check_file_contents, exchange_file_contents, bad_tool_call_looped, load_prompt
+from src.utilities.util_functions import check_file_contents, exchange_file_contents, bad_tool_call_looped, load_prompt, TOOL_NOT_EXECUTED_WORD
 from src.utilities.langgraph_common_functions import (
     call_model,
     call_tool,
@@ -71,8 +71,8 @@ def call_model_executor(self, state):
         state = call_tool(state, self.tools)
 
         # auxiliary actions depending on tools called
-        messages = [msg for msg in state["messages"] if msg.type == "ai"]
-        last_ai_message = messages[-1]
+        ai_messages = [msg for msg in state["messages"] if msg.type == "ai"]
+        last_ai_message = ai_messages[-1]
         if len(last_ai_message.tool_calls) > 1:
             for tool_call in last_ai_message.tool_calls:
                 state["messages"].append(ToolMessage(content="too much tool calls", tool_call_id=tool_call["id"]))
@@ -84,6 +84,10 @@ def call_model_executor(self, state):
                 new_file = CodeFile(tool_call["args"]["filename"], is_modified=True)
                 self.files.add(new_file)
             elif tool_call["name"] in ["replace_code", "insert_code"]:
+                last_tool_message = [msg for msg in state["messages"] if msg.type == "tool"][-1]
+                # do not mark as modified if tool was not executed
+                if last_tool_message.content.startswith(TOOL_NOT_EXECUTED_WORD):
+                    continue
                 filename = tool_call["args"]["filename"]
                 for file in self.files:
                     if file.filename == filename:

src/agents/executor_agent.py

@@ -18,6 +18,22 @@ def python_static_analysis(files):
     return outputs
 
 
+def js_ts_static_analysis(files):
+    outputs = ""
+    for file in files:
+        command = [
+            "npx",
+            "biome",
+            "check",
+            join_paths(os.getenv("WORK_DIR"), file.filename),
+            #"--config-path", "src/linters/biome-config.json"  # only if you want non-default settings
+        ]
+        result = subprocess.run(command, capture_output=True, text=True, encoding="utf-8")
+        if result.stdout.strip() != "All checks passed!":
+            outputs += f"\n\n---\n{file.filename}:\n\n{result.stdout}"
+
+    return outputs
+
 # Print results
 # print("STDOUT:", result.stdout)
 # print("STDERR:", result.stderr)

src/linters/static_analisys.py

@@ -3,11 +3,11 @@ When you unsure how some feature need to be implemented, ask human.
 
 Make good file research before creating a task to understand how to implement task the best and to describe it in all details.
 
-Tasks you are creating are always very concrete and concise, showing programmer how he can implement the change. If you unsure which technologies to use, ask human.
-Hovewer, do not write code in your task, just overview from above.
+Tasks you are creating are always very concrete and concise, showing programmer how he can implement the change. If you unsure which technologies to use, ask human first.
 Avoid creating flaky tasks, where it's unclear how to do task and if it is needed at all.
 
-Never make up information when describing task. Ask human or make file research to get more info instead.
+- Never make up information when describing task. Ask human or make file research to get more info instead.
+- Do not write code inside of the task - it's job of programmer.
 
 
 Here is description of changes in the project you work on:
@@ -20,7 +20,3 @@ Some important project informations and rules:
 '''
 {project_rules}
 '''
-
-First, provide step by step reasoning about what do you need to find in order to accomplish the task. Ensure, you have
-long and thoughtful reasoning before every tool call. Remember, you are brain worker.
-Next, call appropriate tool.