PraisonAI 0.0.26__py3-none-any.whl → 0.0.28__py3-none-any.whl

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/chainlit_ui.py

@@ -1,27 +1,162 @@
+# 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."}],
     )
+    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", [])
@@ -33,20 +168,52 @@ async def on_chat_resume(thread: ThreadDict):
             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
-    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})
+    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()
@@ -59,9 +226,9 @@ password = os.getenv("CHAINLIT_PASSWORD", "admin")  # Default to "admin" if not
 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
+        return None

praisonai/cli.py

@@ -47,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

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

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.26.dist-info → praisonai-0.0.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 0.0.26
+Version: 0.0.28
 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

praisonai-0.0.28.dist-info/RECORD

@@ -0,0 +1,16 @@
+praisonai/__init__.py,sha256=5SwxMGd4vNUmYedF_HLLQBo4u8zMEWuEfKhHqJrEE1I,59
+praisonai/__main__.py,sha256=MVgsjMThjBexHt4nhd760JCqvP4x0IQcwo8kULOK4FQ,144
+praisonai/agents_generator.py,sha256=blzU5uru7rctRUTlnxEER9NLyu4aAd-oUjE-0xo81ww,12787
+praisonai/auto.py,sha256=CpE9zUbdCP1wR0aLZWKVLxiLU9JOQprRNBK9WKDZVQo,7758
+praisonai/chainlit_ui.py,sha256=jXNQfnH3D2xsSvJ0ESuHy-yDgBjudBKb1ODPfbqhYRc,10053
+praisonai/cli.py,sha256=_KB_12VoYFSLywFqE0kfbkM76e3DNRK9eeWsFlnfANc,10021
+praisonai/deploy.py,sha256=t8JLpY4Zq4GBlOogjI2cLKyjIq2_xOVsqLguQrhtE3M,6031
+praisonai/inbuilt_tools/__init__.py,sha256=mUKnbL6Gram9c9f2m8wJwEzURBLmPEOcHzwySBH89YA,74
+praisonai/inbuilt_tools/autogen_tools.py,sha256=m3Ws2444hzgkiEjqw9Y4PFb_LsU9ZDD23C03uNsyeu0,14556
+praisonai/test.py,sha256=RZKq3UEFb6AnFFiHER3zBXfNmlteSLBlrTmOvnpnZLo,4092
+praisonai/version.py,sha256=ugyuFliEqtAwQmH4sTlc16YXKYbFWDmfyk87fErB8-8,21
+praisonai-0.0.28.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
+praisonai-0.0.28.dist-info/METADATA,sha256=zYoPjpI0HpZ6RfcHI6IzzrEaelO_z4vyNz_C-ZfqyiY,9552
+praisonai-0.0.28.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+praisonai-0.0.28.dist-info/entry_points.txt,sha256=Qg41eW3A1-dvdV5tF7LqChfYof8Rihk2rN1fiEE3vnk,53
+praisonai-0.0.28.dist-info/RECORD,,

praisonai-0.0.26.dist-info/RECORD

@@ -1,16 +0,0 @@
-praisonai/__init__.py,sha256=5SwxMGd4vNUmYedF_HLLQBo4u8zMEWuEfKhHqJrEE1I,59
-praisonai/__main__.py,sha256=MVgsjMThjBexHt4nhd760JCqvP4x0IQcwo8kULOK4FQ,144
-praisonai/agents_generator.py,sha256=blzU5uru7rctRUTlnxEER9NLyu4aAd-oUjE-0xo81ww,12787
-praisonai/auto.py,sha256=evK0RxnR89e-HBTZD0fyJSD_m9k6rNj1Cmdn7dZKZ7A,7378
-praisonai/chainlit_ui.py,sha256=vOI6zPmQBD7OQJBMcmz-yuc1Hrs1QiO9cdgHcEZc8l4,2610
-praisonai/cli.py,sha256=rOQPALmdQBn1kbM5q9lpjRz4yfcWPybBRQ0ExeDCKqU,9961
-praisonai/deploy.py,sha256=4-OxTeU7I3I4dTZtvp8esmIFKjTmqA3I-BHLor9_U8A,6031
-praisonai/inbuilt_tools/__init__.py,sha256=mUKnbL6Gram9c9f2m8wJwEzURBLmPEOcHzwySBH89YA,74
-praisonai/inbuilt_tools/autogen_tools.py,sha256=m3Ws2444hzgkiEjqw9Y4PFb_LsU9ZDD23C03uNsyeu0,14556
-praisonai/test.py,sha256=DkS_z3w7TmXt9lc57ToYQzdKN2IkWqXEMDBYUmZiGNk,4040
-praisonai/version.py,sha256=ugyuFliEqtAwQmH4sTlc16YXKYbFWDmfyk87fErB8-8,21
-praisonai-0.0.26.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
-praisonai-0.0.26.dist-info/METADATA,sha256=moxTdew9K_So-jIuaETixmrozyt7yUFGGnpx41F88lU,9552
-praisonai-0.0.26.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-praisonai-0.0.26.dist-info/entry_points.txt,sha256=Qg41eW3A1-dvdV5tF7LqChfYof8Rihk2rN1fiEE3vnk,53
-praisonai-0.0.26.dist-info/RECORD,,