quantalogic 0.2.15__py3-none-any.whl → 0.2.16__py3-none-any.whl

quantalogic/agent.py

@@ -406,7 +406,7 @@ class Agent(BaseModel):
 
         formatted_response = (
             "\n"
-            f"--- Observations for iteration {iteration} ---\n"
+            f"--- Observations for iteration {iteration} / max {self.max_iterations} ---\n"
             "\n"
             f"\n --- Tool execution result stored in variable ${variable_name}$ --- \n"
             "\n"
@@ -428,7 +428,7 @@ class Agent(BaseModel):
         # Format the response message
         formatted_response = (
             "\n"
-            f"--- Observations for iteration {iteration} ---\n"
+            f"--- Observations for iteration {iteration} / max {self.max_iterations} ---\n"
             "\n"
             f"\n --- Tool execution result stored in variable ${variable_name}$ --- \n"
             "\n"
@@ -440,7 +440,7 @@ class Agent(BaseModel):
             "\n"
             f"--- Variables --- \n"
             "\n"
-            f"{self._get_variable_prompt()}"
+            f"{self._get_variable_prompt()}\n"
             "\n"
             "You must analyze this answer and evaluate what to do next to solve the task.\n"
             "If the step failed, take a step back and rethink your approach.\n"

quantalogic/coding_agent.py

@@ -1,5 +1,6 @@
 from quantalogic.agent import Agent
 from quantalogic.tools import (
+    DuckDuckGoSearchTool,
     EditWholeContentTool,
     ExecuteBashCommandTool,
     InputQuestionTool,
@@ -59,6 +60,7 @@ def create_coding_agent(model_name: str, vision_model_name: str | None = None, b
         ReadFileTool(),
         ExecuteBashCommandTool(),
         InputQuestionTool(),
+        DuckDuckGoSearchTool(),
     ]
 
     if vision_model_name:
@@ -69,7 +71,7 @@ def create_coding_agent(model_name: str, vision_model_name: str | None = None, b
             LLMTool(
                 model_name=model_name,
                 system_prompt="You are a software expert, your role is to answer coding questions.",
-                name="coding_consultant",  # Handles implementation-level coding questions                
+                name="coding_consultant",  # Handles implementation-level coding questions
             )
         )
         tools.append(

quantalogic/main.py

@@ -32,9 +32,9 @@ from quantalogic.agent_config import (  # noqa: E402
 )
 from quantalogic.interactive_text_editor import get_multiline_input  # noqa: E402
 from quantalogic.print_event import console_print_events  # noqa: E402
-from quantalogic.search_agent import create_search_agent
+from quantalogic.search_agent import create_search_agent  # noqa: E402
 
-AGENT_MODES = ["code", "basic", "interpreter", "full", "code-basic","search"]
+AGENT_MODES = ["code", "basic", "interpreter", "full", "code-basic", "search", "search-full"]
 
 
 def create_agent_for_mode(mode: str, model_name: str, vision_model_name: str | None) -> Agent:
@@ -53,9 +53,12 @@ def create_agent_for_mode(mode: str, model_name: str, vision_model_name: str | N
         return create_interpreter_agent(model_name, vision_model_name)
     elif mode == "search":
         return create_search_agent(model_name)
+    if mode == "search-full":
+        return create_search_agent(model_name, mode_full=True)
     else:
         raise ValueError(f"Unknown agent mode: {mode}")
 
+
 def check_new_version():
     # Randomly check for updates (1 in 10 chance)
     if random.randint(1, 10) == 1:
@@ -81,6 +84,7 @@ def check_new_version():
         except Exception:
             return
 
+
 def configure_logger(log_level: str) -> None:
     """Configure the logger with the specified log level and format."""
     logger.remove()
@@ -122,7 +126,9 @@ def get_task_from_file(file_path: str) -> str:
         raise Exception(f"Unexpected error reading file: {e}")
 
 
-def display_welcome_message(console: Console, model_name: str, vision_model_name: str | None) -> None:
+def display_welcome_message(
+    console: Console, model_name: str, vision_model_name: str | None, max_iterations: int = 50
+) -> None:
     """Display the welcome message and instructions."""
     version = get_version()
     console.print(
@@ -135,7 +141,8 @@ def display_welcome_message(console: Console, model_name: str, vision_model_name
             f"[yellow] 🤖 System Info:[/yellow]\n\n"
             "\n"
             f"- Model: {model_name}\n"
-            f"- Vision Model: {vision_model_name}\n\n"
+            f"- Vision Model: {vision_model_name}\n"
+            f"- Max Iterations: {max_iterations}\n\n"
             "[bold magenta]💡 Pro Tips:[/bold magenta]\n\n"
             "- Be as specific as possible in your task description to get the best results!\n"
             "- Use clear and concise language when describing your task\n"
@@ -167,6 +174,12 @@ def display_welcome_message(console: Console, model_name: str, vision_model_name
     default=None,
     help='Specify the vision model to use (litellm format, e.g. "openrouter/A/gpt-4o-mini").',
 )
+@click.option(
+    "--max-iterations",
+    type=int,
+    default=30,
+    help="Maximum number of iterations for task solving (default: 30).",
+)
 @click.pass_context
 def cli(
     ctx: click.Context,
@@ -176,6 +189,7 @@ def cli(
     mode: str,
     log: str,
     vision_model_name: str | None,
+    max_iterations: int,
 ) -> None:
     """QuantaLogic AI Assistant - A powerful AI tool for various tasks."""
     if version:
@@ -184,7 +198,13 @@ def cli(
         sys.exit(0)
     if ctx.invoked_subcommand is None:
         ctx.invoke(
-            task, model_name=model_name, verbose=verbose, mode=mode, log=log, vision_model_name=vision_model_name
+            task,
+            model_name=model_name,
+            verbose=verbose,
+            mode=mode,
+            log=log,
+            vision_model_name=vision_model_name,
+            max_iterations=max_iterations,
         )
 
 
@@ -208,6 +228,12 @@ def cli(
     default=None,
     help='Specify the vision model to use (litellm format, e.g. "openrouter/openai/gpt-4o-mini").',
 )
+@click.option(
+    "--max-iterations",
+    type=int,
+    default=30,
+    help="Maximum number of iterations for task solving (default: 30).",
+)
 @click.argument("task", required=False)
 def task(
     file: Optional[str],
@@ -217,12 +243,12 @@ def task(
     log: str,
     vision_model_name: str | None,
     task: Optional[str],
+    max_iterations: int,
 ) -> None:
     """Execute a task with the QuantaLogic AI Assistant."""
     console = Console()
     switch_verbose(verbose, log)
 
-
     try:
         if file:
             task_content = get_task_from_file(file)
@@ -231,7 +257,7 @@ def task(
                 check_new_version()
                 task_content = task
             else:
-                display_welcome_message(console, model_name, vision_model_name)
+                display_welcome_message(console, model_name, vision_model_name, max_iterations=max_iterations)
                 check_new_version()
                 logger.debug("Waiting for user input...")
                 task_content = get_multiline_input(console).strip()
@@ -241,14 +267,13 @@ def task(
                     console.print("[yellow]No task provided. Exiting...[/yellow]")
                     sys.exit(2)
 
-        if model_name != MODEL_NAME:
-            console.print(
-                Panel.fit(
-                    f"[bold]Task to be submitted:[/bold]\n{task_content}",
-                    title="[bold]Task Preview[/bold]",
-                    border_style="blue",
-                )
+        console.print(
+            Panel.fit(
+                f"[bold]Task to be submitted:[/bold]\n{task_content}",
+                title="[bold]Task Preview[/bold]",
+                border_style="blue",
             )
+        )
         if not Confirm.ask("[bold]Are you sure you want to submit this task?[/bold]"):
             console.print("[yellow]Task submission cancelled. Exiting...[/yellow]")
             sys.exit(0)
@@ -284,8 +309,10 @@ def task(
         logger.debug("Registered event handlers for agent events with events: {events}")
 
         logger.debug(f"Solving task with agent: {task_content}")
-        result = agent.solve_task(task=task_content, max_iterations=300)
-        logger.debug(f"Task solved with result: {result}")
+        if max_iterations < 1:
+            raise ValueError("max_iterations must be greater than 0")
+        result = agent.solve_task(task=task_content, max_iterations=max_iterations)
+        logger.debug(f"Task solved with result: {result} using {max_iterations} iterations")
 
         console.print(
             Panel.fit(

quantalogic/prompts.py

@@ -90,4 +90,5 @@ Every response must contain exactly two XML blocks:
 
 ### Environment Details
 {environment}
+
 """

quantalogic/search_agent.py

@@ -1,22 +1,23 @@
 from quantalogic.agent import Agent
 from quantalogic.tools import (
+    DuckDuckGoSearchTool,
     InputQuestionTool,
+    MarkitdownTool,
+    ReadFileBlockTool,
+    ReadFileTool,
+    RipgrepTool,
     SerpApiSearchTool,
-    DuckDuckGoSearchTool,
     TaskCompleteTool,
     WikipediaSearchTool,
-    ReadFileBlockTool,
-    ReadFileTool,
-    MarkitdownTool,
-    RipgrepTool
 )
 
 
-def create_search_agent(model_name: str) -> Agent:
+def create_search_agent(model_name: str, mode_full: bool = False) -> Agent:
     """Creates and configures a search agent with web, knowledge, and privacy-focused search tools.
 
     Args:
         model_name (str): Name of the language model to use for the agent's core capabilities
+        mode_full (bool, optional): If True, the agent will be configured with a full set of tools.
 
     Returns:
         Agent: A fully configured search agent instance with:
@@ -31,7 +32,6 @@ def create_search_agent(model_name: str) -> Agent:
 
     tools = [
         # Search tools
-        SerpApiSearchTool(),  # Web search capabilities
         DuckDuckGoSearchTool(),  # Privacy-focused web search
         WikipediaSearchTool(),  # Knowledge search capabilities
         # Basic interaction tools
@@ -45,6 +45,14 @@ def create_search_agent(model_name: str) -> Agent:
         RipgrepTool(),  # Code search capabilities
     ]
 
+    if mode_full:
+        tools.extend(
+            [
+                # Search tools
+                SerpApiSearchTool(),  # Web search capabilities
+            ]
+        )
+
     return Agent(
         model_name=model_name,
         tools=tools,

{quantalogic-0.2.15.dist-info → quantalogic-0.2.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quantalogic
-Version: 0.2.15
+Version: 0.2.16
 Summary: QuantaLogic ReAct Agents
 Author: Raphaël MANSUY
 Author-email: raphael.mansuy@gmail.com
@@ -133,7 +133,8 @@ Options:
                                   e.g. "openrouter/A/gpt-4o-mini").
   --log [info|debug|warning]      Set logging level (info/debug/warning).
   --verbose                       Enable verbose output.
-  --mode [code|basic|interpreter|full|code-basic|search]
+  --max-iterations INTEGER        Maximum iterations for task solving (default: 30).
+  --mode [code|basic|interpreter|full|code-basic|search|search-full]
                                   Agent mode (code/search/full).
   --help                          Show this message and exit.
 
@@ -154,6 +155,7 @@ task    Execute a task with the QuantaLogic AI Assistant
 - interpreter: Interactive code execution agent
 - full: Full-featured agent with all capabilities
 - code-basic: Coding agent with basic reasoning
+- search: Web search agent with Wikipedia, DuckDuckGo and SERPApi integration
 
 #### Task Execution
 

{quantalogic-0.2.15.dist-info → quantalogic-0.2.16.dist-info}/RECORD

@@ -1,16 +1,16 @@
 quantalogic/__init__.py,sha256=HFk7_19UzHzYwvPzb9QTQ4w_lPwTTPda61AYb8qggZY,686
-quantalogic/agent.py,sha256=ROE9hJe9b2eRhhuH64-rxWWHsXO4lnjV-PdjqqdxS_g,26653
+quantalogic/agent.py,sha256=uKY0y1ruJUUvnXmEyQASIFQbmoGZEj08w4T--eduEpQ,26711
 quantalogic/agent_config.py,sha256=RWXnRpZeT_twtDIFVHY0K7EdHLmEbb8LvVGRr0oc3Q8,4634
-quantalogic/coding_agent.py,sha256=FrodyypgtOOV-AvJiQP8PLkUIDQkDrye26dbOxIEKjM,3486
+quantalogic/coding_agent.py,sha256=xKrkf-d3BDQRaeD6ODKDwgtpmWFmZxwP_IaNY6Py9Ew,3528
 quantalogic/event_emitter.py,sha256=jqot2g4JRXc88K6PW837Oqxbf7shZfO-xdPaUWmzupk,7901
 quantalogic/generative_model.py,sha256=pDbjwPfOQEtuZBk8o9uT8vxjauFfXwTM7GkMco73jfU,11787
 quantalogic/interactive_text_editor.py,sha256=kYeTA2qej5kxtPvAUHy_Dr2MhrGQAyenLFpW9mU9Rmw,6855
-quantalogic/main.py,sha256=jIIFuQQXK29F-Ue95H6Wv0g-u0Q1VYTNRzZJlXP57NI,11143
+quantalogic/main.py,sha256=pMcJ7cLNcBWKsMRFFl7I1XVY52nmbXMcL_A4tNyU_Ts,11905
 quantalogic/memory.py,sha256=zbtRuM05jaS2lJll-92dt5JfYVLERnF_m_9xqp2x-k0,6304
 quantalogic/model_names.py,sha256=UZlz25zG9B2dpfwdw_e1Gw5qFsKQ7iME9FJh9Ts4u6s,938
 quantalogic/print_event.py,sha256=nl1aRdYnsU72SRezafePF82zKtrqGfY8OoTx2QfbdE8,2206
-quantalogic/prompts.py,sha256=BHIST57DYcTeTb7rvV1QkGLt0_B8Wk8a_9tsnsN6suk,3547
-quantalogic/search_agent.py,sha256=kGHu-tVm85rEMx7dpcxScAraVC5V0Wp_JeIZ42iNJRI,1700
+quantalogic/prompts.py,sha256=jRAm9YYvwx8KAx42Ak2H7y2p_1jIVuL1e3Wsd2Y81Cc,3548
+quantalogic/search_agent.py,sha256=Jy-Zw77giZOlON_bDO0u3ppfRxv_O0EGcGmN4QuuLmQ,1944
 quantalogic/server/__init__.py,sha256=8sz_PYAUCrkM6JM5EAUeIzNM4NPW6j6UT72JVkc21WQ,91
 quantalogic/server/agent_server.py,sha256=38GEK_MpLp--CX_dCkopTFOU7KcGuOw4-GciwmRJyyg,22502
 quantalogic/server/models.py,sha256=nVUGWElOsUw8QnRCGJylk25wCew_5gohe6nldYighUA,1322
@@ -68,8 +68,8 @@ quantalogic/utils/read_http_text_content.py,sha256=n3IayT5KcqctIVVF2gOQQAMf3Ow6e
 quantalogic/version.py,sha256=ea_cRutaQk5_lwlLbUUvPFuOT7Of7-gAsDl7wdveS-g,107
 quantalogic/xml_parser.py,sha256=cTRorr5sVfkIzH72M0C-GQ9ROGPiz2FTT66U9ndjzhE,9538
 quantalogic/xml_tool_parser.py,sha256=lsVzClZBrZan7wjCuCKnGHWzksXI3VMy_vWthxu2_bo,3738
-quantalogic-0.2.15.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-quantalogic-0.2.15.dist-info/METADATA,sha256=eIK_0Ll5qQfhvkqfVXCuuTmrwKzwC-_MVTrkZrDxNO4,41700
-quantalogic-0.2.15.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-quantalogic-0.2.15.dist-info/entry_points.txt,sha256=wgSq5SRU98yvlRHGEZD1Xn7sS5CSjH2RfUtTa6Qy28Q,52
-quantalogic-0.2.15.dist-info/RECORD,,
+quantalogic-0.2.16.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+quantalogic-0.2.16.dist-info/METADATA,sha256=38YNMH6-P_Sj7eUvqvsKfN1cgevdzcH2GFDCgwH-6As,41875
+quantalogic-0.2.16.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+quantalogic-0.2.16.dist-info/entry_points.txt,sha256=wgSq5SRU98yvlRHGEZD1Xn7sS5CSjH2RfUtTa6Qy28Q,52
+quantalogic-0.2.16.dist-info/RECORD,,