Merge pull request #630 from phenobarbital/orchestrator

Orchestrator

Author: phenobarbital

parrot/bots/base.py

@@ -10,8 +10,7 @@
 import asyncio
 from pydantic import BaseModel
 from ..memory import (
-    ConversationTurn,
-    ConversationHistory
+    ConversationTurn
 )
 from ..models import AIMessage, StructuredOutputConfig
 from ..models.outputs import OutputMode
@@ -22,6 +21,7 @@
 )
 from .abstract import AbstractBot
 from ..models.status import AgentStatus
+from .middleware import PromptPipeline
 
 
 class BaseBot(AbstractBot):
@@ -364,6 +364,18 @@ async def invoke(
                 content="Your request could not be processed due to security concerns.",
                 metadata={'error': 'security_block'}
             )
+        
+        # Apply prompt pipeline
+        if self.prompt_pipeline and self._prompt_pipeline.has_middlewares:
+            question = await self._prompt_pipeline.apply(
+                question,
+                context={
+                    'agent_name': self.name,
+                    'user_id': user_id,
+                    'session_id': session_id,
+                    'method': 'ask',
+                }
+            )
 
         try:
             # Update status and trigger start event
@@ -563,6 +575,18 @@ async def ask(
                 }
             )
 
+        # Apply prompt pipeline
+        if self.prompt_pipeline and self._prompt_pipeline.has_middlewares:
+            question = await self._prompt_pipeline.apply(
+                question,
+                context={
+                    'agent_name': self.name,
+                    'user_id': user_id,
+                    'session_id': session_id,
+                    'method': 'ask',
+                }
+            )
+
         # Update status and trigger start event
         self.status = AgentStatus.WORKING
         self._trigger_event(
@@ -851,13 +875,25 @@ async def ask_stream(
                 session_id=session_id,
                 context={'method': 'ask_stream'}
             )
-        except PromptInjectionException as e:
+        except PromptInjectionException:
             yield (
                 "Your request could not be processed due to security concerns. "
                 "Please rephrase your question."
             )
             return
 
+        # Apply prompt pipeline
+        if self.prompt_pipeline and self._prompt_pipeline.has_middlewares:
+            question = await self._prompt_pipeline.apply(
+                question,
+                context={
+                    'agent_name': self.name,
+                    'user_id': user_id,
+                    'session_id': session_id,
+                    'method': 'ask',
+                }
+            )
+
         default_max_tokens = self._llm_kwargs.get('max_tokens', None)
         max_tokens = kwargs.get('max_tokens', default_max_tokens)
         limit = kwargs.get('limit', self.context_search_limit)

parrot/bots/middleware.py

@@ -14,7 +14,7 @@ class PromptMiddleware:
     ] = None
     enabled: bool = True
 
-    async def process(self, query: str, context: Dict[str, Any]) -> str:
+    async def apply(self, query: str, context: Dict[str, Any]) -> str:
         if not self.enabled or not self.transform:
             return query
         return await self.transform(query, context)
@@ -34,11 +34,11 @@ def add(self, middleware: PromptMiddleware) -> None:
     def remove(self, name: str) -> None:
         self._middlewares = [m for m in self._middlewares if m.name != name]
 
-    async def process(self, query: str, context: Dict[str, Any] = None) -> str:
+    async def apply(self, query: str, context: Dict[str, Any] = None) -> str:
         context = context or {}
         for mw in self._middlewares:
             try:
-                query = await mw.process(query, context)
+                query = await mw.apply(query, context)
             except Exception as e:
                 self.logger.warning(
                     f"Middleware '{mw.name}' failed: {e}, skipping"

parrot/bots/search.py

@@ -1,16 +1,15 @@
 """WebSearchAgent implementation for the ai-parrot framework."""
 from string import Template
 from typing import Optional, List, Any
-
-from parrot.bots.agent import BasicAgent
-from parrot.models.responses import AIMessage
-
+from ..models.responses import AIMessage
 # Import default tools
-from parrot.tools.googlesearch import GoogleSearchTool
-from parrot.tools.googlesitesearch import GoogleSiteSearchTool
-from parrot.tools.ddgsearch import DdgSearchTool
-from parrot.tools.bingsearch import BingSearchTool
-from parrot.tools.serpapi import SerpApiSearchTool
+from ..tools.googlesearch import GoogleSearchTool
+from ..tools.googlesitesearch import GoogleSiteSearchTool
+from ..tools.ddgsearch import DdgSearchTool
+from ..tools.bingsearch import BingSearchTool
+from ..tools.serpapi import SerpApiSearchTool
+from .agent import BasicAgent
+from .middleware import PromptPipeline, PromptMiddleware
 
 DEFAULT_CONTRASTIVE_PROMPT = """Based on following query: $query
 Below are search results about its COMPETITORS. Analyze ONLY the competitors:
@@ -40,6 +39,15 @@
 - **Sources Quality**: Assessment of information reliability"""
 
 
+DEFAULT_COMPETITOR_TRANSFORM_PROMPT = """You are a query transformation engine.
+Given a user query about a product or company, transform it into a competitor
+research query. NEVER return a query about the original product itself.
+Extract the product category, then generate a single search query focused
+on direct COMPETITORS and ALTERNATIVES.
+
+Respond ONLY with the transformed search query string. Nothing else."""
+
+
 class WebSearchAgent(BasicAgent):
     """An agent specialized in performing web searches.
 
@@ -73,6 +81,8 @@ def __init__(
         contrastive_prompt: Optional[str] = None,
         synthesize: bool = False,
         synthesize_prompt: Optional[str] = None,
+        competitor_search: bool = False,
+        competitor_prompt: Optional[str] = None,
         **kwargs
     ):
         """Initialize the WebSearchAgent."""
@@ -81,7 +91,12 @@ def __init__(
         self.contrastive_prompt = contrastive_prompt or DEFAULT_CONTRASTIVE_PROMPT
         self.synthesize = synthesize
         self.synthesize_prompt = synthesize_prompt or DEFAULT_SYNTHESIZE_PROMPT
+        self.competitor_search = competitor_search
+        self._competitor_prompt = competitor_prompt or DEFAULT_COMPETITOR_TRANSFORM_PROMPT
 
+        # setup competitor search middleware if enabled:
+        if self.competitor_search:
+            self._setup_competitor_pipeline()
         # Provide a default list of web search tools if none is provided
         if tools is None:
             tools = [
@@ -101,6 +116,30 @@ def __init__(
             **kwargs
         )
 
+    def _setup_competitor_pipeline(self):
+        if not self._prompt_pipeline:
+            self._prompt_pipeline = PromptPipeline()
+        self._prompt_pipeline.add(PromptMiddleware(
+            name="competitor_transform",
+            priority=10,
+            transform=self._as_competitor_query
+        ))
+
+    async def _as_competitor_query(
+        self, query: str, context: dict
+    ) -> str:
+        """Use LLM without tools to pivot query toward competitors."""
+        self.logger.info(f"Transforming query to competitor search: {query}")
+        async with self._llm as client:
+            response = await client.ask(
+                prompt=query,
+                system_prompt=self._competitor_prompt,
+                use_tools=False,
+            )
+        transformed = self._extract_text(response).strip()
+        self.logger.info(f"Transformed query: {transformed}")
+        return transformed
+
     def _extract_text(self, response: AIMessage) -> str:
         """Extract text content from an AIMessage response."""
         try:

parrot/cli.py

@@ -2,7 +2,7 @@
 import click
 from parrot.mcp.cli import mcp
 from parrot.autonomous.cli import autonomous
-
+from parrot.install.cli import install
 
 @click.group()
 def cli():
@@ -13,7 +13,7 @@ def cli():
 # Attach subcommands
 cli.add_command(mcp, name="mcp")
 cli.add_command(autonomous, name="autonomous")
-
+cli.add_command(install, name="install")
 
 if __name__ == "__main__":
     cli()

parrot/handlers/chat_interaction.py

@@ -277,3 +277,61 @@ async def delete(self) -> web.Response:
             response={"message": f"Conversation {session_id} not found"},
             status=404,
         )
+
+    async def patch(self) -> web.Response:
+        """Delete a specific turn from a conversation."""
+        storage = self._get_storage()
+        if storage is None:
+            self.error(
+                response={"message": "Chat storage not available"},
+                status=503,
+            )
+
+        user_id = await self._get_user_id()
+        if not user_id:
+            self.error(
+                response={"message": "User ID not found in session"},
+                status=401,
+            )
+
+        session_id = self.request.match_info.get("session_id")
+        if not session_id:
+            self.error(
+                response={"message": "session_id is required in path"},
+                status=400,
+            )
+
+        try:
+            body = await self.json_data()
+        except Exception:
+            body = {}
+
+        action = body.get("action")
+        if action != "delete_turn":
+            self.error(
+                response={"message": f"Unknown action: {action}"},
+                status=400,
+            )
+
+        turn_id = body.get("turn_id")
+        if not turn_id:
+            self.error(
+                response={"message": "turn_id is required"},
+                status=400,
+            )
+
+        deleted = await storage.delete_turn(
+            session_id=session_id,
+            turn_id=turn_id,
+        )
+
+        if deleted:
+            return self.json_response({
+                "message": f"Turn {turn_id} deleted",
+                "session_id": session_id,
+                "turn_id": turn_id,
+            })
+        self.error(
+            response={"message": f"Turn {turn_id} not found"},
+            status=404,
+        )

parrot/install/__init__.py

@@ -0,0 +1 @@
+"""Install command group for Parrot CLI."""