agently 4.0.6.5__py3-none-any.whl → 4.0.6.10__py3-none-any.whl

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/builtins/hookers/SystemMessageHooker.py

@@ -17,6 +17,32 @@ from typing import TYPE_CHECKING
 
 from agently.types.plugins import EventHooker
 
+COLORS = {
+    "black": 30,
+    "red": 31,
+    "green": 32,
+    "yellow": 33,
+    "blue": 34,
+    "magenta": 35,
+    "cyan": 36,
+    "white": 37,
+    "gray": 90,
+}
+
+
+def color_text(text: str, color: str | None = None, bold: bool = False, underline: bool = False) -> str:
+    codes = []
+    if bold:
+        codes.append("1")
+    if underline:
+        codes.append("4")
+    if color and color in COLORS:
+        codes.append(str(COLORS[color]))
+    if not codes:
+        return text
+    return f"\x1b[{';'.join(codes)}m{text}\x1b[0m"
+
+
 if TYPE_CHECKING:
     from agently.types.data import EventMessage, AgentlySystemEvent
 
@@ -72,12 +98,18 @@ class SystemMessageHooker(EventHooker):
                             and SystemMessageHooker._current_meta["row_id"] == message_data["response_id"]
                             and SystemMessageHooker._current_meta["stage"] == content["stage"]
                         ):
-                            print(content["detail"], end="")
+                            print(color_text(content["detail"], color="gray"), end="", flush=True)
                         else:
-                            print(
-                                f"[Agent-{ message_data['agent_name'] }] - [Request-{ message_data['response_id'] }]\nStage: { content['stage'] }\nDetail:\n{ content['detail'] }",
-                                end="",
+                            header = color_text(
+                                f"[Agent-{ message_data['agent_name'] }] - [Request-{ message_data['response_id'] }]",
+                                color="blue",
+                                bold=True,
                             )
+                            stage_label = color_text("Stage:", color="cyan", bold=True)
+                            stage_val = color_text(content["stage"], color="yellow", underline=True)
+                            detail_label = color_text("Detail:\n", color="cyan", bold=True)
+                            detail = color_text(content["detail"], color="green")
+                            print(f"{header}\n{stage_label} {stage_val}\n{detail_label}{detail}", end="")
                             SystemMessageHooker._current_meta["table_name"] = message_data["agent_name"]
                             SystemMessageHooker._current_meta["row_id"] = message_data["response_id"]
                             SystemMessageHooker._current_meta["stage"] = content["stage"]
@@ -99,28 +131,40 @@ class SystemMessageHooker(EventHooker):
                         },
                     )
                     if settings["runtime.show_model_logs"]:
+                        header = color_text(
+                            f"[Agent-{ message_data['agent_name'] }] - [Response-{ message_data['response_id'] }]",
+                            color="blue",
+                            bold=True,
+                        )
+                        stage_label = color_text("Stage:", color="cyan", bold=True)
+                        stage_val = color_text(content["stage"], color="yellow", underline=True)
+                        detail_label = color_text("Detail:\n", color="cyan", bold=True)
+                        detail = color_text(f"{content['detail']}", color="gray")
                         await event_center.async_emit(
                             "log",
                             {
                                 "level": "INFO",
-                                "content": f"[Agent-{ message_data['agent_name'] }] - [Response-{ message_data['response_id'] }]\nStage: { content['stage'] }\nDetail:\n{ content['detail'] }",
+                                "content": f"{header}\n{stage_label} {stage_val}\n{detail_label}{detail}",
                             },
                         )
             case "TOOL":
                 if settings["runtime.show_tool_logs"]:
+                    tool_title = color_text("[Tool Using Result]:", color="blue", bold=True)
+                    tool_body = color_text(str(message.content["data"]), color="gray")
                     await event_center.async_emit(
                         "log",
                         {
                             "level": "INFO",
-                            "content": f"[Tool Using Result]:\n{ message.content['data'] }",
+                            "content": f"{tool_title}\n{tool_body}",
                         },
                     )
             case "TRIGGER_FLOW":
                 if settings["runtime.show_trigger_flow_logs"]:
+                    trigger = color_text(f"[TriggerFlow] { message.content['data'] }", color="yellow", bold=True)
                     await event_center.async_emit(
                         "log",
                         {
                             "level": "INFO",
-                            "content": f"[TriggerFlow] { message.content['data'] }",
+                            "content": trigger,
                         },
                     )

agently/builtins/plugins/ModelRequester/OpenAICompatible.py

@@ -146,6 +146,10 @@ class OpenAICompatible(ModelRequester):
         self.model_type = cast(str, self.plugin_settings.get("model_type"))
         self._messenger = event_center.create_messenger(self.name)
 
+        # check if has attachment prompt
+        if self.prompt["attachment"]:
+            self.plugin_settings["rich_content"] = True
+
     @staticmethod
     def _on_register():
         pass
@@ -351,13 +355,13 @@ class OpenAICompatible(ModelRequester):
         api_key = self.plugin_settings.get("api_key", None)
         if api_key is not None and auth["api_key"] == "None":
             auth["api_key"] = str(api_key)
-        if "api_key" in auth:
-            headers_with_auth = {**request_data.headers, "Authorization": f"Bearer { auth['api_key'] }"}
-        elif "headers" in auth and isinstance(auth["headers"], dict):
+        if "headers" in auth and isinstance(auth["headers"], dict):
             headers_with_auth = {**request_data.headers, **auth["headers"]}
         elif "body" in auth and isinstance(auth["body"], dict):
             headers_with_auth = request_data.headers.copy()
             request_data.data.update(**auth["body"])
+        if "api_key" in auth and auth["api_key"] != "None":
+            headers_with_auth = {**request_data.headers, "Authorization": f"Bearer { auth['api_key'] }"}
         else:
             headers_with_auth = request_data.headers.copy()
 

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
 
@@ -307,9 +309,7 @@ class AgentlyPromptGenerator(PromptGenerator):
         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() }:"
-        )
+        prompt_text_list.append(f"{ (merged_role_mapping['user'] if 'user' in merged_role_mapping else 'user') }:")
 
         # system & developer
         if prompt_object.system:
@@ -368,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').upper() }:"
+            f"{ (merged_role_mapping['assistant'] if 'assistant' in merged_role_mapping else 'assistant') }:"
         )
 
         return "\n".join(prompt_text_list)
@@ -398,12 +398,7 @@ class AgentlyPromptGenerator(PromptGenerator):
         if prompt_object.system:
             prompt_messages.append(
                 self._generate_yaml_prompt_message(
-                    str(
-                        prompt_title_mapping.get(
-                            'system',
-                            'SYSTEM',
-                        )
-                    ),
+                    "system",
                     prompt_object.system,
                     role_mapping=merged_role_mapping,
                 )
@@ -412,12 +407,7 @@ class AgentlyPromptGenerator(PromptGenerator):
         if prompt_object.developer:
             prompt_messages.append(
                 self._generate_yaml_prompt_message(
-                    str(
-                        prompt_title_mapping.get(
-                            'developer',
-                            'DEVELOPER DIRECTIONS',
-                        )
-                    ),
+                    "developer",
                     prompt_object.developer,
                     role_mapping=merged_role_mapping,
                 )
@@ -661,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:
@@ -710,3 +705,59 @@ 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 _:
+                        desc_text = ";".join([item for item in output_prompt_part[1:] if item])
+                        if desc_text:
+                            return {
+                                "$type": output_prompt_part[0],
+                                "$desc": desc_text,
+                            }
+                        else:
+                            return {
+                                "$type": output_prompt_part[0],
+                            }
+            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,11 +268,24 @@ 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
 
+    def attachment(
+        self,
+        prompt: list[dict[str, Any]],
+        mappings: dict[str, Any] | None = None,
+        *,
+        always: bool = False,
+    ):
+        if always:
+            self.agent_prompt.set("attachment", prompt, mappings)
+        else:
+            self.request_prompt.set("attachment", prompt, mappings)
+        return self
+
     def options(
         self,
         options: dict[str, Any],
@@ -278,7 +293,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,
+        )