prompture 0.0.47__py3-none-any.whl → 0.0.47.dev1__py3-none-any.whl

prompture/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.47'
-__version_tuple__ = version_tuple = (0, 0, 47)
+__version__ = version = '0.0.47.dev1'
+__version_tuple__ = version_tuple = (0, 0, 47, 'dev1')
 
 __commit_id__ = commit_id = None

prompture/async_conversation.py

@@ -55,7 +55,6 @@ class AsyncConversation:
         callbacks: DriverCallbacks | None = None,
         tools: ToolRegistry | None = None,
         max_tool_rounds: int = 10,
-        simulated_tools: bool | Literal["auto"] = "auto",
         conversation_id: str | None = None,
         auto_save: str | Path | None = None,
         tags: list[str] | None = None,
@@ -107,10 +106,6 @@ class AsyncConversation:
         }
         self._tools = tools or ToolRegistry()
         self._max_tool_rounds = max_tool_rounds
-        self._simulated_tools = simulated_tools
-
-        # Reasoning content from last response
-        self._last_reasoning: str | None = None
 
         # Persistence
         self._conversation_id = conversation_id or str(uuid.uuid4())
@@ -124,11 +119,6 @@ class AsyncConversation:
     # Public helpers
     # ------------------------------------------------------------------
 
-    @property
-    def last_reasoning(self) -> str | None:
-        """The reasoning/thinking content from the last LLM response, if any."""
-        return self._last_reasoning
-
     @property
     def messages(self) -> list[dict[str, Any]]:
         """Read-only view of the conversation history."""
@@ -334,15 +324,8 @@ class AsyncConversation:
         If tools are registered and the driver supports tool use,
         dispatches to the async tool execution loop.
         """
-        self._last_reasoning = None
-
-        # Route to appropriate tool handling
-        if self._tools:
-            use_native = getattr(self._driver, "supports_tool_use", False)
-            if self._simulated_tools is True or (self._simulated_tools == "auto" and not use_native):
-                return await self._ask_with_simulated_tools(content, options, images=images)
-            elif use_native and self._simulated_tools is not True:
-                return await self._ask_with_tools(content, options, images=images)
+        if self._tools and getattr(self._driver, "supports_tool_use", False):
+            return await self._ask_with_tools(content, options, images=images)
 
         merged = {**self._options, **(options or {})}
         messages = self._build_messages(content, images=images)
@@ -350,7 +333,6 @@ class AsyncConversation:
 
         text = resp.get("text", "")
         meta = resp.get("meta", {})
-        self._last_reasoning = resp.get("reasoning_content")
 
         user_content = self._build_content_with_images(content, images)
         self._messages.append({"role": "user", "content": user_content})
@@ -383,7 +365,6 @@ class AsyncConversation:
             text = resp.get("text", "")
 
             if not tool_calls:
-                self._last_reasoning = resp.get("reasoning_content")
                 self._messages.append({"role": "assistant", "content": text})
                 return text
 
@@ -396,11 +377,6 @@ class AsyncConversation:
                 }
                 for tc in tool_calls
             ]
-            # Preserve reasoning_content for providers that require it
-            # on subsequent requests (e.g. Moonshot reasoning models).
-            if resp.get("reasoning_content") is not None:
-                assistant_msg["reasoning_content"] = resp["reasoning_content"]
-
             self._messages.append(assistant_msg)
             msgs.append(assistant_msg)
 
@@ -421,63 +397,6 @@ class AsyncConversation:
 
         raise RuntimeError(f"Tool execution loop exceeded {self._max_tool_rounds} rounds")
 
-    async def _ask_with_simulated_tools(
-        self,
-        content: str,
-        options: dict[str, Any] | None = None,
-        images: list[ImageInput] | None = None,
-    ) -> str:
-        """Async prompt-based tool calling for drivers without native tool use."""
-        from .simulated_tools import build_tool_prompt, format_tool_result, parse_simulated_response
-
-        merged = {**self._options, **(options or {})}
-        tool_prompt = build_tool_prompt(self._tools)
-
-        # Augment system prompt with tool descriptions
-        augmented_system = tool_prompt
-        if self._system_prompt:
-            augmented_system = f"{self._system_prompt}\n\n{tool_prompt}"
-
-        # Record user message in history
-        user_content = self._build_content_with_images(content, images)
-        self._messages.append({"role": "user", "content": user_content})
-
-        for _round in range(self._max_tool_rounds):
-            # Build messages with the augmented system prompt
-            msgs: list[dict[str, Any]] = []
-            msgs.append({"role": "system", "content": augmented_system})
-            msgs.extend(self._messages)
-
-            resp = await self._driver.generate_messages_with_hooks(msgs, merged)
-            text = resp.get("text", "")
-            meta = resp.get("meta", {})
-            self._accumulate_usage(meta)
-
-            parsed = parse_simulated_response(text, self._tools)
-
-            if parsed["type"] == "final_answer":
-                answer = parsed["content"]
-                self._messages.append({"role": "assistant", "content": answer})
-                return answer
-
-            # Tool call
-            tool_name = parsed["name"]
-            tool_args = parsed["arguments"]
-
-            # Record assistant's tool call as an assistant message
-            self._messages.append({"role": "assistant", "content": text})
-
-            try:
-                result = self._tools.execute(tool_name, tool_args)
-                result_msg = format_tool_result(tool_name, result)
-            except Exception as exc:
-                result_msg = format_tool_result(tool_name, f"Error: {exc}")
-
-            # Record tool result as a user message
-            self._messages.append({"role": "user", "content": result_msg})
-
-        raise RuntimeError(f"Simulated tool execution loop exceeded {self._max_tool_rounds} rounds")
-
     def _build_messages_raw(self) -> list[dict[str, Any]]:
         """Build messages array from system prompt + full history (including tool messages)."""
         msgs: list[dict[str, Any]] = []
@@ -538,8 +457,6 @@ class AsyncConversation:
         images: list[ImageInput] | None = None,
     ) -> dict[str, Any]:
         """Send a message with schema enforcement and get structured JSON back (async)."""
-        self._last_reasoning = None
-
         merged = {**self._options, **(options or {})}
 
         schema_string = json.dumps(json_schema, indent=2)
@@ -577,7 +494,6 @@ class AsyncConversation:
 
         text = resp.get("text", "")
         meta = resp.get("meta", {})
-        self._last_reasoning = resp.get("reasoning_content")
 
         user_content = self._build_content_with_images(content, images)
         self._messages.append({"role": "user", "content": user_content})
@@ -612,7 +528,6 @@ class AsyncConversation:
             "json_object": json_obj,
             "usage": usage,
             "output_format": output_format,
-            "reasoning": self._last_reasoning,
         }
 
         if output_format == "toon":

prompture/conversation.py

@@ -56,7 +56,6 @@ class Conversation:
         callbacks: DriverCallbacks | None = None,
         tools: ToolRegistry | None = None,
         max_tool_rounds: int = 10,
-        simulated_tools: bool | Literal["auto"] = "auto",
         conversation_id: str | None = None,
         auto_save: str | Path | None = None,
         tags: list[str] | None = None,
@@ -110,10 +109,6 @@ class Conversation:
         }
         self._tools = tools or ToolRegistry()
         self._max_tool_rounds = max_tool_rounds
-        self._simulated_tools = simulated_tools
-
-        # Reasoning content from last response
-        self._last_reasoning: str | None = None
 
         # Persistence
         self._conversation_id = conversation_id or str(uuid.uuid4())
@@ -127,11 +122,6 @@ class Conversation:
     # Public helpers
     # ------------------------------------------------------------------
 
-    @property
-    def last_reasoning(self) -> str | None:
-        """The reasoning/thinking content from the last LLM response, if any."""
-        return self._last_reasoning
-
     @property
     def messages(self) -> list[dict[str, Any]]:
         """Read-only view of the conversation history."""
@@ -348,15 +338,8 @@ class Conversation:
             images: Optional list of images to include (bytes, path, URL,
                 base64 string, or :class:`ImageContent`).
         """
-        self._last_reasoning = None
-
-        # Route to appropriate tool handling
-        if self._tools:
-            use_native = getattr(self._driver, "supports_tool_use", False)
-            if self._simulated_tools is True or (self._simulated_tools == "auto" and not use_native):
-                return self._ask_with_simulated_tools(content, options, images=images)
-            elif use_native and self._simulated_tools is not True:
-                return self._ask_with_tools(content, options, images=images)
+        if self._tools and getattr(self._driver, "supports_tool_use", False):
+            return self._ask_with_tools(content, options, images=images)
 
         merged = {**self._options, **(options or {})}
         messages = self._build_messages(content, images=images)
@@ -364,7 +347,6 @@ class Conversation:
 
         text = resp.get("text", "")
         meta = resp.get("meta", {})
-        self._last_reasoning = resp.get("reasoning_content")
 
         # Record in history — store content with images for context
         user_content = self._build_content_with_images(content, images)
@@ -400,7 +382,6 @@ class Conversation:
 
             if not tool_calls:
                 # No tool calls -> final response
-                self._last_reasoning = resp.get("reasoning_content")
                 self._messages.append({"role": "assistant", "content": text})
                 return text
 
@@ -414,11 +395,6 @@ class Conversation:
                 }
                 for tc in tool_calls
             ]
-            # Preserve reasoning_content for providers that require it
-            # on subsequent requests (e.g. Moonshot reasoning models).
-            if resp.get("reasoning_content") is not None:
-                assistant_msg["reasoning_content"] = resp["reasoning_content"]
-
             self._messages.append(assistant_msg)
             msgs.append(assistant_msg)
 
@@ -440,63 +416,6 @@ class Conversation:
 
         raise RuntimeError(f"Tool execution loop exceeded {self._max_tool_rounds} rounds")
 
-    def _ask_with_simulated_tools(
-        self,
-        content: str,
-        options: dict[str, Any] | None = None,
-        images: list[ImageInput] | None = None,
-    ) -> str:
-        """Prompt-based tool calling for drivers without native tool use."""
-        from .simulated_tools import build_tool_prompt, format_tool_result, parse_simulated_response
-
-        merged = {**self._options, **(options or {})}
-        tool_prompt = build_tool_prompt(self._tools)
-
-        # Augment system prompt with tool descriptions
-        augmented_system = tool_prompt
-        if self._system_prompt:
-            augmented_system = f"{self._system_prompt}\n\n{tool_prompt}"
-
-        # Record user message in history
-        user_content = self._build_content_with_images(content, images)
-        self._messages.append({"role": "user", "content": user_content})
-
-        for _round in range(self._max_tool_rounds):
-            # Build messages with the augmented system prompt
-            msgs: list[dict[str, Any]] = []
-            msgs.append({"role": "system", "content": augmented_system})
-            msgs.extend(self._messages)
-
-            resp = self._driver.generate_messages_with_hooks(msgs, merged)
-            text = resp.get("text", "")
-            meta = resp.get("meta", {})
-            self._accumulate_usage(meta)
-
-            parsed = parse_simulated_response(text, self._tools)
-
-            if parsed["type"] == "final_answer":
-                answer = parsed["content"]
-                self._messages.append({"role": "assistant", "content": answer})
-                return answer
-
-            # Tool call
-            tool_name = parsed["name"]
-            tool_args = parsed["arguments"]
-
-            # Record assistant's tool call as an assistant message
-            self._messages.append({"role": "assistant", "content": text})
-
-            try:
-                result = self._tools.execute(tool_name, tool_args)
-                result_msg = format_tool_result(tool_name, result)
-            except Exception as exc:
-                result_msg = format_tool_result(tool_name, f"Error: {exc}")
-
-            # Record tool result as a user message (all drivers understand user/assistant)
-            self._messages.append({"role": "user", "content": result_msg})
-
-        raise RuntimeError(f"Simulated tool execution loop exceeded {self._max_tool_rounds} rounds")
-
     def _build_messages_raw(self) -> list[dict[str, Any]]:
         """Build messages array from system prompt + full history (including tool messages)."""
         msgs: list[dict[str, Any]] = []
@@ -565,8 +484,6 @@ class Conversation:
         context clean for subsequent turns.
         """
 
-        self._last_reasoning = None
-
         merged = {**self._options, **(options or {})}
 
         # Build the full prompt with schema instructions inline (handled by ask_for_json)
@@ -608,7 +525,6 @@ class Conversation:
 
         text = resp.get("text", "")
         meta = resp.get("meta", {})
-        self._last_reasoning = resp.get("reasoning_content")
 
         # Store original content (without schema boilerplate) for cleaner context
         # Include images in history so subsequent turns can reference them
@@ -647,7 +563,6 @@ class Conversation:
             "json_object": json_obj,
             "usage": usage,
             "output_format": output_format,
-            "reasoning": self._last_reasoning,
         }
 
         if output_format == "toon":

prompture/drivers/async_grok_driver.py

@@ -95,17 +95,8 @@ class AsyncGrokDriver(CostMixin, AsyncDriver):
             "model_name": model,
         }
 
-        message = resp["choices"][0]["message"]
-        text = message.get("content") or ""
-        reasoning_content = message.get("reasoning_content")
-
-        if not text and reasoning_content:
-            text = reasoning_content
-
-        result: dict[str, Any] = {"text": text, "meta": meta}
-        if reasoning_content is not None:
-            result["reasoning_content"] = reasoning_content
-        return result
+        text = resp["choices"][0]["message"]["content"]
+        return {"text": text, "meta": meta}
 
     # ------------------------------------------------------------------
     # Tool use
@@ -182,20 +173,15 @@ class AsyncGrokDriver(CostMixin, AsyncDriver):
                 args = json.loads(tc["function"]["arguments"])
             except (json.JSONDecodeError, TypeError):
                 args = {}
-            tool_calls_out.append(
-                {
-                    "id": tc["id"],
-                    "name": tc["function"]["name"],
-                    "arguments": args,
-                }
-            )
-
-        result: dict[str, Any] = {
+            tool_calls_out.append({
+                "id": tc["id"],
+                "name": tc["function"]["name"],
+                "arguments": args,
+            })
+
+        return {
             "text": text,
             "meta": meta,
             "tool_calls": tool_calls_out,
             "stop_reason": stop_reason,
         }
-        if choice["message"].get("reasoning_content") is not None:
-            result["reasoning_content"] = choice["message"]["reasoning_content"]
-        return result

prompture/drivers/async_groq_driver.py

@@ -88,16 +88,8 @@ class AsyncGroqDriver(CostMixin, AsyncDriver):
             "model_name": model,
         }
 
-        text = resp.choices[0].message.content or ""
-        reasoning_content = getattr(resp.choices[0].message, "reasoning_content", None)
-
-        if not text and reasoning_content:
-            text = reasoning_content
-
-        result: dict[str, Any] = {"text": text, "meta": meta}
-        if reasoning_content is not None:
-            result["reasoning_content"] = reasoning_content
-        return result
+        text = resp.choices[0].message.content
+        return {"text": text, "meta": meta}
 
     # ------------------------------------------------------------------
     # Tool use
@@ -160,21 +152,15 @@ class AsyncGroqDriver(CostMixin, AsyncDriver):
                     args = json.loads(tc.function.arguments)
                 except (json.JSONDecodeError, TypeError):
                     args = {}
-                tool_calls_out.append(
-                    {
-                        "id": tc.id,
-                        "name": tc.function.name,
-                        "arguments": args,
-                    }
-                )
-
-        result: dict[str, Any] = {
+                tool_calls_out.append({
+                    "id": tc.id,
+                    "name": tc.function.name,
+                    "arguments": args,
+                })
+
+        return {
             "text": text,
             "meta": meta,
             "tool_calls": tool_calls_out,
             "stop_reason": stop_reason,
         }
-        reasoning_content = getattr(choice.message, "reasoning_content", None)
-        if reasoning_content is not None:
-            result["reasoning_content"] = reasoning_content
-        return result

prompture/drivers/async_lmstudio_driver.py

@@ -98,12 +98,7 @@ class AsyncLMStudioDriver(AsyncDriver):
         if "choices" not in response_data or not response_data["choices"]:
             raise ValueError(f"Unexpected response format: {response_data}")
 
-        message = response_data["choices"][0]["message"]
-        text = message.get("content") or ""
-        reasoning_content = message.get("reasoning_content")
-
-        if not text and reasoning_content:
-            text = reasoning_content
+        text = response_data["choices"][0]["message"]["content"]
 
         usage = response_data.get("usage", {})
         prompt_tokens = usage.get("prompt_tokens", 0)
@@ -119,10 +114,7 @@ class AsyncLMStudioDriver(AsyncDriver):
             "model_name": merged_options.get("model", self.model),
         }
 
-        result: dict[str, Any] = {"text": text, "meta": meta}
-        if reasoning_content is not None:
-            result["reasoning_content"] = reasoning_content
-        return result
+        return {"text": text, "meta": meta}
 
     # -- Model management (LM Studio 0.4.0+) ----------------------------------
 

prompture/drivers/async_moonshot_driver.py

@@ -138,11 +138,10 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
 
         message = resp["choices"][0]["message"]
         text = message.get("content") or ""
-        reasoning_content = message.get("reasoning_content")
 
         # Reasoning models may return content in reasoning_content when content is empty
-        if not text and reasoning_content:
-            text = reasoning_content
+        if not text and message.get("reasoning_content"):
+            text = message["reasoning_content"]
 
         # Structured output fallback: if we used json_schema mode and got an
         # empty response, retry with json_object mode and schema in the prompt.
@@ -185,9 +184,8 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
                     resp = fb_resp
                     fb_message = fb_resp["choices"][0]["message"]
                     text = fb_message.get("content") or ""
-                    reasoning_content = fb_message.get("reasoning_content")
-                    if not text and reasoning_content:
-                        text = reasoning_content
+                    if not text and fb_message.get("reasoning_content"):
+                        text = fb_message["reasoning_content"]
 
         total_cost = self._calculate_cost("moonshot", model, prompt_tokens, completion_tokens)
 
@@ -200,10 +198,7 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
             "model_name": model,
         }
 
-        result: dict[str, Any] = {"text": text, "meta": meta}
-        if reasoning_content is not None:
-            result["reasoning_content"] = reasoning_content
-        return result
+        return {"text": text, "meta": meta}
 
     # ------------------------------------------------------------------
     # Tool use
@@ -276,12 +271,11 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
         }
 
         choice = resp["choices"][0]
-        message = choice["message"]
-        text = message.get("content") or ""
+        text = choice["message"].get("content") or ""
         stop_reason = choice.get("finish_reason")
 
         tool_calls_out: list[dict[str, Any]] = []
-        for tc in message.get("tool_calls", []):
+        for tc in choice["message"].get("tool_calls", []):
             try:
                 args = json.loads(tc["function"]["arguments"])
             except (json.JSONDecodeError, TypeError):
@@ -294,21 +288,13 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
                 }
             )
 
-        result: dict[str, Any] = {
+        return {
             "text": text,
             "meta": meta,
             "tool_calls": tool_calls_out,
             "stop_reason": stop_reason,
         }
 
-        # Preserve reasoning_content for reasoning models so the
-        # conversation loop can include it when sending the assistant
-        # message back (Moonshot requires it on subsequent requests).
-        if message.get("reasoning_content") is not None:
-            result["reasoning_content"] = message["reasoning_content"]
-
-        return result
-
     # ------------------------------------------------------------------
     # Streaming
     # ------------------------------------------------------------------
@@ -339,7 +325,6 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
             data["temperature"] = opts["temperature"]
 
         full_text = ""
-        full_reasoning = ""
         prompt_tokens = 0
         completion_tokens = 0
 
@@ -374,11 +359,9 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
                 if choices:
                     delta = choices[0].get("delta", {})
                     content = delta.get("content") or ""
-                    reasoning_chunk = delta.get("reasoning_content") or ""
-                    if reasoning_chunk:
-                        full_reasoning += reasoning_chunk
-                    if not content and reasoning_chunk:
-                        content = reasoning_chunk
+                    # Reasoning models stream thinking via reasoning_content
+                    if not content:
+                        content = delta.get("reasoning_content") or ""
                     if content:
                         full_text += content
                         yield {"type": "delta", "text": content}
@@ -386,7 +369,7 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
         total_tokens = prompt_tokens + completion_tokens
         total_cost = self._calculate_cost("moonshot", model, prompt_tokens, completion_tokens)
 
-        done_chunk: dict[str, Any] = {
+        yield {
             "type": "done",
             "text": full_text,
             "meta": {
@@ -398,6 +381,3 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
                 "model_name": model,
             },
         }
-        if full_reasoning:
-            done_chunk["reasoning_content"] = full_reasoning
-        yield done_chunk