agently 4.0.6.8__py3-none-any.whl → 4.0.6.9__py3-none-any.whl

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
 
@@ -703,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/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/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/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.8.dist-info → agently-4.0.6.9.dist-info}/METADATA

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

{agently-4.0.6.8.dist-info → agently-4.0.6.9.dist-info}/RECORD

@@ -12,19 +12,19 @@ agently/builtins/hookers/ConsoleHooker.py,sha256=aJdDj_nG8CiwyelA505zvtpzBSwD52n
 agently/builtins/hookers/PureLoggerHooker.py,sha256=fzN0OfhQzgns4KeCNH-qcdm-BdQT0W2kqEmt3Zp2pYI,1906
 agently/builtins/hookers/SystemMessageHooker.py,sha256=nU5rOzcuXKdaTXWix3jhZ-4QoD4cMQJZo02wNTpZpjI,5396
 agently/builtins/plugins/ModelRequester/OpenAICompatible.py,sha256=xX-iy3qgToD8jIrPsL1NufMb6dlf0SVmX0rPjAkPSQ0,25261
-agently/builtins/plugins/PromptGenerator/AgentlyPromptGenerator.py,sha256=6ME04zMI2fsBeVPZtDG3AynUfY8Ulz4UUDjyp6VJRhA,28624
+agently/builtins/plugins/PromptGenerator/AgentlyPromptGenerator.py,sha256=Ma9rTsLnDk8gNkjVR5r1fqnO7emajR5aNJbtzZDteNU,30553
 agently/builtins/plugins/ResponseParser/AgentlyResponseParser.py,sha256=FEhfsiHB4Bx7HfghnObklLj08j8IVwGh0WEVD6U-G3U,17445
 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/__init__.py,sha256=pFOWgH2C3xRvgQo3UVdkj4yHjF9nNtmoVHmOZfoGsyU,647
-agently/core/Agent.py,sha256=HbUqlCWFgtziavN8r-2RFQyrbHMMxKA6y-io-0CY8TA,9022
+agently/core/Agent.py,sha256=EIhHCxu4ePZxH6kMQdseQsfricRO3nFSNkEVkKVqXrE,9973
 agently/core/EventCenter.py,sha256=sknU5w9MpGDQgMOF9c5k4PfM4SNT5X_LrpYte2HaFNM,10861
 agently/core/ExtensionHandlers.py,sha256=88iSAW50bgMshB56cTgKg30eOjZQyXiJY1en4w7afWY,2076
 agently/core/ModelRequest.py,sha256=OAsNRKFiSAR_dfAdWO6efgUSQat8rHGfZ-zkiSPVNDc,22943
 agently/core/PluginManager.py,sha256=oUnXbe1ilQTOWwnENxtGtV6wG-yZriCxniqfuxuTFO0,4354
-agently/core/Prompt.py,sha256=8SlqytnAIM_FIWbY2Jx-T7yOs_jqmkz9cux8-2iOCjA,8023
+agently/core/Prompt.py,sha256=oAxRZ7kG07mM6G7p6gP_zX41TgGb8vA-IilcnCb_Gc4,8432
 agently/core/Tool.py,sha256=PNYf_BwVefr8IOqf5asLaVq2fU7hQaFJwJVj3S4fq84,1871
 agently/core/TriggerFlow/BluePrint.py,sha256=Lz-wbA0f79t7VjvX0knH-9AC_Qz9wts0QFemL97R3jo,4810
 agently/core/TriggerFlow/Chunk.py,sha256=i5oTT9-dI-mXI6vbWwnQZ5e1ryGgZDYsyE9ALqbS2tQ,1555
@@ -48,7 +48,7 @@ agently/types/data/serializable.py,sha256=v2KlyKNOKp4L6J_Ueupb-gCyrnngvBskFUwNPS
 agently/types/data/tool.py,sha256=wE8Dda2JtY5cojpHUuQrw7PNeVZ6Zma968bn-pUmS7I,1529
 agently/types/plugins/EventHooker.py,sha256=kb80-baVc3fVlrddW5syv9uSD8a2Mcw8Fd3I2HQhY_Y,1030
 agently/types/plugins/ModelRequester.py,sha256=urG1zFX0b4U6ZKSO50IbW5IHK3ydmRgUom7O7Niqk8s,3875
-agently/types/plugins/PromptGenerator.py,sha256=45jmVzAkyl1Yj2M8RVfQM_zFAJZP4zrPuQkHbWIQSRQ,4531
+agently/types/plugins/PromptGenerator.py,sha256=V8kqT0Eeq09AQqfGA-SZ5mNKeit1UrmqlDQCquSMzUU,4752
 agently/types/plugins/ResponseParser.py,sha256=_IRbQhT-G1ZNg2zkJgCYNF5qRaIzrDfbxLC7kO-tdK4,3984
 agently/types/plugins/ToolManager.py,sha256=q1Y3G_tzh1AU3s13H-zTDZIkR4W1mjh9E6AKudFOvyg,2421
 agently/types/plugins/__init__.py,sha256=gz_EpgBQGndIQHY5vJB2YRzAN5yIb3FZZG7pC8lB1lM,848
@@ -70,7 +70,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=7MDln5OVkqFEdhhuG8VTdr2q02UWwCj-udndwzWV_iQ,1280
-agently-4.0.6.8.dist-info/METADATA,sha256=DRFbHp8XxD7LoxfOy2KvqFfJKqKVU4gbV7nYj0Qp5Cc,7112
-agently-4.0.6.8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-agently-4.0.6.8.dist-info/licenses/LICENSE,sha256=Y5ZgAdYgMFigPT8dhN18dTLRtBshOSfWhTDRO1t0Cq4,11360
-agently-4.0.6.8.dist-info/RECORD,,
+agently-4.0.6.9.dist-info/METADATA,sha256=HTZhMkH_W8nVgy1aZJZhZbpp3VG168z60y7eEUsUwnk,7112
+agently-4.0.6.9.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+agently-4.0.6.9.dist-info/licenses/LICENSE,sha256=Y5ZgAdYgMFigPT8dhN18dTLRtBshOSfWhTDRO1t0Cq4,11360
+agently-4.0.6.9.dist-info/RECORD,,