promptbuilder 0.4.32__py3-none-any.whl → 0.4.34__py3-none-any.whl

promptbuilder/agent/agent.py

@@ -49,7 +49,7 @@ class Agent(Generic[MessageType, ContextType]):
             return messages
 
     async def _answer_with_llm(self, **kwargs: Any) -> Response:
-        messages = self._formatted_messages(self.context.dialog_history.last_messages())
+        messages = self._formatted_messages(self.context.dialog_history.last_content_messages())
         return await run_async(self.llm_client.create,
             messages=messages,
             system_message=self.system_message(**kwargs),
@@ -73,7 +73,7 @@ class AgentRouter(Agent[MessageType, ContextType]):
         callable_trs = [self.tools.get(name) or self.routes.get(name) for name in self.tr_names if name not in trs_to_exclude]
         trs = [callable_tr.tool for callable_tr in callable_trs]
 
-        messages = self._formatted_messages(self.context.dialog_history.last_messages())
+        messages = self._formatted_messages(self.context.dialog_history.last_content_messages())
         response = await run_async(self.llm_client.create,
             messages=messages,
             system_message=self.system_message(callable_trs=callable_trs),

promptbuilder/agent/context.py

@@ -6,12 +6,15 @@ from typing import Any, TypeVar, Generic
 MessageType = TypeVar("MessageType", bound=Any)
 
 class DialogHistory(Generic[MessageType]):
-    def last_messages(self, n: int = 0) -> list[Content]:
+    def last_content_messages(self, n: int = 0) -> list[Content]:
         raise NotImplementedError("Subclasses must implement this method")
 
     def add_message(self, message: MessageType):
         raise NotImplementedError("Subclasses must implement this method")
 
+    def last_messages(self, n: int = 0) -> list[MessageType]:
+        raise NotImplementedError("Subclasses must implement this method")
+
     def clear(self):
         raise NotImplementedError("Subclasses must implement this method")
 
@@ -19,12 +22,19 @@ class InMemoryDialogHistory(DialogHistory[Content]):
     def __init__(self):
         self.messages: list[Content] = []
 
-    def last_messages(self, n: int = 0) -> list[Content]:
+    def last_content_messages(self, n: int = 0) -> list[Content]:
+        if n == 0:
+            return self.messages
         return self.messages[-n:]
 
     def add_message(self, message: Content):
         self.messages.append(message)
 
+    def last_messages(self, n: int = 0) -> list[Content]:
+        if n == 0:
+            return self.messages
+        return self.messages[-n:]
+
     def clear(self):
         self.messages = []
 

promptbuilder/llm_client/logfire_decorators.py

@@ -7,7 +7,7 @@ import logfire
 
 from promptbuilder.llm_client.utils import inherited_decorator
 from promptbuilder.llm_client.config import GLOBAL_CONFIG
-from promptbuilder.llm_client.types import Response, UsageMetadata
+from promptbuilder.llm_client.types import Response, UsageMetadata, content_to_str
 
 
 P = ParamSpec("P")
@@ -24,9 +24,9 @@ def extract_span_data(self, *args, **kwargs) -> dict[str, Any]:
         logfire_messages.append({"role": "system", "content": system_message})
     for content in messages:
         if content.role == "user":
-            logfire_messages.append({"role": "user", "content": content.as_str()})
+            logfire_messages.append({"role": "user", "content": content_to_str(content)})
         elif content.role == "model":
-            logfire_messages.append({"role": "assistant", "content": content.as_str()})
+            logfire_messages.append({"role": "assistant", "content": content_to_str(content)})
     span_data["request_data"] = {"messages": logfire_messages}
     span_data["messages"] = messages
     

promptbuilder/llm_client/types.py

@@ -96,11 +96,13 @@ class Content(BaseModel):
     role: Role | None = None
     
     def as_str(self) -> str:
-        if self.parts is None:
-            return ""
-        else:
-            return "\n".join([(part.text or "") for part in self.parts])
+        return content_to_str(self)
 
+def content_to_str(content: Content) -> str:
+    if content.parts is None:
+        return ""
+    else:
+        return "".join([part.text for part in content.parts if part.text])
 
 class FinishReason(Enum):
   """Output only. The reason why the model stopped generating tokens.

promptbuilder/llm_client/vertex_client.py

@@ -198,6 +198,15 @@ class VertexLLMClient(BaseLLMClient):
         v_messages = _to_vertex_content(messages)
         GenerationConfig = getattr(importlib.import_module("vertexai.generative_models"), "GenerationConfig")
         gen_cfg = GenerationConfig(max_output_tokens=max_tokens or self.default_max_tokens)
+        
+        # Handle thinking config
+        if thinking_config is None:
+            thinking_config = self.default_thinking_config
+        if thinking_config is not None:
+            # Vertex AI supports thinking via response_logprobs and logprobs parameters
+            # but the exact implementation may vary - for now, we'll store it for potential future use
+            pass
+        
         req_opts: dict[str, Any] | None = {}
         if timeout is not None:
             req_opts["timeout"] = timeout

{promptbuilder-0.4.32.dist-info → promptbuilder-0.4.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: promptbuilder
-Version: 0.4.32
+Version: 0.4.34
 Summary: Library for building prompts for LLMs
 Home-page: https://github.com/kapulkin/promptbuilder
 Author: Kapulkin Stanislav

{promptbuilder-0.4.32.dist-info → promptbuilder-0.4.34.dist-info}/RECORD

@@ -2,8 +2,8 @@ promptbuilder/__init__.py,sha256=o_NdXl7NppM399-fy5VGfYkSN8iYDAaFAwJNhdkW3bI,56
 promptbuilder/embeddings.py,sha256=bu-soCNYiHxshc1jejGmI5iJTIdotqEhmvpImSjlFTY,8087
 promptbuilder/prompt_builder.py,sha256=kK6WHr2umYmsanYb2fQVxqEajs_dzGPXRulTo40g36E,12428
 promptbuilder/agent/__init__.py,sha256=qG4Jq4wbmCH5NKLOX6ZMtZ7lFURhJXf464BntR-u5rU,56
-promptbuilder/agent/agent.py,sha256=dVu251C1r9w5LS2P_shsIRH9tFz1Jq93MDv3Uu41_4E,9274
-promptbuilder/agent/context.py,sha256=CVw715vFrhfvddQmRNy4A1U87GsZyIKj9Xu4SCidbc0,1120
+promptbuilder/agent/agent.py,sha256=A1-r2J6bmVQW5yCSzJOTzknQhkGkKw8wUUzL1BtAEAA,9290
+promptbuilder/agent/context.py,sha256=xJwNxx-NKq6SDdy4Rpa4sU60nnhQ1a2AXiUQIlNhlG4,1481
 promptbuilder/agent/tool.py,sha256=VDbIHK3_Q62Ei7hwLF7nIgHq-PTMKnv1NSjHpDYkUZE,2651
 promptbuilder/agent/utils.py,sha256=vTkphKw04v_QDIJtoB2JKK0RGY6iI1t_0LbmuStunzI,356
 promptbuilder/llm_client/__init__.py,sha256=wJ33cnRtZX_YPsbcGxEu3SEZMOhPX7-fHI59MEPUe7I,517
@@ -15,14 +15,14 @@ promptbuilder/llm_client/config.py,sha256=exQEm35wp7lK5SfXNpN5H9VZEb2LVa4pyZ-cxG
 promptbuilder/llm_client/exceptions.py,sha256=t-X7r_a8B1jNu8eEavde1jXu5dz97yV3IG4YHOtgh0Y,4836
 promptbuilder/llm_client/google_client.py,sha256=ZjJjDUQZH6zAIRoi4xUx3IDEm8jRkVWGyehy5P_Ba_M,12170
 promptbuilder/llm_client/litellm_client.py,sha256=NxVJORvQy5fSoqzPOagBliAhg2fjnFNnV5ZF7qckbVI,25561
-promptbuilder/llm_client/logfire_decorators.py,sha256=un_QnIekypOEcqTZ5v1y9pwijGnF95xwnwKO5rFSHVY,9667
+promptbuilder/llm_client/logfire_decorators.py,sha256=pEPm3nTfqkg9kZr3s5ORs3fMex_z4Ce8CAt301m3OIk,9697
 promptbuilder/llm_client/main.py,sha256=2Q7J5FwivX2YwvptzoSEtCfvfcI9p5HC55D3mMb2se4,8243
 promptbuilder/llm_client/openai_client.py,sha256=QMXX7VPYWFo1VvX8bWF6jpi95ZIOk_MMBpz-14GrT-k,25274
-promptbuilder/llm_client/types.py,sha256=kgbg5FRzvZwu98y1OhAZJDneXBNPnsFZueQCr9HXIY4,8063
+promptbuilder/llm_client/types.py,sha256=fnkSMFjK9ViaRQsD6LILpLz8R2_E1TI9efjy8VNO0RQ,8139
 promptbuilder/llm_client/utils.py,sha256=79lvSppjrrItHB5MIozbp_5Oq7TsOK4Qzt9Ae3XMLFw,7624
-promptbuilder/llm_client/vertex_client.py,sha256=aewidTryIpFMlTRFmDqOG7O-NCbvTP5wW6I3-3vQShE,15002
-promptbuilder-0.4.32.dist-info/licenses/LICENSE,sha256=fqXmInzgsvEOIaKSBgcrwKyYCGYF0MKErJ0YivtODcc,1096
-promptbuilder-0.4.32.dist-info/METADATA,sha256=8BdCEIoYzptCDbU4SlpgtfIGIkdKob2A6ksOpSXWdVw,3799
-promptbuilder-0.4.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-promptbuilder-0.4.32.dist-info/top_level.txt,sha256=UBVcYn4UgrPy3O3fmmnPEU_kieuplBMgheetIMei4EI,14
-promptbuilder-0.4.32.dist-info/RECORD,,
+promptbuilder/llm_client/vertex_client.py,sha256=OgbmRIYQXeK2kAh27ijhXuTzeg8APP38IyJ9WJqvDkY,15405
+promptbuilder-0.4.34.dist-info/licenses/LICENSE,sha256=fqXmInzgsvEOIaKSBgcrwKyYCGYF0MKErJ0YivtODcc,1096
+promptbuilder-0.4.34.dist-info/METADATA,sha256=vGhJa-lzL9vGZm-4GTwWmYtqzpjPGEkVt7SL5Lvkskg,3799
+promptbuilder-0.4.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+promptbuilder-0.4.34.dist-info/top_level.txt,sha256=UBVcYn4UgrPy3O3fmmnPEU_kieuplBMgheetIMei4EI,14
+promptbuilder-0.4.34.dist-info/RECORD,,