agently 4.0.5.7__tar.gz → 4.0.6__tar.gz

{agently-4.0.5.7 → agently-4.0.6}/PKG-INFO

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

{agently-4.0.5.7 → agently-4.0.6}/agently/_default_settings.yaml

@@ -22,6 +22,18 @@ prompt:
     assistant: assistant
     user: user
     _: assistant
+  prompt_title_mapping:
+    system: "SYSTEM"
+    developer: "DEVELOPER DIRECTIONS"
+    chat_history: "CHAT HISTORY"
+    info: "INFO"
+    tools: "TOOLS"
+    action_results: "ACTION RESULTS"
+    instruct: "INSTRUCT"
+    examples: "EXAMPLES"
+    input: "INPUT"
+    output: "OUTPUT"
+    output_requirement: "OUTPUT REQUIREMENT"
 response:
   streaming_parse: False
   streaming_parse_path_style: dot

{agently-4.0.5.7 → agently-4.0.6}/agently/builtins/agent_extensions/KeyWaiterExtension.py

@@ -19,6 +19,7 @@ from typing import Any, Callable
 from agently.core import BaseAgent
 from agently.utils import FunctionShifter, GeneratorConsumer
 
+
 class KeyWaiterExtension(BaseAgent):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -48,7 +49,7 @@ class KeyWaiterExtension(BaseAgent):
 
     def __get_consumer(self):
         response = self.get_response()
-        return GeneratorConsumer(response.get_async_generator(content="instant"))
+        return GeneratorConsumer(response.get_async_generator(type="instant"))
 
     async def async_get_key_result(
         self,

{agently-4.0.5.7 → agently-4.0.6}/agently/builtins/agent_extensions/ToolExtension.py

@@ -119,7 +119,7 @@ class ToolExtension(BaseAgent):
                 },
             )
             tool_judgement_response = tool_judgement_request.get_response()
-            tool_judgement_result = tool_judgement_response.get_async_generator(content="instant")
+            tool_judgement_result = tool_judgement_response.get_async_generator(type="instant")
             async for instant in tool_judgement_result:
                 if instant.path == "use_tool" and instant.is_complete:
                     if instant.value is False:

{agently-4.0.5.7 → agently-4.0.6}/agently/builtins/plugins/ModelRequester/OpenAICompatible.py

@@ -46,6 +46,7 @@ class ContentMapping(TypedDict):
     id: str | None
     role: str | None
     delta: str | None
+    tool_calls: str | None
     done: str | None
     usage: str | None
     finish_reason: str | None
@@ -114,11 +115,11 @@ class OpenAICompatible(ModelRequester):
             "id": "id",
             "role": "choices[0].delta.role",
             "delta": "choices[0].delta.content",
+            "tool_calls": "choices[0].delta.tool_calls",
             "done": None,
             "usage": "usage",
             "finish_reason": "choices[0].finish_reason",
             "extra_delta": {
-                "tool_calls": "choices[0].delta.tool_calls",
                 "function_call": "choices[0].delta.function_call",
             },
             "extra_done": None,
@@ -372,10 +373,15 @@ class OpenAICompatible(ModelRequester):
                 )
                 full_request_data.update(request_data.request_options)
                 try:
+                    has_done = False
                     async for sse in await self._aiter_sse_with_retry(
                         client, "POST", request_data.request_url, json=full_request_data, headers=headers_with_auth
                     ):
                         yield sse.event, sse.data
+                        if sse.data.strip() == "[DONE]":
+                            has_done = False
+                    if not has_done:
+                        yield "message", "[DONE]"
                 except SSEError as e:
                     response = await client.post(
                         request_data.request_url,
@@ -403,6 +409,12 @@ class OpenAICompatible(ModelRequester):
                             error = error_json["error"]
                             error_title = f"{ error['code'] if 'code' in error else 'unknown_code' } - { error['type'] if 'type' in error else 'unknown_type' }"
                             error_detail = error["message"] if "message" in error else ""
+                            self._messenger.error(
+                                f"Error: { error_title }\n"
+                                f"Detail: {error_detail }\n"
+                                f"Request Data: {full_request_data}",
+                                status="FAILED",
+                            )
                             yield "error", error_detail
                         else:
                             self._messenger.error(
@@ -497,6 +509,7 @@ class OpenAICompatible(ModelRequester):
         id_mapping = content_mapping["id"]
         role_mapping = content_mapping["role"]
         delta_mapping = content_mapping["delta"]
+        tool_calls_mapping = content_mapping["tool_calls"]
         done_mapping = content_mapping["done"]
         usage_mapping = content_mapping["usage"]
         finish_reason_mapping = content_mapping["finish_reason"]
@@ -540,6 +553,14 @@ class OpenAICompatible(ModelRequester):
                     if delta:
                         content_buffer += str(delta)
                         yield "delta", delta
+                if tool_calls_mapping:
+                    tool_calls = DataLocator.locate_path_in_dict(
+                        loaded_message,
+                        tool_calls_mapping,
+                        style=content_mapping_style,
+                    )
+                    if tool_calls:
+                        yield "tool_calls", tool_calls
                 if extra_delta_mapping:
                     for extra_key, extra_path in extra_delta_mapping.items():
                         extra_value = DataLocator.locate_path_in_dict(

{agently-4.0.5.7 → agently-4.0.6}/agently/builtins/plugins/PromptGenerator/AgentlyPromptGenerator.py

@@ -135,7 +135,7 @@ class AgentlyPromptGenerator(PromptGenerator):
     def _generate_yaml_prompt_list(self, title: str, prompt_part: Any) -> list[str]:
         sanitized_part = DataFormatter.sanitize(prompt_part)
         return [
-            f"[{ title.upper() }]:",
+            f"[{ title }]:",
             (
                 str(sanitized_part)
                 if isinstance(sanitized_part, (str, int, float, bool)) or sanitized_part is None
@@ -145,10 +145,11 @@ class AgentlyPromptGenerator(PromptGenerator):
         ]
 
     def _generate_main_prompt(self, prompt_object: PromptModel):
+        prompt_title_mapping = cast(dict[str, str], self.settings.get("prompt.prompt_title_mapping", {}))
         prompt_text_list = []
         # tools
         if prompt_object.tools and isinstance(prompt_object.tools, list):
-            prompt_text_list.append("[TOOLS]:")
+            prompt_text_list.append(f"[{ prompt_title_mapping.get('tools', 'TOOLS') }]:")
             for tool_info in prompt_object.tools:
                 if isinstance(tool_info, dict):
                     prompt_text_list.append("[")
@@ -163,11 +164,21 @@ class AgentlyPromptGenerator(PromptGenerator):
 
         # action_results
         if prompt_object.action_results:
-            prompt_text_list.extend(self._generate_yaml_prompt_list("ACTION RESULTS", prompt_object.action_results))
+            prompt_text_list.extend(
+                self._generate_yaml_prompt_list(
+                    str(
+                        prompt_title_mapping.get(
+                            'action_results',
+                            'ACTION RESULTS',
+                        )
+                    ),
+                    prompt_object.action_results,
+                )
+            )
 
         # info
         if prompt_object.info:
-            prompt_text_list.append("[INFO]:")
+            prompt_text_list.append(f"[{ prompt_title_mapping.get('info', 'INFO') }]:")
             if isinstance(prompt_object.info, Mapping):
                 for title, content in prompt_object.info.items():
                     prompt_text_list.append(f"- { title }: { DataFormatter.sanitize(content) }")
@@ -186,11 +197,45 @@ class AgentlyPromptGenerator(PromptGenerator):
 
         # instruct
         if prompt_object.instruct:
-            prompt_text_list.extend(self._generate_yaml_prompt_list("INSTRUCT", prompt_object.instruct))
+            prompt_text_list.extend(
+                self._generate_yaml_prompt_list(
+                    str(
+                        prompt_title_mapping.get(
+                            'instruct',
+                            'INSTRUCT',
+                        )
+                    ),
+                    prompt_object.instruct,
+                )
+            )
+
+        # examples
+        if prompt_object.examples:
+            prompt_text_list.extend(
+                self._generate_yaml_prompt_list(
+                    str(
+                        prompt_title_mapping.get(
+                            'examples',
+                            'EXAMPLES',
+                        )
+                    ),
+                    prompt_object.examples,
+                )
+            )
 
         # input
         if prompt_object.input:
-            prompt_text_list.extend(self._generate_yaml_prompt_list("INPUT", prompt_object.input))
+            prompt_text_list.extend(
+                self._generate_yaml_prompt_list(
+                    str(
+                        prompt_title_mapping.get(
+                            'input',
+                            'INPUT',
+                        )
+                    ),
+                    prompt_object.input,
+                )
+            )
 
         # output
         if prompt_object.output:
@@ -200,7 +245,7 @@ class AgentlyPromptGenerator(PromptGenerator):
                     final_output_dict.update(prompt_object.output)
                     prompt_text_list.extend(
                         [
-                            "[OUTPUT REQUIREMENT]:",
+                            f"[{ prompt_title_mapping.get('output_requirement', 'OUTPUT REQUIREMENT') }]:",
                             "Data Format: JSON",
                             "Data Structure:",
                             self._generate_json_output_prompt(DataFormatter.sanitize(final_output_dict)),
@@ -210,14 +255,16 @@ class AgentlyPromptGenerator(PromptGenerator):
                 case "markdown":
                     prompt_text_list.extend(
                         [
-                            "[OUTPUT REQUIREMENT]:",
+                            f"[{ prompt_title_mapping.get('output_requirement', 'OUTPUT REQUIREMENT') }]:",
                             "Data Format: markdown text",
                         ]
                     )
                 case "text":
                     pass
 
-        prompt_text_list.append("[OUTPUT]:")
+        prompt_text_list.append(
+            f"[{ prompt_title_mapping.get('output', 'OUTPUT') }]:",
+        )
         return prompt_text_list
 
     def _generate_yaml_prompt_message(
@@ -253,22 +300,47 @@ class AgentlyPromptGenerator(PromptGenerator):
         prompt_text_list = []
 
         merged_role_mapping = cast(dict[str, str], self.settings.get("prompt.role_mapping", {}))
+        prompt_title_mapping = cast(dict[str, str], self.settings.get("prompt.prompt_title_mapping", {}))
         if not isinstance(merged_role_mapping, dict):
             merged_role_mapping = {}
 
         if isinstance(role_mapping, dict):
             merged_role_mapping.update(role_mapping)
 
+        prompt_text_list.append(
+            f"{ (merged_role_mapping['user'] if 'user' in merged_role_mapping else 'user').upper() }:"
+        )
+
         # system & developer
         if prompt_object.system:
-            prompt_text_list.extend(self._generate_yaml_prompt_list("SYSTEM", prompt_object.system))
+            prompt_text_list.extend(
+                self._generate_yaml_prompt_list(
+                    str(
+                        prompt_title_mapping.get(
+                            'system',
+                            'SYSTEM',
+                        )
+                    ),
+                    prompt_object.system,
+                )
+            )
 
         if prompt_object.developer:
-            prompt_text_list.extend(self._generate_yaml_prompt_list("DEVELOPER DIRECTIONS", prompt_object.developer))
+            prompt_text_list.extend(
+                self._generate_yaml_prompt_list(
+                    str(
+                        prompt_title_mapping.get(
+                            'developer',
+                            'DEVELOPER DIRECTIONS',
+                        )
+                    ),
+                    prompt_object.developer,
+                )
+            )
 
         # chat_history
         if prompt_object.chat_history:
-            chat_history_lines = ["[CHAT HISTORY]:"]
+            chat_history_lines = [f"[{ prompt_title_mapping.get('chat_history', 'CHAT HISTORY') }]:"]
             content_adapter = TypeAdapter(ChatMessageContent)
             for message in prompt_object.chat_history:
                 role = (
@@ -296,7 +368,7 @@ class AgentlyPromptGenerator(PromptGenerator):
 
         prompt_text_list.extend(self._generate_main_prompt(prompt_object))
         prompt_text_list.append(
-            f"[{ merged_role_mapping['assistant'] if 'assistant' in merged_role_mapping else 'assistant' }]:"
+            f"{ (merged_role_mapping['assistant'] if 'assistant' in merged_role_mapping else 'assistant').upper() }:"
         )
 
         return "\n".join(prompt_text_list)
@@ -314,6 +386,8 @@ class AgentlyPromptGenerator(PromptGenerator):
         prompt_messages = []
 
         merged_role_mapping = cast(dict[str, str], self.settings.get("prompt.role_mapping", {}))
+        prompt_title_mapping = cast(dict[str, str], self.settings.get("prompt.prompt_title_mapping", {}))
+
         if not isinstance(merged_role_mapping, dict):
             merged_role_mapping = {}
 
@@ -324,7 +398,12 @@ class AgentlyPromptGenerator(PromptGenerator):
         if prompt_object.system:
             prompt_messages.append(
                 self._generate_yaml_prompt_message(
-                    "system",
+                    str(
+                        prompt_title_mapping.get(
+                            'system',
+                            'SYSTEM',
+                        )
+                    ),
                     prompt_object.system,
                     role_mapping=merged_role_mapping,
                 )
@@ -333,7 +412,12 @@ class AgentlyPromptGenerator(PromptGenerator):
         if prompt_object.developer:
             prompt_messages.append(
                 self._generate_yaml_prompt_message(
-                    "developer",
+                    str(
+                        prompt_title_mapping.get(
+                            'developer',
+                            'DEVELOPER DIRECTIONS',
+                        )
+                    ),
                     prompt_object.developer,
                     role_mapping=merged_role_mapping,
                 )
@@ -376,7 +460,12 @@ class AgentlyPromptGenerator(PromptGenerator):
                         0,
                         {
                             "role": "user",
-                            "content": [{"type": "text", "text": "[Chat History]"}],
+                            "content": [
+                                {
+                                    "type": "text",
+                                    "text": f"[{ prompt_title_mapping.get('chat_history', 'CHAT HISTORY') }]",
+                                }
+                            ],
                         },
                     )
                 if chat_history[-1]["role"] != "assistant":

{agently-4.0.5.7 → agently-4.0.6}/agently/builtins/plugins/ResponseParser/AgentlyResponseParser.py

@@ -22,6 +22,7 @@ from pydantic import BaseModel
 import json5
 
 from agently.types.plugins import ResponseParser
+from agently.types.data import StreamingData
 from agently.utils import (
     DataPathBuilder,
     RuntimeDataNamespace,
@@ -86,8 +87,8 @@ class AgentlyResponseParser(ResponseParser):
 
         self.get_meta = FunctionShifter.syncify(self.async_get_meta)
         self.get_text = FunctionShifter.syncify(self.async_get_text)
-        self.get_result = FunctionShifter.syncify(self.async_get_result)
-        self.get_result_object = FunctionShifter.syncify(self.async_get_result_object)
+        self.get_data = FunctionShifter.syncify(self.async_get_data)
+        self.get_data_object = FunctionShifter.syncify(self.async_get_data_object)
 
     @staticmethod
     def _on_register():
@@ -241,14 +242,20 @@ class AgentlyResponseParser(ResponseParser):
         await cast(GeneratorConsumer, self._response_consumer).get_result()
         return self.full_result_data["meta"]
 
-    async def async_get_result(
+    async def async_get_data(
         self,
         *,
-        content: Literal['original', 'parsed', "all"] = "parsed",
+        type: Literal['original', 'parsed', "all"] | None = "parsed",
+        content: Literal['original', 'parsed', "all"] | None = "parsed",
     ) -> Any:
         await self._ensure_consumer()
         await cast(GeneratorConsumer, self._response_consumer).get_result()
-        match content:
+        if type is None and content is not None:
+            warnings.warn(
+                f"Parameter `content` in method .async_get_data() is  deprecated and will be removed in future version, please use parameter `type` instead."
+            )
+            type = content
+        match type:
             case "original":
                 return self.full_result_data["original_done"].copy()
             case "parsed":
@@ -257,7 +264,7 @@ class AgentlyResponseParser(ResponseParser):
             case "all":
                 return self.full_result_data.copy()
 
-    async def async_get_result_object(self) -> BaseModel | None:
+    async def async_get_data_object(self) -> BaseModel | None:
         if self._prompt_object.output_format != "json":
             raise TypeError(
                 "Error: Cannot build an output model for a non-structure output.\n"
@@ -275,23 +282,36 @@ class AgentlyResponseParser(ResponseParser):
 
     async def get_async_generator(
         self,
-        content: Literal['all', 'delta', 'original', 'instant', 'streaming_parse'] | None = "delta",
+        type: Literal['all', 'delta', 'typed_delta', 'original', 'instant', 'streaming_parse'] | None = "delta",
+        content: Literal['all', 'delta', 'typed_delta', 'original', 'instant', 'streaming_parse'] | None = "delta",
     ) -> AsyncGenerator:
         await self._ensure_consumer()
         parsed_generator = cast(GeneratorConsumer, self._response_consumer).get_async_generator()
         _streaming_parse_path_style = self.settings.get("response.streaming_parse_path_style", "dot")
+        if type is None and content is not None:
+            warnings.warn(
+                f"Parameter `content` in method .get_async_generator() is  deprecated and will be removed in future version, please use parameter `type` instead."
+            )
+            type = content
         async for event, data in parsed_generator:
-            match content:
+            match type:
                 case "all":
                     yield event, data
                 case "delta":
                     if event == "delta":
                         yield data
+                case "typed_delta":
+                    if event == "delta":
+                        yield "delta", data
+                    elif event == "tool_calls":
+                        yield "tool_calls", data
                 case "instant" | "streaming_parse":
                     if self._streaming_json_parser is not None:
                         streaming_parsed = None
                         if event == "delta":
                             streaming_parsed = self._streaming_json_parser.parse_chunk(data)
+                        elif event == "tool_calls":
+                            yield StreamingData(path="$tool_calls", value=data)
                         elif event == "done":
                             streaming_parsed = self._streaming_json_parser.finalize()
                         if streaming_parsed:
@@ -305,23 +325,36 @@ class AgentlyResponseParser(ResponseParser):
 
     def get_generator(
         self,
-        content: Literal['all', 'delta', 'original', 'instant', 'streaming_parse'] | None = "delta",
+        type: Literal['all', 'delta', 'typed_delta', 'original', 'instant', 'streaming_parse'] | None = "delta",
+        content: Literal['all', 'delta', 'typed_delta', 'original', 'instant', 'streaming_parse'] | None = "delta",
     ) -> Generator:
         asyncio.run(self._ensure_consumer())
         parsed_generator = cast(GeneratorConsumer, self._response_consumer).get_generator()
         _streaming_parse_path_style = self.settings.get("response.streaming_parse_path_style", "dot")
+        if type is None and content is not None:
+            warnings.warn(
+                f"Parameter `content` in method .get_generator() is  deprecated and will be removed in future version, please use parameter `type` instead."
+            )
+            type = content
         for event, data in parsed_generator:
-            match content:
+            match type:
                 case "all":
                     yield event, data
                 case "delta":
                     if event == "delta":
                         yield data
+                case "typed_delta":
+                    if event == "delta":
+                        yield "delta", data
+                    elif event == "tool_calls":
+                        yield "tool_calls", data
                 case "instant" | "streaming_parse":
                     if self._streaming_json_parser is not None:
                         streaming_parsed = None
                         if event == "delta":
                             streaming_parsed = self._streaming_json_parser.parse_chunk(data)
+                        elif event == "tool_calls":
+                            yield StreamingData(path="$tool_calls", value=data)
                         elif event == "done":
                             streaming_parsed = self._streaming_json_parser.finalize()
                         if streaming_parsed:

{agently-4.0.5.7 → agently-4.0.6}/agently/builtins/tools/Search.py

@@ -13,15 +13,16 @@
 # limitations under the License.
 
 
-from typing import Literal
+from typing import Any, Literal
 
-from agently.utils import LazyImport
+from agently.utils import LazyImport, FunctionShifter
 
 
 class Search:
 
     def __init__(
         self,
+        *,
         proxy: str | None = None,
         timeout: int | None = None,
         backend: (
@@ -31,6 +32,76 @@ class Search:
             Literal["auto", "bing", "duckduckgo", "yahoo", "google", "mullvad_google", "yandex", "wikipedia"] | None
         ) = None,
         news_backend: Literal["auto", "bing", "duckduckgo", "yahoo"] | None = None,
+        region: Literal[
+            "xa-ar",
+            "xa-en",
+            "ar-es",
+            "au-en",
+            "at-de",
+            "be-fr",
+            "be-nl",
+            "br-pt",
+            "bg-bg",
+            "ca-en",
+            "ca-fr",
+            "ct-ca",
+            "cl-es",
+            "cn-zh",
+            "co-es",
+            "hr-hr",
+            "cz-cs",
+            "dk-da",
+            "ee-et",
+            "fi-fi",
+            "fr-fr",
+            "de-de",
+            "gr-el",
+            "hk-tzh",
+            "hu-hu",
+            "in-en",
+            "id-id",
+            "id-en",
+            "ie-en",
+            "il-he",
+            "it-it",
+            "jp-jp",
+            "kr-kr",
+            "lv-lv",
+            "lt-lt",
+            "xl-es",
+            "my-ms",
+            "my-en",
+            "mx-es",
+            "nl-nl",
+            "nz-en",
+            "no-no",
+            "pe-es",
+            "ph-en",
+            "ph-tl",
+            "pl-pl",
+            "pt-pt",
+            "ro-ro",
+            "ru-ru",
+            "sg-en",
+            "sk-sk",
+            "sl-sl",
+            "za-en",
+            "es-es",
+            "se-sv",
+            "ch-de",
+            "ch-fr",
+            "ch-it",
+            "tw-tzh",
+            "th-th",
+            "tr-tr",
+            "ua-uk",
+            "uk-en",
+            "us-en",
+            "ue-es",
+            "ve-es",
+            "vn-vi",
+        ] = "us-en",
+        options: dict[str, Any] | None = None,
     ):
         LazyImport.import_package("ddgs")
         from ddgs import DDGS
@@ -42,6 +113,8 @@ class Search:
             "search": search_backend if search_backend is not None else backend,
             "news": news_backend if news_backend is not None else backend,
         }
+        self.region = region
+        self._extra_options = options or {}
 
     async def search(
         self,
@@ -60,11 +133,14 @@ class Search:
         Returns:
             List of dictionaries with search results.
         """
-        return self.ddgs.text(
+        search_text = FunctionShifter.auto_options_func(self.ddgs.text)
+        return search_text(
             query=query,
             timelimit=timelimit,
             max_results=max_results,
             backend=self.backends.get("search", "auto"),
+            region=self.region,
+            **self._extra_options,
         )
 
     async def search_news(
@@ -84,11 +160,14 @@ class Search:
         Returns:
             List of dictionaries with news search results.
         """
-        return self.ddgs.news(
+        search_news = FunctionShifter.auto_options_func(self.ddgs.news)
+        return search_news(
             query=query,
             timelimit=timelimit,
             max_results=max_results,
             backend=self.backends.get("news", "auto"),
+            region=self.region,
+            **self._extra_options,
         )
 
     async def search_wikipedia(
@@ -108,11 +187,14 @@ class Search:
         Returns:
             List of dictionaries with search results.
         """
-        return self.ddgs.text(
+        search_wikipedia = FunctionShifter.auto_options_func(self.ddgs.text)
+        return search_wikipedia(
             query=query,
             timelimit=timelimit,
             max_results=max_results,
             backend="wikipedia",
+            region=self.region,
+            **self._extra_options,
         )
 
     async def search_arxiv(