Merge pull request #49 from MervinPraison/develop

v0.0.27

Author: MervinPraison

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.11-slim
 WORKDIR /app
 COPY . .
-RUN pip install flask praisonai==0.0.26 gunicorn markdown
+RUN pip install flask praisonai==0.0.27 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.26'
+release = '7'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/ui.md

@@ -26,4 +26,13 @@ CHAINLIT_USERNAME=admin
 pip install gradio
 export OPENAI_API_KEY="Enter your API key"
 praisonai --ui gradio
+```
+
+## Streamlit
+
+```
+git clone https://github.com/leporejoseph/PraisonAi-Streamlit
+cd PraisonAi-Streamlit
+pip install -r requirements.txt
+streamlit run app.py
 ```

poetry.lock

@@ -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,27 +23,29 @@ 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.
             agent_file (str): The specified name of the YAML file to save the generated team structure.
             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/auto.py

@@ -1,16 +1,20 @@
+# 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"
@@ -21,7 +25,29 @@ async def start_chat():
         "message_history",
         [{"role": "system", "content": "You are a helpful assistant."}],
     )
+    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']),
+            Select(
+                id="Framework",
+                label="Framework",
+                values=["crewai", "autogen"],
+                initial_index=0,
+            ),
+        ]
+    ).send()
+    # 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"]
+    framework = settings["Framework"]
+    print("Settings updated:", settings)
+
 @cl.on_chat_resume
 async def on_chat_resume(thread: ThreadDict):
     message_history = cl.user_session.get("message_history", [])
@@ -40,7 +66,7 @@ async def main(message: cl.Message):
     message_history.append({"role": "user", "content": message.content})
     topic = message.content
     agent_file = "test.yaml"
-    generator = AutoGenerator(topic=topic, framework=framework)
+    generator = AutoGenerator(topic=topic, 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()
@@ -59,9 +85,9 @@ async def main(message: cl.Message):
 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"):
+    if (username, password) == (username, password):
         return cl.User(
-            identifier="admin", metadata={"role": "admin", "provider": "credentials"}
+            identifier=username, metadata={"role": "ADMIN", "provider": "credentials"}
         )
     else:
         return None

praisonai/chainlit_ui.py

@@ -47,6 +47,7 @@ def __init__(self, agent_file="agents.yaml", framework="", auto=False, init=Fals
             {
                 '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

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

praisonai/deploy.py

@@ -9,6 +9,7 @@
     {
         '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/test.py

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