Merge pull request #63 from MervinPraison/develop

v0.0.36

Author: MervinPraison

Dockerfile

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

docs/api/praisonai/agents_generator.html

@@ -52,7 +52,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
 <dl>
 <dt id="praisonai.agents_generator.AgentsGenerator"><code class="flex name class">
 <span>class <span class="ident">AgentsGenerator</span></span>
-<span>(</span><span>agent_file, framework, config_list, log_level=20, agent_callback=None, task_callback=None)</span>
+<span>(</span><span>agent_file, framework, config_list, log_level=None, agent_callback=None, task_callback=None)</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Initialize the AgentsGenerator object.</p>
@@ -83,7 +83,7 @@ <h2 id="attributes">Attributes</h2>
 <span>Expand source code</span>
 </summary>
 <pre><code class="python">class AgentsGenerator:
-    def __init__(self, agent_file, framework, config_list, log_level=logging.INFO, agent_callback=None, task_callback=None):
+    def __init__(self, agent_file, framework, config_list, log_level=None, agent_callback=None, task_callback=None):
         &#34;&#34;&#34;
         Initialize the AgentsGenerator object.
 
@@ -109,6 +109,9 @@ <h2 id="attributes">Attributes</h2>
         self.log_level = log_level
         self.agent_callback = agent_callback
         self.task_callback = task_callback
+        self.log_level = log_level or logging.getLogger().getEffectiveLevel()
+        if self.log_level == logging.NOTSET:
+            self.log_level = os.environ.get(&#39;LOGLEVEL&#39;, &#39;INFO&#39;).upper()
 
         logging.basicConfig(level=self.log_level, format=&#39;%(asctime)s - %(levelname)s - %(message)s&#39;)
         self.logger = logging.getLogger(__name__)
@@ -241,10 +244,10 @@ <h2 id="attributes">Attributes</h2>
 
         if os.path.isfile(tools_py_path):
             tools_dict.update(self.load_tools_from_module_class(tools_py_path))
-            # print(&#34;tools.py exists in the root directory. Loading tools.py and skipping tools folder.&#34;)
+            self.logger.debug(&#34;tools.py exists in the root directory. Loading tools.py and skipping tools folder.&#34;)
         elif tools_dir_path.is_dir():
             tools_dict.update(self.load_tools_from_module_class(tools_dir_path))
-            # print(&#34;tools folder exists in the root directory&#34;)
+            self.logger.debug(&#34;tools folder exists in the root directory&#34;)
 
         framework = self.framework or config.get(&#39;framework&#39;)
 
@@ -328,11 +331,15 @@ <h2 id="attributes">Attributes</h2>
                         task.callback = self.task_callback
 
                     tasks.append(task)
+            if agentops:
+                agentops.init()
             crew = Crew(
                 agents=list(agents.values()),
                 tasks=tasks,
                 verbose=2
             )
+            if agentops:
+                agentops.end_session(&#34;Success&#34;)
 
             self.logger.debug(&#34;Final Crew Configuration:&#34;)
             self.logger.debug(f&#34;Agents: {crew.agents}&#34;)

docs/api/praisonai/deploy.html

@@ -110,7 +110,7 @@ <h2 id="raises">Raises</h2>
             file.write(&#34;FROM python:3.11-slim\n&#34;)
             file.write(&#34;WORKDIR /app\n&#34;)
             file.write(&#34;COPY . .\n&#34;)
-            file.write(&#34;RUN pip install flask praisonai==0.0.35 gunicorn markdown\n&#34;)
+            file.write(&#34;RUN pip install flask praisonai==0.0.36 gunicorn markdown\n&#34;)
             file.write(&#34;EXPOSE 8080\n&#34;)
             file.write(&#39;CMD [&#34;gunicorn&#34;, &#34;-b&#34;, &#34;0.0.0.0:8080&#34;, &#34;api:app&#34;]\n&#39;)
 

poetry.lock

@@ -24,6 +24,14 @@
 import importlib.util
 from praisonai_tools import BaseTool
 import os
+import logging
+
+agentops = False
+try:
+    import agentops
+    agentops = True
+except ImportError:
+    agentops = False
 
 os.environ["OTEL_SDK_DISABLED"] = "true"
 
@@ -38,23 +46,39 @@ def disable_crewai_telemetry():
 disable_crewai_telemetry()
 
 class AgentsGenerator:
-    def __init__(self, agent_file, framework, config_list):
+    def __init__(self, agent_file, framework, config_list, log_level=None, agent_callback=None, task_callback=None):
         """
         Initialize the AgentsGenerator object.
 
         Parameters:
             agent_file (str): The path to the agent file.
             framework (str): The framework to be used for the agents.
             config_list (list): A list of configurations for the agents.
+            log_level (int, optional): The logging level to use. Defaults to logging.INFO.
+            agent_callback (callable, optional): A callback function to be executed after each agent step.
+            task_callback (callable, optional): A callback function to be executed after each tool run.
 
         Attributes:
             agent_file (str): The path to the agent file.
             framework (str): The framework to be used for the agents.
             config_list (list): A list of configurations for the agents.
+            log_level (int): The logging level to use.
+            agent_callback (callable, optional): A callback function to be executed after each agent step.
+            task_callback (callable, optional): A callback function to be executed after each tool run.
         """
         self.agent_file = agent_file
         self.framework = framework
         self.config_list = config_list
+        self.log_level = log_level
+        self.agent_callback = agent_callback
+        self.task_callback = task_callback
+        self.log_level = log_level or logging.getLogger().getEffectiveLevel()
+        if self.log_level == logging.NOTSET:
+            self.log_level = os.environ.get('LOGLEVEL', 'INFO').upper()
+        
+        logging.basicConfig(level=self.log_level, format='%(asctime)s - %(levelname)s - %(message)s')
+        self.logger = logging.getLogger(__name__)
+        self.logger.setLevel(self.log_level)
 
     def is_function_or_decorated(self, obj):
         """
@@ -183,10 +207,10 @@ def generate_crew_and_kickoff(self):
 
         if os.path.isfile(tools_py_path):
             tools_dict.update(self.load_tools_from_module_class(tools_py_path))
-            # print("tools.py exists in the root directory. Loading tools.py and skipping tools folder.")
+            self.logger.debug("tools.py exists in the root directory. Loading tools.py and skipping tools folder.")
         elif tools_dir_path.is_dir():
             tools_dict.update(self.load_tools_from_module_class(tools_dir_path))
-            # print("tools folder exists in the root directory")
+            self.logger.debug("tools folder exists in the root directory")
 
         framework = self.framework or config.get('framework')
 
@@ -252,20 +276,39 @@ def generate_crew_and_kickoff(self):
                 # Adding tools to the agent if exists
                 agent_tools = [tools_dict[tool] for tool in details.get('tools', []) if tool in tools_dict]
                 agent = Agent(role=role_filled, goal=goal_filled, backstory=backstory_filled, tools=agent_tools, allow_delegation=False)
+                
+                # Set agent callback if provided
+                if self.agent_callback:
+                    agent.step_callback = self.agent_callback
+
                 agents[role] = agent
 
                 for task_name, task_details in details.get('tasks', {}).items():
                     description_filled = task_details['description'].format(topic=topic)
                     expected_output_filled = task_details['expected_output'].format(topic=topic)
 
                     task = Task(description=description_filled, expected_output=expected_output_filled, agent=agent)
+                    
+                    # Set tool callback if provided
+                    if self.task_callback:
+                        task.callback = self.task_callback
+
                     tasks.append(task)
+            if agentops:
+                agentops.init()
             crew = Crew(
                 agents=list(agents.values()),
                 tasks=tasks,
                 verbose=2
             )
+            if agentops:
+                agentops.end_session("Success")
+            
+            self.logger.debug("Final Crew Configuration:")
+            self.logger.debug(f"Agents: {crew.agents}")
+            self.logger.debug(f"Tasks: {crew.tasks}")
 
             response = crew.kickoff()
             result = f"### Task Output ###\n{response}"
         return result
+

praisonai/agents_generator.py

@@ -8,6 +8,8 @@
 from typing import Optional
 from dotenv import load_dotenv
 load_dotenv()
+from contextlib import redirect_stdout
+from io import StringIO
 
 framework = "crewai"
 config_list = [
@@ -178,20 +180,80 @@ async def on_chat_resume(thread: ThreadDict):
 # async def tool(data: Optional[str] = None, language: Optional[str] = None):
 #     return cl.Message(content=data, language=language)
 
+@cl.step(type="tool", show_input=False)
+async def run_agents(agent_file: str, framework: str):
+    """Runs the agents and returns the result."""
+    agents_generator = AgentsGenerator(agent_file, framework, config_list)
+    current_step = cl.context.current_step
+    print("Current Step:", current_step)
+
+    stdout_buffer = StringIO()
+    with redirect_stdout(stdout_buffer):
+        result = agents_generator.generate_crew_and_kickoff()
+        
+    complete_output = stdout_buffer.getvalue()
+
+    async with cl.Step(name="gpt4", type="llm", show_input=True) as step:
+        step.input = ""
+        
+        for line in stdout_buffer.getvalue().splitlines():
+            print(line)
+            await step.stream_token(line)
+            
+        tool_res = await output(complete_output)
+
+    yield result
+
+@cl.step(type="tool", show_input=False, language="yaml")
+async def output(output):
+    return output
+
+@cl.step(type="tool", show_input=False, language="yaml")
+def agent(output):
+    return(f"""
+        Agent Step Completed!
+        Output: {output}
+    """)
+
+@cl.step(type="tool", show_input=False, language="yaml")
+def task(output):
+    return(f"""
+        Task Completed!
+        Task: {output.description}
+        Output: {output.raw_output}
+        {output}
+    """)
+
 @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")
+    if message_history is None:
+        message_history = []
+        cl.user_session.set("message_history", 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)
+        await cl.sleep(2)
         agent_file = generator.generate()
-        agents_generator = AgentsGenerator(agent_file, framework, config_list)
-        result = agents_generator.generate_crew_and_kickoff()
+        agents_generator = AgentsGenerator(
+            agent_file, 
+            framework, 
+            config_list, 
+            # agent_callback=agent,
+            # task_callback=task
+        )
+        # Capture stdout
+        stdout_buffer = StringIO()
+        with redirect_stdout(stdout_buffer):
+            result = agents_generator.generate_crew_and_kickoff()
+            
+        complete_output = stdout_buffer.getvalue()
+        tool_res = await output(complete_output)
         msg = cl.Message(content=result)
         await msg.send()
         message_history.append({"role": "assistant", "content": message.content})

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

praisonai/deploy.py

@@ -14,6 +14,8 @@
 import os
 import inspect
 import sys
+import logging
+logging.basicConfig(level=os.environ.get('LOGLEVEL', 'INFO'), format='%(asctime)s - %(levelname)s - %(message)s')
 
 def create_autogen_tool_function(tool_name):
     def autogen_tool(assistant, user_proxy):
@@ -51,10 +53,10 @@ def tool_func(query: str) -> Any:
 tools_module = None
 
 if os.path.isfile(tools_py_path):
-    print(f"{tools_py_path} exists in the root directory. Loading {tools_py_path} and skipping tools folder.")
+    logging.info(f"{tools_py_path} exists in the root directory. Loading {tools_py_path} and skipping tools folder.")
     tools_module = importlib.import_module("tools")
 elif tools_dir_path.is_dir():
-    print(f"tools folder exists in the root directory. Loading {tool_name} from tools/{tool_name}.py.")
+    logging.info(f"tools folder exists in the root directory. Loading {tool_name} from tools/{tool_name}.py.")
     tools_module = importlib.import_module(f"tools.{tool_name}")
 
 # Create autogen_TOOL_NAME_HERE function for each tool

praisonai/inbuilt_tools/autogen_tools.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PraisonAI"
-version = "0.0.35"
+version = "0.0.36"
 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 = ""
@@ -24,10 +24,12 @@ pyparsing = ">=3.0.0"
 chainlit = {version = "^1.1.301", optional = true}
 gradio = {version = ">=4.26.0", optional = true}
 flask = {version = ">=3.0.0", optional = true}
+agentops = {version = "==0.2.3", optional = true}
 
 [tool.poetry.dev-dependencies]
-pytest = "^8.0.0"
-pre-commit = "^3.7"
+pytest = "8.2.2"
+pre-commit = "3.7.1"
+unittest-xml-reporting = "3.2.0"
 
 [build-system]
 requires = ["poetry-core"]
@@ -39,4 +41,5 @@ praisonai = "praisonai.__main__:main"
 [tool.poetry.extras]
 ui = ["chainlit"]
 gradio = ["gradio"]
-api = ["flask"]
+api = ["flask"]
+agentops = ["agentops"]

pyproject.toml

@@ -1,4 +1,3 @@
-# tests/test.py
 import unittest
 import subprocess
 from praisonai.cli import PraisonAI
@@ -7,6 +6,10 @@
 from .auto_example import auto
 from xmlrunner import XMLTestRunner
 
+# Patch for collections.abc MutableMapping issue
+import collections.abc
+collections.MutableMapping = collections.abc.MutableMapping
+
 class TestPraisonAIFramework(unittest.TestCase):
     def test_main_with_autogen_framework(self):
         praison_ai = PraisonAI(agent_file='tests/autogen-agents.yaml')