Merge pull request #46 from MervinPraison/develop

v0.0.24

Author: MervinPraison

Dockerfile

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

docs/conf.py

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

praisonai/chainlit_ui.py

@@ -4,6 +4,7 @@
 import os
 from chainlit.types import ThreadDict
 from typing import Optional
+from dotenv import load_dotenv
 
 framework = "crewai"
 config_list = [
@@ -47,6 +48,13 @@ async def main(message: cl.Message):
     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

praisonai/cli.py

@@ -9,16 +9,23 @@
 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
 from .inbuilt_tools import *
 
+try:
+    from chainlit.cli import chainlit_run
+    CHAINLIT_AVAILABLE = True
+except ImportError:
+    CHAINLIT_AVAILABLE = False
+
+try:
+    import gradio as gr
+    GRADIO_AVAILABLE = True
+except ImportError:
+    GRADIO_AVAILABLE = False
+
 class PraisonAI:
     def __init__(self, agent_file="agents.yaml", framework="", auto=False, init=False):
         """
@@ -110,7 +117,10 @@ def main(self):
             elif args.ui == "chainlit":
                 self.create_chainlit_interface()
             else:
-                self.create_chainlit_interface()
+                # Modify below code to allow default ui
+                agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list)
+                result = agents_generator.generate_crew_and_kickoff()
+                return result
         else:
             agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list)
             result = agents_generator.generate_crew_and_kickoff()
@@ -135,7 +145,7 @@ 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", nargs='?', const='chainlit', default="chainlit", help="Specify the UI framework (gradio or chainlit). Default chainlit")
+        parser.add_argument("--ui", choices=["chainlit", "gradio"], help="Specify the UI framework (gradio or 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")
@@ -165,40 +175,43 @@ def create_gradio_interface(self):
         Example:
             >>> praison_ai.create_gradio_interface()
         """
-        def generate_crew_and_kickoff_interface(auto_args, framework):
-            """
-            Generate a crew and kick off tasks based on the provided auto arguments and framework.
-
-            Args:
-                auto_args (list): Topic.
-                framework (str): The framework to use for generating agents.
-
-            Returns:
-                str: A string representing the result of generating the crew and kicking off tasks.
-
-            Raises:
-                None: This method does not raise any exceptions.
-
-            Example:
-                >>> result = generate_crew_and_kickoff_interface("Create a movie about Cat in Mars", "crewai")
-                >>> print(result)
-            """
-            self.framework = framework
-            self.agent_file = "test.yaml"
-            generator = AutoGenerator(topic=auto_args , framework=self.framework)
-            self.agent_file = generator.generate()
-            agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list)
-            result = agents_generator.generate_crew_and_kickoff()
-            return result
-
-        gr.Interface(
-            fn=generate_crew_and_kickoff_interface,
-            inputs=[gr.Textbox(lines=2, label="Auto Args"), gr.Dropdown(choices=["crewai", "autogen"], label="Framework")],
-            outputs="textbox",
-            title="Praison AI Studio",
-            description="Create Agents and perform tasks",
-            theme="default"
-        ).launch()
+        if GRADIO_AVAILABLE:
+            def generate_crew_and_kickoff_interface(auto_args, framework):
+                """
+                Generate a crew and kick off tasks based on the provided auto arguments and framework.
+
+                Args:
+                    auto_args (list): Topic.
+                    framework (str): The framework to use for generating agents.
+
+                Returns:
+                    str: A string representing the result of generating the crew and kicking off tasks.
+
+                Raises:
+                    None: This method does not raise any exceptions.
+
+                Example:
+                    >>> result = generate_crew_and_kickoff_interface("Create a movie about Cat in Mars", "crewai")
+                    >>> print(result)
+                """
+                self.framework = framework
+                self.agent_file = "test.yaml"
+                generator = AutoGenerator(topic=auto_args , framework=self.framework)
+                self.agent_file = generator.generate()
+                agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list)
+                result = agents_generator.generate_crew_and_kickoff()
+                return result
+
+            gr.Interface(
+                fn=generate_crew_and_kickoff_interface,
+                inputs=[gr.Textbox(lines=2, label="Auto Args"), gr.Dropdown(choices=["crewai", "autogen"], label="Framework")],
+                outputs="textbox",
+                title="Praison AI Studio",
+                description="Create Agents and perform tasks",
+                theme="default"
+            ).launch()
+        else:
+            print("ERROR: Gradio is not installed. Please install it with 'pip install \"praisonai[gradio]\"' to use this feature.") 
 
     def create_chainlit_interface(self):
         """
@@ -211,10 +224,11 @@ def create_chainlit_interface(self):
         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 CHAINLIT_AVAILABLE:
+            os.environ["CHAINLIT_PORT"] = "8082"  
+            chainlit_run(["praisonai/chainlit_ui.py"])  
+        else:
+            print("ERROR: Chainlit is not installed. Please install it with 'pip install \"praisonai\[ui]\"' to use the UI.")        
 
 if __name__ == "__main__":
     praison_ai = PraisonAI()

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

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PraisonAI"
-version = "0.0.23"
+version = "0.0.24"
 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,6 @@ python = ">=3.10,<3.13"
 rich = ">=13.7"
 pyautogen = ">=0.2.19"
 crewai = ">=0.30.4"
-gradio = ">=4.26.0"
 Flask = ">=3.0.0"
 markdown = ">=3.5"
 crewai-tools = "^0.2.6"
@@ -33,4 +32,9 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-praisonai = "praisonai.__main__:main"
+praisonai = "praisonai.__main__:main"
+
+[tool.poetry.extras]
+ui = ["chainlit>=1.1.301"]
+chainlit = ["chainlit>=1.1.301"]
+gradio = ["gradio>=4.26.0"]

requirements.txt

@@ -2,6 +2,7 @@ rich>=13.7
 pyautogen>=0.2.19
 crewai>=0.30.4
 gradio>=4.20.0
+chainlit>=1.1.301
 crewai_tools
 duckduckgo_search
 praisonai_tools