PraisonAI 0.0.24__tar.gz → 0.0.31__tar.gz

{praisonai-0.0.24 → praisonai-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 0.0.24
+Version: 0.0.31
 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
@@ -8,12 +8,14 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Provides-Extra: chainlit
+Provides-Extra: api
 Provides-Extra: gradio
 Provides-Extra: ui
-Requires-Dist: Flask (>=3.0.0)
+Requires-Dist: chainlit (>=1.1.301,<2.0.0) ; extra == "ui"
 Requires-Dist: crewai (>=0.30.4)
 Requires-Dist: crewai-tools (>=0.2.6,<0.3.0)
+Requires-Dist: flask (>=3.0.0) ; extra == "api"
+Requires-Dist: gradio (>=4.26.0) ; extra == "gradio"
 Requires-Dist: markdown (>=3.5)
 Requires-Dist: praisonai-tools (>=0.0.4)
 Requires-Dist: pyautogen (>=0.2.19)

{praisonai-0.0.24 → praisonai-0.0.31}/praisonai/agents_generator.py

@@ -9,7 +9,6 @@ from crewai import Agent, Task, Crew
 from crewai.telemetry import Telemetry
 load_dotenv()
 import autogen
-import gradio as gr
 import argparse
 from .auto import AutoGenerator
 from crewai_tools import (

{praisonai-0.0.24 → praisonai-0.0.31}/praisonai/auto.py

@@ -1,6 +1,6 @@
 from openai import OpenAI
 from pydantic import BaseModel
-from typing import Dict, List
+from typing import Dict, List, Optional
 import instructor
 import os
 import json
@@ -23,16 +23,17 @@ class TeamStructure(BaseModel):
     roles: Dict[str, RoleDetails]
 
 class AutoGenerator:
-    def __init__(self, topic="Movie Story writing about AI", agent_file="test.yaml", framework="crewai"):
+    def __init__(self, topic="Movie Story writing about AI", agent_file="test.yaml", framework="crewai", config_list: Optional[List[Dict]] = None):
         """
         Initialize the AutoGenerator class with the specified topic, agent file, and framework.
-        note: autogen framework is different from this AutoGenerator class.
+        Note: autogen framework is different from this AutoGenerator class.
 
         Args:
             topic (str, optional): The topic for the generated team structure. Defaults to "Movie Story writing about AI".
             agent_file (str, optional): The name of the YAML file to save the generated team structure. Defaults to "test.yaml".
             framework (str, optional): The framework for the generated team structure. Defaults to "crewai".
-
+            config_list (Optional[List[Dict]], optional): A list containing the configuration details for the OpenAI API. 
+                                                          If None, it defaults to using environment variables or hardcoded values.
         Attributes:
             config_list (list): A list containing the configuration details for the OpenAI API.
             topic (str): The specified topic for the generated team structure.
@@ -40,10 +41,11 @@ class AutoGenerator:
             framework (str): The specified framework for the generated team structure.
             client (instructor.Client): An instance of the instructor.Client class initialized with the specified OpenAI API configuration.
         """
-        self.config_list = [
+        self.config_list = config_list or [
             {
                 'model': os.environ.get("OPENAI_MODEL_NAME", "gpt-4o"),
                 'base_url': os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1"),
+                'api_key': os.environ.get("OPENAI_API_KEY")
             }
         ]
         self.topic = topic

praisonai-0.0.31/praisonai/chainlit_ui.py

@@ -0,0 +1,240 @@
+# praisonai/chainlit_ui.py
+from praisonai.agents_generator import AgentsGenerator 
+from praisonai.auto import AutoGenerator 
+import chainlit as cl
+import os
+from chainlit.types import ThreadDict
+from chainlit.input_widget import Select, TextInput
+from typing import Optional
+from dotenv import load_dotenv
+load_dotenv()
+
+framework = "crewai"
+config_list = [
+            {
+                'model': os.environ.get("OPENAI_MODEL_NAME", "gpt-4o"),
+                'base_url': os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1"),
+                'api_key': os.environ.get("OPENAI_API_KEY")
+            }
+        ]
+agent_file = "test.yaml"
+
+actions=[
+    cl.Action(name="run", value="run", label="✅ Run"),
+    cl.Action(name="modify", value="modify", label="🔧 Modify"),
+]
+
+@cl.action_callback("run")
+async def on_run(action):
+    await main(cl.Message(content=""))
+
+@cl.action_callback("modify")
+async def on_modify(action):
+    await cl.Message(content="Modify the agents and tools from below settings").send()
+    
+
+@cl.set_chat_profiles
+async def set_profiles(current_user: cl.User):
+    return [
+        cl.ChatProfile(
+            name="Auto",
+            markdown_description="Automatically generate agents and tasks based on your input.",
+            starters=[
+                cl.Starter(
+                    label="Create a movie script",
+                    message="Create a movie script about a futuristic society where AI and humans coexist, focusing on the conflict and resolution between them. Start with an intriguing opening scene.",
+                    icon="/public/movie.svg",
+                ),
+                cl.Starter(
+                    label="Design a fantasy world",
+                    message="Design a detailed fantasy world with unique geography, cultures, and magical systems. Start by describing the main continent and its inhabitants.",
+                    icon="/public/fantasy.svg",
+                ),
+                cl.Starter(
+                    label="Write a futuristic political thriller",
+                    message="Write a futuristic political thriller involving a conspiracy within a global government. Start with a high-stakes meeting that sets the plot in motion.",
+                    icon="/public/thriller.svg",
+                ),
+                cl.Starter(
+                    label="Develop a new board game",
+                    message="Develop a new, innovative board game. Describe the game's objective, rules, and unique mechanics. Create a scenario to illustrate gameplay.",
+                    icon="/public/game.svg",
+                ),
+            ]
+        ),
+        cl.ChatProfile(
+            name="Manual",
+            markdown_description="Manually define your agents and tasks using a YAML file.",
+        ),
+    ]
+
+
+@cl.on_chat_start
+async def start_chat():
+    cl.user_session.set(
+        "message_history",
+        [{"role": "system", "content": "You are a helpful assistant."}],
+    )
+    
+    # Create tools.py if it doesn't exist
+    if not os.path.exists("tools.py"):
+        with open("tools.py", "w") as f:
+            f.write("# Add your custom tools here\n")
+    
+    settings = await cl.ChatSettings(
+        [
+            TextInput(id="Model", label="OpenAI - Model", initial=config_list[0]['model']),
+            TextInput(id="BaseUrl", label="OpenAI - Base URL", initial=config_list[0]['base_url']),
+            TextInput(id="ApiKey", label="OpenAI - API Key", initial=config_list[0]['api_key']), 
+            Select(
+                id="Framework",
+                label="Framework",
+                values=["crewai", "autogen"],
+                initial_index=0,
+            ),
+        ]
+    ).send()
+    cl.user_session.set("settings", settings)
+    chat_profile = cl.user_session.get("chat_profile")
+    if chat_profile=="Manual":
+        
+        agent_file = "agents.yaml"
+        full_agent_file_path = os.path.abspath(agent_file)  # Get full path
+        if os.path.exists(full_agent_file_path):
+            with open(full_agent_file_path, 'r') as f:
+                yaml_content = f.read()
+            msg = cl.Message(content=yaml_content, language="yaml")
+            await msg.send()
+            
+                
+        full_tools_file_path = os.path.abspath("tools.py")  # Get full path
+        if os.path.exists(full_tools_file_path):
+            with open(full_tools_file_path, 'r') as f:
+                tools_content = f.read()
+            msg = cl.Message(content=tools_content, language="python")
+            await msg.send()
+
+        settings = await cl.ChatSettings(
+            [
+                TextInput(id="Model", label="OpenAI - Model", initial=config_list[0]['model']),
+                TextInput(id="BaseUrl", label="OpenAI - Base URL", initial=config_list[0]['base_url']),
+                TextInput(id="ApiKey", label="OpenAI - API Key", initial=config_list[0]['api_key']), 
+                Select(
+                    id="Framework",
+                    label="Framework",
+                    values=["crewai", "autogen"],
+                    initial_index=0,
+                ),
+                TextInput(id="agents", label="agents.yaml", initial=yaml_content, multiline=True),
+                TextInput(id="tools", label="tools.py", initial=tools_content, multiline=True),
+            ]
+        ).send()
+        cl.user_session.set("settings", settings)
+        
+        res = await cl.AskActionMessage(
+            content="Pick an action!",
+            actions=actions,
+        ).send()
+        if res and res.get("value") == "modify":
+            await cl.Message(content="Modify the agents and tools from below settings", actions=actions).send()
+        elif res and res.get("value") == "run":
+            await main(cl.Message(content="", actions=actions))
+
+    await on_settings_update(settings)
+    
+@cl.on_settings_update
+async def on_settings_update(settings):
+    """Handle updates to the ChatSettings form."""
+    global config_list, framework
+    config_list[0]['model'] = settings["Model"]
+    config_list[0]['base_url'] = settings["BaseUrl"]
+    config_list[0]['api_key'] = settings["ApiKey"]
+    os.environ["OPENAI_API_KEY"] = config_list[0]['api_key']
+    os.environ["OPENAI_MODEL_NAME"] = config_list[0]['model']
+    os.environ["OPENAI_API_BASE"] = config_list[0]['base_url']
+    framework = settings["Framework"]
+    
+    if "agents" in settings:
+        with open("agents.yaml", "w") as f:
+            f.write(settings["agents"])
+    if "tools" in settings:
+        with open("tools.py", "w") as f:
+            f.write(settings["tools"])
+    
+    print("Settings updated")
+
+@cl.on_chat_resume
+async def on_chat_resume(thread: ThreadDict):
+    message_history = cl.user_session.get("message_history", [])
+    root_messages = [m for m in thread["steps"] if m["parentId"] is None]
+    for message in root_messages:
+        if message["type"] == "user_message":
+            message_history.append({"role": "user", "content": message["output"]})
+        elif message["type"] == "ai_message":
+            message_history.append({"role": "assistant", "content": message["content"]})
+    cl.user_session.set("message_history", message_history)
+
+# @cl.step(type="tool")
+# async def tool(data: Optional[str] = None, language: Optional[str] = None):
+#     return cl.Message(content=data, language=language)
+
+@cl.on_message
+async def main(message: cl.Message):
+    """Run PraisonAI with the provided message as the topic."""
+    message_history = cl.user_session.get("message_history")
+    message_history.append({"role": "user", "content": message.content})
+    topic = message.content
+    chat_profile = cl.user_session.get("chat_profile")
+
+    if chat_profile == "Auto":
+        agent_file = "agents.yaml"
+        generator = AutoGenerator(topic=topic, agent_file=agent_file, framework=framework, config_list=config_list)
+        agent_file = generator.generate()
+        agents_generator = AgentsGenerator(agent_file, framework, config_list)
+        result = agents_generator.generate_crew_and_kickoff()
+        msg = cl.Message(content=result)
+        await msg.send()
+        message_history.append({"role": "assistant", "content": message.content})
+    else:  # chat_profile == "Manual"
+        agent_file = "agents.yaml"
+        full_agent_file_path = os.path.abspath(agent_file)  # Get full path
+        full_tools_file_path = os.path.abspath("tools.py")  
+        if os.path.exists(full_agent_file_path):
+            with open(full_agent_file_path, 'r') as f:
+                yaml_content = f.read()
+            # tool_res = await tool()
+            msg_agents = cl.Message(content=yaml_content, language="yaml")
+            await msg_agents.send()
+            if os.path.exists(full_tools_file_path):
+                with open(full_tools_file_path, 'r') as f:
+                    tools_content = f.read()
+                msg_tools = cl.Message(content=tools_content, language="python")
+                await msg_tools.send()
+        else:
+            # If the file doesn't exist, follow the same process as "Auto"
+            generator = AutoGenerator(topic=topic, agent_file=agent_file, framework=framework, config_list=config_list)
+            agent_file = generator.generate()
+
+        agents_generator = AgentsGenerator(agent_file, framework, config_list)
+        result = agents_generator.generate_crew_and_kickoff()
+        msg = cl.Message(content=result, actions=actions)
+        await msg.send()
+        message_history.append({"role": "assistant", "content": message.content})
+
+# Load environment variables from .env file
+load_dotenv()
+
+# Get username and password from environment variables
+username = os.getenv("CHAINLIT_USERNAME", "admin")  # Default to "admin" if not found
+password = os.getenv("CHAINLIT_PASSWORD", "admin")  # Default to "admin" if not found
+
+@cl.password_auth_callback
+def auth_callback(username: str, password: str):
+    # Fetch the user matching username from your database
+    # and compare the hashed password with the value stored in the database
+    if (username, password) == (username, password):
+        return cl.User(
+            identifier=username, metadata={"role": "ADMIN", "provider": "credentials"}
+        )
+    else:
+        return None

{praisonai-0.0.24 → praisonai-0.0.31}/praisonai/cli.py

@@ -8,7 +8,6 @@ from dotenv import load_dotenv
 from crewai import Agent, Task, Crew
 load_dotenv()
 import autogen
-import gradio as gr
 import argparse
 from .auto import AutoGenerator
 from .agents_generator import AgentsGenerator
@@ -48,6 +47,7 @@ class PraisonAI:
             {
                 'model': os.environ.get("OPENAI_MODEL_NAME", "gpt-4o"),
                 'base_url': os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1"),
+                'api_key': os.environ.get("OPENAI_API_KEY")
             }
         ]
         self.agent_file = agent_file
@@ -156,6 +156,8 @@ class PraisonAI:
             args.agent_file = 'agents.yaml'
         if args.agent_file == 'api:app' or args.agent_file == '/app/api:app':
             args.agent_file = 'agents.yaml'
+        if args.agent_file == 'ui':
+            args.ui = 'chainlit'
 
         return args
 
@@ -211,7 +213,7 @@ class PraisonAI:
                 theme="default"
             ).launch()
         else:
-            print("ERROR: Gradio is not installed. Please install it with 'pip install \"praisonai[gradio]\"' to use this feature.") 
+            print("ERROR: Gradio is not installed. Please install it with 'pip install gradio' to use this feature.") 
         
     def create_chainlit_interface(self):
         """
@@ -226,9 +228,11 @@ class PraisonAI:
         """
         if CHAINLIT_AVAILABLE:
             os.environ["CHAINLIT_PORT"] = "8082"  
-            chainlit_run(["praisonai/chainlit_ui.py"])  
+            import praisonai
+            chainlit_ui_path = os.path.join(os.path.dirname(praisonai.__file__), 'chainlit_ui.py')
+            chainlit_run([chainlit_ui_path])
         else:
-            print("ERROR: Chainlit is not installed. Please install it with 'pip install \"praisonai\[ui]\"' to use the UI.")        
+            print("ERROR: Chainlit is not installed. Please install it with 'pip install chainlit' to use the UI.")        
 
 if __name__ == "__main__":
     praison_ai = PraisonAI()

{praisonai-0.0.24 → praisonai-0.0.31}/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.24 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==0.0.31 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             

{praisonai-0.0.24 → praisonai-0.0.31}/praisonai/inbuilt_tools/autogen_tools.py

@@ -166,7 +166,11 @@ def autogen_ScrapeWebsiteTool(assistant, user_proxy):
     def register_scrape_website_tool(tool_class, tool_name, tool_description, assistant, user_proxy):
         def tool_func(website_url: str) -> Any:
             tool_instance = tool_class(website_url=website_url)
-            return tool_instance.run()
+            content = tool_instance.run()
+            # Ensure content is properly decoded as UTF-8 if it's a bytes object
+            if isinstance(content, bytes):
+                content = content.decode('utf-8') 
+            return content
         register_function(tool_func, caller=assistant, executor=user_proxy, name=tool_name, description=tool_description)
     register_scrape_website_tool(ScrapeWebsiteTool, "scrape_website_tool", "Read website content(website_url: 'string') - A tool that can be used to read content from a specified website.", assistant, user_proxy)
 

{praisonai-0.0.24 → praisonai-0.0.31}/praisonai/test.py

@@ -9,6 +9,7 @@ config_list = [
     {
         'model': os.environ.get("OPENAI_MODEL_NAME", "gpt-3.5-turbo"),
         'base_url': os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1"),
+        'api_key': os.environ.get("OPENAI_API_KEY")
     }
 ]
 

{praisonai-0.0.24 → praisonai-0.0.31}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PraisonAI"
-version = "0.0.24"
+version = "0.0.31"
 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 = ""
@@ -18,10 +18,12 @@ python = ">=3.10,<3.13"
 rich = ">=13.7"
 pyautogen = ">=0.2.19"
 crewai = ">=0.30.4"
-Flask = ">=3.0.0"
 markdown = ">=3.5"
 crewai-tools = "^0.2.6"
 praisonai-tools = ">=0.0.4"
+chainlit = {version = "^1.1.301", optional = true}
+gradio = {version = ">=4.26.0", optional = true}
+flask = {version = ">=3.0.0", optional = true}
 
 [tool.poetry.dev-dependencies]
 pytest = "^8.0.0"
@@ -36,5 +38,5 @@ praisonai = "praisonai.__main__:main"
 
 [tool.poetry.extras]
 ui = ["chainlit"]
-chainlit = ["chainlit"]
-gradio = ["gradio"]
+gradio = ["gradio"]
+api = ["flask"]

praisonai-0.0.24/praisonai/chainlit_ui.py

@@ -1,67 +0,0 @@
-from praisonai.agents_generator import AgentsGenerator 
-from praisonai.auto import AutoGenerator 
-import chainlit as cl
-import os
-from chainlit.types import ThreadDict
-from typing import Optional
-from dotenv import load_dotenv
-
-framework = "crewai"
-config_list = [
-            {
-                'model': os.environ.get("OPENAI_MODEL_NAME", "gpt-4o"),
-                'base_url': os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1"),
-            }
-        ]
-agent_file = "test.yaml"
-
-@cl.on_chat_start
-async def start_chat():
-    cl.user_session.set(
-        "message_history",
-        [{"role": "system", "content": "You are a helpful assistant."}],
-    )
-    
-@cl.on_chat_resume
-async def on_chat_resume(thread: ThreadDict):
-    message_history = cl.user_session.get("message_history", [])
-    root_messages = [m for m in thread["steps"] if m["parentId"] is None]
-    for message in root_messages:
-        if message["type"] == "user_message":
-            message_history.append({"role": "user", "content": message["output"]})
-        elif message["type"] == "ai_message":
-            message_history.append({"role": "assistant", "content": message["content"]})
-    cl.user_session.set("message_history", message_history)
-
-@cl.on_message
-async def main(message: cl.Message):
-    """Run PraisonAI with the provided message as the topic."""
-    message_history = cl.user_session.get("message_history")
-    message_history.append({"role": "user", "content": message.content})
-    topic = message.content
-    agent_file = "test.yaml"
-    generator = AutoGenerator(topic=topic, framework=framework)
-    agent_file = generator.generate()
-    agents_generator = AgentsGenerator(agent_file, framework, config_list)
-    result = agents_generator.generate_crew_and_kickoff()
-    msg = cl.Message(content=result)
-    await msg.send()
-    message_history.append({"role": "assistant", "content": message.content})
-
-# Load environment variables from .env file
-load_dotenv()
-
-# Get username and password from environment variables
-username = os.getenv("CHAINLIT_USERNAME", "admin")  # Default to "admin" if not found
-password = os.getenv("CHAINLIT_PASSWORD", "admin")  # Default to "admin" if not found
-
-@cl.password_auth_callback
-def auth_callback(username: str, password: str):
-    # Fetch the user matching username from your database
-    # and compare the hashed password with the value stored in the database
-    if (username, password) == ("admin", "admin"):
-        return cl.User(
-            identifier="admin", metadata={"role": "admin", "provider": "credentials"}
-        )
-    else:
-        return None