PraisonAI 0.0.71__tar.gz → 0.0.72__tar.gz

{praisonai-0.0.71 → praisonai-0.0.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 0.0.71
+Version: 0.0.72
 Summary: PraisonAI application combines AutoGen and CrewAI or similar frameworks into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customization, and efficient human-agent collaboration.
 Author: Mervin Praison
 Requires-Python: >=3.10,<3.13
@@ -19,9 +19,10 @@ Provides-Extra: gradio
 Provides-Extra: openai
 Provides-Extra: train
 Provides-Extra: ui
-Requires-Dist: agentops (>=0.2.6) ; extra == "agentops"
+Requires-Dist: agentops (>=0.3.12) ; extra == "agentops"
 Requires-Dist: aiosqlite (>=0.20.0) ; extra == "chat" or extra == "code"
 Requires-Dist: chainlit (==1.2.0) ; extra == "ui" or extra == "chat" or extra == "code"
+Requires-Dist: crawl4ai (==0.3.4) ; extra == "chat" or extra == "code"
 Requires-Dist: crewai (>=0.32.0)
 Requires-Dist: flask (>=3.0.0) ; extra == "api"
 Requires-Dist: gradio (>=4.26.0) ; extra == "gradio"

{praisonai-0.0.71 → praisonai-0.0.72}/praisonai/deploy.py

@@ -56,7 +56,7 @@ class CloudDeployer:
             file.write("FROM python:3.11-slim\n")
             file.write("WORKDIR /app\n")
             file.write("COPY . .\n")
-            file.write("RUN pip install flask praisonai==0.0.71 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==0.0.72 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             

{praisonai-0.0.71 → praisonai-0.0.72}/praisonai/ui/chat.py

@@ -15,6 +15,8 @@ import logging
 import json
 from sql_alchemy import SQLAlchemyDataLayer
 from tavily import TavilyClient
+from crawl4ai import WebCrawler
+import asyncio
 
 # Set up logging
 logger = logging.getLogger(__name__)
@@ -176,27 +178,55 @@ cl_data._data_layer = SQLAlchemyDataLayer(conninfo=f"sqlite+aiosqlite:///{DB_PAT
 tavily_api_key = os.getenv("TAVILY_API_KEY")
 tavily_client = TavilyClient(api_key=tavily_api_key) if tavily_api_key else None
 
-# Function to call Tavily Search API
+# Modify the tavily_web_search function to be synchronous
 def tavily_web_search(query):
     if not tavily_client:
         return json.dumps({
             "query": query,
             "error": "Tavily API key is not set. Web search is unavailable."
         })
+    
     response = tavily_client.search(query)
-    print(response)  # Print the full response
+    logger.debug(f"Tavily search response: {response}")
+
+    # Create an instance of WebCrawler
+    crawler = WebCrawler()
+
+    # Warm up the crawler (load necessary models)
+    crawler.warmup()
+
+    # Prepare the results
+    results = []
+    for result in response.get('results', []):
+        url = result.get('url')
+        if url:
+            try:
+                # Run the crawler on each URL
+                crawl_result = crawler.run(url=url)
+                results.append({
+                    "content": result.get('content'),
+                    "url": url,
+                    "full_content": crawl_result.markdown
+                })
+            except Exception as e:
+                logger.error(f"Error crawling {url}: {str(e)}")
+                results.append({
+                    "content": result.get('content'),
+                    "url": url,
+                    "full_content": "Error: Unable to crawl this URL"
+                })
+
     return json.dumps({
         "query": query,
-        "answer": response.get('answer'),
-        "top_result": response['results'][0]['content'] if response['results'] else 'No results found'
+        "results": results
     })
 
-# Define the tool for function calling
+# Update the tools definition
 tools = [{
     "type": "function",
     "function": {
         "name": "tavily_web_search",
-        "description": "Search the web using Tavily API",
+        "description": "Search the web using Tavily API and crawl the resulting URLs",
         "parameters": {
             "type": "object",
             "properties": {
@@ -346,6 +376,7 @@ Current Date and Time: {now}
                 if function_args:
                     try:
                         function_args = json.loads(function_args)
+                        # Call the function synchronously
                         function_response = function_to_call(
                             query=function_args.get("query"),
                         )

{praisonai-0.0.71 → praisonai-0.0.72}/praisonai/ui/code.py

@@ -17,6 +17,8 @@ from sql_alchemy import SQLAlchemyDataLayer
 from context import ContextGatherer
 from tavily import TavilyClient
 from datetime import datetime
+from crawl4ai import WebCrawler
+
 # Set up logging
 logger = logging.getLogger(__name__)
 log_level = os.getenv("LOGLEVEL", "INFO").upper()
@@ -238,19 +240,47 @@ async def setup_agent(settings):
 tavily_api_key = os.getenv("TAVILY_API_KEY")
 tavily_client = TavilyClient(api_key=tavily_api_key) if tavily_api_key else None
 
-# Function to call Tavily Search API
+# Function to call Tavily Search API and crawl the results
 def tavily_web_search(query):
     if not tavily_client:
         return json.dumps({
             "query": query,
             "error": "Tavily API key is not set. Web search is unavailable."
         })
+    
     response = tavily_client.search(query)
-    print(response)  # Print the full response
+    logger.debug(f"Tavily search response: {response}")
+
+    # Create an instance of WebCrawler
+    crawler = WebCrawler()
+
+    # Warm up the crawler (load necessary models)
+    crawler.warmup()
+
+    # Prepare the results
+    results = []
+    for result in response.get('results', []):
+        url = result.get('url')
+        if url:
+            try:
+                # Run the crawler on each URL
+                crawl_result = crawler.run(url=url)
+                results.append({
+                    "content": result.get('content'),
+                    "url": url,
+                    "full_content": crawl_result.markdown
+                })
+            except Exception as e:
+                logger.error(f"Error crawling {url}: {str(e)}")
+                results.append({
+                    "content": result.get('content'),
+                    "url": url,
+                    "full_content": "Error: Unable to crawl this URL"
+                })
+
     return json.dumps({
         "query": query,
-        "answer": response.get('answer'),
-        "top_result": response['results'][0]['content'] if response['results'] else 'No results found'
+        "results": results
     })
 
 # Define the tool for function calling
@@ -258,7 +288,7 @@ tools = [{
     "type": "function",
     "function": {
         "name": "tavily_web_search",
-        "description": "Search the web using Tavily API",
+        "description": "Search the web using Tavily API and crawl the resulting URLs",
         "parameters": {
             "type": "object",
             "properties": {
@@ -300,14 +330,14 @@ async def main(message: cl.Message):
         completion_params["tool_choice"] = "auto"
 
     response = await acompletion(**completion_params)
-    print(response)
+    logger.debug(f"LLM response: {response}")
 
     full_response = ""
     tool_calls = []
     current_tool_call = None
 
     async for part in response:
-        print(part)
+        logger.debug(f"LLM part: {part}")
         if 'choices' in part and len(part['choices']) > 0:
             delta = part['choices'][0].get('delta', {})
             

{praisonai-0.0.71 → praisonai-0.0.72}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PraisonAI"
-version = "0.0.71"
+version = "0.0.72"
 description = "PraisonAI application combines AutoGen and CrewAI or similar frameworks into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customization, and efficient human-agent collaboration."
 authors = ["Mervin Praison"]
 license = ""
@@ -24,7 +24,7 @@ pyparsing = ">=3.0.0"
 chainlit = {version = "==1.2.0", optional = true}
 gradio = {version = ">=4.26.0", optional = true}
 flask = {version = ">=3.0.0", optional = true}
-agentops = {version = ">=0.2.6", optional = true}
+agentops = {version = ">=0.3.12", optional = true}
 langchain-google-genai = {version = ">=1.0.4", optional = true}
 langchain-anthropic = {version = ">=0.1.13", optional = true}
 langchain-openai = {version = ">=0.1.7", optional = true}
@@ -33,6 +33,7 @@ litellm = {version = ">=1.41.8", optional = true}
 aiosqlite= {version = ">=0.20.0", optional = true}
 greenlet = {version = ">=3.0.3", optional = true}
 tavily-python = {version = "==0.5.0", optional=true}
+crawl4ai = {version = "==0.3.4", optional = true}
 
 [tool.poetry.group.docs.dependencies]
 mkdocs = "*"
@@ -74,7 +75,7 @@ unittest2 = "*"
 chainlit = "==1.2.0"
 gradio = ">=4.26.0"
 flask = ">=3.0.0"
-agentops = ">=0.2.6"
+agentops = ">=0.3.12"
 langchain-google-genai = ">=1.0.4"
 langchain-anthropic = ">=0.1.13"
 langchain-openai = ">=0.1.7"
@@ -102,8 +103,8 @@ google = ["langchain-google-genai"]
 openai = ["langchain-openai"]
 anthropic = ["langchain-anthropic"]
 cohere = ["langchain-cohere"]
-chat = ["chainlit", "litellm", "aiosqlite", "greenlet", "tavily-python"]
-code = ["chainlit", "litellm", "aiosqlite", "greenlet", "tavily-python"]
+chat = ["chainlit", "litellm", "aiosqlite", "greenlet", "tavily-python", "crawl4ai"]
+code = ["chainlit", "litellm", "aiosqlite", "greenlet", "tavily-python", "crawl4ai"]
 train = ["setup-conda-env"]
 
 [tool.poetry-dynamic-versioning]