promptbuilder 0.4.36__py3-none-any.whl → 0.4.37__py3-none-any.whl

promptbuilder/llm_client/base_client.py

@@ -319,31 +319,44 @@ class BaseLLMClient(ABC, utils.InheritDecoratorsMixin):
             max_tokens = self.default_max_tokens
         
         stream_messages = []
-
         total_count = 0
-        response = None
-        for response in self._create_stream(
-            messages=messages,
-            thinking_config=thinking_config,
-            system_message=system_message,
-            max_tokens=max_tokens if not autocomplete else None,
-        ):
+        response: Response | None = None
+
+        # Factory to (re)create the underlying provider stream using current accumulated state
+        def _stream_factory():
+            nonlocal response, total_count
+            tries = 3
+            while tries > 0:
+                try:
+                    iter = self._create_stream(
+                        messages=messages + stream_messages,
+                        thinking_config=thinking_config,
+                        system_message=system_message,
+                        max_tokens=max_tokens if not autocomplete else None,
+                    )
+                    for response in iter:
+                        yield response
+                    break
+                except Exception as e:
+                    tries -= 1
+                    if tries == 0:
+                        raise
+                    logger.warning(f"Stream generation error: {e}, retrying...")
+
+        # Use retry to iterate through the stream; on exception previously yielded parts
+        # are already merged into stream_messages so resumed attempts continue generation.
+        for response in _stream_factory():
             BaseLLMClient._append_generated_part(stream_messages, response)
             total_count += BaseLLMClient._response_out_tokens(response)
             yield response
         finish_reason = response.candidates[0].finish_reason.value if response and response.candidates and response.candidates[0].finish_reason else None
         if finish_reason and autocomplete:
             while response.candidates and finish_reason == FinishReason.MAX_TOKENS.value:
-                for response in self._create_stream(
-                    messages=messages,
-                    thinking_config=thinking_config,
-                    system_message=system_message,
-                    max_tokens=max_tokens if not autocomplete else None,
-                ):
+                for response in _stream_factory():
                     BaseLLMClient._append_generated_part(stream_messages, response)
                     total_count += BaseLLMClient._response_out_tokens(response)
                     yield response
-                finish_reason = response.candidates[0].finish_reason.value if response.candidates and response.candidates[0].finish_reason else None
+                finish_reason = response.candidates[0].finish_reason.value if response and response.candidates and response.candidates[0].finish_reason else None
                 if max_tokens is not None and total_count >= max_tokens:
                     break
 
@@ -673,31 +686,41 @@ class BaseLLMClientAsync(ABC, utils.InheritDecoratorsMixin):
             max_tokens = self.default_max_tokens
         
         total_count = 0
-        stream_iter = await self._create_stream(
-            messages=messages,
-            thinking_config=thinking_config,
-            system_message=system_message,
-            max_tokens=max_tokens if not autocomplete else None,
-        )
         response = None
+
+        async def _stream_factory():
+            nonlocal response, total_count
+            tries = 3
+            while tries > 0:
+                try:
+                    iter = await self._create_stream(
+                        messages=messages,
+                        thinking_config=thinking_config,
+                        system_message=system_message,
+                        max_tokens=max_tokens if not autocomplete else None,
+                    )
+
+                    async for response in iter:
+                        BaseLLMClient._append_generated_part(messages, response)
+                        total_count += BaseLLMClient._response_out_tokens(response)
+                        yield response
+                    break
+                except Exception as e:
+                    tries -= 1
+                    if tries <= 0:
+                        raise
+                    logger.warning(f"Stream generation error: {e}, retrying...")
+        
+        stream_iter = _stream_factory()
         async for response in stream_iter:
-            BaseLLMClient._append_generated_part(messages, response)
-            total_count += BaseLLMClient._response_out_tokens(response)
             yield response
-        
+
         finish_reason = response.candidates[0].finish_reason.value if response and response.candidates and response.candidates[0].finish_reason else None
         if finish_reason and autocomplete:
             while response.candidates and finish_reason == FinishReason.MAX_TOKENS.value:
-                stream_iter = await self._create_stream(
-                    messages=messages,
-                    thinking_config=thinking_config,
-                    system_message=system_message,
-                    max_tokens=max_tokens if not autocomplete else None,
-                )
+                stream_iter = _stream_factory()
                 async for response in stream_iter:
                     yield response
-                    BaseLLMClient._append_generated_part(messages, response)
-                    total_count += BaseLLMClient._response_out_tokens(response)
                 finish_reason = response.candidates[0].finish_reason.value if response.candidates and response.candidates[0].finish_reason else None
                 if max_tokens is not None and total_count >= max_tokens:
                     break

{promptbuilder-0.4.36.dist-info → promptbuilder-0.4.37.dist-info}/METADATA

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

{promptbuilder-0.4.36.dist-info → promptbuilder-0.4.37.dist-info}/RECORD

@@ -9,7 +9,7 @@ promptbuilder/agent/utils.py,sha256=vTkphKw04v_QDIJtoB2JKK0RGY6iI1t_0LbmuStunzI,
 promptbuilder/llm_client/__init__.py,sha256=wJ33cnRtZX_YPsbcGxEu3SEZMOhPX7-fHI59MEPUe7I,517
 promptbuilder/llm_client/aisuite_client.py,sha256=8inY3UoH8o9yEOvRYP6a_8pjGQK0W_f9eV8MmHzpKTU,15641
 promptbuilder/llm_client/anthropic_client.py,sha256=YR1Pc4Fj0WpG7qcQnPLkQMzDsvA7SMvWomFR1oCzMsk,28328
-promptbuilder/llm_client/base_client.py,sha256=UZg5B4sG86QLTrdpgWw1dyd6MomEYz7i1FuMMlYtChg,33955
+promptbuilder/llm_client/base_client.py,sha256=RZ7AF5b0Z8Y8WACcyhSRBe4OJFjkhsDaCkiiUYkvYIM,34852
 promptbuilder/llm_client/bedrock_client.py,sha256=IQt7Sv_Wt6mg5-bhuyr-Nwjx5Nxk2S8rKEVkfwvWqE0,28183
 promptbuilder/llm_client/config.py,sha256=exQEm35wp7lK5SfXNpN5H9VZEb2LVa4pyZ-cxGt1U-U,1124
 promptbuilder/llm_client/exceptions.py,sha256=t-X7r_a8B1jNu8eEavde1jXu5dz97yV3IG4YHOtgh0Y,4836
@@ -21,8 +21,8 @@ promptbuilder/llm_client/openai_client.py,sha256=ZgI22-j4_B6OmvV10DO1lk4yN63hNYA
 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=OgbmRIYQXeK2kAh27ijhXuTzeg8APP38IyJ9WJqvDkY,15405
-promptbuilder-0.4.36.dist-info/licenses/LICENSE,sha256=fqXmInzgsvEOIaKSBgcrwKyYCGYF0MKErJ0YivtODcc,1096
-promptbuilder-0.4.36.dist-info/METADATA,sha256=U10TCSk-YVFDRo-tzrNI2u1TfcY6OO_Foqt2tQ-bgjs,3799
-promptbuilder-0.4.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-promptbuilder-0.4.36.dist-info/top_level.txt,sha256=UBVcYn4UgrPy3O3fmmnPEU_kieuplBMgheetIMei4EI,14
-promptbuilder-0.4.36.dist-info/RECORD,,
+promptbuilder-0.4.37.dist-info/licenses/LICENSE,sha256=fqXmInzgsvEOIaKSBgcrwKyYCGYF0MKErJ0YivtODcc,1096
+promptbuilder-0.4.37.dist-info/METADATA,sha256=Qjz3KpGxhDKBbjJQpkNXLQCXNMEmAn4orrnraB6qKt4,3799
+promptbuilder-0.4.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+promptbuilder-0.4.37.dist-info/top_level.txt,sha256=UBVcYn4UgrPy3O3fmmnPEU_kieuplBMgheetIMei4EI,14
+promptbuilder-0.4.37.dist-info/RECORD,,