praisonaiagents 0.0.25__py3-none-any.whl → 0.0.27__py3-none-any.whl

praisonaiagents/agent/agent.py

@@ -18,6 +18,7 @@ from ..main import (
     client,
     error_logs
 )
+import inspect
 
 if TYPE_CHECKING:
     from ..task.task import Task
@@ -67,9 +68,24 @@ class Agent:
             return None
 
         import inspect
+        # Langchain tools
+        if inspect.isclass(func) and hasattr(func, 'run'):
+            original_func = func
+            func = func.run
+            function_name = original_func.__name__
+
         sig = inspect.signature(func)
         logging.debug(f"Function signature: {sig}")
         
+        # Skip self, *args, **kwargs, so they don't get passed in arguments
+        parameters_list = []
+        for name, param in sig.parameters.items():
+            if name == "self":
+                continue
+            if param.kind in (inspect.Parameter.VAR_POSITIONAL, inspect.Parameter.VAR_KEYWORD):
+                continue
+            parameters_list.append((name, param))
+
         parameters = {
             "type": "object",
             "properties": {},
@@ -95,7 +111,7 @@ class Agent:
         
         logging.debug(f"Parameter descriptions: {param_descriptions}")
 
-        for name, param in sig.parameters.items():
+        for name, param in parameters_list:
             param_type = "string"  # Default type
             if param.annotation != inspect.Parameter.empty:
                 if param.annotation == int:
@@ -249,25 +265,31 @@ Your Goal: {self.goal}
         # Try to find the function in the agent's tools list first
         func = None
         for tool in self.tools:
-            if callable(tool) and getattr(tool, '__name__', '') == function_name:
+            if (callable(tool) and getattr(tool, '__name__', '') == function_name) or \
+               (inspect.isclass(tool) and tool.__name__ == function_name):
                 func = tool
                 break
         
-        logging.debug(f"Looking for {function_name} in agent tools: {func is not None}")
-        
-        # If not found in tools, try globals and main
-        if not func:
+        if func is None:
+            # If not found in tools, try globals and main
             func = globals().get(function_name)
-            logging.debug(f"Looking for {function_name} in globals: {func is not None}")
-            
             if not func:
                 import __main__
                 func = getattr(__main__, function_name, None)
-                logging.debug(f"Looking for {function_name} in __main__: {func is not None}")
 
-        if func and callable(func):
+        if func:
             try:
-                return func(**arguments)
+                # If it's a class with run method, instantiate and call run
+                if inspect.isclass(func) and hasattr(func, 'run'):
+                    instance = func()
+                    # Extract only the parameters that run() expects
+                    run_params = {k: v for k, v in arguments.items() 
+                                if k in inspect.signature(instance.run).parameters 
+                                and k != 'self'}
+                    return instance.run(**run_params)
+                # Otherwise treat as regular function
+                elif callable(func):
+                    return func(**arguments)
             except Exception as e:
                 error_msg = str(e)
                 logging.error(f"Error executing tool {function_name}: {error_msg}")

praisonaiagents/tools/__init__.py

@@ -8,6 +8,59 @@ TOOL_MAPPINGS = {
     'internet_search': ('.duckduckgo_tools', None),
     'duckduckgo': ('.duckduckgo_tools', None),
     
+    # arXiv Tools
+    'search_arxiv': ('.arxiv_tools', None),
+    'get_arxiv_paper': ('.arxiv_tools', None),
+    'get_papers_by_author': ('.arxiv_tools', None),
+    'get_papers_by_category': ('.arxiv_tools', None),
+    'arxiv_tools': ('.arxiv_tools', None),
+    
+    # Wikipedia Tools
+    'wiki_search': ('.wikipedia_tools', None),
+    'wiki_summary': ('.wikipedia_tools', None),
+    'wiki_page': ('.wikipedia_tools', None),
+    'wiki_random': ('.wikipedia_tools', None),
+    'wiki_language': ('.wikipedia_tools', None),
+    'wikipedia_tools': ('.wikipedia_tools', None),
+    
+    # Newspaper Tools
+    'get_article': ('.newspaper_tools', None),
+    'get_news_sources': ('.newspaper_tools', None),
+    'get_articles_from_source': ('.newspaper_tools', None),
+    'get_trending_topics': ('.newspaper_tools', None),
+    'newspaper_tools': ('.newspaper_tools', None),
+    
+    # Spider Tools
+    'scrape_page': ('.spider_tools', None),
+    'extract_links': ('.spider_tools', None),
+    'crawl': ('.spider_tools', None),
+    'extract_text': ('.spider_tools', None),
+    'spider_tools': ('.spider_tools', None),
+    
+    # DuckDB Tools
+    'query': ('.duckdb_tools', None),
+    'create_table': ('.duckdb_tools', None),
+    'load_data': ('.duckdb_tools', None),
+    'export_data': ('.duckdb_tools', None),
+    'get_table_info': ('.duckdb_tools', None),
+    'analyze_data': ('.duckdb_tools', None),
+    'duckdb_tools': ('.duckdb_tools', None),
+    
+    # Shell Tools
+    'execute_command': ('.shell_tools', None),
+    'list_processes': ('.shell_tools', None),
+    'kill_process': ('.shell_tools', None),
+    'get_system_info': ('.shell_tools', None),
+    'shell_tools': ('.shell_tools', None),
+
+    # Calculator Tools
+    'evaluate': ('.calculator_tools', None),
+    'solve_equation': ('.calculator_tools', None),
+    'convert_units': ('.calculator_tools', None),
+    'calculate_statistics': ('.calculator_tools', None),
+    'calculate_financial': ('.calculator_tools', None),
+    'calculator_tools': ('.calculator_tools', None),
+
     # Class methods from YFinance
     'get_stock_price': ('.yfinance_tools', 'YFinanceTools'),
     'get_stock_info': ('.yfinance_tools', 'YFinanceTools'),
@@ -68,14 +121,6 @@ TOOL_MAPPINGS = {
     'transform_yaml': ('.yaml_tools', 'YAMLTools'),
     'yaml_tools': ('.yaml_tools', 'YAMLTools'),
 
-    # Calculator Tools
-    'evaluate': ('.calculator_tools', 'CalculatorTools'),
-    'solve_equation': ('.calculator_tools', 'CalculatorTools'),
-    'convert_units': ('.calculator_tools', 'CalculatorTools'),
-    'calculate_statistics': ('.calculator_tools', 'CalculatorTools'),
-    'calculate_financial': ('.calculator_tools', 'CalculatorTools'),
-    'calculator_tools': ('.calculator_tools', 'CalculatorTools'),
-
     # Python Tools
     'execute_code': ('.python_tools', 'PythonTools'),
     'analyze_code': ('.python_tools', 'PythonTools'),
@@ -90,51 +135,6 @@ TOOL_MAPPINGS = {
     'group_by': ('.pandas_tools', 'PandasTools'),
     'pivot_table': ('.pandas_tools', 'PandasTools'),
     'pandas_tools': ('.pandas_tools', 'PandasTools'),
-
-    # Wikipedia Tools
-    'search': ('.wikipedia_tools', 'WikipediaTools'),
-    'get_wikipedia_summary': ('.wikipedia_tools', 'WikipediaTools'),
-    'get_wikipedia_page': ('.wikipedia_tools', 'WikipediaTools'),
-    'get_random_wikipedia': ('.wikipedia_tools', 'WikipediaTools'),
-    'set_wikipedia_language': ('.wikipedia_tools', 'WikipediaTools'),
-    'wikipedia_tools': ('.wikipedia_tools', 'WikipediaTools'),
-
-    # Newspaper Tools
-    'get_article': ('.newspaper_tools', 'NewspaperTools'),
-    'get_news_sources': ('.newspaper_tools', 'NewspaperTools'),
-    'get_articles_from_source': ('.newspaper_tools', 'NewspaperTools'),
-    'get_trending_topics': ('.newspaper_tools', 'NewspaperTools'),
-    'newspaper_tools': ('.newspaper_tools', 'NewspaperTools'),
-
-    # arXiv Tools
-    'search_arxiv': ('.arxiv_tools', 'ArxivTools'),
-    'get_arxiv_paper': ('.arxiv_tools', 'ArxivTools'),
-    'get_papers_by_author': ('.arxiv_tools', 'ArxivTools'),
-    'get_papers_by_category': ('.arxiv_tools', 'ArxivTools'),
-    'arxiv_tools': ('.arxiv_tools', 'ArxivTools'),
-
-    # Spider Tools
-    'scrape_page': ('.spider_tools', 'SpiderTools'),
-    'extract_links': ('.spider_tools', 'SpiderTools'),
-    'crawl': ('.spider_tools', 'SpiderTools'),
-    'extract_text': ('.spider_tools', 'SpiderTools'),
-    'spider_tools': ('.spider_tools', 'SpiderTools'),
-
-    # DuckDB Tools
-    'query': ('.duckdb_tools', 'DuckDBTools'),
-    'create_table': ('.duckdb_tools', 'DuckDBTools'),
-    'load_data': ('.duckdb_tools', 'DuckDBTools'),
-    'export_data': ('.duckdb_tools', 'DuckDBTools'),
-    'get_table_info': ('.duckdb_tools', 'DuckDBTools'),
-    'analyze_data': ('.duckdb_tools', 'DuckDBTools'),
-    'duckdb_tools': ('.duckdb_tools', 'DuckDBTools'),
-
-    # Shell Tools
-    'execute_command': ('.shell_tools', 'ShellTools'),
-    'list_processes': ('.shell_tools', 'ShellTools'),
-    'kill_process': ('.shell_tools', 'ShellTools'),
-    'get_system_info': ('.shell_tools', 'ShellTools'),
-    'shell_tools': ('.shell_tools', 'ShellTools'),
 }
 
 _instances = {}  # Cache for class instances
@@ -149,7 +149,18 @@ def __getattr__(name: str) -> Any:
     if class_name is None:
         # Direct function import
         module = import_module(module_path, __package__)
-        if name in ['duckduckgo', 'file_tools', 'pandas_tools', 'wikipedia_tools',
+        if name in [
+            'duckduckgo', 'internet_search',
+            'search_arxiv', 'get_arxiv_paper', 'get_papers_by_author', 'get_papers_by_category',
+            'wiki_search', 'wiki_summary', 'wiki_page', 'wiki_random', 'wiki_language',
+            'get_article', 'get_news_sources', 'get_articles_from_source', 'get_trending_topics',
+            'scrape_page', 'extract_links', 'crawl', 'extract_text',
+            'query', 'create_table', 'load_data', 'export_data', 'get_table_info', 'analyze_data',
+            'execute_command', 'list_processes', 'kill_process', 'get_system_info',
+            'evaluate', 'solve_equation', 'convert_units', 'calculate_statistics', 'calculate_financial'
+        ]:
+            return getattr(module, name)
+        if name in ['file_tools', 'pandas_tools', 'wikipedia_tools',
                    'newspaper_tools', 'arxiv_tools', 'spider_tools', 'duckdb_tools', 'csv_tools', 'json_tools', 'excel_tools', 'xml_tools', 'yaml_tools', 'calculator_tools', 'python_tools', 'shell_tools']:
             return module  # Returns the callable module
         return getattr(module, name)

praisonaiagents/tools/duckduckgo_tools.py

@@ -12,7 +12,6 @@ results = duckduckgo("AI news")
 from typing import List, Dict
 import logging
 from importlib import util
-import sys
 
 def internet_search(query: str) -> List[Dict]:
     """Perform an internet search using DuckDuckGo."""
@@ -40,8 +39,9 @@ def internet_search(query: str) -> List[Dict]:
         logging.error(error_msg)
         return [{"error": error_msg}]
 
-# Make the module callable
-sys.modules[__name__].__call__ = internet_search
+def duckduckgo(query: str) -> List[Dict]:
+    """Alias for internet_search function."""
+    return internet_search(query)
 
 if __name__ == "__main__":
     # Example usage

praisonaiagents/tools/wikipedia_tools.py

@@ -2,13 +2,13 @@
 
 Usage:
 from praisonaiagents.tools import wikipedia_tools
-summary = wikipedia_tools.get_summary("Python programming language")
-page = wikipedia_tools.get_page("Python programming language")
-results = wikipedia_tools.search("Python programming")
+summary = wikipedia_tools.wiki_summary("Python programming language")
+page = wikipedia_tools.wiki_page("Python programming language")
+results = wikipedia_tools.wiki_search("Python programming")
 
 or
-from praisonaiagents.tools import get_wikipedia_summary, get_wikipedia_page
-summary = get_wikipedia_summary("Python programming language")
+from praisonaiagents.tools import wiki_search, wiki_summary, wiki_page
+summary = wiki_summary("Python programming language")
 """
 
 import logging
@@ -32,7 +32,7 @@ class WikipediaTools:
         # Set default language to English
         wikipedia.set_lang("en")
 
-    def search(
+    def wiki_search(
         self, 
         query: str, 
         results: int = 10, 
@@ -63,7 +63,7 @@ class WikipediaTools:
             logging.error(error_msg)
             return {"error": error_msg}
 
-    def get_summary(
+    def wiki_summary(
         self, 
         title: str, 
         sentences: int = 5, 
@@ -92,7 +92,7 @@ class WikipediaTools:
             logging.error(error_msg)
             return {"error": error_msg}
 
-    def get_page(
+    def wiki_page(
         self, 
         title: str, 
         auto_suggest: bool = True
@@ -168,7 +168,7 @@ class WikipediaTools:
         
         return sections
 
-    def get_random(self, pages: int = 1) -> Union[List[str], Dict[str, str]]:
+    def wiki_random(self, pages: int = 1) -> Union[List[str], Dict[str, str]]:
         """
         Get random Wikipedia page titles.
         
@@ -185,7 +185,7 @@ class WikipediaTools:
             logging.error(error_msg)
             return {"error": error_msg}
 
-    def set_language(self, language: str) -> bool:
+    def wiki_language(self, language: str) -> bool:
         """
         Set the language for Wikipedia searches.
         
@@ -205,11 +205,11 @@ class WikipediaTools:
 
 # Create instance for direct function access
 _wikipedia_tools = WikipediaTools()
-search = _wikipedia_tools.search
-get_summary = _wikipedia_tools.get_summary
-get_page = _wikipedia_tools.get_page
-get_random = _wikipedia_tools.get_random
-set_language = _wikipedia_tools.set_language
+wiki_search = _wikipedia_tools.wiki_search
+wiki_summary = _wikipedia_tools.wiki_summary
+wiki_page = _wikipedia_tools.wiki_page
+wiki_random = _wikipedia_tools.wiki_random
+wiki_language = _wikipedia_tools.wiki_language
 
 if __name__ == "__main__":
     # Example usage
@@ -220,7 +220,7 @@ if __name__ == "__main__":
     # 1. Search for a topic
     print("1. Searching Wikipedia")
     print("------------------------------")
-    search_results = search("Python programming language")
+    search_results = wiki_search("Python programming language")
     print("Search results:")
     print(json.dumps(search_results, indent=2))
     print()
@@ -228,7 +228,7 @@ if __name__ == "__main__":
     # 2. Get a page summary
     print("2. Getting Page Summary")
     print("------------------------------")
-    summary = get_summary("Python programming language", sentences=3)
+    summary = wiki_summary("Python programming language", sentences=3)
     print("Summary:")
     print(summary)
     print()
@@ -236,7 +236,7 @@ if __name__ == "__main__":
     # 3. Get detailed page information
     print("3. Getting Full Page Information")
     print("------------------------------")
-    page = get_page("Python programming language")
+    page = wiki_page("Python programming language")
     if isinstance(page, dict) and "error" not in page:
         print("Page sections:")
         for section in page["sections"]:
@@ -252,7 +252,7 @@ if __name__ == "__main__":
     # 4. Get random pages
     print("4. Getting Random Pages")
     print("------------------------------")
-    random_pages = get_random(3)
+    random_pages = wiki_random(3)
     print("Random page titles:")
     print(json.dumps(random_pages, indent=2))
     print()
@@ -260,9 +260,9 @@ if __name__ == "__main__":
     # 5. Try different language
     print("5. Changing Language")
     print("------------------------------")
-    success = set_language("es")
+    success = wiki_language("es")
     if success:
-        summary = get_summary("Python (lenguaje de programación)", sentences=1)
+        summary = wiki_summary("Python (lenguaje de programación)", sentences=1)
         print("Spanish summary:")
         print(summary)
     print()

{praisonaiagents-0.0.25.dist-info → praisonaiagents-0.0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: praisonaiagents
-Version: 0.0.25
+Version: 0.0.27
 Summary: Praison AI agents for completing complex tasks with Self Reflection Agents
 Author: Mervin Praison
 Requires-Dist: pydantic

{praisonaiagents-0.0.25.dist-info → praisonaiagents-0.0.27.dist-info}/RECORD

@@ -1,7 +1,7 @@
 praisonaiagents/__init__.py,sha256=xJLN8i6V9SRmJFMxSRWDQt_hBePoupVd3WanNIgbBbc,1052
 praisonaiagents/main.py,sha256=7Phfe0gdxHzbhPb3WRzBTfq9CaLq0K31M5DM_4oCiCQ,12451
 praisonaiagents/agent/__init__.py,sha256=sKO8wGEXvtCrvV1e834r1Okv0XAqAxqZCqz6hKLiTvA,79
-praisonaiagents/agent/agent.py,sha256=3Y8-eaebjOEculRgiz5IobAf5oadBKEpvNWJE5qaa4A,32305
+praisonaiagents/agent/agent.py,sha256=0nNGMoP_SO8sM2uR0-fXKx7d2-OxaMLft-a5Mo6o-8s,33273
 praisonaiagents/agents/__init__.py,sha256=7RDeQNSqZg5uBjD4M_0p_F6YgfWuDuxPFydPU50kDYc,120
 praisonaiagents/agents/agents.py,sha256=BikzgqE469uUg3OeiBBihpYzuK1RUvRaB_CTc3DPdOM,23589
 praisonaiagents/build/lib/praisonaiagents/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
@@ -16,12 +16,12 @@ praisonaiagents/process/__init__.py,sha256=lkYbL7Hn5a0ldvJtkdH23vfIIZLIcanK-65C0
 praisonaiagents/process/process.py,sha256=4qXdrCDQPH5MtvHvdJVURXKNgSl6ae3OYTiqAF_A2ZU,24295
 praisonaiagents/task/__init__.py,sha256=VL5hXVmyGjINb34AalxpBMl-YW9m5EDcRkMTKkSSl7c,80
 praisonaiagents/task/task.py,sha256=UiiWgLDOdX_w0opP8h8-u-leVZlq1CkpGUmf7L2qyJs,3110
-praisonaiagents/tools/__init__.py,sha256=bFCnpM_MOiYASz7Y7b0WnFjF68QEgToR3JJgfiAWgfA,7012
+praisonaiagents/tools/__init__.py,sha256=-0lV5n5cG54vYW6REjXIfuJnCLKnfQIDlXsySCaPB9s,7347
 praisonaiagents/tools/arxiv_tools.py,sha256=1stb31zTjLTon4jCnpZG5de9rKc9QWgC0leLegvPXWo,10528
 praisonaiagents/tools/calculator_tools.py,sha256=S1xPT74Geurvjm52QMMIG29zDXVEWJmM6nmyY7yF298,9571
 praisonaiagents/tools/csv_tools.py,sha256=gX2nYz4ktmpKvXB36jx5-GqddntEQD4G2fVQWTIKrwU,8435
 praisonaiagents/tools/duckdb_tools.py,sha256=KB3b-1HcX7ocoxskDpk_7RRpTGHnH8hizIY0ZdLRbIE,8816
-praisonaiagents/tools/duckduckgo_tools.py,sha256=LUliFagYtVz7kcgsJfHOC5fbF4RsrT3kFcXoW_4RUr4,1622
+praisonaiagents/tools/duckduckgo_tools.py,sha256=ynlB5ZyWfHYjUq0JZXH12TganqTihgD-2IyRgs32y84,1657
 praisonaiagents/tools/excel_tools.py,sha256=e2HqcwnyBueOyss0xEKxff3zB4w4sNWCOMXvZfbDYlE,11309
 praisonaiagents/tools/file_tools.py,sha256=KRskI9q8up3sHaLQSaIGtvpl1brq419Up6YvB9QzSoI,8807
 praisonaiagents/tools/json_tools.py,sha256=ApUYNuQ1qnbmYNCxSlx6Tth_H1yo8mhWtZ7Rr2WS6C4,16507
@@ -32,11 +32,11 @@ praisonaiagents/tools/shell_tools.py,sha256=P3fSrfOw71CGcrPwdPOA9Fr6Bgt_CAC71bUj
 praisonaiagents/tools/spider_tools.py,sha256=lrZnT1V1BC46We-AzBrDB1Ryifr3KKGmYNntMsScU7w,15094
 praisonaiagents/tools/test.py,sha256=UHOTNrnMo0_H6I2g48re1WNZkrR7f6z25UnlWxiOSbM,1600
 praisonaiagents/tools/tools.py,sha256=TK5njOmDSpMlyBnbeBzNSlnzXWlnNaTpVqkFPhkMArg,265
-praisonaiagents/tools/wikipedia_tools.py,sha256=vKYvnJlLnG5Ysvhdi5fq8efDMWInfDCXaizYB5WJo9Q,9435
+praisonaiagents/tools/wikipedia_tools.py,sha256=pGko-f33wqXgxJTv8db7TbizY5XnzBQRkNdq_GsplvI,9465
 praisonaiagents/tools/xml_tools.py,sha256=iYTMBEk5l3L3ryQ1fkUnNVYK-Nnua2Kx2S0dxNMMs1A,17122
 praisonaiagents/tools/yaml_tools.py,sha256=uogAZrhXV9O7xvspAtcTfpKSQYL2nlOTvCQXN94-G9A,14215
 praisonaiagents/tools/yfinance_tools.py,sha256=nmzjS7G_5GqMQD4r867mt17dHg5xvtsYDDfOPh68SgE,8105
-praisonaiagents-0.0.25.dist-info/METADATA,sha256=Z5VIr56RrpyJ7xF6mav54_GzlQwmjNMKKj9-4JKeBoY,233
-praisonaiagents-0.0.25.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-praisonaiagents-0.0.25.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.25.dist-info/RECORD,,
+praisonaiagents-0.0.27.dist-info/METADATA,sha256=PBOP4EDkaq4vlKhH8RUz-75vCuAgkIRhrxnMWy-CsDM,233
+praisonaiagents-0.0.27.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+praisonaiagents-0.0.27.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.27.dist-info/RECORD,,