quantalogic 0.33.3__py3-none-any.whl → 0.35.0__py3-none-any.whl

quantalogic/agent.py

@@ -669,8 +669,9 @@ class Agent(BaseModel):
             import re
 
             for var in self.variable_store.keys():
-                # Escape the variable name for regex, but use raw value for replacement
-                pattern = rf"\${re.escape(var)}\$"
+                # Create safe pattern without double-escaping backslashes
+                safe_var = re.sub(r"([\\\.\^\$\*\+\?\{\}\[\]\|\(\)])", r"\\\1", var)
+                pattern = rf"\${safe_var}\$"
                 replacement = self.variable_store[var]
                 text = re.sub(pattern, replacement, text)
             return text

quantalogic/agent_config.py

@@ -251,3 +251,48 @@ def create_basic_agent(
         compact_every_n_iterations=compact_every_n_iteration,
         max_tokens_working_memory=max_tokens_working_memory,
     )
+
+def create_minimal_agent(
+    model_name: str, 
+    vision_model_name: str | None = None, 
+    no_stream: bool = False, 
+    compact_every_n_iteration: int | None = None,
+    max_tokens_working_memory: int | None = None
+) -> Agent:
+    """Create an agent with the specified model and tools.
+
+    Args:
+        model_name (str): Name of the model to use
+        vision_model_name (str | None): Name of the vision model to use
+        no_stream (bool, optional): If True, the agent will not stream results.
+        compact_every_n_iteration (int | None, optional): Frequency of memory compaction.
+        max_tokens_working_memory (int | None, optional): Maximum tokens for working memory.
+
+    Returns:
+        Agent: An agent with the specified model and tools
+    """
+    # Rebuild AgentTool to resolve forward references
+    AgentTool.model_rebuild()
+
+    tools = [
+        LLMTool(model_name=model_name, on_token=console_print_token if not no_stream else None),
+        DownloadHttpFileTool(),
+        WikipediaSearchTool(),
+        DuckDuckGoSearchTool(),
+        ReadHTMLTool(),
+        SearchDefinitionNames(),  
+        ReadFileBlockTool(),
+        WriteFileTool(),
+        ReadFileTool(),
+        TaskCompleteTool(), 
+    ]
+
+    if vision_model_name:
+        tools.append(LLMVisionTool(model_name=vision_model_name, on_token=console_print_token if not no_stream else None))
+
+    return Agent(
+        model_name=model_name,
+        tools=tools,
+        compact_every_n_iterations=compact_every_n_iteration,
+        max_tokens_working_memory=max_tokens_working_memory,
+    )

quantalogic/agent_factory.py

@@ -7,6 +7,7 @@ from quantalogic.agent_config import (
     create_basic_agent,
     create_full_agent,
     create_interpreter_agent,
+    create_minimal_agent,
 )
 from quantalogic.coding_agent import create_coding_agent
 from quantalogic.search_agent import create_search_agent  # noqa: E402
@@ -66,6 +67,7 @@ def create_agent_for_mode(
     mode: str,
     model_name: str,
     vision_model_name: Optional[str],
+    thinking_model_name: Optional[str],
     no_stream: bool = False,
     compact_every_n_iteration: Optional[int] = None,
     max_tokens_working_memory: Optional[int] = None
@@ -76,6 +78,7 @@ def create_agent_for_mode(
         mode: The mode of operation for the agent
         model_name: The name of the language model to use
         vision_model_name: Optional name of the vision model
+        thinking_model_name: Optional name for a thinking model
         no_stream: Whether to disable streaming mode
         compact_every_n_iteration: Optional number of iterations before compacting memory
         max_tokens_working_memory: Optional maximum tokens for working memory
@@ -97,6 +100,7 @@ def create_agent_for_mode(
         agent = create_coding_agent(
             model_name,
             vision_model_name,
+            thinking_model_name,
             basic=False,
             no_stream=no_stream,
             compact_every_n_iteration=compact_every_n_iteration,
@@ -107,6 +111,7 @@ def create_agent_for_mode(
         agent = create_coding_agent(
             model_name,
             vision_model_name,
+
             basic=True,
             no_stream=no_stream,
             compact_every_n_iteration=compact_every_n_iteration,
@@ -157,5 +162,14 @@ def create_agent_for_mode(
             max_tokens_working_memory=max_tokens_working_memory
         )
         return agent
+    if mode == "minimal":
+        agent = create_minimal_agent(
+            model_name,
+            vision_model_name,
+            no_stream=no_stream,
+            compact_every_n_iteration=compact_every_n_iteration,
+            max_tokens_working_memory=max_tokens_working_memory
+        )
+        return agent
     else:
         raise ValueError(f"Unknown agent mode: {mode}")

quantalogic/coding_agent.py

@@ -28,6 +28,7 @@ from quantalogic.utils.get_quantalogic_rules_content import get_quantalogic_rule
 def create_coding_agent(
     model_name: str, 
     vision_model_name: str | None = None, 
+    thinking_model_name: str | None = None,
     basic: bool = False, 
     no_stream: bool = False, 
     compact_every_n_iteration: int | None = None,
@@ -38,6 +39,7 @@ def create_coding_agent(
     Args:
         model_name (str): Name of the language model to use for the agent's core capabilities
         vision_model_name (str | None): Name of the vision model to use for the agent's core capabilities
+        thinking_model_name (str | None): Name of the thinking model to use for the agent's core capabilities
         basic (bool, optional): If True, the agent will be configured with a basic set of tools.
         no_stream (bool, optional): If True, the agent will not stream results.
         compact_every_n_iteration (int | None, optional): Frequency of memory compaction.
@@ -87,6 +89,10 @@ def create_coding_agent(
     if vision_model_name:
         tools.append(LLMVisionTool(model_name=vision_model_name, on_token=console_print_token if not no_stream else None))
 
+
+    if thinking_model_name:
+        tools.append(LLMTool(model_name=thinking_model_name,name="smartest_code_expert", on_token=console_print_token if not no_stream else None))
+
     if not basic:
         tools.append(
             LLMTool(

quantalogic/config.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-
+from typing import Optional
 
 @dataclass
 class QLConfig:
@@ -8,8 +8,10 @@ class QLConfig:
     verbose: bool
     mode: str
     log: str
-    vision_model_name: str | None
+    vision_model_name: Optional[str]
     max_iterations: int
-    compact_every_n_iteration: int | None
-    max_tokens_working_memory: int | None
-    no_stream: bool
+    compact_every_n_iteration: Optional[int]
+    max_tokens_working_memory: Optional[int]
+    no_stream: bool
+    thinking_model_name: str
+

quantalogic/get_model_info.py

@@ -2,7 +2,7 @@ import loguru
 
 from quantalogic.model_info_list import model_info
 from quantalogic.model_info_litellm import litellm_get_model_max_input_tokens, litellm_get_model_max_output_tokens
-from quantalogic.utils.lm_studio_model_info import ModelInfo, get_model_list
+from quantalogic.utils.lm_studio_model_info import get_model_list
 
 DEFAULT_MAX_OUTPUT_TOKENS = 4 * 1024  # Reasonable default for most models
 DEFAULT_MAX_INPUT_TOKENS = 32 * 1024  # Reasonable default for most models

quantalogic/main.py

@@ -122,6 +122,12 @@ def restore_terminal(old_settings):
     default=None,
     help="Set the maximum number of tokens allowed in the working memory.",
 )
+@click.option(
+    "--thinking-model",
+    type=str,
+    default="default",
+    help="The thinking model to use",
+)
 @click.pass_context
 def cli(
     ctx: click.Context,
@@ -134,6 +140,7 @@ def cli(
     max_iterations: int,
     compact_every_n_iteration: int | None,
     max_tokens_working_memory: int | None,
+    thinking_model: str,
 ) -> None:
     """QuantaLogic AI Assistant - A powerful AI tool for various tasks.
 
@@ -161,7 +168,8 @@ def cli(
             max_iterations=max_iterations,
             compact_every_n_iteration=compact_every_n_iteration,
             max_tokens_working_memory=max_tokens_working_memory,
-            no_stream=False  # Default value for backward compatibility
+            no_stream=False,  # Default value for backward compatibility
+            thinking_model_name=thinking_model,
         )
         ctx.invoke(
             task,
@@ -173,6 +181,7 @@ def cli(
             max_iterations=config.max_iterations,
             compact_every_n_iteration=config.compact_every_n_iteration,
             max_tokens_working_memory=config.max_tokens_working_memory,
+            thinking_model=thinking_model,
         )
 
 
@@ -219,6 +228,12 @@ def cli(
     is_flag=True,
     help="Disable streaming output (default: streaming enabled).",
 )
+@click.option(
+    "--thinking-model",
+    type=str,
+    default="default",
+    help="The thinking model to use",
+)
 @click.argument("task", required=False)
 def task(
     file: Optional[str],
@@ -232,6 +247,7 @@ def task(
     compact_every_n_iteration: int | None,
     max_tokens_working_memory: int | None,
     no_stream: bool,
+    thinking_model: str,
 ) -> None:
     console = Console()
 
@@ -246,8 +262,9 @@ def task(
             compact_every_n_iteration=compact_every_n_iteration,
             max_tokens_working_memory=max_tokens_working_memory,
             no_stream=no_stream,
+            thinking_model_name=thinking_model,
         )
-        
+
         task_runner(
             console,
             file,

quantalogic/model_info_list.py

@@ -57,4 +57,16 @@ model_info = {
         max_output_tokens=8 * 1024,
         max_input_tokens=1024 * 64,
     ),
+    "gemini/gemini-2.0-flash": ModelInfo(
+        model_name="gemini/gemini-2.0-flash",
+        max_input_tokens=1000000,
+        max_output_tokens=8 * 1024,
+        input_cost_per_token=0.0000001
+    ),
+    "openrouter/google/gemini-2.0-flash-001": ModelInfo(
+        model_name="openrouter/google/gemini-2.0-flash-001",
+        max_input_tokens=1000000,
+        max_output_tokens=8 * 1024,
+        input_cost_per_token=0.0000001
+    )
 }

quantalogic/task_runner.py

@@ -163,6 +163,7 @@ def task_runner(
         mode=config.mode,
         model_name=config.model_name,
         vision_model_name=config.vision_model_name,
+        thinking_model_name=config.thinking_model_name,
         compact_every_n_iteration=config.compact_every_n_iteration,
         max_tokens_working_memory=config.max_tokens_working_memory
     )

quantalogic/tools/read_html_tool.py

@@ -113,7 +113,7 @@ class ReadHTMLTool(Tool):
             description="The starting line number (1-based index). Default: 1",
             required=False,
             example="1",
-            default=1
+            default="1"
         ),
         ToolArgument(
             name="line_end",
@@ -121,7 +121,7 @@ class ReadHTMLTool(Tool):
             description="The ending line number (1-based index). Default: 300",
             required=False,
             example="300",
-            default=300
+            default="300"
         )
     ]
 

{quantalogic-0.33.3.dist-info → quantalogic-0.35.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quantalogic
-Version: 0.33.3
+Version: 0.35.0
 Summary: QuantaLogic ReAct Agents
 Author: Raphaël MANSUY
 Author-email: raphael.mansuy@gmail.com
@@ -185,6 +185,9 @@ See our [Release Notes](RELEASE_NOTES.MD) for detailed version history and chang
 | openrouter/mistralai/mistral-large-2411 | OPENROUTER_API_KEY | Mistral's large model optimized for complex reasoning tasks, available through OpenRouter with enhanced multilingual capabilities. |
 | mistral/mistral-large-2407 | MISTRAL_API_KEY | Mistral's high-performance model designed for enterprise-grade applications, offering advanced reasoning and multilingual support. |
 | nvidia/deepseek-ai/deepseek-r1 | NVIDIA_API_KEY | NVIDIA's DeepSeek R1 model optimized for high-performance AI tasks and advanced reasoning capabilities. |
+| gemini/gemini-2.0-flash | GEMINI_API_KEY | Google's Gemini Flash 2.0 model offering a balance of speed and performance for various tasks. |
+| openrouter/google/gemini-2.0-flash-001 | OPENROUTER_API_KEY | Google's Gemini Flash 2.0 model offering a balance of speed and performance for various tasks through the OpenRouter platform. |
+| ovh/DeepSeek-R1-Distill-Llama-70B	 | OVH_API_KEY | DeepSeek's R1 model optimized for research and development tasks hosted on OVH in France. |
 | lm_studio/mistral-small-24b-instruct-2501 | LM_STUDIO_API_KEY | LM Studio's Mistral Small model optimized for local inference with advanced reasoning capabilities. |
 | dashscope/qwen-max | DASHSCOPE_API_KEY | Alibaba's Qwen-Max model optimized for maximum performance and extensive reasoning capabilities. |
 | dashscope/qwen-plus | DASHSCOPE_API_KEY | Alibaba's Qwen-Plus model offering balanced performance and cost-efficiency for a variety of tasks. |

{quantalogic-0.33.3.dist-info → quantalogic-0.35.0.dist-info}/RECORD

@@ -1,21 +1,21 @@
 quantalogic/__init__.py,sha256=Su8CnOEdqKu4zTytjiP9P5olg-oIDuUA3fMWM1WUdRY,925
-quantalogic/agent.py,sha256=NPCcqXPf3YfxnKxxgZQayV3vNsjF_27jj-oCZnZyWJw,34510
-quantalogic/agent_config.py,sha256=jkjEjZe47DJoZlUTsKzcKQ4_3sYrEKpG0kcOWjvdBC0,8110
-quantalogic/agent_factory.py,sha256=HWKwN_DN57EPmME-hoCD2uJE0DqsPCzGU_V7nq54XzI,5284
-quantalogic/coding_agent.py,sha256=UbuvtTedt6rtIdgfSgTn3Z-Nkfq0Y24N2eRfN59gHuY,5124
-quantalogic/config.py,sha256=S_SAdsCoTa1jS8GIJW2TjlCtE5vjGDbMBg-6E0j8K1o,355
+quantalogic/agent.py,sha256=6t17qND9Z5EswHdsFTdNf-mzZB-JVHjjbaETY2XK5Xs,34575
+quantalogic/agent_config.py,sha256=B3cm23F6XniXb_o5f_Ui0sGNYtZQ6wqv2Yq5tbTKJ4Y,9693
+quantalogic/agent_factory.py,sha256=ax0IPmFdaVNXsHLA2_D6HSLYo6srJQ9OM-p8bWaXuio,5760
+quantalogic/coding_agent.py,sha256=r0XeShNkXfMYGBKh7_22HatjmNnjXvM-RQW7jdNIkm4,5455
+quantalogic/config.py,sha256=6UUIUSXKYlqKkL5aIklYzr8PJIDSRLDVVe3Wr6QAUFQ,422
 quantalogic/console_print_events.py,sha256=md1CwNBoi58nW7KRVESna3QfkWDJo8PvugXSKjL-c-k,2129
 quantalogic/console_print_token.py,sha256=qSU-3kmoZk4T5-1ybrEBi8tIXDPcz7eyWKhGh3E8uIg,395
 quantalogic/docs_cli.py,sha256=3giVbUpespB9ZdTSJ955A3BhcOaBl5Lwsn1AVy9XAeY,1663
 quantalogic/event_emitter.py,sha256=jqot2g4JRXc88K6PW837Oqxbf7shZfO-xdPaUWmzupk,7901
 quantalogic/generative_model.py,sha256=3OLEPwsKEvtc0JYISeim_gEU8MY45FBN3q2rcixGVsk,13729
-quantalogic/get_model_info.py,sha256=_9Nb9JQ09HZzT-_gZUSvl4Er7uCXs5ys36sIBa-8DXA,3005
+quantalogic/get_model_info.py,sha256=LFO_0vJ9cWpnzIk5s8xGNGNbPFP8DxBqHkbmjmYNlEk,2994
 quantalogic/interactive_text_editor.py,sha256=1vW4poJl7SItRGEeGQgtCFcmRDXmfCM8PE-uBtDBJuE,16658
 quantalogic/llm.py,sha256=98osu6LmjuYw4g-CDIp1SJkYlfoHNwdvq6yJqI-K5NA,5692
-quantalogic/main.py,sha256=__-4pX2pgoSFvt-aLdp6Qlrq55_SrwP_l8u2uTaQbjg,9262
+quantalogic/main.py,sha256=5XxR-exyO8T7lw6Qm7z2bJ4WspBBCbU6Img9lElH0QI,9676
 quantalogic/memory.py,sha256=zbtRuM05jaS2lJll-92dt5JfYVLERnF_m_9xqp2x-k0,6304
 quantalogic/model_info.py,sha256=j7QqvjEFQDGpDOgQs8uTkVyI3a50Oa_nrsQjyxizTLc,272
-quantalogic/model_info_list.py,sha256=qGDKI5oBbu5oyJSH4o4jGYGqyqYEUMXFRi_qMDAQ2nU,1997
+quantalogic/model_info_list.py,sha256=n2Y11akkFBghOOOokuT5B15QOIkui6caa9qFKiW-wG0,2434
 quantalogic/model_info_litellm.py,sha256=m1Yt4SIiOBRWLx7S8f8k4fcTiKJZKtOvcPN_QvQ_Oxk,1880
 quantalogic/model_names.py,sha256=UZlz25zG9B2dpfwdw_e1Gw5qFsKQ7iME9FJh9Ts4u6s,938
 quantalogic/prompts.py,sha256=LZ82J_IVZy_G3Cabz_XnCmdM5RAPGuxyAsViCX8ldl4,2939
@@ -29,7 +29,7 @@ quantalogic/server/static/js/event_visualizer.js,sha256=eFkkWyNZw3zOZlF18kxbfsWq
 quantalogic/server/static/js/quantalogic.js,sha256=x7TrlZGR1Y0WLK2DWl1xY847BhEWMPnL0Ua7KtOldUc,22311
 quantalogic/server/templates/index.html,sha256=nDnXJoQEm1vXbhXtgaYk0G5VXj0wwzE6KrqEDhHFpj4,7773
 quantalogic/task_file_reader.py,sha256=AMIJoeVY9Hhu0dBJ-C5EyaOFsXLkhn2oBhVs-WTnnLk,1460
-quantalogic/task_runner.py,sha256=6kL7o0br2YU8FNKyq-rKJo1oGKZKl73vtATpHusPIWQ,10038
+quantalogic/task_runner.py,sha256=urUNgKTGMicKxDNwzueQVDtQt3P-gosGTbGY90Lp0j8,10094
 quantalogic/tool_manager.py,sha256=Uh-ufrJPufHqDUrFwKlXw3MOsVGc_4lQxuc6cRvZ7wU,7186
 quantalogic/tools/__init__.py,sha256=syshfk5d0_HV6A_mG4OBBJXy3H7ky-x57MnvlrDVXgI,2331
 quantalogic/tools/agent_tool.py,sha256=MXCXxWHRch7VK4UWhtRP1jeI8Np9Ne2CUGo8vm1oZiM,3064
@@ -61,7 +61,7 @@ quantalogic/tools/nodejs_tool.py,sha256=zdnE0VFj_5786uR2L0o-SKR0Gk8L-U7rdj7xGHJY
 quantalogic/tools/python_tool.py,sha256=70HLbfU2clOBgj4axDOtIKzXwEBMNGEAX1nGSf-KNNQ,18156
 quantalogic/tools/read_file_block_tool.py,sha256=FTcDAUOOPQOvWRjnRI6nMI1Upus90klR4PC0pbPP_S8,5266
 quantalogic/tools/read_file_tool.py,sha256=l6k-SOIV9krpXAmUTkxzua51S-KHgzGqkcDlD5AD8K0,2710
-quantalogic/tools/read_html_tool.py,sha256=PlmS35XdbYAF2BnMKUjWRGMYvZ4DkWdE6FmC68xx-bs,11188
+quantalogic/tools/read_html_tool.py,sha256=ZReMuGajMqlXcU7i5JOxCRlGTt96M2CsB7L0ZOEoXMI,11192
 quantalogic/tools/replace_in_file_tool.py,sha256=95GqcOC0sZzbWHWzYDVwq7rEwChlOgKxb5cxKk-Y7W8,13844
 quantalogic/tools/ripgrep_tool.py,sha256=sRzHaWac9fa0cCGhECJN04jw_Ko0O3u45KDWzMIYcvY,14291
 quantalogic/tools/safe_python_interpreter_tool.py,sha256=I8e33-S_6K-1JxgkcTL0J79Op57kp2dzQBsXgwKFm8w,8140
@@ -95,8 +95,8 @@ quantalogic/version_check.py,sha256=cttR1lR3OienGLl7NrK1Te1fhDkqSjCci7HC1vFUTSY,
 quantalogic/welcome_message.py,sha256=IXMhem8h7srzNUwvw8G_lmEkHU8PFfote021E_BXmVk,3039
 quantalogic/xml_parser.py,sha256=iUQZC4a8uqBsP7RAZaY0Ed9k8TCd-ImuF41eF7MR2WM,11615
 quantalogic/xml_tool_parser.py,sha256=Vz4LEgDbelJynD1siLOVkJ3gLlfHsUk65_gCwbYJyGc,3784
-quantalogic-0.33.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-quantalogic-0.33.3.dist-info/METADATA,sha256=wF3UAR3LMyROM1_shcCrAxVyTHRYvwfvixyyco55W4Q,23461
-quantalogic-0.33.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-quantalogic-0.33.3.dist-info/entry_points.txt,sha256=h74O_Q3qBRCrDR99qvwB4BpBGzASPUIjCfxHq6Qnups,183
-quantalogic-0.33.3.dist-info/RECORD,,
+quantalogic-0.35.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+quantalogic-0.35.0.dist-info/METADATA,sha256=rWN7fF9L5VdvL4al2IAcldkom7cuDYC8KadeBIcYKqY,23941
+quantalogic-0.35.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+quantalogic-0.35.0.dist-info/entry_points.txt,sha256=h74O_Q3qBRCrDR99qvwB4BpBGzASPUIjCfxHq6Qnups,183
+quantalogic-0.35.0.dist-info/RECORD,,