promptbuilder 0.4.31__tar.gz → 0.4.33__tar.gz

{promptbuilder-0.4.31/promptbuilder.egg-info → promptbuilder-0.4.33}/PKG-INFO

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

{promptbuilder-0.4.31 → promptbuilder-0.4.33}/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-0.4.31 → promptbuilder-0.4.33}/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-0.4.31 → promptbuilder-0.4.33}/promptbuilder/llm_client/base_client.py

@@ -98,7 +98,7 @@ class BaseLLMClient(ABC, utils.InheritDecoratorsMixin):
             result_type=result_type,
             thinking_config=thinking_config,
             system_message=system_message,
-            max_tokens=max_tokens,
+            max_tokens=max_tokens if not autocomplete else None,
             timeout=timeout,
             tools=tools,
             tool_config=tool_config,
@@ -116,7 +116,7 @@ class BaseLLMClient(ABC, utils.InheritDecoratorsMixin):
                     result_type=result_type,
                     thinking_config=thinking_config,
                     system_message=system_message,
-                    max_tokens=max_tokens,
+                    max_tokens=max_tokens if not autocomplete else None,
                     timeout=timeout,
                     tools=tools,
                     tool_config=tool_config,
@@ -449,7 +449,7 @@ class BaseLLMClientAsync(ABC, utils.InheritDecoratorsMixin):
             result_type=result_type,
             thinking_config=thinking_config,
             system_message=system_message,
-            max_tokens=max_tokens,
+            max_tokens=max_tokens if not autocomplete else None,
             timeout=timeout,
             tools=tools,
             tool_config=tool_config,
@@ -467,7 +467,7 @@ class BaseLLMClientAsync(ABC, utils.InheritDecoratorsMixin):
                     result_type=result_type,
                     thinking_config=thinking_config,
                     system_message=system_message,
-                    max_tokens=max_tokens,
+                    max_tokens=max_tokens if not autocomplete else None,
                     timeout=timeout,
                     tools=tools,
                     tool_config=tool_config,

{promptbuilder-0.4.31 → promptbuilder-0.4.33}/promptbuilder/llm_client/litellm_client.py

@@ -23,7 +23,7 @@ from promptbuilder.llm_client.config import DecoratorConfigs
 from promptbuilder.prompt_builder import PromptBuilder
 
 
-class LiteLLMLLMClient(BaseLLMClient):
+class LiteLLMClient(BaseLLMClient):
     provider: str = ""
     user_tag: Role = "user"
     assistant_tag: Role = "model"
@@ -241,7 +241,7 @@ class LiteLLMLLMClient(BaseLLMClient):
                     finish_reason_val = first_choice.get("finish_reason")
                 else:
                     finish_reason_val = getattr(first_choice, "finish_reason", None)
-            mapped_finish_reason = LiteLLMLLMClient._map_finish_reason(finish_reason_val)
+            mapped_finish_reason = LiteLLMClient._map_finish_reason(finish_reason_val)
 
             content_parts: list[Part | Any] = list(parts)
             return Response(
@@ -293,7 +293,7 @@ class LiteLLMLLMClient(BaseLLMClient):
                     finish_reason_val = first_choice.get("finish_reason")
                 else:
                     finish_reason_val = getattr(first_choice, "finish_reason", None)
-            mapped_finish_reason = LiteLLMLLMClient._map_finish_reason(finish_reason_val)
+            mapped_finish_reason = LiteLLMClient._map_finish_reason(finish_reason_val)
 
             content_parts2: list[Part | Any] = list(parts)
             return Response(
@@ -311,7 +311,7 @@ class LiteLLMLLMClient(BaseLLMClient):
             raise ValueError(f"Unsupported result_type: {result_type}. Supported types are: None, 'json', or a Pydantic model.")
 
 
-class LiteLLMLLMClientAsync(BaseLLMClientAsync):
+class LiteLLMClientAsync(BaseLLMClientAsync):
     provider: str = ""
     user_tag: Role = "user"
     assistant_tag: Role = "model"
@@ -341,11 +341,11 @@ class LiteLLMLLMClientAsync(BaseLLMClientAsync):
 
     @staticmethod
     def make_function_call(tool_call) -> FunctionCall | None:
-        return LiteLLMLLMClient.make_function_call(tool_call)
+        return LiteLLMClient.make_function_call(tool_call)
 
     @staticmethod
     def make_usage_metadata(usage) -> UsageMetadata:
-        return LiteLLMLLMClient.make_usage_metadata(usage)
+        return LiteLLMClient.make_usage_metadata(usage)
 
     async def _create(
         self,
@@ -450,7 +450,7 @@ class LiteLLMLLMClientAsync(BaseLLMClientAsync):
                     finish_reason_val = first_choice.get("finish_reason")
                 else:
                     finish_reason_val = getattr(first_choice, "finish_reason", None)
-            mapped_finish_reason = LiteLLMLLMClient._map_finish_reason(finish_reason_val)
+            mapped_finish_reason = LiteLLMClient._map_finish_reason(finish_reason_val)
 
             content_parts3: list[Part | Any] = list(parts)
             return Response(
@@ -502,7 +502,7 @@ class LiteLLMLLMClientAsync(BaseLLMClientAsync):
                     finish_reason_val = first_choice.get("finish_reason")
                 else:
                     finish_reason_val = getattr(first_choice, "finish_reason", None)
-            mapped_finish_reason = LiteLLMLLMClient._map_finish_reason(finish_reason_val)
+            mapped_finish_reason = LiteLLMClient._map_finish_reason(finish_reason_val)
 
             content_parts4: list[Part | Any] = list(parts)
             return Response(

{promptbuilder-0.4.31 → promptbuilder-0.4.33}/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.31 → promptbuilder-0.4.33/promptbuilder.egg-info}/PKG-INFO

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

{promptbuilder-0.4.31 → promptbuilder-0.4.33}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="promptbuilder",
-    version="0.4.31",
+    version="0.4.33",
     packages=find_packages(),
     install_requires=[
         "pydantic",