PraisonAI 0.0.71__tar.gz → 0.0.73__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 0.0.71
+Version: 0.0.73
 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.73}/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.73 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.73}/praisonai/ui/chat.py

@@ -15,6 +15,11 @@ import logging
 import json
 from sql_alchemy import SQLAlchemyDataLayer
 from tavily import TavilyClient
+from crawl4ai import WebCrawler
+import asyncio
+from PIL import Image
+import io
+import base64
 
 # Set up logging
 logger = logging.getLogger(__name__)
@@ -176,27 +181,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": {
@@ -262,11 +295,32 @@ async def main(message: cl.Message):
     message_history = cl.user_session.get("message_history", [])
     now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     
-    # Add the current date and time to the user's message
+    # Check if an image was uploaded with this message
+    image = None
+    if message.elements and isinstance(message.elements[0], cl.Image):
+        image_element = message.elements[0]
+        try:
+            # Open the image and keep it in memory
+            image = Image.open(image_element.path)
+            image.load()  # This ensures the file is fully loaded into memory
+            cl.user_session.set("image", image)
+        except Exception as e:
+            logger.error(f"Error processing image: {str(e)}")
+            await cl.Message(content="There was an error processing the uploaded image. Please try again.").send()
+            return
+
+    # Prepare user message
     user_message = f"""
-Answer the question and use tools if needed:\n{message.content}.\n\n
+Answer the question and use tools if needed:\n
+
 Current Date and Time: {now}
+
+User Question: {message.content}
 """
+
+    if image:
+        user_message = f"Image uploaded. {user_message}"
+
     message_history.append({"role": "user", "content": user_message})
 
     msg = cl.Message(content="")
@@ -279,6 +333,19 @@ Current Date and Time: {now}
         "stream": True,
     }
 
+    # If an image is uploaded, include it in the message
+    if image:
+        buffered = io.BytesIO()
+        image.save(buffered, format="PNG")
+        img_str = base64.b64encode(buffered.getvalue()).decode()
+        
+        completion_params["messages"][-1] = {
+            "role": "user",
+            "content": [
+                {"type": "text", "text": user_message},
+                {"type": "image_url", "image_url": {"url": f"data:image/png;base64,{img_str}"}}
+            ]
+        }
     # Only add tools and tool_choice if Tavily API key is available
     if tavily_api_key:
         completion_params["tools"] = tools
@@ -329,6 +396,7 @@ Current Date and Time: {now}
     cl.user_session.set("message_history", message_history)
     await msg.update()
 
+    # Handle tool calls if any
     if tavily_api_key and tool_calls:
         available_functions = {
             "tavily_web_search": tavily_web_search,
@@ -346,6 +414,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"),
                         )
@@ -380,7 +449,7 @@ Current Date and Time: {now}
         msg.content = full_response
         await msg.update()
     else:
-        # If no tool calls or Tavily API key is not set, the full_response is already set
+        # If no tool calls, the full_response is already set
         msg.content = full_response
         await msg.update()
 
@@ -402,7 +471,7 @@ async def send_count():
     ).send()
 
 @cl.on_chat_resume
-async def on_chat_resume(thread: ThreadDict):  # Change the type hint here
+async def on_chat_resume(thread: ThreadDict):
     logger.info(f"Resuming chat: {thread['id']}")
     model_name = load_setting("model_name") or os.getenv("MODEL_NAME") or "gpt-4o-mini"
     logger.debug(f"Model name: {model_name}")
@@ -450,3 +519,10 @@ async def on_chat_resume(thread: ThreadDict):  # Change the type hint here
             logger.warning(f"Message without recognized type: {message}")
 
     cl.user_session.set("message_history", message_history)
+
+    # Check if there's an image in the thread metadata
+    image_data = metadata.get("image")
+    if image_data:
+        image = Image.open(io.BytesIO(base64.b64decode(image_data)))
+        cl.user_session.set("image", image)
+        await cl.Message(content="Previous image loaded. You can continue asking questions about it or upload a new image.").send()

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

@@ -17,6 +17,11 @@ from sql_alchemy import SQLAlchemyDataLayer
 from context import ContextGatherer
 from tavily import TavilyClient
 from datetime import datetime
+from crawl4ai import WebCrawler
+from PIL import Image
+import io
+import base64
+
 # Set up logging
 logger = logging.getLogger(__name__)
 log_level = os.getenv("LOGLEVEL", "INFO").upper()
@@ -238,19 +243,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 +291,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": {
@@ -273,16 +306,37 @@ tools = [{
 async def main(message: cl.Message):
     model_name = load_setting("model_name") or os.getenv("MODEL_NAME") or "gpt-4o-mini"
     message_history = cl.user_session.get("message_history", [])
-    message_history.append({"role": "user", "content": message.content})
     gatherer = ContextGatherer()
     context, token_count, context_tree = gatherer.run()
     now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-    prompt_history = message_history
-    prompt_history.append({"role": "user", "content": """
-                           Answer the question and use tools if needed:\n{question}.\n\n
-                           Current Date and Time: {now}
-                           Below is the Context:\n{context}\n\n"""
-                           .format(context=context, question=message.content, now=now)})
+
+    # Check if an image was uploaded with this message
+    image = None
+    if message.elements and isinstance(message.elements[0], cl.Image):
+        image_element = message.elements[0]
+        try:
+            # Open the image and keep it in memory
+            image = Image.open(image_element.path)
+            image.load()  # This ensures the file is fully loaded into memory
+            cl.user_session.set("image", image)
+        except Exception as e:
+            logger.error(f"Error processing image: {str(e)}")
+            await cl.Message(content="There was an error processing the uploaded image. Please try again.").send()
+            return
+
+    # Prepare user message
+    user_message = f"""
+Answer the question and use tools if needed:\n{message.content}.\n\n
+Current Date and Time: {now}
+
+Context:
+{context}
+"""
+
+    if image:
+        user_message = f"Image uploaded. {user_message}"
+
+    message_history.append({"role": "user", "content": user_message})
 
     msg = cl.Message(content="")
     await msg.send()
@@ -290,24 +344,40 @@ async def main(message: cl.Message):
     # Prepare the completion parameters
     completion_params = {
         "model": model_name,
-        "messages": prompt_history,
+        "messages": message_history,
         "stream": True,
     }
 
-    # Only add tools and tool_choice if Tavily API key is available
+    # If an image is uploaded, include it in the message
+    if image:
+        buffered = io.BytesIO()
+        image.save(buffered, format="PNG")
+        img_str = base64.b64encode(buffered.getvalue()).decode()
+        
+        completion_params["messages"][-1] = {
+            "role": "user",
+            "content": [
+                {"type": "text", "text": user_message},
+                {"type": "image_url", "image_url": {"url": f"data:image/png;base64,{img_str}"}}
+            ]
+        }
+        # Use a vision-capable model when an image is present
+        completion_params["model"] = "gpt-4-vision-preview"  # Adjust this to your actual vision-capable model
+
+    # Only add tools and tool_choice if Tavily API key is available and no image is uploaded
     if tavily_api_key:
         completion_params["tools"] = tools
         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', {})
             
@@ -350,7 +420,7 @@ async def main(message: cl.Message):
         available_functions = {
             "tavily_web_search": tavily_web_search,
         }
-        messages = prompt_history + [{"role": "assistant", "content": None, "function_call": {
+        messages = message_history + [{"role": "assistant", "content": None, "function_call": {
             "name": tool_calls[0]['function']['name'],
             "arguments": tool_calls[0]['function']['arguments']
         }}]
@@ -467,3 +537,10 @@ async def on_chat_resume(thread: ThreadDict):
             logger.warning(f"Message without recognized type: {message}")
 
     cl.user_session.set("message_history", message_history)
+
+    # Check if there's an image in the thread metadata
+    image_data = metadata.get("image")
+    if image_data:
+        image = Image.open(io.BytesIO(base64.b64decode(image_data)))
+        cl.user_session.set("image", image)
+        await cl.Message(content="Previous image loaded. You can continue asking questions about it, upload a new image, or just chat.").send()

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PraisonAI"
-version = "0.0.71"
+version = "0.0.73"
 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]