PraisonAI 1.0.11__cp312-cp312-manylinux_2_39_x86_64.whl → 2.0.1__cp312-cp312-manylinux_2_39_x86_64.whl

praisonai/agents_generator.py

@@ -20,6 +20,13 @@ CREWAI_AVAILABLE = False
 AUTOGEN_AVAILABLE = False
 PRAISONAI_TOOLS_AVAILABLE = False
 AGENTOPS_AVAILABLE = False
+PRAISONAI_AVAILABLE = False
+
+try:
+    from praisonaiagents import Agent as PraisonAgent, Task as PraisonTask, PraisonAIAgents
+    PRAISONAI_AVAILABLE = True
+except ImportError:
+    pass
 
 try:
     from crewai import Agent, Task, Crew
@@ -37,11 +44,14 @@ except ImportError:
 try:
     import agentops
     AGENTOPS_AVAILABLE = True
+    AGENTOPS_API_KEY = os.getenv("AGENTOPS_API_KEY")
+    if not AGENTOPS_API_KEY:
+        AGENTOPS_AVAILABLE = False
 except ImportError:
     pass
 
 # Only try to import praisonai_tools if either CrewAI or AutoGen is available
-if CREWAI_AVAILABLE or AUTOGEN_AVAILABLE:
+if CREWAI_AVAILABLE or AUTOGEN_AVAILABLE or PRAISONAI_AVAILABLE:
     try:
         from praisonai_tools import (
             CodeDocsSearchTool, CSVSearchTool, DirectorySearchTool, DOCXSearchTool, DirectoryReadTool,
@@ -115,6 +125,8 @@ class AgentsGenerator:
             raise ImportError("CrewAI is not installed. Please install it with 'pip install praisonai[crewai]'")
         elif framework == "autogen" and not AUTOGEN_AVAILABLE:
             raise ImportError("AutoGen is not installed. Please install it with 'pip install praisonai[autogen]'")
+        elif framework == "praisonai" and not PRAISONAI_AVAILABLE:
+            raise ImportError("PraisonAI is not installed. Please install it with 'pip install praisonaiagents'")
 
     def is_function_or_decorated(self, obj):
         """
@@ -221,7 +233,7 @@ class AgentsGenerator:
         tools_dict = {}
         
         # Only try to use praisonai_tools if it's available and needed
-        if PRAISONAI_TOOLS_AVAILABLE and (CREWAI_AVAILABLE or AUTOGEN_AVAILABLE):
+        if PRAISONAI_TOOLS_AVAILABLE and (CREWAI_AVAILABLE or AUTOGEN_AVAILABLE or PRAISONAI_AVAILABLE):
             tools_dict = {
                 'CodeDocsSearchTool': CodeDocsSearchTool(),
                 'CSVSearchTool': CSVSearchTool(),
@@ -266,13 +278,19 @@ class AgentsGenerator:
             if not AUTOGEN_AVAILABLE:
                 raise ImportError("AutoGen is not installed. Please install it with 'pip install praisonai[autogen]'")
             if AGENTOPS_AVAILABLE:
-                agentops.init(os.environ.get("AGENTOPS_API_KEY"), tags=["autogen"])
+                agentops.init(os.environ.get("AGENTOPS_API_KEY"), default_tags=["autogen"])
             return self._run_autogen(config, topic, tools_dict)
+        elif framework == "praisonai":
+            if not PRAISONAI_AVAILABLE:
+                raise ImportError("PraisonAI is not installed. Please install it with 'pip install praisonaiagents'")
+            if AGENTOPS_AVAILABLE:
+                agentops.init(os.environ.get("AGENTOPS_API_KEY"), default_tags=["praisonai"])
+            return self._run_praisonai(config, topic, tools_dict)
         else:  # framework=crewai
             if not CREWAI_AVAILABLE:
                 raise ImportError("CrewAI is not installed. Please install it with 'pip install praisonai[crewai]'")
             if AGENTOPS_AVAILABLE:
-                agentops.init(os.environ.get("AGENTOPS_API_KEY"), tags=["crewai"])
+                agentops.init(os.environ.get("AGENTOPS_API_KEY"), default_tags=["crewai"])
             return self._run_crewai(config, topic, tools_dict)
 
     def _run_autogen(self, config, topic, tools_dict):
@@ -472,3 +490,126 @@ class AgentsGenerator:
             
         return result
 
+    def _run_praisonai(self, config, topic, tools_dict):
+        """
+        Run agents using the PraisonAI framework.
+        """
+        agents = {}
+        tasks = []
+        tasks_dict = {}
+
+        # Create agents from config
+        for role, details in config['roles'].items():
+            role_filled = details['role'].format(topic=topic)
+            goal_filled = details['goal'].format(topic=topic)
+            backstory_filled = details['backstory'].format(topic=topic)
+            
+            # Get agent tools
+            agent_tools = [tools_dict[tool] for tool in details.get('tools', []) 
+                          if tool in tools_dict]
+            
+            # Configure LLM
+            llm_model = details.get('llm')
+            if llm_model:
+                llm = llm_model.get("model", os.environ.get("MODEL_NAME", "gpt-4o"))
+            else:
+                llm = os.environ.get("MODEL_NAME", "gpt-4o")
+
+            # Configure function calling LLM
+            function_calling_llm_model = details.get('function_calling_llm')
+            if function_calling_llm_model:
+                function_calling_llm = function_calling_llm_model.get("model", os.environ.get("MODEL_NAME", "openai/gpt-4o"))
+            else:
+                function_calling_llm = os.environ.get("MODEL_NAME", "gpt-4o")
+            
+            # Create PraisonAI agent
+            agent = PraisonAgent(
+                name=role_filled,
+                role=role_filled,
+                goal=goal_filled,
+                backstory=backstory_filled,
+                tools=agent_tools,
+                allow_delegation=details.get('allow_delegation', False),
+                llm=llm,
+                function_calling_llm=function_calling_llm,
+                max_iter=details.get('max_iter', 15),
+                max_rpm=details.get('max_rpm'),
+                max_execution_time=details.get('max_execution_time'),
+                verbose=details.get('verbose', True),
+                cache=details.get('cache', True),
+                system_template=details.get('system_template'),
+                prompt_template=details.get('prompt_template'),
+                response_template=details.get('response_template'),
+            )
+            
+            # Set agent callback if provided
+            if self.agent_callback:
+                agent.step_callback = self.agent_callback
+
+            agents[role] = agent
+
+            # Create tasks for the 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)
+
+                # Create task using PraisonAI Task class
+                task = PraisonTask(
+                    description=description_filled,
+                    expected_output=expected_output_filled,
+                    agent=agent,
+                    tools=task_details.get('tools', []),
+                    async_execution=task_details.get('async_execution', False),
+                    context=[],
+                    config=task_details.get('config', {}),
+                    output_json=task_details.get('output_json'),
+                    output_pydantic=task_details.get('output_pydantic'),
+                    output_file=task_details.get('output_file', ""),
+                    callback=task_details.get('callback'),
+                    create_directory=task_details.get('create_directory', False)
+                )
+                
+                # Set task callback if provided
+                if self.task_callback:
+                    task.callback = self.task_callback
+
+                tasks.append(task)
+                tasks_dict[task_name] = task
+
+        # Set up task contexts
+        for role, details in config['roles'].items():
+            for task_name, task_details in details.get('tasks', {}).items():
+                task = tasks_dict[task_name]
+                context_tasks = [tasks_dict[ctx] for ctx in task_details.get('context', []) 
+                               if ctx in tasks_dict]
+                task.context = context_tasks
+
+        # Create and run the PraisonAI agents
+        if config.get('process') == 'hierarchical':
+            agents = PraisonAIAgents(
+                agents=list(agents.values()),
+                tasks=tasks,
+                verbose=True,
+                process="hierarchical",
+                manager_llm=config.get('manager_llm', 'gpt-4o'),
+            )
+        else:
+            agents = PraisonAIAgents(
+                agents=list(agents.values()),
+                tasks=tasks,
+                verbose=2
+            )
+        
+        self.logger.debug("Final Configuration:")
+        self.logger.debug(f"Agents: {agents.agents}")
+        self.logger.debug(f"Tasks: {agents.tasks}")
+
+        response = agents.start()
+        # result = f"### Task Output ###\n{response}"
+        self.logger.debug(f"Result: {response}")
+        result = ""
+        
+        if AGENTOPS_AVAILABLE:
+            agentops.end_session("Success")
+            
+        return result

praisonai/auto.py

@@ -12,6 +12,13 @@ import logging
 CREWAI_AVAILABLE = False
 AUTOGEN_AVAILABLE = False
 PRAISONAI_TOOLS_AVAILABLE = False
+PRAISONAI_AVAILABLE = False
+
+try:
+    from praisonaiagents import Agent as PraisonAgent, Task as PraisonTask, PraisonAIAgents
+    PRAISONAI_AVAILABLE = True
+except ImportError:
+    pass
 
 try:
     from crewai import Agent, Task, Crew
@@ -71,6 +78,11 @@ CrewAI is not installed. Please install with:
 AutoGen is not installed. Please install with:
     pip install "praisonai[autogen]"
 """)
+        elif framework == "praisonai" and not PRAISONAI_AVAILABLE:
+            raise ImportError("""
+Praisonai is not installed. Please install with:
+    pip install praisonaiagents
+""")
 
         # Only show tools message if using a framework and tools are needed
         if (framework in ["crewai", "autogen"]) and not PRAISONAI_TOOLS_AVAILABLE:
@@ -88,7 +100,7 @@ Tools are not available for {framework}. To use tools, install:
         ]
         self.topic = topic
         self.agent_file = agent_file
-        self.framework = framework or "crewai"
+        self.framework = framework or "praisonai"
         self.client = instructor.patch(
             OpenAI(
                 base_url=self.config_list[0]['base_url'],

praisonai/cli.py

@@ -24,6 +24,7 @@ GRADIO_AVAILABLE = False
 CALL_MODULE_AVAILABLE = False
 CREWAI_AVAILABLE = False
 AUTOGEN_AVAILABLE = False
+PRAISONAI_AVAILABLE = False
 
 try:
     # Create necessary directories and set CHAINLIT_APP_ROOT
@@ -65,6 +66,12 @@ try:
 except ImportError:
     pass
 
+try:
+    from praisonaiagents import Agent as PraisonAgent, Task as PraisonTask, PraisonAIAgents
+    PRAISONAI_AVAILABLE = True
+except ImportError:
+    pass
+
 logging.basicConfig(level=os.environ.get('LOGLEVEL', 'INFO'), format='%(asctime)s - %(levelname)s - %(message)s')
 
 def stream_subprocess(command, env=None):
@@ -273,7 +280,7 @@ class PraisonAI:
         Parse the command-line arguments for the PraisonAI CLI.
         """
         parser = argparse.ArgumentParser(prog="praisonai", description="praisonAI command-line interface")
-        parser.add_argument("--framework", choices=["crewai", "autogen"], help="Specify the framework")
+        parser.add_argument("--framework", choices=["crewai", "autogen", "praisonai"], help="Specify the framework")
         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="Initialize agents with optional topic")
@@ -381,11 +388,12 @@ class PraisonAI:
 
         # Only check framework availability for agent-related operations
         if not args.command and (args.init or args.auto or args.framework):
-            if not CREWAI_AVAILABLE and not AUTOGEN_AVAILABLE:
+            if not CREWAI_AVAILABLE and not AUTOGEN_AVAILABLE and not PRAISONAI_AVAILABLE:
                 print("[red]ERROR: No framework is installed. Please install at least one framework:[/red]")
                 print("\npip install \"praisonai\\[crewai]\"  # For CrewAI")
                 print("pip install \"praisonai\\[autogen]\"  # For AutoGen")
                 print("pip install \"praisonai\\[crewai,autogen]\"  # For both frameworks\n")
+                print("pip install praisonaiagents # For PraisonAIAgents\n")  
                 sys.exit(1)
 
         return args

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

praisonai/ui/config/.chainlit/config.toml

@@ -69,7 +69,7 @@ cot = "full"
 
 # Specify a CSS file that can be used to customize the user interface.
 # The CSS file can be served from the public directory or via an external link.
-custom_css = "https://cdn.jsdelivr.net/gh/MervinPraison/PraisonAI@1.0.11/praisonai/ui/public/praison.css"
+custom_css = "https://cdn.jsdelivr.net/gh/MervinPraison/PraisonAI@2.0.1/praisonai/ui/public/praison.css"
 
 # Specify a Javascript file that can be used to customize the user interface.
 # The Javascript file can be served from the public directory.

{praisonai-1.0.11.dist-info → praisonai-2.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 1.0.11
+Version: 2.0.1
 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
@@ -23,9 +23,10 @@ Provides-Extra: openai
 Provides-Extra: realtime
 Provides-Extra: train
 Provides-Extra: ui
+Requires-Dist: PyYAML (>=6.0)
 Requires-Dist: agentops (>=0.3.12) ; extra == "agentops"
 Requires-Dist: aiosqlite (>=0.20.0) ; extra == "chat" or extra == "code" or extra == "realtime"
-Requires-Dist: chainlit (==1.3.0rc1) ; extra == "ui" or extra == "chat" or extra == "code" or extra == "realtime"
+Requires-Dist: chainlit (==2.0rc1) ; extra == "ui" or extra == "chat" or extra == "code" or extra == "realtime"
 Requires-Dist: crawl4ai (==0.3.4) ; extra == "chat" or extra == "code" or extra == "realtime"
 Requires-Dist: crewai (>=0.32.0) ; extra == "crewai" or extra == "autogen"
 Requires-Dist: duckduckgo_search (>=6.3.0) ; extra == "realtime"
@@ -45,11 +46,12 @@ Requires-Dist: openai (>=1.54.0) ; extra == "call"
 Requires-Dist: playwright (>=1.47.0) ; extra == "chat" or extra == "code"
 Requires-Dist: plotly (>=5.24.0) ; extra == "realtime"
 Requires-Dist: praisonai-tools (>=0.0.7) ; extra == "crewai" or extra == "autogen"
+Requires-Dist: praisonaiagents (>=0.0.4)
 Requires-Dist: pyautogen (>=0.2.19) ; extra == "autogen"
 Requires-Dist: pydantic (<=2.10.1) ; extra == "chat" or extra == "code"
 Requires-Dist: pyngrok (>=1.4.0) ; extra == "call"
 Requires-Dist: pyparsing (>=3.0.0)
-Requires-Dist: python-dotenv (>=0.19.0) ; extra == "call"
+Requires-Dist: python-dotenv (>=1.0.1) ; extra == "call"
 Requires-Dist: rich (>=13.7) ; extra == "chat" or extra == "call"
 Requires-Dist: sqlalchemy (>=2.0.36) ; extra == "chat" or extra == "code" or extra == "realtime"
 Requires-Dist: tavily-python (==0.5.0) ; extra == "chat" or extra == "code" or extra == "realtime"

{praisonai-1.0.11.dist-info → praisonai-2.0.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 praisonai/__init__.py,sha256=JrgyPlzZfLlozoW7SHZ1nVJ63rLPR3ki2k5ZPywYrnI,175
 praisonai/__main__.py,sha256=MVgsjMThjBexHt4nhd760JCqvP4x0IQcwo8kULOK4FQ,144
-praisonai/agents_generator.py,sha256=CYqoJj4wHi_2lD39vAiOiLLV7SYg30o5nky09u5ViAE,20801
+praisonai/agents_generator.py,sha256=9-KuU1--_cBI85y2J-9XjW0LYHTCMnKJhy5WAUrf3M0,26887
 praisonai/api/call.py,sha256=iHdAlgIH_oTsEbjaGGu1Jjo6DTfMR-SfFdtSxnOLCeY,11032
-praisonai/auto.py,sha256=NDQiTV8ex_NE5C6AoY26-gMyLZNYrfthgQ6G0Dn1uhU,8304
+praisonai/auto.py,sha256=uLDm8CU3L_3amZsd55yzf9RdBF1uW-BGSx7nl9ctNZ4,8680
 praisonai/chainlit_ui.py,sha256=bNR7s509lp0I9JlJNvwCZRUZosC64qdvlFCt8NmFamQ,12216
-praisonai/cli.py,sha256=JAopax31bOyHi0uHqucq-Jt-uAASTXAKfs0if7mlvZ0,20903
-praisonai/deploy.py,sha256=BYncPlo774jSJTqIYoPAreP0dsBodOeSBlIpfd3IvZc,6028
+praisonai/cli.py,sha256=O7abKND2MP_yDdD_OclPoiZG1JRoGc4u9KowbRzuQuQ,21209
+praisonai/deploy.py,sha256=NxKvfC53zDznMaMePYkaJR0h1sYkDgMXv3LYxLVs1jI,6027
 praisonai/inbuilt_tools/__init__.py,sha256=fai4ZJIKz7-iOnGZv5jJX0wmT77PKa4x2jqyaJddKFA,569
 praisonai/inbuilt_tools/autogen_tools.py,sha256=kJdEv61BTYvdHOaURNEpBcWq8Rs-oC03loNFTIjT-ak,4687
 praisonai/inc/__init__.py,sha256=sPDlYBBwdk0VlWzaaM_lG0_LD07lS2HRGvPdxXJFiYg,62
@@ -36,7 +36,7 @@ praisonai/ui/README.md,sha256=QG9yucvBieVjCjWFzu6hL9xNtYllkoqyJ_q1b0YYAco,1124
 praisonai/ui/chat.py,sha256=rlYwhTd3giBuvtK4Yc9kf6N9jfVT0VrZ-mLIzhANGiQ,13565
 praisonai/ui/code.py,sha256=GD_xQTo7qzpOM98tu4MOPsviJdXU__Ta3JIfsjoRe6U,15797
 praisonai/ui/components/aicoder.py,sha256=Xh95RSEJCel5mEGic4vdtzyNpHNULF3ymft9nbwglXY,11155
-praisonai/ui/config/.chainlit/config.toml,sha256=a61MjfHZDGt0xGs9mOC21LHJZHY95Acxo5uvP0hJkvU,3825
+praisonai/ui/config/.chainlit/config.toml,sha256=nTpaTDrCK4UxCYqbBcwxHl8K5phqu8Akt0SoDC4stkA,3824
 praisonai/ui/config/.chainlit/translations/bn.json,sha256=m2TAaGMS-18_siW5dw4sbosh0Wn8ENWWzdGYkHaBrXw,22679
 praisonai/ui/config/.chainlit/translations/en-US.json,sha256=QoQAg8P5Q5gbGASc-HAHcfhufk71-Uc1u_ewIBfHuLc,9821
 praisonai/ui/config/.chainlit/translations/gu.json,sha256=9wE-NsHf7j5VUFzfE-cCpESTyHtzVHRcZXAwC3ACMl0,21660
@@ -75,8 +75,8 @@ praisonai/ui/realtimeclient/realtimedocs.txt,sha256=hmgd8Uwy2SkjSndyyF_-ZOaNxiyH
 praisonai/ui/realtimeclient/tools.py,sha256=IJOYwVOBW5Ocn5_iV9pFkmSKR3WU3YpX3kwF0I3jikQ,7855
 praisonai/ui/sql_alchemy.py,sha256=cfyL9uFfuizKFvW0aZfUBlJWPQYI-YBi1v4vxlkb1BQ,29615
 praisonai/version.py,sha256=ugyuFliEqtAwQmH4sTlc16YXKYbFWDmfyk87fErB8-8,21
-praisonai-1.0.11.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
-praisonai-1.0.11.dist-info/METADATA,sha256=G970R4iJK7lrtMtd3TWM1efEMxznfd5fQju2c1-GjBY,17375
-praisonai-1.0.11.dist-info/WHEEL,sha256=x1HiyTP_r-PIOu3STHzjukjf5kVLXzgVftSXf5bl8AU,110
-praisonai-1.0.11.dist-info/entry_points.txt,sha256=I_xc6a6MNTTfLxYmAxe0rgey0G-_hbY07oFW-ZDnkw4,135
-praisonai-1.0.11.dist-info/RECORD,,
+praisonai-2.0.1.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
+praisonai-2.0.1.dist-info/METADATA,sha256=3qoIcd7N8JBf2EHutRil4IADlBlnK7GlADzZGrITvqw,17442
+praisonai-2.0.1.dist-info/WHEEL,sha256=x1HiyTP_r-PIOu3STHzjukjf5kVLXzgVftSXf5bl8AU,110
+praisonai-2.0.1.dist-info/entry_points.txt,sha256=I_xc6a6MNTTfLxYmAxe0rgey0G-_hbY07oFW-ZDnkw4,135
+praisonai-2.0.1.dist-info/RECORD,,