Agently 3.2.2.2__tar.gz → 3.2.2.4__tar.gz

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/Agent/Agent.py

@@ -122,6 +122,10 @@ class Agent(object):
         self.settings.set(settings_key, settings_value)
         return self
 
+    def set_global_variable(self, variable_name: str, variable_value: any):
+        self.settings.set(f"global_variables.{ variable_name }", variable_value)
+        return self
+
     def set_agent_prompt(self, key: str, value: any):
         self.agent_runtime_ctx.set(f"prompt.{ key }", value)
         return self

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/Agent/AgentFactory.py

@@ -52,6 +52,10 @@ class AgentFactory(object):
         self.settings.set(settings_key, settings_value)
         return self
 
+    def set_global_variable(self, variable_name: str, variable_value: any):
+        self.settings.set(f"global_variables.{ variable_name }", variable_value)
+        return self
+
     def toggle_component(self, component_name: str, is_enabled: bool):
         self.set_settings(f"component_toggles.{ component_name }", is_enabled)
         return self

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/Workflow/yamlflow/yamlflow.py

@@ -107,7 +107,7 @@ def start_yaml(workflow, yaml_dict, *, draw):
 
 def start_yaml_from_path(workflow, yaml_path, *, draw):
     try:
-        with open(yaml_path, "r") as yaml_file:
+        with open(yaml_path, "r", encoding="utf-8") as yaml_file:
             yaml_dict = yaml.safe_load(yaml_file)
             return start_yaml(workflow, yaml_dict, draw=draw)
     except Exception as e:

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/plugins/agent_component/Tool.py

@@ -1,3 +1,4 @@
+import asyncio
 import json
 from datetime import datetime
 from .utils import ComponentABC
@@ -11,6 +12,7 @@ class Tool(ComponentABC):
         self.tool_manager = self.agent.tool_manager
         self.tool_dict = {}
         self.must_call_tool_info = None
+        self.get_tool_func = self.tool_manager.get_tool_func
         self.call_tool_func = self.tool_manager.call_tool_func
         self.set_tool_proxy = self.tool_manager.set_tool_proxy
 
@@ -101,10 +103,11 @@ class Tool(ComponentABC):
                             tool_kwrags.update({ "proxy": proxy })
                     call_result = None
                     try:
-                        call_result = self.call_tool_func(
-                            tool_info["tool_name"],
-                            **tool_kwrags
-                        )
+                        tool_func = self.get_tool_func(tool_info["tool_name"])
+                        if asyncio.iscoroutinefunction(tool_func):
+                            call_result = await tool_func(**tool_kwrags)
+                        else:
+                            call_result = tool_func(**tool_kwrags)
                     except Exception as e:
                         if self.is_debug():
                             print("[Tool Error]: ", e)
@@ -151,7 +154,6 @@ class Tool(ComponentABC):
             if tool_results and len(tool_results.keys()) > 0:
                 return {
                     "info": tool_results,
-                    "instruct": ["Use format [keywords](url) to mark internet-source information in {OUTPUT}"]
                 }
             else:
                 return None

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/plugins/agent_component/YAMLLoader.py

@@ -19,7 +19,7 @@ class YAMLLoader(ComponentABC):
                     agently_tuple_list[1] = self.transform_to_agently_style(value, variables=variables)
                 else:
                     result.update({ key: self.transform_to_agently_style(value, variables=variables) })
-            if agently_tuple_list[0] and agently_tuple_list[1]:
+            if agently_tuple_list[0] or agently_tuple_list[1]:
                 result = (agently_tuple_list[0], agently_tuple_list[1])
             return result
         if isinstance(target, list):
@@ -31,6 +31,10 @@ class YAMLLoader(ComponentABC):
             result = str(target)
             for key, value in variables.items():
                 result = result.replace("${" + str(key) + "}", str(value))
+            global_variables = self.agent.settings.get("global_variables")
+            if global_variables:
+                for key, value in global_variables.items():
+                    result = result.replace("${" + str(key) + "}", str(value))
             return result
 
     def load_yaml_prompt(self, *, path:str=None, yaml:str=None, use_agently_style:bool=True, variables:dict={}):

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/plugins/request/Claude.py

@@ -1,4 +1,4 @@
-from .utils import RequestABC, to_prompt_structure, to_instruction, to_json_desc, find_json
+from .utils import RequestABC, to_prompt_structure, to_instruction, to_json_desc, find_json, format_request_messages
 from Agently.utils import RuntimeCtxNamespace
 import httpx
 import json
@@ -8,6 +8,12 @@ class Claude(RequestABC):
         self.request = request
         self.model_name = "Claude"
         self.model_settings = RuntimeCtxNamespace(f"model.{ self.model_name }", self.request.settings)
+        if not self.model_settings.get_trace_back("message_rules.no_multi_system_messages"):
+            self.model_settings.set("message_rules.no_multi_system_messages", False)
+        if not self.model_settings.get_trace_back("message_rules.strict_orders"):
+            self.model_settings.set("message_rules.strict_orders", True)
+        if not self.model_settings.get_trace_back("message_rules.no_multi_type_messages"):
+            self.model_settings.set("message_rules.no_multi_type_messages", False)
         self.default_options = {
             "model": "claude-3-sonnet-20240229",
             "max_tokens": 4096,
@@ -72,15 +78,20 @@ class Claude(RequestABC):
         request_messages.append({ "role": "user", "content": [{"type": "text", "text": prompt_text }] })
         return request_messages
 
+    
+
     def generate_request_data(self):
         options = self.model_settings.get_trace_back("options", {})
         return {
-            "messages": self.construct_request_messages(),
+            "messages": format_request_messages(self.construct_request_messages(), self.model_settings),
             "options": options,
         }
 
     async def request_model(self, request_data: dict):
         api_key = self.model_settings.get_trace_back("auth.api_key")
+        base_url = self.model_settings.get_trace_back("url", "https://api.anthropic.com/v1")
+        if base_url.endswith("/"):
+            base_url = base_url[:-1]
         proxy = self.request.settings.get_trace_back("proxy")
         messages = request_data["messages"]
         system_prompt = ""
@@ -111,7 +122,7 @@ class Claude(RequestABC):
         async with httpx.AsyncClient(**client_params) as client:
             async with client.stream(
                 "POST",
-                "https://api.anthropic.com/v1/messages",
+                f"{ base_url }/messages",
                 **request_params
             ) as response:
                 async for chunk in response.aiter_lines():

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/plugins/request/OAIClient.py

@@ -1,5 +1,5 @@
 from openai import AsyncOpenAI as OpenAIClient
-from .utils import RequestABC, to_prompt_structure, to_instruction, to_json_desc, find_json
+from .utils import RequestABC, to_prompt_structure, to_instruction, to_json_desc, find_json, format_request_messages
 from Agently.utils import RuntimeCtxNamespace
 import httpx
 import json
@@ -76,58 +76,6 @@ class OAIClient(RequestABC):
         request_messages.append({ "role": "user", "content": [{"type": "text", "text": prompt_text }] })
         return request_messages
 
-    def format_request_messages(self, request_messages):
-        system_prompt = ""
-        system_messages = []
-        chat_messages = []
-        role_list = ["user", "assistant"]
-        current_role = 0
-        for message in request_messages:
-            if message["role"] == "system":
-                # no_multi_system_messages=True
-                if self.model_settings.get_trace_back("message_rules.no_multi_system_messages"):
-                    for content in message["content"]:
-                        if content["type"] == "text":
-                            system_prompt += f"{ content['text'] }\n"
-                # no_multi_system_messages=False
-                else:
-                    system_messages.append(message)
-            else:
-                # strict_orders=True
-                if self.model_settings.get_trace_back("message_rules.strict_orders"):
-                    if len(chat_messages) == 0 and message["role"] != "user":
-                        chat_messages.append({ "role": "user", "content": "What did we talked about?" })
-                        current_role = not current_role
-                    if message["role"] == role_list[current_role]:
-                        chat_messages.append(message)
-                        current_role = not current_role
-                    else:
-                        content = f"{ chat_messages[-1]['content'] }\n{ message['content'] }"
-                        chat_messages[-1]['content'] = content
-                # strict_orders=False
-                else:
-                    chat_messages.append(message)
-        # no_multi_system_messages=True
-        if self.model_settings.get_trace_back("message_rules.no_multi_system_messages") and system_prompt != "":
-            system_messages.append({
-                "role": "system",
-                "content": [{
-                    "type": "text",
-                    "text": system_prompt
-                }]
-            })
-        formatted_messages = system_messages.copy()
-        formatted_messages.extend(chat_messages)
-        # no_multi_type_messages=True
-        if self.model_settings.get_trace_back("message_rules.no_multi_type_messages"):
-            current_messages = formatted_messages.copy()
-            formatted_messages = []
-            for message in current_messages:
-                for item in message["content"]:
-                    if item["type"] == "text":
-                        formatted_messages.append({ "role": message["role"], "content": item["text"] })
-        return formatted_messages
-
     def construct_completion_prompt(self):
         # - init prompt
         completion_prompt = ""
@@ -218,7 +166,7 @@ class OAIClient(RequestABC):
                 options.update({ key: value })
         if self.request_type == "chat":
             return {
-                "messages": self.format_request_messages(self.construct_request_messages()),
+                "messages": format_request_messages(self.construct_request_messages(), self.model_settings),
                 **options,
             }
         elif self.request_type == "completions":

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/plugins/request/utils/__init__.py

@@ -1,2 +1,3 @@
 from .RequestABC import RequestABC
-from .transform import to_prompt_structure, to_instruction, to_json_desc, find_json
+from .transform import to_prompt_structure, to_instruction, to_json_desc, find_json
+from .format import format_request_messages

Agently-3.2.2.4/Agently/plugins/request/utils/format.py

@@ -0,0 +1,57 @@
+def format_request_messages(request_messages, model_settings):
+    system_prompt = ""
+    system_messages = []
+    chat_messages = []
+    role_list = ["user", "assistant"]
+    current_role = 0
+    for message in request_messages:
+        if message["role"] == "system":
+            # no_multi_system_messages=True
+            if model_settings.get_trace_back("message_rules.no_multi_system_messages"):
+                if isinstance(message["content"], str):
+                    system_prompt += f"{ message['content'] }\n"
+                elif isinstance(message["content"], list):
+                    for content in message["content"]:
+                        if content["type"] == "text":
+                            system_prompt += f"{ content['text'] }\n"
+            # no_multi_system_messages=False
+            else:
+                system_messages.append(message)
+        else:
+            # strict_orders=True
+            if model_settings.get_trace_back("message_rules.strict_orders"):
+                if len(chat_messages) == 0 and message["role"] != "user":
+                    chat_messages.append({ "role": "user", "content": [{"type": "text", "text": "What did we talked about?" }] })
+                    current_role = not current_role
+                if message["role"] == role_list[current_role]:
+                    chat_messages.append(message)
+                    current_role = not current_role
+                else:
+                    content = f"{ chat_messages[-1]['content'] }\n{ message['content'] }"
+                    chat_messages[-1]['content'] = content
+            # strict_orders=False
+            else:
+                chat_messages.append(message)
+    # no_multi_system_messages=True
+    if model_settings.get_trace_back("message_rules.no_multi_system_messages") and system_prompt != "":
+        system_messages.append({
+            "role": "system",
+            "content": [{
+                "type": "text",
+                "text": system_prompt
+            }]
+        })
+    formatted_messages = system_messages.copy()
+    formatted_messages.extend(chat_messages)
+    # no_multi_type_messages=True
+    if model_settings.get_trace_back("message_rules.no_multi_type_messages"):
+        current_messages = formatted_messages.copy()
+        formatted_messages = []
+        for message in current_messages:
+            if isinstance(message["content"], str):
+                formatted_messages.append(message)
+            elif isinstance(message["content"], list):
+                for item in message["content"]:
+                    if item["type"] == "text":
+                        formatted_messages.append({ "role": message["role"], "content": item["text"] })
+    return formatted_messages

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/plugins/storage/FileStorage.py

@@ -5,7 +5,7 @@ from .utils import StorageABC
 class FileStorage(StorageABC):
     def __init__(self, db_name: str="default"):
         self.db_name = db_name
-        self.path = "./file_storage"
+        self.path = "./.Agently"
         if not os.path.exists(self.path):
             os.mkdir(self.path)
 

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/plugins/tool/Web.py

@@ -2,8 +2,8 @@ from .utils import ToolABC
 import time
 import httpx
 from duckduckgo_search import DDGS
-from newspaper import Article as NsArticle, Config as NsConfig
-#from bs4 import BeautifulSoup
+import requests
+from bs4 import BeautifulSoup
 
 class Web(ToolABC):
     def __init__(self, tool_manager: object):
@@ -36,14 +36,6 @@ class Web(ToolABC):
                             "brief": result["body"],
                             "url": result["href"],
                         })
-                        '''
-                        results["origin"].append(result)
-                        results["for_agent"].append({
-                            "index": index,
-                            "title": result["title"],
-                            "body": result["body"],
-                        })
-                        '''
                 elif type == 2:
                     for index, result in enumerate(ddgs.news(
                         str(keywords),
@@ -56,15 +48,6 @@ class Web(ToolABC):
                             "source": result["source"],
                             "date": result["date"],
                         })
-                        '''
-                        results["origin"].append(result)
-                        results["for_agent"].append({
-                            "index": index,
-                            "title": result["title"],
-                            "body": result["body"],
-                            "date": result["date"],
-                        })
-                        '''
         except Exception as e:
             results = f"No Result Because: { str(e) }"
         return results
@@ -82,40 +65,28 @@ class Web(ToolABC):
         return self.search(keywords, options=options, proxy=proxy, type=2)
 
     def browse(self, url: str, *, retry_times:int = 0, proxy: str=None):
-        ns_config = NsConfig()
-        if proxy:
-            if proxy.startswith("http:"):
-                ns_config.proxies = { "http": proxy }
-            elif proxy.startswith("https:"):
-                ns_config.proxies = { "https": proxy }
-        ns_config.request_timeout = 20
-        ns_config.browser_user_agent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36"
-        ns_config.browser_accept = "*/*"
-        ns_config.fetch_images = False
-        ns_config.memoize_articles = False
-        ns_article = NsArticle(url, config = ns_config)
-        ns_article.download()
-        ns_article.parse()
-        result = ns_article.text
-        return result
-        '''
-        if len(result) < 200:
-            request_params = {}
+        try:
+            request_options = {}
             if proxy:
-                request_params.update({ "proxies": proxy })
-            response = httpx.get(url, **request_params)
-            if response.status_code == 200:
-                soup = BeautifulSoup(response.text, "html.parser")
-                result = re.sub(r"\n{3,}", "\n\n", soup.get_text())
-                return result
+                if proxy.startswith("http:"):
+                    request_options.update({ "proxies": { "http": proxy } })
+                elif proxy.startswith("https:"):
+                    request_options.update({ "proxies": { "https": proxy } })
+            request_options.update({ "headers": { "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36"} })
+            page_response = requests.get(url, **request_options)
+            soup = BeautifulSoup(page_response.content, 'html.parser')
+            paragraphs = soup.find_all('p')
+            texts = [p.get_text() for p in paragraphs]
+            page_content = '\n'.join(texts)
+            if page_content and page_content != "":
+                return page_content
             else:
-                if retry_times < 3:
-                    return self.browse(url, retry_times = retry_times + 1)
-                else:
-                    return "Can not open the web page."
-        else:
-            return result
-        '''
+                return f"Can not get content from url: { url }"
+        except Exception as e:
+            if retry_times < 3:
+                return self.browse(url, retry_times = retry_times + 1, proxy = proxy)
+            else:
+                return f"Can not get content from url: { url }\nError: { str(e) }"
 
     def export(self):
         return {

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/requirements.txt

@@ -12,7 +12,8 @@ PyYAML
 json5
 # Web
 duckduckgo_search
-newspaper3k
+beautifulsoup4
+requests
 # Calulate
 numpy
 scipy

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently/utils/ToolManager.py

@@ -1,3 +1,4 @@
+import asyncio
 from .RuntimeCtx import RuntimeCtx, RuntimeCtxNamespace
 
 class ToolManager(object):
@@ -71,7 +72,11 @@ class ToolManager(object):
     def call_tool_func(self, tool_name: str, *args, **kwargs):
         func = self.get_tool_func(tool_name)
         if func:
-            return func(*args, **kwargs)
+            if asyncio.iscoroutinefunction(func):
+                loop = asyncio.get_event_loop()
+                return loop.run_until_complete(func(*args, **kwargs))
+            else:
+                return func(*args, **kwargs)
         else:
             return None
 

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Agently
-Version: 3.2.2.2
+Version: 3.2.2.4
 Summary: Agently, a framework to build applications based on language model powered intelligent agents.
 Home-page: https://github.com/Maplemx/Agently
 Author: Maplemx
@@ -20,7 +20,8 @@ Requires-Dist: zhipuai
 Requires-Dist: PyYAML
 Requires-Dist: json5
 Requires-Dist: duckduckgo_search
-Requires-Dist: newspaper3k
+Requires-Dist: beautifulsoup4
+Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: sympy

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently.egg-info/SOURCES.txt

@@ -80,6 +80,7 @@ Agently/plugins/request/__init__.py
 Agently/plugins/request/config.ini
 Agently/plugins/request/utils/RequestABC.py
 Agently/plugins/request/utils/__init__.py
+Agently/plugins/request/utils/format.py
 Agently/plugins/request/utils/transform.py
 Agently/plugins/storage/FileStorage.py
 Agently/plugins/storage/__init__.py

{Agently-3.2.2.2 → Agently-3.2.2.4}/Agently.egg-info/requires.txt

@@ -8,7 +8,8 @@ zhipuai
 PyYAML
 json5
 duckduckgo_search
-newspaper3k
+beautifulsoup4
+requests
 numpy
 scipy
 sympy

{Agently-3.2.2.2 → Agently-3.2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Agently
-Version: 3.2.2.2
+Version: 3.2.2.4
 Summary: Agently, a framework to build applications based on language model powered intelligent agents.
 Home-page: https://github.com/Maplemx/Agently
 Author: Maplemx
@@ -20,7 +20,8 @@ Requires-Dist: zhipuai
 Requires-Dist: PyYAML
 Requires-Dist: json5
 Requires-Dist: duckduckgo_search
-Requires-Dist: newspaper3k
+Requires-Dist: beautifulsoup4
+Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: sympy

{Agently-3.2.2.2 → Agently-3.2.2.4}/setup.py

@@ -10,7 +10,7 @@ for requirement in origin_requirements:
 
 setuptools.setup(
     name = "Agently",
-    version = "3.2.2.2",
+    version = "3.2.2.4",
     author = "Maplemx",
     author_email = "maplemx@gmail.com",
     description = "Agently, a framework to build applications based on language model powered intelligent agents.",