PraisonAI 0.1.8__cp312-cp312-manylinux_2_35_x86_64.whl → 0.1.10__cp312-cp312-manylinux_2_35_x86_64.whl

praisonai/agents_generator.py

@@ -47,7 +47,7 @@ def disable_crewai_telemetry():
 disable_crewai_telemetry()
 
 class AgentsGenerator:
-    def __init__(self, agent_file, framework, config_list, log_level=None, agent_callback=None, task_callback=None, agent_yaml=None):
+    def __init__(self, agent_file, framework, config_list, log_level=None, agent_callback=None, task_callback=None, agent_yaml=None, tools=None):
         """
         Initialize the AgentsGenerator object.
 
@@ -59,6 +59,7 @@ class AgentsGenerator:
             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.
             agent_yaml (str, optional): The content of the YAML file. Defaults to None.
+            tools (dict, optional): A dictionary containing the tools to be used for the agents. Defaults to None.
 
         Attributes:
             agent_file (str): The path to the agent file.
@@ -67,6 +68,7 @@ class AgentsGenerator:
             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.
+            tools (dict): A dictionary containing the tools to be used for the agents.
         """
         self.agent_file = agent_file
         self.framework = framework
@@ -75,6 +77,7 @@ class AgentsGenerator:
         self.agent_callback = agent_callback
         self.task_callback = task_callback
         self.agent_yaml = agent_yaml
+        self.tools = tools or []  # Store tool class names as a list
         self.log_level = log_level or logging.getLogger().getEffectiveLevel()
         if self.log_level == logging.NOTSET:
             self.log_level = os.environ.get('LOGLEVEL', 'INFO').upper()
@@ -207,6 +210,14 @@ class AgentsGenerator:
             'YoutubeChannelSearchTool': YoutubeChannelSearchTool(),
             'YoutubeVideoSearchTool': YoutubeVideoSearchTool(),
         }
+        
+        # Add tools from class names
+        for tool_class in self.tools:
+            if isinstance(tool_class, type) and issubclass(tool_class, BaseTool):
+                tool_name = tool_class.__name__
+                tools_dict[tool_name] = tool_class()
+                self.logger.debug(f"Added tool: {tool_name}")
+        
         root_directory = os.getcwd()
         tools_py_path = os.path.join(root_directory, 'tools.py')
         tools_dir_path = Path(root_directory) / 'tools'
@@ -288,7 +299,7 @@ class AgentsGenerator:
                 backstory_filled = details['backstory'].format(topic=topic)
                 
                 # Adding tools to the agent if exists
-                agent_tools = [tools_dict.get(tool) for tool in details.get('tools', [])]
+                agent_tools = [tools_dict[tool] for tool in details.get('tools', []) if tool in tools_dict]
                 
                 llm_model = details.get('llm')  # Get the llm configuration
                 if llm_model:

praisonai/cli.py

@@ -67,7 +67,7 @@ def stream_subprocess(command, env=None):
         raise subprocess.CalledProcessError(return_code, command)
 
 class PraisonAI:
-    def __init__(self, agent_file="agents.yaml", framework="", auto=False, init=False, agent_yaml=None):
+    def __init__(self, agent_file="agents.yaml", framework="", auto=False, init=False, agent_yaml=None, tools=None):
         """
         Initialize the PraisonAI object with default parameters.
 
@@ -97,6 +97,7 @@ class PraisonAI:
         self.framework = framework
         self.auto = auto
         self.init = init
+        self.tools = tools or []  # Store tool class names as a list
 
     def run(self):
         """
@@ -238,11 +239,23 @@ class PraisonAI:
                 self.create_chainlit_interface()
             else:
                 # Modify below code to allow default ui
-                agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list, agent_yaml=self.agent_yaml)
+                agents_generator = AgentsGenerator(
+                    self.agent_file, 
+                    self.framework, 
+                    self.config_list, 
+                    agent_yaml=self.agent_yaml,
+                    tools=self.tools  # Pass tools to AgentsGenerator
+                )
                 result = agents_generator.generate_crew_and_kickoff()
                 return result
         else:
-            agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list, agent_yaml=self.agent_yaml)
+            agents_generator = AgentsGenerator(
+                self.agent_file, 
+                self.framework, 
+                self.config_list, 
+                agent_yaml=self.agent_yaml,
+                tools=self.tools  # Pass tools to AgentsGenerator
+            )
             result = agents_generator.generate_crew_and_kickoff()
             return result
             

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

{praisonai-0.1.8.dist-info → praisonai-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 0.1.8
+Version: 0.1.10
 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.1.8.dist-info → praisonai-0.1.10.dist-info}/RECORD

@@ -1,11 +1,11 @@
 praisonai/__init__.py,sha256=JrgyPlzZfLlozoW7SHZ1nVJ63rLPR3ki2k5ZPywYrnI,175
 praisonai/__main__.py,sha256=MVgsjMThjBexHt4nhd760JCqvP4x0IQcwo8kULOK4FQ,144
-praisonai/agents_generator.py,sha256=SltYtjFrADEkYkbzNrWHT6tIxpyjAMBbwH2czZOGPhg,19109
+praisonai/agents_generator.py,sha256=SNqjOT5bup9XVlpKnQ6orWqS3Q5LAC6V0t2OnxH0hnU,19748
 praisonai/api/call.py,sha256=iHdAlgIH_oTsEbjaGGu1Jjo6DTfMR-SfFdtSxnOLCeY,11032
 praisonai/auto.py,sha256=9spTXqj47Hmmqv5QHRYE_RzSVHH_KoPbaZjskUj2UcE,7895
 praisonai/chainlit_ui.py,sha256=bNR7s509lp0I9JlJNvwCZRUZosC64qdvlFCt8NmFamQ,12216
-praisonai/cli.py,sha256=8q8nfvc9ztKW3AQ0NpFnby739MCcvaqF3Y14BrpuCXo,20768
-praisonai/deploy.py,sha256=MY4PCgp8iSA-T1ovph00zZ8dTjIL7gZ7sjNENOOZ5sg,6027
+praisonai/cli.py,sha256=scEX17qKURlxXluGc3Sn8GBiaP5Q2QG8JLT7iifA17Y,21169
+praisonai/deploy.py,sha256=ex7QNuSSluOctpi4KyvR5cXW0282Fcr35CoUp6bXpEQ,6028
 praisonai/inbuilt_tools/__init__.py,sha256=mUKnbL6Gram9c9f2m8wJwEzURBLmPEOcHzwySBH89YA,74
 praisonai/inbuilt_tools/autogen_tools.py,sha256=svYkM2N7DVFvbiwgoAS7U_MqTOD8rHf8VD3BaFUV5_Y,14907
 praisonai/inc/__init__.py,sha256=sPDlYBBwdk0VlWzaaM_lG0_LD07lS2HRGvPdxXJFiYg,62
@@ -46,8 +46,8 @@ praisonai/ui/realtimeclient/realtimedocs.txt,sha256=hmgd8Uwy2SkjSndyyF_-ZOaNxiyH
 praisonai/ui/realtimeclient/tools.py,sha256=IJOYwVOBW5Ocn5_iV9pFkmSKR3WU3YpX3kwF0I3jikQ,7855
 praisonai/ui/sql_alchemy.py,sha256=kf025P_37C505YDDJZ-dPSmN_d62J2DCrkxbDAzXyrM,29884
 praisonai/version.py,sha256=ugyuFliEqtAwQmH4sTlc16YXKYbFWDmfyk87fErB8-8,21
-praisonai-0.1.8.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
-praisonai-0.1.8.dist-info/METADATA,sha256=C2u3l914yI9enMAZLYuaaAY72fRXXwZ8e--VkGn3KdQ,13291
-praisonai-0.1.8.dist-info/WHEEL,sha256=Ie8mbC-etDUh6aDhzdvvvp_A-4mQQX7whlOFBnSJhcE,110
-praisonai-0.1.8.dist-info/entry_points.txt,sha256=LT8Ie95dy4JkUlpgS0YyvD4Tf9zTstjaXISJnijDxoM,172
-praisonai-0.1.8.dist-info/RECORD,,
+praisonai-0.1.10.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
+praisonai-0.1.10.dist-info/METADATA,sha256=3OyUMuBts_LDDJ5dDN3H327th0Gvp3cc7Re31-c-yhM,13292
+praisonai-0.1.10.dist-info/WHEEL,sha256=Ie8mbC-etDUh6aDhzdvvvp_A-4mQQX7whlOFBnSJhcE,110
+praisonai-0.1.10.dist-info/entry_points.txt,sha256=LT8Ie95dy4JkUlpgS0YyvD4Tf9zTstjaXISJnijDxoM,172
+praisonai-0.1.10.dist-info/RECORD,,