agentle 0.9.23__py3-none-any.whl → 0.9.25__py3-none-any.whl

agentle/generations/providers/google/adapters/generate_generate_content_response_to_generation_adapter.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import datetime
 import logging
 import uuid
-from collections.abc import AsyncIterator
+from collections.abc import AsyncGenerator, AsyncIterator
 from logging import Logger
 from typing import TYPE_CHECKING, Any, Literal, cast, overload
 
@@ -88,11 +88,11 @@ class GenerateGenerateContentResponseToGenerationAdapter[T](
     @overload
     def adapt(
         self, _f: AsyncIterator["GenerateContentResponse"]
-    ) -> AsyncIterator[Generation[T]]: ...
+    ) -> AsyncGenerator[Generation[T], None]: ...
 
     def adapt(
         self, _f: "GenerateContentResponse | AsyncIterator[GenerateContentResponse]"
-    ) -> Generation[T] | AsyncIterator[Generation[T]]:
+    ) -> Generation[T] | AsyncGenerator[Generation[T], None]:
         """
         Convert Google response(s) to Agentle Generation object(s).
 
@@ -214,7 +214,7 @@ class GenerateGenerateContentResponseToGenerationAdapter[T](
 
     async def _adapt_streaming(
         self, response_stream: AsyncIterator["GenerateContentResponse"]
-    ) -> AsyncIterator[Generation[T]]:
+    ) -> AsyncGenerator[Generation[T], None]:
         """Adapt a streaming response with proper text accumulation."""
         generation_id = self.preferred_id or uuid.uuid4()
         created_time = datetime.datetime.now()

agentle/utils/parse_streaming_json.py

@@ -21,8 +21,6 @@ def parse_streaming_json[T: BaseModel](potential_json: str | None, model: type[T
     if potential_json is None:
         return model()
 
-    # print(f"parsing: {potential_json}")
-
     def find_json_boundaries(text: str) -> tuple[int, int]:
         """Find the start and potential end of JSON in the text."""
 
@@ -95,17 +93,32 @@ def parse_streaming_json[T: BaseModel](potential_json: str | None, model: type[T
         # Remove any leading/trailing whitespace
         json_str = json_str.strip()
 
-        # Fix missing closing quotes on string values (at the end)
-        # Look for patterns like: "key": "value without closing quote
-        json_str = re.sub(r':\s*"([^"]*?)(?:\s*[,}]|$)', r': "\1"', json_str)
-
-        # Fix missing closing quotes for keys
-        # Look for patterns like: "key without quotes:
-        json_str = re.sub(r'"([^"]*?)(?=\s*:)', r'"\1"', json_str)
-
         # Remove trailing commas before closing braces/brackets
         json_str = re.sub(r",\s*([}\]])", r"\1", json_str)
 
+        # For streaming JSON, we need to handle incomplete strings carefully
+        # Check if we have an unclosed string at the end
+        in_string = False
+        escape_next = False
+        last_quote_pos = -1
+        
+        for i, char in enumerate(json_str):
+            if escape_next:
+                escape_next = False
+                continue
+            if char == '\\':
+                escape_next = True
+                continue
+            if char == '"':
+                in_string = not in_string
+                if in_string:
+                    last_quote_pos = i
+
+        # If we're in a string at the end (incomplete), close it properly
+        if in_string and last_quote_pos != -1:
+            # Add closing quote for the incomplete string
+            json_str += '"'
+
         # Ensure the JSON has proper closing braces if it appears incomplete
         open_braces = json_str.count("{") - json_str.count("}")
         open_brackets = json_str.count("[") - json_str.count("]")
@@ -124,12 +137,25 @@ def parse_streaming_json[T: BaseModel](potential_json: str | None, model: type[T
         data = {}
 
         # Extract string key-value pairs with quoted keys
-        # Pattern: "key": "value" or 'key': 'value'
-        string_pattern = r'["\']([^"\']+)["\']:\s*["\']([^"\']*)["\']?'
-        string_matches = re.findall(string_pattern, json_str)
+        # IMPROVED: Handle long strings that may contain newlines, special chars, etc.
+        # Pattern: "key": "value..." - capture everything until the next unescaped quote or EOF
+        string_pattern = r'["\']([\w]+)["\']:\s*["\']([^"\']*?)(?:["\']|$)'
+        string_matches = re.findall(string_pattern, json_str, re.DOTALL)
+        
+        # Also try to capture very long strings that span multiple lines
+        # This catches incomplete strings during streaming
+        long_string_pattern = r'["\']([\w_]+)["\']:\s*["\'](.+?)(?:["\'],?\s*["}]|$)'
+        long_matches = re.findall(long_string_pattern, json_str, re.DOTALL)
 
         for key, value in string_matches:
             data[key] = value
+        
+        # Prefer long_matches for fields that might be truncated in string_matches
+        for key, value in long_matches:
+            # Only override if the long match has more content
+            existing = data.get(key, "")
+            if key not in data or (isinstance(existing, str) and len(value) > len(existing)):
+                data[key] = value
 
         # Extract string key-value pairs with unquoted keys
         # Pattern: key: "value" (no quotes around key)

agentle/web/extractor.py

@@ -1,11 +1,13 @@
-from rsb.coroutines.run_sync import run_sync
 from collections.abc import Sequence
 from textwrap import dedent
 
 from html_to_markdown import convert
 from playwright.async_api import Geolocation, ViewportSize
+from rsb.coroutines.run_sync import run_sync
 from rsb.models import Field
 from rsb.models.base_model import BaseModel
+from rsb.models.config_dict import ConfigDict
+
 from agentle.generations.models.generation.generation import Generation
 from agentle.generations.providers.base.generation_provider import GenerationProvider
 from agentle.prompts.models.prompt import Prompt
@@ -60,6 +62,8 @@ class Extractor(BaseModel):
     model: str | None = Field(default=None)
     max_output_tokens: int | None = Field(default=None)
 
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     def extract[T: BaseModel](
         self,
         urls: Sequence[str],

{agentle-0.9.23.dist-info → agentle-0.9.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentle
-Version: 0.9.23
+Version: 0.9.25
 Summary: ...
 Author-email: Arthur Brenno <64020210+arthurbrenno@users.noreply.github.com>
 License-File: LICENSE

{agentle-0.9.23.dist-info → agentle-0.9.25.dist-info}/RECORD

@@ -1,13 +1,13 @@
 agentle/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/agents/__init__.py,sha256=Y_Vh4954BlEehGOufH79lCvWlgDaVPN6TF9bo4OXioY,10
-agentle/agents/agent.py,sha256=jNMLHAQy8Ywv9ZXGzKkLP3uvcSyO3brDoYZxRipBCPw,205204
+agentle/agents/agent.py,sha256=e5tiq87bBfGI8gp5FU8mIVlxEs81GUpg-JTkptA0EeU,213449
 agentle/agents/agent_config.py,sha256=tkssVo-cmldiQ6rDDkJ2xeK5NRIG3F-NgVhlXZGwCbM,4555
 agentle/agents/agent_config_dict.py,sha256=BzGyKdm0Hv86P0_r7xzK4HtzNVdwM0HtrtuDVCSGbI8,2813
 agentle/agents/agent_input.py,sha256=qckT3_pOGHclT8UViOjUeKCuGo0qigB_h6tYxOtwTXs,1447
 agentle/agents/agent_pipeline.py,sha256=YJAMoHUfcChiwYLwe_vTXaS2QCkgq3DAThsjb0WxA_A,17160
 agentle/agents/agent_protocol.py,sha256=7UTKSLwoM37zgWNWZxSPgEpBctPAxA4Zqiz4qiq6yCM,771
-agentle/agents/agent_run_output.py,sha256=O2WcdJW9rEBiQGvMAoTTpfiRtHQpOHWLkapWTEHeSE0,22419
+agentle/agents/agent_run_output.py,sha256=UsFT48FsPlzWT8aQgNfajkt7IjXBbugI9EbRaXQ40tA,22669
 agentle/agents/agent_team.py,sha256=bUQzLMhOp2UXmj1XhevqB0ZBqqzkhrTAUNV3BwSv7hc,30193
 agentle/agents/context.py,sha256=ap8gSTqiBvYGrAegPOE5O2rz_dWPbiAgOJ5uahi1e0M,16391
 agentle/agents/context_state.py,sha256=4EMxfuRvmAkNbH1ImdoP7MDFQSm9NYORsaCSaAicus0,135
@@ -136,9 +136,10 @@ agentle/agents/templates/data_collection/progressive_profilling_agent.py,sha256=
 agentle/agents/ui/__init__.py,sha256=IjHRV0k2DNwvFrEHebmsXiBvmITE8nQUnsR07h9tVkU,7
 agentle/agents/ui/streamlit.py,sha256=9afICL0cxtG1o2pWh6vH39-NdKiVfADKiXo405F2aB0,42829
 agentle/agents/whatsapp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-agentle/agents/whatsapp/whatsapp_bot.py,sha256=qaL-PDisEWQOKKf8TmbAnQlIxbnZo4Bq8hgyjFUy-g0,135345
+agentle/agents/whatsapp/human_delay_calculator.py,sha256=BGCDeoNTPsMn4d_QYmG0BWGCG8SiUJC6Fk295ulAsAk,18268
+agentle/agents/whatsapp/whatsapp_bot.py,sha256=D51UD2Wbi47RKgxUU8J7iWsxNMqV99Rzujz6TV1DjGw,160179
 agentle/agents/whatsapp/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-agentle/agents/whatsapp/models/audio_message.py,sha256=Cb4uYi4O4ANam8NGZkKVjwsrl8nCeuaHVwV9RvqvE8M,2656
+agentle/agents/whatsapp/models/audio_message.py,sha256=kUqG1HdNW6DCYD-CqscJ6WHlAyv9ufmTSKMdjio9XWk,2705
 agentle/agents/whatsapp/models/context_info.py,sha256=sk80KuNE36S6VRnLh7n6UXmzZCXIB4E4lNxnRyVizg8,563
 agentle/agents/whatsapp/models/data.py,sha256=iertlmc2zbzjuIdTubkO-4RuwB0ni1qx7UvvW7Dlhuo,1245
 agentle/agents/whatsapp/models/device_list_metadata.py,sha256=Nki7esmgi9Zq70L2t4yjJH77clvaljStchVGrXiDlbU,808
@@ -151,7 +152,7 @@ agentle/agents/whatsapp/models/message_context_info.py,sha256=msCSuu8uMN3G9GDaXd
 agentle/agents/whatsapp/models/quoted_message.py,sha256=QC4sp7eLPE9g9i-_f3avb0sDO7gKpkzZR2qkbxqptts,1073
 agentle/agents/whatsapp/models/video_message.py,sha256=-wujSwdYaE3tst7K_rUYCvx6v4lySTW1JZ5burF6slg,3422
 agentle/agents/whatsapp/models/whatsapp_audio_message.py,sha256=AAcnjzJC1O5VjyWZaSWpG_tmZFc2-CdcPn9abjyLrpc,378
-agentle/agents/whatsapp/models/whatsapp_bot_config.py,sha256=yLRGwu8pE5PVQmWH0VSjOoCteKfURKdyeNnPlYhniOs,20945
+agentle/agents/whatsapp/models/whatsapp_bot_config.py,sha256=hkbOAdSZbSt634mZEARuPQSer7wf3biL7dL9TFW-a7o,37164
 agentle/agents/whatsapp/models/whatsapp_contact.py,sha256=6iO6xmFs7z9hd1N9kZzGyNHYvCaUoCHn3Yi1DAJN4YU,240
 agentle/agents/whatsapp/models/whatsapp_document_message.py,sha256=ECM_hXF-3IbC9itbtZI0eA_XRNXFVefw9Mr-Lo_lrH0,323
 agentle/agents/whatsapp/models/whatsapp_image_message.py,sha256=xOAPRRSgqj9gQ2ZZOGdFWfOgtmNpE1W8mIUAmB5YTpo,314
@@ -177,6 +178,15 @@ agentle/agents/whatsapp/providers/twilio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 agentle/agents/whatsapp/providers/twilio/twilio_api_config.py,sha256=Xd9Ui5w3eAMfB12zJb_uQfzMFN5Gbx1Dgz7OIlUk0Yo,1580
 agentle/agents/whatsapp/providers/twilio/twilio_api_provider.py,sha256=7QbHEuQGozNVTf8xpxOR5RkYeA3om60nUlYbB4zmn5Y,29250
 agentle/agents/whatsapp/providers/twilio/twilio_webhook_parser.py,sha256=j9KCOZlbv9horcaFeQJ9fM9bGOr1YWsGqBWGuIhkFqY,10274
+agentle/agents/whatsapp/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+agentle/agents/whatsapp/v2/batch_processor_manager.py,sha256=2cwnFSstbfgIVdlHeMyf5qAr4fEQx_V7Jlt_4O5scWA,55
+agentle/agents/whatsapp/v2/bot_config.py,sha256=eRuDZgrb5EvnRUh8qWSOcyoWZfjOZ2dTEAWZtdHCYVc,7705
+agentle/agents/whatsapp/v2/in_memory_batch_processor_manager.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+agentle/agents/whatsapp/v2/message_limit.py,sha256=ea-ISLPNtm-jGsMLKF-gr0hQPDpB7HLqX7N5mh1WN28,199
+agentle/agents/whatsapp/v2/payload.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+agentle/agents/whatsapp/v2/whatsapp_bot.py,sha256=B6wrsv7oJswATxsjvwgBLJxCpFjpgf9crzuhcLmmz8g,413
+agentle/agents/whatsapp/v2/whatsapp_cloud_api_provider.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+agentle/agents/whatsapp/v2/whatsapp_provider.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/autonomous_systems/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/autonomous_systems/agent.py,sha256=tGrYTD4Rs4hgCF4mfHhjgMLPM0rNQZ5JACU_kA2cXe8,5078
 agentle/autonomous_systems/agent_input_type.py,sha256=mnzELBiKwgj0EYYM4U8GE50XRkys3m6ds_VR7aS-SGA,201
@@ -319,7 +329,7 @@ agentle/generations/providers/google/function_calling_config.py,sha256=5ZL1FDCfe
 agentle/generations/providers/google/google_generation_provider.py,sha256=9Dl8D7npzpHL7qwO7Mgqiu6fzmWzPh-7jfvB6ZuUdYI,25590
 agentle/generations/providers/google/adapters/__init__.py,sha256=sUwLR-CDzvWHn6hwqSsHYztws6DGx6ZiKp32vYeVMfk,1003
 agentle/generations/providers/google/adapters/agentle_tool_to_google_tool_adapter.py,sha256=XQM_aL5zVfrRbNwtO_lDwXqvT8iX83trDNbEPSjZLmI,28482
-agentle/generations/providers/google/adapters/generate_generate_content_response_to_generation_adapter.py,sha256=Z9v7c3NnnUFb-sqXQJHe_3ERb-o0eYzO_1JIGa2bRIM,17197
+agentle/generations/providers/google/adapters/generate_generate_content_response_to_generation_adapter.py,sha256=akzh75PmFnRF3X4L0QmF-lRokOTB9PR0ZFBv7nPTB3A,17234
 agentle/generations/providers/google/adapters/google_content_to_generated_assistant_message_adapter.py,sha256=4sOcT9VLr58YfEnkOm392odhNzzmbTspnnmrz5K6bHc,7829
 agentle/generations/providers/google/adapters/google_part_to_part_adapter.py,sha256=infqHs_LVjpzIOipIVbRHQesXTKoOHVLiTUFaPhaBV8,6520
 agentle/generations/providers/google/adapters/message_to_google_content_adapter.py,sha256=sJ6MEn_R-KkLTEsNhxmKhBDbzlKwOUYqinydag6hqi4,6071
@@ -960,7 +970,7 @@ agentle/utils/file_validation.py,sha256=Rv6y_ylBrDoslscCk2lkfr3LRMarY0J8qWhKJjZj
 agentle/utils/fix_base64_padding.py,sha256=IWBlMP3FYcWs17Y72tVxG7w1lzEKnstaDC9HRKmI56Y,1109
 agentle/utils/make_fields_optional.py,sha256=pu2u-jJ1pNyoQRyGQzxwXnYbWSzZ2G4ssebJvjYsH8A,7800
 agentle/utils/needs.py,sha256=JRTVvgVP0w0bpq1_w2Jly2lxXiONdHOYAYMvReFQcJM,5110
-agentle/utils/parse_streaming_json.py,sha256=OTEfPhack0s-hgmYR2dNqTaE_SUG_bj9SbscjoIA96o,30710
+agentle/utils/parse_streaming_json.py,sha256=9otgyfU37F-X9qbWHxgFmoYi9MSa9PPCarJ5CJ1Tcr0,31890
 agentle/utils/raise_error.py,sha256=EYX6WJS5gzJxgTyFYYOFHc-klEyU0tP20N5k_-ze5nQ,138
 agentle/utils/safe_b64decode.py,sha256=2nkdwUzkeVgtf3kb_zypjJY2KHe7dlLwa4ynjY2Yy1E,1272
 agentle/utils/safe_dill_dumps.py,sha256=yXQ51P05uSiWnREKJ6UWVjCKnRQTjgPVzoE1nylBbJI,237
@@ -993,7 +1003,7 @@ agentle/voice_cloning/voice_cloner.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 agentle/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/web/extraction_preferences.py,sha256=Xb4X6ZgnbDuu4Pp7cI0sdPcv6LaR1Q94FPTNEoHVTGg,985
 agentle/web/extraction_result.py,sha256=IsbRdT_wA9RVYGToCiz17XRoWMTtiFzxky96Zwqa4ZY,318
-agentle/web/extractor.py,sha256=HIqag1SEfWoQ97iwn2fYOfhEpjC4OJXnkn_WSAUsMs0,10889
+agentle/web/extractor.py,sha256=x3KlbJkKSnTaUD9vAx3n2jev-PKgcAlnGJxBPOdwFoM,10997
 agentle/web/location.py,sha256=RZgqb2rW7wUdcbw3PnmDtfr4FkTSSovW0j70ZOvoRiw,64
 agentle/web/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 agentle/web/actions/action.py,sha256=krxW5vXaqB1_JfnPpuo5cVJyANrlElu9P0B0TrF_aZs,723
@@ -1007,7 +1017,7 @@ agentle/web/actions/scroll.py,sha256=WqVVAORNDK3BL1oASZBPmXJYeSVkPgAOmWA8ibYO82I
 agentle/web/actions/viewport.py,sha256=KCwm88Pri19Qc6GLHC69HsRxmdJz1gEEAODfggC_fHo,287
 agentle/web/actions/wait.py,sha256=IKEywjf-KC4ni9Gkkv4wgc7bY-hk7HwD4F-OFWlyf2w,571
 agentle/web/actions/write_text.py,sha256=9mxfHcpKs_L7BsDnJvOYHQwG8M0GWe61SRJAsKk3xQ8,748
-agentle-0.9.23.dist-info/METADATA,sha256=OQxUrAm6kxfo2dh5nIh5rkJ2ZYconQ_QzC5D7AgSFqQ,86849
-agentle-0.9.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-agentle-0.9.23.dist-info/licenses/LICENSE,sha256=T90S9vqRS6qP-voULxAcvwEs558wRRo6dHuZrjgcOUI,1085
-agentle-0.9.23.dist-info/RECORD,,
+agentle-0.9.25.dist-info/METADATA,sha256=FQFBCmIzX4o197z2k9UyswQwuTBJOuAfRqEQelGDtwo,86849
+agentle-0.9.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+agentle-0.9.25.dist-info/licenses/LICENSE,sha256=T90S9vqRS6qP-voULxAcvwEs558wRRo6dHuZrjgcOUI,1085
+agentle-0.9.25.dist-info/RECORD,,