agently 4.0.7__py3-none-any.whl → 4.0.7.1__py3-none-any.whl

agently/_default_settings.yaml

@@ -43,6 +43,7 @@ runtime:
   show_model_logs: False
   show_tool_logs: False
   show_trigger_flow_logs: False
+  httpx_log_level: "WARNING"
 plugins:
   ToolManager:
-    activate: AgentlyToolManager
+    activate: AgentlyToolManager

agently/base.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import logging
 from typing import Any, Literal, Type, TYPE_CHECKING, TypeVar, Generic, cast
 
 from agently.utils import Settings, create_logger, FunctionShifter, DataFormatter
@@ -37,6 +38,10 @@ _hook_default_event_handlers(event_center)
 async_system_message = event_center.async_system_message
 system_message = event_center.system_message
 logger = create_logger()
+httpx_level_name = settings.get("runtime.httpx_log_level", "WARNING")
+httpx_level = getattr(logging, str(httpx_level_name).upper(), logging.WARNING)
+logging.getLogger("httpx").setLevel(httpx_level)
+logging.getLogger("httpcore").setLevel(httpx_level)
 tool = Tool(plugin_manager, settings)
 _agently_messenger = event_center.create_messenger("Agently")
 
@@ -70,11 +75,13 @@ settings.update_mappings(
                     "runtime.show_model_logs": True,
                     "runtime.show_tool_logs": True,
                     "runtime.show_trigger_flow_logs": True,
+                    "runtime.httpx_log_level": "INFO",
                 },
                 False: {
                     "runtime.show_model_logs": False,
                     "runtime.show_tool_logs": False,
                     "runtime.show_trigger_flow_logs": False,
+                    "runtime.httpx_log_level": "WARNING",
                 },
             }
         }
@@ -117,7 +124,16 @@ class AgentlyMain(Generic[A]):
         self.tool = tool
         self.AgentType = AgentType
 
-        self.set_settings = self.settings.set_settings
+        def set_settings(key: str, value: "SerializableValue", *, auto_load_env: bool = False):
+            self.settings.set_settings(key, value, auto_load_env=auto_load_env)
+            if key in ("runtime.httpx_log_level", "debug"):
+                level_name = self.settings.get("runtime.httpx_log_level", "WARNING")
+                level = getattr(logging, str(level_name).upper(), logging.WARNING)
+                logging.getLogger("httpx").setLevel(level)
+                logging.getLogger("httpcore").setLevel(level)
+            return self
+
+        self.set_settings = set_settings
 
     def set_debug_console(self, debug_console_status: Literal["ON", "OFF"]):
         match debug_console_status:

agently/builtins/plugins/PromptGenerator/AgentlyPromptGenerator.py

@@ -589,13 +589,29 @@ class AgentlyPromptGenerator(PromptGenerator):
         fields = {}
         validators = {}
 
-        def ensure_list_and_cast(v: Any, target_type: type):
+        def ensure_list_and_cast(v: Any, target_type: Any):
             if not isinstance(v, list):
                 v = [v]
-            return [
-                (target_type(item) if target_type is not Any and not isinstance(item, target_type) else item)
-                for item in v
-            ]
+            casted = []
+            for item in v:
+                if target_type is Any or not isinstance(target_type, type):
+                    casted.append(item)
+                    continue
+                target_type = cast(type, target_type)
+                if isinstance(item, target_type):
+                    casted.append(item)
+                    continue
+                if isinstance(item, Mapping):
+                    model_validate = getattr(target_type, "model_validate", None)
+                    if callable(model_validate):
+                        casted.append(model_validate(item))
+                        continue
+                    parse_obj = getattr(target_type, "parse_obj", None)
+                    if callable(parse_obj):
+                        casted.append(parse_obj(item))
+                        continue
+                casted.append(target_type(item))
+            return casted
 
         if isinstance(schema, Mapping):
             for field_name, field_type_schema in schema.items():

agently/builtins/tools/Search.py

@@ -103,7 +103,7 @@ class Search:
         ] = "us-en",
         options: dict[str, Any] | None = None,
     ):
-        LazyImport.import_package("ddgs")
+        LazyImport.import_package("ddgs", version_constraint=">=9.10.0")
         from ddgs import DDGS
 
         self.proxy = proxy

agently/core/ModelRequest.py

@@ -153,6 +153,11 @@ class ModelResponseResult:
                         return await self._response_parser.async_get_data(type=type)
         return await self._response_parser.async_get_data(type=type)
 
+    @overload
+    async def async_get_data_object(
+        self,
+    ) -> "BaseModel | None": ...
+
     @overload
     async def async_get_data_object(
         self,
@@ -467,7 +472,7 @@ class ModelRequest:
         prompt: Any,
         mappings: dict[str, Any] | None = None,
     ):
-        self.prompt.set("system", ["YOU MUST REACT AND RESPOND AS {system.role}!"])
+        self.prompt.set("system", ["YOU MUST REACT AND RESPOND AS {system.your_role}!"])
         self.prompt.set("system.your_role", prompt, mappings)
         return self
 

agently/core/TriggerFlow/TriggerFlow.py

@@ -227,7 +227,7 @@ class TriggerFlow:
         self,
         initial_value: Any = None,
         *,
-        timeout: int | None = 10,
+        timeout: float | None = 10.0,
         concurrency: int | None = None,
     ):
         execution = self.create_execution(concurrency=concurrency)

agently/core/TriggerFlow/process/BaseProcess.py

@@ -294,16 +294,20 @@ class TriggerFlowBaseProcess:
                 chunk = self._flow_chunk(chunk_name)(chunk_func)
             else:
                 chunk = self._flow_chunk(chunk.__name__)(chunk) if callable(chunk) else chunk
+            typed_chunk = cast(TriggerFlowChunk, chunk)
             triggers_to_wait[chunk.trigger] = False
             trigger_to_chunk_name[chunk.trigger] = chunk.name
             results[chunk.name] = None
 
             if semaphore is None:
-                handler = chunk.async_call
+                handler = typed_chunk.async_call
             else:
-                async def handler(data: "TriggerFlowEventData", _chunk=chunk):
-                    async with semaphore:
-                        return await _chunk.async_call(data)
+                def make_handler(bound_chunk: TriggerFlowChunk):
+                    async def handler(data: "TriggerFlowEventData"):
+                        async with semaphore:
+                            return await bound_chunk.async_call(data)
+                    return handler
+                handler = make_handler(typed_chunk)
 
             self._blue_print.add_handler(
                 self.trigger_type,

agently/utils/DataFormatter.py

@@ -56,15 +56,21 @@ class DataFormatter:
             if issubclass(value, BaseModel):
                 extracted_value = {}
                 for name, field in value.model_fields.items():
+                    annotation = field.annotation
+                    if hasattr(field, "rebuild_annotation"):
+                        try:
+                            annotation = field.rebuild_annotation()
+                        except Exception:
+                            annotation = field.annotation
                     extracted_value.update(
                         {
                             name: (
                                 (
-                                    DataFormatter.sanitize(field.annotation, remain_type=remain_type),
+                                    DataFormatter.sanitize(annotation, remain_type=remain_type),
                                     field.description,
                                 )
                                 if field.description
-                                else (DataFormatter.sanitize(field.annotation, remain_type=remain_type),)
+                                else (DataFormatter.sanitize(annotation, remain_type=remain_type),)
                             )
                         }
                     )

agently/utils/DataLocator.py

@@ -21,6 +21,101 @@ if TYPE_CHECKING:
 
 
 class DataLocator:
+    @staticmethod
+    def _locate_path_parts(
+        result: Any,
+        path_parts: list[str],
+        *,
+        style: Literal["dot", "slash"],
+        default: Any,
+    ):
+        if not path_parts:
+            return result
+        path_part = path_parts[0]
+        remaining = path_parts[1:]
+        if style == "dot":
+            if "[" in path_part:
+                path_key_and_index = path_part.split("[")
+                path_key = path_key_and_index[0]
+                path_index = path_key_and_index[1][:-1]
+                if isinstance(result, Mapping):
+                    result = result.get(path_key, default)
+                else:
+                    return default
+                if path_index in ("*", ""):
+                    if not isinstance(result, str) and isinstance(result, Sequence):
+                        values = []
+                        for item in result:
+                            value = DataLocator._locate_path_parts(
+                                item,
+                                remaining,
+                                style=style,
+                                default=default,
+                            )
+                            if value is default:
+                                return default
+                            values.append(value)
+                        return values
+                    return default
+                try:
+                    index = int(path_index)
+                except Exception:
+                    return default
+                if not isinstance(result, str) and isinstance(result, Sequence):
+                    try:
+                        return DataLocator._locate_path_parts(
+                            result[index],
+                            remaining,
+                            style=style,
+                            default=default,
+                        )
+                    except Exception:
+                        return default
+                return default
+            else:
+                if isinstance(result, Mapping):
+                    return DataLocator._locate_path_parts(
+                        result.get(path_part, default),
+                        remaining,
+                        style=style,
+                        default=default,
+                    )
+                return default
+        else:
+            if path_part == "*":
+                if not isinstance(result, str) and isinstance(result, Sequence):
+                    values = []
+                    for item in result:
+                        value = DataLocator._locate_path_parts(
+                            item,
+                            remaining,
+                            style=style,
+                            default=default,
+                        )
+                        if value is default:
+                            return default
+                        values.append(value)
+                    return values
+                return default
+            if isinstance(result, Mapping):
+                return DataLocator._locate_path_parts(
+                    result.get(path_part, default),
+                    remaining,
+                    style=style,
+                    default=default,
+                )
+            if not isinstance(result, str) and isinstance(result, Sequence):
+                try:
+                    return DataLocator._locate_path_parts(
+                        result[int(path_part)],
+                        remaining,
+                        style=style,
+                        default=default,
+                    )
+                except Exception:
+                    return default
+            return default
+
     @staticmethod
     def locate_path_in_dict(
         original_dict: dict,
@@ -34,42 +129,24 @@ class DataLocator:
         match style:
             case "dot":
                 try:
-                    result = original_dict
                     path_parts = path.split(".")
-                    for path_part in path_parts:
-                        if "[" in path_part:
-                            path_key_and_index = path_part.split("[")
-                            path_key = path_key_and_index[0]
-                            path_index = int(path_key_and_index[1][:-1])
-                            if isinstance(result, Mapping):
-                                result = result[path_key]
-                            else:
-                                return default
-                            if not isinstance(result, str) and isinstance(result, Sequence):
-                                result = result[path_index]
-                            else:
-                                return default
-                        else:
-                            if isinstance(result, Mapping):
-                                result = result[path_part]
-                            else:
-                                return default
-                    return result
+                    return DataLocator._locate_path_parts(
+                        original_dict,
+                        path_parts,
+                        style="dot",
+                        default=default,
+                    )
                 except Exception:
                     return default
             case "slash":
-                result = original_dict
-                path_parts = path.split("/")
                 try:
-                    for path_part in path_parts:
-                        if path_part:
-                            if isinstance(result, Mapping):
-                                result = result[path_part]
-                            elif not isinstance(result, str) and isinstance(result, Sequence):
-                                result = result[int(path_part)]
-                            else:
-                                return default
-                    return result
+                    path_parts = [part for part in path.split("/") if part]
+                    return DataLocator._locate_path_parts(
+                        original_dict,
+                        path_parts,
+                        style="slash",
+                        default=default,
+                    )
                 except Exception:
                     return default
 

{agently-4.0.7.dist-info → agently-4.0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agently
-Version: 4.0.7
+Version: 4.0.7.1
 Summary: 
 License: Apache-2.0
 License-File: LICENSE

{agently-4.0.7.dist-info → agently-4.0.7.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 agently/__init__.py,sha256=Gf0LL7Czqeuf6hfvHfEGlACLg0d0osQupyMATB0EBlc,884
 agently/_default_init.py,sha256=AhYwzZYOxqDeIoVb8cvPjJ2BjE5V7wxeuH7R-MNZWyg,2057
-agently/_default_settings.yaml,sha256=6woqJ2tjg_jl6kwSOwmTMETfVraHidort2smf0Is_qQ,1357
-agently/base.py,sha256=U92SWzoU7h7Gl92r8bEv-7wsGUPrUlxXyDohLX-2qCo,4629
+agently/_default_settings.yaml,sha256=iyi82glfRk0-7d_n7FvuDjNDxBKGDbeaRA-GfHOW6tE,1387
+agently/base.py,sha256=hc5ayuEQiL8Uus9NVrKFTIjyc73SwRKkdwfLFlNsmKo,5543
 agently/builtins/agent_extensions/AutoFuncExtension.py,sha256=TmwMazwPzb5WXfDqfedY5yZOOMTFIHqaB9Bte29adUc,2433
 agently/builtins/agent_extensions/ChatSessionExtension.py,sha256=Y6mvnsfAY0rykKtfp-tApwJy5O4SS-YEt2-jaWr83uc,12034
 agently/builtins/agent_extensions/ConfigurePromptExtension.py,sha256=9wy2zHIDVHbUlj5sI0A03SscUWSzZNc9hNJSEdXFXd0,11390
@@ -12,17 +12,17 @@ agently/builtins/hookers/ConsoleHooker.py,sha256=aJdDj_nG8CiwyelA505zvtpzBSwD52n
 agently/builtins/hookers/PureLoggerHooker.py,sha256=fzN0OfhQzgns4KeCNH-qcdm-BdQT0W2kqEmt3Zp2pYI,1906
 agently/builtins/hookers/SystemMessageHooker.py,sha256=1nh1FY70PYyZOAQGfQiGnwIvo4ZF3NSAjeghI3sInn4,7207
 agently/builtins/plugins/ModelRequester/OpenAICompatible.py,sha256=CFTMZHENOi6qsrUfWtgq19P6Ec7H-8vRybVVr4RZfJQ,26773
-agently/builtins/plugins/PromptGenerator/AgentlyPromptGenerator.py,sha256=GRRR9uxgyCXHKgt_r2BinWnhKy8rYUN8CG9ld2P8n4E,30841
+agently/builtins/plugins/PromptGenerator/AgentlyPromptGenerator.py,sha256=9iJYOhVh060vpRJrxFF0BkMP3lAmDjgsl_AWM-dRRtE,31583
 agently/builtins/plugins/ResponseParser/AgentlyResponseParser.py,sha256=5iF6NLoMjTtEC3hc-DmatFmSWZK2nKkoiyqHK7Q3Yj4,17847
 agently/builtins/plugins/ToolManager/AgentlyToolManager.py,sha256=oaqte5LAryZQMD6vuEbKhe6kOLUyZTRZswC1MDFiYxw,9138
 agently/builtins/plugins/__init__.py,sha256=wj4_U9TTekc2CmjppbXKUREDFRXFX1y0ySOW-CxQuok,801
 agently/builtins/tools/Browse.py,sha256=gIePs-gtsqOI_ZTReGqEcoKvhs4FkBzTxow--QS5_ek,3469
-agently/builtins/tools/Search.py,sha256=tUynNiW_ZMAGaB2ua3HRcY_trIbLEoASFE-p2QMQ0Zg,7362
+agently/builtins/tools/Search.py,sha256=GtlHppD5RelxMSFDchFD3jdVhaDndh6lZ3Lu9YH0OzM,7393
 agently/builtins/tools/__init__.py,sha256=pFOWgH2C3xRvgQo3UVdkj4yHjF9nNtmoVHmOZfoGsyU,647
 agently/core/Agent.py,sha256=LWkzWG_XXrC4oVkWg4ebnAqAJ81O9UEo1n-qJj7IIrc,10251
 agently/core/EventCenter.py,sha256=sknU5w9MpGDQgMOF9c5k4PfM4SNT5X_LrpYte2HaFNM,10861
 agently/core/ExtensionHandlers.py,sha256=88iSAW50bgMshB56cTgKg30eOjZQyXiJY1en4w7afWY,2076
-agently/core/ModelRequest.py,sha256=t9tnC0uON89MkuuRHPPOgk3xOLz6G953sInvKDMD00o,24526
+agently/core/ModelRequest.py,sha256=tPuFl_v_P85Mhj669cA5Hi9zAfMNzB5jib8APIXh13s,24630
 agently/core/PluginManager.py,sha256=fwRxvqPMgXYIrclhRHtkaPsyvn6SaeBFqvL7tTzYwck,4410
 agently/core/Prompt.py,sha256=uvGGvbND08b0OhkD-UXY0J65yLedllBt4lMqk4NYl1U,6893
 agently/core/Tool.py,sha256=PNYf_BwVefr8IOqf5asLaVq2fU7hQaFJwJVj3S4fq84,1871
@@ -30,9 +30,9 @@ agently/core/TriggerFlow/BluePrint.py,sha256=H_TYymWOci-ZvQzqyRxpkHjO77zlzXLukLU
 agently/core/TriggerFlow/Chunk.py,sha256=xPWr_ofpl-iG4jHIJfB5mPanmn70pq7x8GCcz3G8NPc,1583
 agently/core/TriggerFlow/Execution.py,sha256=EsiZOIeoflyQceRenK5uUL_maML3w7DKgamqlKBQCOE,12500
 agently/core/TriggerFlow/Process.py,sha256=doIDUa7x0j1TVuOhp-hraC0hHLwpistF-Dksf76NJvQ,837
-agently/core/TriggerFlow/TriggerFlow.py,sha256=1y2RmrCE5Ga7iMr67xGUBsTaXykKXIFHR3390deqo-k,8029
+agently/core/TriggerFlow/TriggerFlow.py,sha256=nZfoxtOQocnHmx5hx15ZxK3F9ef-s_CfwRtXUmtwfys,8033
 agently/core/TriggerFlow/__init__.py,sha256=eHc6ldUIS0kka_1fZXkdaHFnSDoXaGSvXggwVszMAJQ,911
-agently/core/TriggerFlow/process/BaseProcess.py,sha256=lIr1kCgxwHxlReZp0-C3kS0wMkPtDbZ1UExI2fKbtOQ,15256
+agently/core/TriggerFlow/process/BaseProcess.py,sha256=tBAMCI2Yd8Ylfi5CpkhlSVLH5Hra2Q_CgWg5LDqhGfo,15473
 agently/core/TriggerFlow/process/ForEachProcess.py,sha256=DD4frz9mTsKgnPXnHJD53hL6uiiU6h338p7ipud8zMU,4897
 agently/core/TriggerFlow/process/MatchCaseProcess.py,sha256=MKY5Yh66JiMABhCzamRl8UZOBjbD75TFp84Jw6o_t68,7900
 agently/core/TriggerFlow/process/__init__.py,sha256=BP5bAr9LRVVD83KFqXeprgTmXA1iCSOSsD509BtoX_E,753
@@ -55,8 +55,8 @@ agently/types/plugins/__init__.py,sha256=gz_EpgBQGndIQHY5vJB2YRzAN5yIb3FZZG7pC8l
 agently/types/plugins/base.py,sha256=AoNLwsH5IZBQt7_NZfxMWMhAk6PJSOFHR0IYOXp1imI,1167
 agently/types/trigger_flow/__init__.py,sha256=Gj31SmWBC4qtrOqQedyGsnCfeSkUf3XvZNFrJ2QbMNw,777
 agently/types/trigger_flow/trigger_flow.py,sha256=6lvhDwizIV5p3h61l1GsmJU_9Tw8v3u-SnHuygkSJdo,3799
-agently/utils/DataFormatter.py,sha256=qdPtLPIQs9eCZ-hPBphan5CcPrR7Nz8h8cb7zF8F1j0,12050
-agently/utils/DataLocator.py,sha256=ss8OLet9HN0U1PZb-OCHS6KL54kv7vFZph6G0-GBidk,6015
+agently/utils/DataFormatter.py,sha256=D45eBlH9CTEs8xNWrDYw9pxUcNnCGVnm0_y97-VyMuU,12346
+agently/utils/DataLocator.py,sha256=0TSMONLPYQVvdJftoXcW4BMhwGFl2JrovAGH3LTthn4,8652
 agently/utils/DataPathBuilder.py,sha256=sEzE1i2EWn7NMkCCXDT50gR6_qMzcZ0y0YGkYbXdB3s,10007
 agently/utils/FunctionShifter.py,sha256=quwugTmf-vzHzRR_2wdv14AxLpr0lwxdUtVoX7Jeq48,5839
 agently/utils/GeneratorConsumer.py,sha256=EXpz2XGnv6rPdz8bPetJu3LpWIVhMvIi8GLG1Bpe7Ys,7459
@@ -71,7 +71,7 @@ agently/utils/Storage.py,sha256=E7QyNJ9T0yOUafPgdP90La698hgLMSGjhJ7qCEHzxxw,9438
 agently/utils/StreamingJSONCompleter.py,sha256=aZ9zuGUTQlP-QKbXHUZCf6EtVuG49MKn8xdhw0VhDEA,4292
 agently/utils/StreamingJSONParser.py,sha256=sPPJOtj5OYvsrukRErcoxRl4yuV1zDuf7pQ_pvw_Zow,21116
 agently/utils/__init__.py,sha256=Uq3uQdk2_OX_m6gF9wAvs4_scC-tsE4EjNTxN_oDagw,1321
-agently-4.0.7.dist-info/METADATA,sha256=pBzUn8zbTtsZscLIDYNBaJ0IiCkEgzZ117Qzgh3TaLY,7110
-agently-4.0.7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-agently-4.0.7.dist-info/licenses/LICENSE,sha256=Y5ZgAdYgMFigPT8dhN18dTLRtBshOSfWhTDRO1t0Cq4,11360
-agently-4.0.7.dist-info/RECORD,,
+agently-4.0.7.1.dist-info/METADATA,sha256=WY94JMooQ57E-n3mWTDbPcx32-V_NhFI-JyY66gVOpM,7112
+agently-4.0.7.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+agently-4.0.7.1.dist-info/licenses/LICENSE,sha256=Y5ZgAdYgMFigPT8dhN18dTLRtBshOSfWhTDRO1t0Cq4,11360
+agently-4.0.7.1.dist-info/RECORD,,