promptbuilder 0.4.21__tar.gz → 0.4.23__tar.gz

{promptbuilder-0.4.21/promptbuilder.egg-info → promptbuilder-0.4.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: promptbuilder
-Version: 0.4.21
+Version: 0.4.23
 Summary: Library for building prompts for LLMs
 Home-page: https://github.com/kapulkin/promptbuilder
 Author: Kapulkin Stanislav
@@ -14,7 +14,7 @@ License-File: LICENSE
 Requires-Dist: pydantic
 Requires-Dist: pytest
 Requires-Dist: aisuite-async
-Requires-Dist: google-genai<=1.21.0,>=1.4.0
+Requires-Dist: google-genai>=1.4.0
 Requires-Dist: anthropic
 Requires-Dist: openai
 Requires-Dist: aioboto3

{promptbuilder-0.4.21 → promptbuilder-0.4.23}/promptbuilder/llm_client/base_client.py

@@ -5,6 +5,7 @@ import hashlib
 import logging
 from abc import ABC, abstractmethod
 from typing import Iterator, AsyncIterator, Literal, overload
+from pydantic import BaseModel
 
 from promptbuilder.llm_client.types import Response, Content, Part, Tool, ToolConfig, FunctionCall, FunctionCallingConfig, Json, ThinkingConfig, ApiKey, PydanticStructure, ResultType, FinishReason
 import promptbuilder.llm_client.utils as utils
@@ -178,7 +179,7 @@ class BaseLLMClient(ABC, utils.InheritDecoratorsMixin):
             tool_config=ToolConfig(function_calling_config=FunctionCallingConfig(mode=tool_choice_mode)),
         )
 
-        while autocomplete and response.candidates and response.candidates[0].finish_reason not in [FinishReason.STOP, FinishReason.MAX_TOKENS]:
+        while autocomplete and response.candidates and response.candidates[0].finish_reason in [FinishReason.STOP, FinishReason.MAX_TOKENS]:
             BaseLLMClient._append_generated_part(messages, response)
 
             response = self.create(
@@ -605,7 +606,12 @@ class CachedLLMClient(BaseLLMClient):
                 with open(cache_path, "rt") as f:
                     cache_data = json.load(f)
                     if cache_data["full_model_name"] == llm_client.full_model_name and json.dumps(cache_data["request"]) == json.dumps(messages_dump):
-                        return Response(**cache_data["response"]), messages_dump, cache_path
+                        response = Response(**cache_data["response"])
+                        result_type = kwargs.get("result_type", None)
+                        if result_type is not None and isinstance(result_type, type(BaseModel)):
+                            response.parsed = result_type.model_validate(response.parsed)
+
+                        return response, messages_dump, cache_path
                     else:
                         logger.debug(f"Cache mismatch for {key}")
             except (json.JSONDecodeError, KeyError) as e:
@@ -637,4 +643,3 @@ class CachedLLMClientAsync(BaseLLMClientAsync):
         response = await self.llm_client.create(messages, **kwargs)
         CachedLLMClient.save_cache(cache_path, self.llm_client.full_model_name, messages_dump, response)
         return response
-

{promptbuilder-0.4.21 → promptbuilder-0.4.23}/promptbuilder/llm_client/types.py

@@ -1,9 +1,9 @@
 import logging
 from abc import ABC, abstractmethod
-from typing import Optional, Any, Callable, Literal, TypeVar, Self
+from typing import Optional, Any, Callable, Literal, TypeVar, Self, Protocol, runtime_checkable
 from enum import Enum
 
-from pydantic import BaseModel, model_validator
+from pydantic import BaseModel, model_validator, ConfigDict
 
 
 logger = logging.getLogger(__name__)
@@ -17,6 +17,16 @@ PydanticStructure = TypeVar("PydanticStructure", bound=BaseModel)
 type ResultType = Literal["json"] | type[PydanticStructure] | None
 
 
+@runtime_checkable
+class PartLike(Protocol):
+    """Protocol for Part-like objects that have the same interface as Part."""
+    text: Optional[str]
+    function_call: Optional[Any]  # Using Any to allow different FunctionCall types
+    function_response: Optional[Any]  # Using Any to allow different FunctionResponse types
+    thought: Optional[bool]
+    inline_data: Optional[Any]  # Using Any to allow different Blob types
+
+
 class CustomApiKey(ABC):
     @abstractmethod
     def __hash__(self):
@@ -80,14 +90,16 @@ class Part(BaseModel):
         return cls(inline_data=inline_data)
 
 class Content(BaseModel):
-    parts: Optional[list[Part]] = None
-    role: Optional[Role] = None
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+    
+    parts: list[Part | PartLike] | None = None
+    role: Role | None = None
     
     def as_str(self) -> str:
         if self.parts is None:
             return ""
         else:
-            return "\n".join([part.as_str() for part in self.parts])
+            return "\n".join([(part.text or "") for part in self.parts])
 
 
 class FinishReason(Enum):

{promptbuilder-0.4.21 → promptbuilder-0.4.23/promptbuilder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: promptbuilder
-Version: 0.4.21
+Version: 0.4.23
 Summary: Library for building prompts for LLMs
 Home-page: https://github.com/kapulkin/promptbuilder
 Author: Kapulkin Stanislav
@@ -14,7 +14,7 @@ License-File: LICENSE
 Requires-Dist: pydantic
 Requires-Dist: pytest
 Requires-Dist: aisuite-async
-Requires-Dist: google-genai<=1.21.0,>=1.4.0
+Requires-Dist: google-genai>=1.4.0
 Requires-Dist: anthropic
 Requires-Dist: openai
 Requires-Dist: aioboto3

{promptbuilder-0.4.21 → promptbuilder-0.4.23}/promptbuilder.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pydantic
 pytest
 aisuite-async
-google-genai<=1.21.0,>=1.4.0
+google-genai>=1.4.0
 anthropic
 openai
 aioboto3

{promptbuilder-0.4.21 → promptbuilder-0.4.23}/setup.py

@@ -2,13 +2,13 @@ from setuptools import setup, find_packages
 
 setup(
     name="promptbuilder",
-    version="0.4.21",
+    version="0.4.23",
     packages=find_packages(),
     install_requires=[
         "pydantic",
         "pytest",
         "aisuite-async",
-        "google-genai>=1.4.0,<=1.21.0",
+        "google-genai>=1.4.0",
         "anthropic",
         "openai",
         "aioboto3"