agently 4.0.6.7__tar.gz → 4.0.6.9__tar.gz

{agently-4.0.6.7 → agently-4.0.6.9}/PKG-INFO

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

{agently-4.0.6.7 → agently-4.0.6.9}/agently/builtins/agent_extensions/ConfigurePromptExtension.py

@@ -188,6 +188,7 @@ class ConfigurePromptExtension(BaseAgent):
                 "Cannot execute YAML prompt configures, expect prompt configures as a dictionary data but got:"
                 f"{ prompt }"
             )
+        return self
 
     def load_json_prompt(self, path_or_content: str, mappings: dict[str, Any] | None = None):
         path = Path(path_or_content)
@@ -209,3 +210,4 @@ class ConfigurePromptExtension(BaseAgent):
                 "Cannot execute JSON prompt configures, expect prompt configures as a dictionary data but got:"
                 f"{ prompt }"
             )
+        return self

{agently-4.0.6.7 → agently-4.0.6.9}/agently/builtins/plugins/PromptGenerator/AgentlyPromptGenerator.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
 import yaml
 
 from typing import (
@@ -38,6 +39,7 @@ from agently.utils import SettingsNamespace, DataFormatter
 
 if TYPE_CHECKING:
     from pydantic import BaseModel
+    from agently.types.data import SerializableData
     from agently.core import Prompt
     from agently.utils import Settings
 
@@ -649,7 +651,12 @@ class AgentlyPromptGenerator(PromptGenerator):
                         }
                     )
 
-            return create_model(name, **fields, **validators)
+            return create_model(
+                name,
+                __config__={'extra': 'allow'},
+                **fields,
+                **validators,
+            )
         else:
             item_type = Any
             if len(schema) > 0:
@@ -698,3 +705,53 @@ class AgentlyPromptGenerator(PromptGenerator):
                 "AgentlyOutput",
                 {"list": DataFormatter.sanitize(output_prompt, remain_type=True)},
             )
+
+    def _to_serializable_output_prompt(self, output_prompt_part: Any):
+        if not isinstance(output_prompt_part, (Mapping, Sequence)) or isinstance(output_prompt_part, str):
+            return output_prompt_part
+
+        if isinstance(output_prompt_part, Mapping):
+            result = {}
+            for key, value in output_prompt_part.items():
+                result[key] = self._to_serializable_output_prompt(value)
+            return result
+        else:
+            if isinstance(output_prompt_part, tuple):
+                match len(output_prompt_part):
+                    case 0:
+                        return []
+                    case 1:
+                        return {
+                            "$type": output_prompt_part[0],
+                        }
+                    case _:
+                        return {
+                            "$type": output_prompt_part[0],
+                            "$desc": ";".join(output_prompt_part[1:]),
+                        }
+            else:
+                return list(output_prompt_part)
+
+    def to_serializable_prompt_data(self, inherit: bool = False) -> "SerializableData":
+        prompt_data = self.prompt.get(
+            default={},
+            inherit=inherit,
+        )
+        if "output" in prompt_data:
+            prompt_data["output"] = self._to_serializable_output_prompt(prompt_data["output"])
+        return DataFormatter.sanitize(prompt_data)
+
+    def to_json_prompt(self, inherit: bool = False):
+        return json.dumps(
+            self.to_serializable_prompt_data(inherit),
+            indent=2,
+            ensure_ascii=False,
+        )
+
+    def to_yaml_prompt(self, inherit: bool = False):
+        return yaml.safe_dump(
+            self.to_serializable_prompt_data(inherit),
+            indent=2,
+            allow_unicode=True,
+            sort_keys=False,
+        )

{agently-4.0.6.7 → agently-4.0.6.9}/agently/core/Agent.py

@@ -13,6 +13,8 @@
 # limitations under the License.
 
 import uuid
+import yaml
+import json
 
 from typing import Any, TYPE_CHECKING
 
@@ -91,7 +93,7 @@ class BaseAgent:
         value: Any,
         mappings: dict[str, Any] | None = None,
     ):
-        self.prompt.set(key, value, mappings)
+        self.agent_prompt.set(key, value, mappings)
         return self
 
     def set_request_prompt(
@@ -104,7 +106,7 @@ class BaseAgent:
         return self
 
     def remove_agent_prompt(self, key: "PromptStandardSlot | str"):
-        self.prompt.set(key, None)
+        self.agent_prompt.set(key, None)
         return self
 
     def remove_request_prompt(self, key: "PromptStandardSlot | str"):
@@ -112,34 +114,34 @@ class BaseAgent:
         return self
 
     def reset_chat_history(self):
-        if "chat_history" in self.prompt:
-            self.prompt.set("chat_history", [])
+        if "chat_history" in self.agent_prompt:
+            self.agent_prompt.set("chat_history", [])
         return self
 
     def set_chat_history(self, chat_history: "list[dict[str, Any] | ChatMessage]"):
         self.reset_chat_history()
         if not isinstance(chat_history, list):
             chat_history = [chat_history]
-        self.prompt.set("chat_history", chat_history)
+        self.agent_prompt.set("chat_history", chat_history)
         return self
 
     def add_chat_history(self, chat_history: "list[dict[str, Any] | ChatMessage] | dict[str, Any] | ChatMessage"):
         if not isinstance(chat_history, list):
             chat_history = [chat_history]
-        self.prompt.set("chat_history", chat_history)
+        self.agent_prompt.set("chat_history", chat_history)
         return self
 
     def reset_action_results(self):
-        if "action_results" in self.prompt:
-            del self.prompt["action_results"]
+        if "action_results" in self.agent_prompt:
+            del self.agent_prompt["action_results"]
         return self
 
     def set_action_results(self, action_results: list[dict[str, Any]]):
-        self.prompt.set("action_results", action_results)
+        self.agent_prompt.set("action_results", action_results)
         return self
 
     def add_action_results(self, action: str, result: Any):
-        self.prompt.append("action_results", {action: result})
+        self.agent_prompt.append("action_results", {action: result})
         return self
 
     # Quick Prompt
@@ -151,7 +153,7 @@ class BaseAgent:
         always: bool = False,
     ):
         if always:
-            self.prompt.set("input", prompt, mappings)
+            self.agent_prompt.set("input", prompt, mappings)
         else:
             self.request.prompt.set("input", prompt, mappings)
         return self
@@ -164,8 +166,8 @@ class BaseAgent:
         always: bool = False,
     ):
         if always:
-            self.prompt.set("instruct", ["{system.rule} ARE IMPORTANT RULES YOU SHALL FOLLOW!"])
-            self.prompt.set("system.rule", prompt, mappings)
+            self.agent_prompt.set("instruct", ["{system.rule} ARE IMPORTANT RULES YOU SHALL FOLLOW!"])
+            self.agent_prompt.set("system.rule", prompt, mappings)
         else:
             self.request.prompt.set("instruct", ["{system.rule} ARE IMPORTANT RULES YOU SHALL FOLLOW!"])
             self.request.prompt.set("system.rule", prompt, mappings)
@@ -179,8 +181,8 @@ class BaseAgent:
         always: bool = False,
     ):
         if always:
-            self.prompt.set("instruct", ["YOU MUST REACT AND RESPOND AS {system.role}!"])
-            self.prompt.set("system.your_role", prompt, mappings)
+            self.agent_prompt.set("instruct", ["YOU MUST REACT AND RESPOND AS {system.role}!"])
+            self.agent_prompt.set("system.your_role", prompt, mappings)
         else:
             self.request.prompt.set("instruct", ["YOU MUST REACT AND RESPOND AS {system.role}!"])
             self.request.prompt.set("system.your_role", prompt, mappings)
@@ -194,8 +196,8 @@ class BaseAgent:
         always: bool = False,
     ):
         if always:
-            self.prompt.set("instruct", ["{system.user_info} IS IMPORTANT INFORMATION ABOUT USER!"])
-            self.prompt.set("system.user_info", prompt, mappings)
+            self.agent_prompt.set("instruct", ["{system.user_info} IS IMPORTANT INFORMATION ABOUT USER!"])
+            self.agent_prompt.set("system.user_info", prompt, mappings)
         else:
             self.request.prompt.set("instruct", ["{system.user_info} IS IMPORTANT INFORMATION ABOUT USER!"])
             self.request.prompt.set("system.user_info", prompt, mappings)
@@ -209,7 +211,7 @@ class BaseAgent:
         always: bool = False,
     ):
         if always:
-            self.prompt.set("input", prompt, mappings)
+            self.agent_prompt.set("input", prompt, mappings)
         else:
             self.request.prompt.set("input", prompt, mappings)
         return self
@@ -222,7 +224,7 @@ class BaseAgent:
         always: bool = False,
     ):
         if always:
-            self.prompt.set("info", prompt, mappings)
+            self.agent_prompt.set("info", prompt, mappings)
         else:
             self.request.prompt.set("info", prompt, mappings)
         return self
@@ -235,7 +237,7 @@ class BaseAgent:
         always: bool = False,
     ):
         if always:
-            self.prompt.set("instruct", prompt, mappings)
+            self.agent_prompt.set("instruct", prompt, mappings)
         else:
             self.request.prompt.set("instruct", prompt, mappings)
         return self
@@ -248,7 +250,7 @@ class BaseAgent:
         always: bool = False,
     ):
         if always:
-            self.prompt.set("examples", prompt, mappings)
+            self.agent_prompt.set("examples", prompt, mappings)
         else:
             self.request.prompt.set("examples", prompt, mappings)
         return self
@@ -266,7 +268,7 @@ class BaseAgent:
         always: bool = False,
     ):
         if always:
-            self.prompt.set("output", prompt, mappings)
+            self.agent_prompt.set("output", prompt, mappings)
         else:
             self.request.prompt.set("output", prompt, mappings)
         return self
@@ -278,7 +280,34 @@ class BaseAgent:
         always: bool = False,
     ):
         if always:
-            self.prompt.set("options", options)
+            self.agent_prompt.set("options", options)
         else:
             self.request.prompt.set("options", options)
         return self
+
+    # Prompt
+    def get_prompt_text(self):
+        return self.request_prompt.to_text()[6:][:-11]
+
+    def get_json_prompt(self):
+        prompt_data = {
+            ".agent": self.agent_prompt.to_serializable_prompt_data(),
+            ".request": self.request_prompt.to_serializable_prompt_data(),
+        }
+        return json.dumps(
+            prompt_data,
+            indent=2,
+            ensure_ascii=False,
+        )
+
+    def get_yaml_prompt(self):
+        prompt_data = {
+            ".agent": self.agent_prompt.to_serializable_prompt_data(),
+            ".request": self.request_prompt.to_serializable_prompt_data(),
+        }
+        return yaml.safe_dump(
+            prompt_data,
+            indent=2,
+            allow_unicode=True,
+            sort_keys=False,
+        )

{agently-4.0.6.7 → agently-4.0.6.9}/agently/core/ModelRequest.py

@@ -22,12 +22,13 @@ ContentKindTuple: TypeAlias = Literal["all", "delta", "original"]
 ContentKindStreaming: TypeAlias = Literal["instant", "streaming_parse"]
 
 from agently.core import Prompt, ExtensionHandlers
-from agently.utils import Settings, FunctionShifter, DataFormatter
+from agently.utils import Settings, FunctionShifter, DataFormatter, DataLocator
 
 if TYPE_CHECKING:
     from agently.core import PluginManager
     from agently.types.data import AgentlyModelResponseMessage, PromptStandardSlot, StreamingData, SerializableValue
     from agently.types.plugins import ModelRequester, ResponseParser
+    from pydantic import BaseModel
 
 
 class ModelResponseResult:
@@ -39,6 +40,7 @@ class ModelResponseResult:
         response_generator: AsyncGenerator["AgentlyModelResponseMessage", None],
         plugin_manager: "PluginManager",
         settings: Settings,
+        extension_handlers: ExtensionHandlers,
     ):
         self.agent_name = agent_name
         self.plugin_manager = plugin_manager
@@ -50,19 +52,145 @@ class ModelResponseResult:
                 str(self.settings["plugins.ResponseParser.activate"]),
             ),
         )
-        _response_parser = ResponseParser(agent_name, response_id, prompt, response_generator, self.settings)
+        self._response_id = response_id
+        self._extension_handlers = extension_handlers
+        self._response_parser = ResponseParser(agent_name, response_id, prompt, response_generator, self.settings)
         self.prompt = prompt
-        self.full_result_data = _response_parser.full_result_data
-        self.get_meta = _response_parser.get_meta
-        self.async_get_meta = _response_parser.async_get_meta
-        self.get_text = _response_parser.get_text
-        self.async_get_text = _response_parser.async_get_text
-        self.get_data = _response_parser.get_data
-        self.async_get_data = _response_parser.async_get_data
-        self.get_data_object = _response_parser.get_data_object
-        self.async_get_data_object = _response_parser.async_get_data_object
-        self.get_generator = _response_parser.get_generator
-        self.get_async_generator = _response_parser.get_async_generator
+        self.full_result_data = self._response_parser.full_result_data
+        self.get_meta = self._response_parser.get_meta
+        self.async_get_meta = self._response_parser.async_get_meta
+        self.get_text = self._response_parser.get_text
+        self.async_get_text = self._response_parser.async_get_text
+        # self.get_data = self._response_parser.get_data
+        # self.async_get_data = self._response_parser.async_get_data
+        # self.get_data_object = self._response_parser.get_data_object
+        # self.async_get_data_object = self._response_parser.async_get_data_object
+        self.get_data = FunctionShifter.syncify(self.async_get_data)
+        self.get_data_object = FunctionShifter.syncify(self.async_get_data_object)
+        self.get_generator = self._response_parser.get_generator
+        self.get_async_generator = self._response_parser.get_async_generator
+
+    @overload
+    async def async_get_data(
+        self,
+        *,
+        type: Literal['parsed'],
+        ensure_keys: list[str],
+        key_style: Literal["dot", "slash"] = "dot",
+        max_retries: int = 3,
+        raise_ensure_failure: bool = True,
+        _retry_count: int = 0,
+    ) -> dict[str, Any]: ...
+
+    @overload
+    async def async_get_data(
+        self,
+        *,
+        type: Literal['original', 'parsed', 'all'] = "parsed",
+        ensure_keys: list[str] | None = None,
+        key_style: Literal["dot", "slash"] = "dot",
+        max_retries: int = 3,
+        raise_ensure_failure: bool = True,
+        _retry_count: int = 0,
+    ) -> Any: ...
+
+    async def async_get_data(
+        self,
+        *,
+        type: Literal['original', 'parsed', 'all'] = "parsed",
+        ensure_keys: list[str] | None = None,
+        key_style: Literal["dot", "slash"] = "dot",
+        max_retries: int = 3,
+        raise_ensure_failure: bool = True,
+        _retry_count: int = 0,
+    ) -> Any:
+        if type == "parsed" and ensure_keys:
+            try:
+                data = await self._response_parser.async_get_data(type=type)
+                for ensure_key in ensure_keys:
+                    EMPTY = object()
+                    if DataLocator.locate_path_in_dict(data, ensure_key, key_style, default=EMPTY) is EMPTY:
+                        raise
+                return data
+            except:
+                from agently.base import async_system_message
+
+                await async_system_message(
+                    "MODEL_REQUEST",
+                    {
+                        "agent_name": self.agent_name,
+                        "response_id": self._response_id,
+                        "content": {
+                            "stage": "No Target Data in Response, Preparing Retry",
+                            "detail": f"\n[Response]: { await self.async_get_text() }\n"
+                            f"[Retried Times]: { _retry_count }",
+                        },
+                    },
+                    self.settings,
+                )
+
+                if _retry_count < max_retries:
+                    return await ModelResponse(
+                        self.agent_name,
+                        self.plugin_manager,
+                        self.settings,
+                        self.prompt,
+                        self._extension_handlers,
+                    ).result.async_get_data(
+                        type=type,
+                        ensure_keys=ensure_keys,
+                        key_style=key_style,
+                        max_retries=max_retries,
+                        raise_ensure_failure=raise_ensure_failure,
+                        _retry_count=_retry_count + 1,
+                    )
+                else:
+                    if raise_ensure_failure:
+                        raise ValueError(
+                            f"Can not generate ensure keys { ensure_keys } within { max_retries } retires."
+                        )
+                    else:
+                        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,
+        *,
+        ensure_keys: list[str],
+        key_style: Literal["dot", "slash"] = "dot",
+        max_retries: int = 3,
+        raise_ensure_failure: bool = True,
+    ) -> "BaseModel": ...
+
+    @overload
+    async def async_get_data_object(
+        self,
+        *,
+        ensure_keys: None,
+        key_style: Literal["dot", "slash"] = "dot",
+        max_retries: int = 3,
+        raise_ensure_failure: bool = True,
+    ) -> "BaseModel | None": ...
+
+    async def async_get_data_object(
+        self,
+        *,
+        ensure_keys: list[str] | None = None,
+        key_style: Literal["dot", "slash"] = "dot",
+        max_retries: int = 3,
+        raise_ensure_failure: bool = True,
+    ):
+        if ensure_keys:
+            await self.async_get_data(
+                ensure_keys=ensure_keys,
+                key_style=key_style,
+                max_retries=max_retries,
+                _retry_count=0,
+                raise_ensure_failure=raise_ensure_failure,
+            )
+            return await self._response_parser.async_get_data_object()
+        return await self._response_parser.async_get_data_object()
 
 
 class ModelResponse:
@@ -98,6 +226,7 @@ class ModelResponse:
             self._get_response_generator(),
             self.plugin_manager,
             self.settings,
+            self.extension_handlers,
         )
         self.get_meta = self.result.get_meta
         self.async_get_meta = self.result.async_get_meta
@@ -418,11 +547,35 @@ class ModelRequest:
         self,
         *,
         type: Literal['original', 'parsed', 'all'] = "parsed",
+        ensure_keys: list[str] | None = None,
+        key_style: Literal["dot", "slash"] = "dot",
+        max_retries: int = 3,
+        raise_ensure_failure: bool = True,
     ):
-        return await self.get_response().async_get_data(type=type)
+        response = self.get_response()
+        return await response.async_get_data(
+            type=type,
+            ensure_keys=ensure_keys,
+            key_style=key_style,
+            max_retries=max_retries,
+            raise_ensure_failure=raise_ensure_failure,
+        )
 
-    async def async_get_data_object(self):
-        return await self.get_response().async_get_data_object()
+    async def async_get_data_object(
+        self,
+        *,
+        ensure_keys: list[str] | None = None,
+        key_style: Literal["dot", "slash"] = "dot",
+        max_retries: int = 3,
+        raise_ensure_failure: bool = True,
+    ):
+        response = self.get_response()
+        return await response.async_get_data_object(
+            ensure_keys=ensure_keys,
+            key_style=key_style,
+            max_retries=max_retries,
+            raise_ensure_failure=raise_ensure_failure,
+        )
 
     @overload
     def get_generator(

{agently-4.0.6.7 → agently-4.0.6.9}/agently/core/Prompt.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import re
+from textwrap import dedent
 from typing import Any, Literal, Mapping, Sequence, TYPE_CHECKING, cast, overload, TypeVar
 
 from agently.utils import RuntimeData, Settings
@@ -98,6 +99,9 @@ class Prompt(RuntimeData):
         self.to_messages = self.prompt_generator.to_messages
         self.to_prompt_object = self.prompt_generator.to_prompt_object
         self.to_output_model = self.prompt_generator.to_output_model
+        self.to_serializable_prompt_data = self.prompt_generator.to_serializable_prompt_data
+        self.to_json_prompt = self.prompt_generator.to_json_prompt
+        self.to_yaml_prompt = self.prompt_generator.to_yaml_prompt
 
     def _substitute_placeholder(self, obj: T, variable_mappings: dict[str, Any]) -> T | Any:
         if not isinstance(variable_mappings, dict):
@@ -157,6 +161,8 @@ class Prompt(RuntimeData):
         value: Any,
         mappings: dict[str, Any] | None = None,
     ):
+        if isinstance(value, str):
+            value = dedent(value.strip())
         if mappings is not None:
             super().set(
                 self._substitute_placeholder(key, mappings),
@@ -183,6 +189,8 @@ class Prompt(RuntimeData):
         value: Any,
         mappings: dict[str, Any] | None = None,
     ):
+        if isinstance(value, str):
+            value = dedent(value.strip())
         if mappings is not None:
             super().append(
                 self._substitute_placeholder(key, mappings),

{agently-4.0.6.7 → agently-4.0.6.9}/agently/types/plugins/PromptGenerator.py

@@ -16,7 +16,7 @@ from typing import Any, Protocol, TYPE_CHECKING
 from .base import AgentlyPlugin
 
 if TYPE_CHECKING:
-    from agently.types.data import PromptModel
+    from agently.types.data import PromptModel, SerializableData
     from agently.core import Prompt
     from agently.utils import Settings
     from pydantic import BaseModel
@@ -130,3 +130,7 @@ class PromptGenerator(AgentlyPlugin, Protocol):
             - For list outputs: use `BaseModel(list=output_result)` to validate.
         """
         ...
+
+    def to_serializable_prompt_data(self, *args, **kwargs) -> "SerializableData": ...
+    def to_json_prompt(self, *args, **kwargs) -> str: ...
+    def to_yaml_prompt(self, *args, **kwargs) -> str: ...

{agently-4.0.6.7 → agently-4.0.6.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agently"
-version = "4.0.6.7"
+version = "4.0.6.9"
 description = ""
 authors = [
     {name = "Agently Team",email = "developer@agently.tech"},