Amend the context replacer for the new data structures (#1081)

* Take the tool output into consideration when constructing the user block

* Remove the not-needed OpenInterpreter special-case in the context retriever

* Skip content that has no text in context retriever

This is the case for Anthropic ToolUse messages.

* Add a unit test for the context retriever

* Re-enable the OpenInterpreter test case in test_messages_block.py

Author: jhrozek

src/codegate/pipeline/codegate_context_retriever/codegate.py

@@ -32,6 +32,21 @@ class CodegateContextRetriever(PipelineStep):
     the word "codegate" in the user message.
     """
 
+    def __init__(
+            self,
+            storage_engine: StorageEngine | None = None,
+            package_extractor: PackageExtractor | None = None,
+        ):
+        """
+        Initialize the CodegateContextRetriever with optional dependencies.
+
+        Args:
+            storage_engine: Optional StorageEngine instance for package searching
+            package_extractor: Optional PackageExtractor class for package extraction
+        """
+        self.storage_engine = storage_engine or StorageEngine()
+        self.package_extractor = package_extractor or PackageExtractor
+
     @property
     def name(self) -> str:
         """
@@ -80,9 +95,6 @@ async def process(  # noqa: C901
             return PipelineResult(request=request)
         user_message, last_user_idx = last_message
 
-        # Create storage engine object
-        storage_engine = StorageEngine()
-
         # Extract any code snippets
         extractor = MessageCodeExtractorFactory.create_snippet_extractor(context.client)
         snippets = extractor.extract_snippets(user_message)
@@ -106,7 +118,7 @@ async def process(  # noqa: C901
                 f"for language {snippet_language} in code snippets."
             )
             # Find bad packages in the snippets
-            bad_snippet_packages = await storage_engine.search(
+            bad_snippet_packages = await self.storage_engine.search(
                 language=snippet_language, packages=snippet_packages
             )  # type: ignore
             logger.info(f"Found {len(bad_snippet_packages)} bad packages in code snippets.")
@@ -122,7 +134,11 @@ async def process(  # noqa: C901
         collected_bad_packages = []
         for item_message in filter(None, map(str.strip, split_messages)):
             # Vector search to find bad packages
-            bad_packages = await storage_engine.search(query=item_message, distance=0.5, limit=100)
+            bad_packages = await self.storage_engine.search(
+                query=item_message,
+                distance=0.5,
+                limit=100,
+            )
             if bad_packages and len(bad_packages) > 0:
                 collected_bad_packages.extend(bad_packages)
 
@@ -145,42 +161,36 @@ async def process(  # noqa: C901
             # perform replacement in all the messages starting from this index
             messages = request.get_messages()
             filtered = itertools.dropwhile(lambda x: x[0] < last_user_idx, enumerate(messages))
-            if context.client != ClientType.OPEN_INTERPRETER:
-                for i, message in filtered:
-                    message_str = "".join([
-                        txt
-                        for content in message.get_content()
-                        for txt in content.get_text()
-                    ])
-                    context_msg = message_str
-                    # Add the context to the last user message
-                    if context.client in [ClientType.CLINE, ClientType.KODU]:
-                        match = re.search(r"<task>\s*(.*?)\s*</task>(.*)", message_str, re.DOTALL)
-                        if match:
-                            task_content = match.group(1)  # Content within <task>...</task>
-                            rest_of_message = match.group(
-                                2
-                            ).strip()  # Content after </task>, if any
-
-                            # Embed the context into the task block
-                            updated_task_content = (
-                                f"<task>Context: {context_str}"
-                                + f"Query: {task_content.strip()}</task>"
-                            )
-
-                            # Combine updated task content with the rest of the message
-                            context_msg = updated_task_content + rest_of_message
-                    else:
-                        context_msg = f"Context: {context_str} \n\n Query: {message_str}"
-                    content = next(message.get_content())
-                    content.set_text(context_msg)
-                    logger.debug("Final context message", context_message=context_msg)
-            else:
-                #  just add a message in the end
-                new_request["messages"].append(
-                    {
-                        "content": context_str,
-                        "role": "assistant",
-                    }
-                )
+            for i, message in filtered:
+                message_str = ""
+                for content in message.get_content():
+                    txt = content.get_text()
+                    if not txt:
+                        logger.debug(f"content has no text: {content}")
+                        continue
+                    message_str += txt
+                context_msg = message_str
+                # Add the context to the last user message
+                if context.client in [ClientType.CLINE, ClientType.KODU]:
+                    match = re.search(r"<task>\s*(.*?)\s*</task>(.*)", message_str, re.DOTALL)
+                    if match:
+                        task_content = match.group(1)  # Content within <task>...</task>
+                        rest_of_message = match.group(
+                            2
+                        ).strip()  # Content after </task>, if any
+
+                        # Embed the context into the task block
+                        updated_task_content = (
+                            f"<task>Context: {context_str}"
+                            + f"Query: {task_content.strip()}</task>"
+                        )
+
+                        # Combine updated task content with the rest of the message
+                        context_msg = updated_task_content + rest_of_message
+                else:
+                    context_msg = f"Context: {context_str} \n\n Query: {message_str}"
+                content = next(message.get_content())
+                content.set_text(context_msg)
+                logger.debug("Final context message", context_message=context_msg)
+
             return PipelineResult(request=request, context=context)

src/codegate/types/anthropic/_request_models.py

@@ -110,7 +110,7 @@ def get_text(self) -> Iterable[str]:
 
     def set_text(self, text) -> None:
         if isinstance(self.content, str):
-            self.content = txt
+            self.content = text
             return
 
         # should have been called on the content

src/codegate/types/ollama/_request_models.py

@@ -142,9 +142,9 @@ def last_user_message(self) -> tuple[Message, int] | None:
 
     def last_user_block(self) -> Iterable[tuple[Message, int]]:
         for idx, msg in enumerate(reversed(self.messages)):
-            if isinstance(msg, UserMessage):
-                yield msg, len(self.messages) - 1 - idx
-            elif isinstance(msg, (SystemMessage, ToolMessage)):
+            if isinstance(msg, (UserMessage, ToolMessage)):
+                    yield msg, len(self.messages) - 1 - idx
+            elif isinstance(msg, SystemMessage):
                 # these can occur in the middle of a user block
                 continue
             elif isinstance(msg, AssistantMessage):

src/codegate/types/openai/_request_models.py

@@ -339,9 +339,9 @@ def last_user_message(self) -> tuple[Message, int] | None:
 
     def last_user_block(self) -> Iterable[tuple[Message, int]]:
         for idx, msg in enumerate(reversed(self.messages)):
-            if isinstance(msg, UserMessage):
+            if isinstance(msg, (UserMessage, ToolMessage)):
                 yield msg, len(self.messages) - 1 - idx
-            elif isinstance(msg, (SystemMessage, DeveloperMessage, ToolMessage)):
+            elif isinstance(msg, (SystemMessage, DeveloperMessage)):
                 # these can occur in the middle of a user block
                 continue
             elif isinstance(msg, (AssistantMessage, FunctionMessage)):