Agently 3.2.2.2__tar.gz → 3.2.2.3__tar.gz

{Agently-3.2.2.2 → Agently-3.2.2.3}/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.3}/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.3}/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.3}/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.3}/Agently.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Agently
-Version: 3.2.2.2
+Version: 3.2.2.3
 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.3}/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.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Agently
-Version: 3.2.2.2
+Version: 3.2.2.3
 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.3}/setup.py

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