Merge pull request #45 from MervinPraison/develop

v0.0.23

Author: MervinPraison

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.11-slim
 WORKDIR /app
 COPY . .
-RUN pip install flask praisonai==0.0.22 gunicorn markdown
+RUN pip install flask praisonai==0.0.23 gunicorn markdown
 EXPOSE 8080
 CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]

chainlit.md

@@ -0,0 +1 @@
+# Welcome to Praison AI! 🚀🤖

docs/conf.py

@@ -9,7 +9,7 @@
 project = 'PraisonAI'
 copyright = '2024, Mervin Praison'
 author = 'Mervin Praison'
-release = '0.0.22'
+release = '0.0.23'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/requirements.in

@@ -8,4 +8,5 @@ mkdocs-jupyter
 pymdown-extensions
 Pygments
 pdoc3
-xmlrunner
+xmlrunner
+unittest2

docs/requirements.txt

@@ -20,4 +20,5 @@ crewai_tools
 duckduckgo_search
 praisonai_tools
 open-interpreter
-xmlrunner
+xmlrunner
+unittest2

poetry.lock

@@ -0,0 +1,59 @@
+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
+
+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})
+
+@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

praisonai/chainlit_ui.py

@@ -9,6 +9,11 @@
 load_dotenv()
 import autogen
 import gradio as gr
+import chainlit as cl
+import asyncio
+import uvicorn
+from chainlit.cli import cli as chainlit_cli
+from chainlit.server import app
 import argparse
 from .auto import AutoGenerator
 from .agents_generator import AgentsGenerator
@@ -72,9 +77,8 @@ def main(self):
 
         self.framework = args.framework or self.framework 
 
-        ui = args.ui
         if args.agent_file:
-            if args.agent_file.startswith("tests.test"): # Argument used for testing purposes
+            if args.agent_file.startswith("tests.test"): # Argument used for testing purposes. eg: python -m unittest tests.test 
                 print("test")
             else:
                 self.agent_file = args.agent_file
@@ -100,8 +104,13 @@ def main(self):
             print("File {} created successfully".format(self.agent_file))
             return "File {} created successfully".format(self.agent_file)
 
-        if ui:
-            self.create_gradio_interface()
+        if args.ui:
+            if args.ui == "gradio":
+                self.create_gradio_interface()
+            elif args.ui == "chainlit":
+                self.create_chainlit_interface()
+            else:
+                self.create_chainlit_interface()
         else:
             agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list)
             result = agents_generator.generate_crew_and_kickoff()
@@ -126,12 +135,11 @@ def parse_args(self):
         """
         parser = argparse.ArgumentParser(prog="praisonai", description="praisonAI command-line interface")
         parser.add_argument("--framework", choices=["crewai", "autogen"], help="Specify the framework")
-        parser.add_argument("--ui", action="store_true", help="Enable UI mode")
+        parser.add_argument("--ui", nargs='?', const='chainlit', default="chainlit", help="Specify the UI framework (gradio or chainlit). Default chainlit")
         parser.add_argument("--auto", nargs=argparse.REMAINDER, help="Enable auto mode and pass arguments for it")
         parser.add_argument("--init", nargs=argparse.REMAINDER, help="Enable auto mode and pass arguments for it")
         parser.add_argument("agent_file", nargs="?", help="Specify the agent file")
         parser.add_argument("--deploy", action="store_true", help="Deploy the application")  # New argument
-
         args, unknown_args = parser.parse_known_args()
 
         if unknown_args and unknown_args[0] == '-b' and unknown_args[1] == 'api:app':
@@ -191,8 +199,23 @@ def generate_crew_and_kickoff_interface(auto_args, framework):
             description="Create Agents and perform tasks",
             theme="default"
         ).launch()
+        
+    def create_chainlit_interface(self):
+        """
+        Create a Chainlit interface for generating agents and performing tasks.
+
+        This function sets up a Chainlit application that listens for messages.
+        When a message is received, it runs PraisonAI with the provided message as the topic.
+        The generated agents are then used to perform tasks.
+
+        Returns:
+            None: This function does not return any value. It starts the Chainlit application.
+        """
+        from chainlit.cli import chainlit_run  # Import chainlit_run
+        os.environ["CHAINLIT_PORT"] = "8082"  
+        chainlit_run(["praisonai/chainlit_ui.py"])  
+        
 
 if __name__ == "__main__":
     praison_ai = PraisonAI()
-    praison_ai.main()
-    
+    praison_ai.main()

praisonai/cli.py

@@ -56,7 +56,7 @@ def create_dockerfile(self):
             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.22 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==0.0.23 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
 

praisonai/deploy.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PraisonAI"
-version = "0.0.22"
+version = "0.0.23"
 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,7 +18,7 @@ python = ">=3.10,<3.13"
 rich = ">=13.7"
 pyautogen = ">=0.2.19"
 crewai = ">=0.30.4"
-gradio = ">=4.20.0"
+gradio = ">=4.26.0"
 Flask = ">=3.0.0"
 markdown = ">=3.5"
 crewai-tools = "^0.2.6"