PraisonAI 2.0.11__cp311-cp311-macosx_15_0_arm64.whl → 2.0.53__cp311-cp311-macosx_15_0_arm64.whl

praisonai/agents_generator.py

@@ -200,6 +200,47 @@ class AgentsGenerator:
                     tools_dict[name] = obj
         return tools_dict
 
+    def load_tools_from_tools_py(self):
+        """
+        Imports and returns all contents from tools.py file.
+        Also adds the tools to the global namespace.
+
+        Returns:
+            list: A list of callable functions with proper formatting
+        """
+        tools_list = []
+        try:
+            # Try to import tools.py from current directory
+            spec = importlib.util.spec_from_file_location("tools", "tools.py")
+            self.logger.debug(f"Spec: {spec}")
+            if spec is None:
+                self.logger.debug("tools.py not found in current directory")
+                return tools_list
+
+            module = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(module)
+
+            # Get all module attributes except private ones and classes
+            for name, obj in inspect.getmembers(module):
+                if (not name.startswith('_') and 
+                    callable(obj) and 
+                    not inspect.isclass(obj)):
+                    # Add the function to global namespace
+                    globals()[name] = obj
+                    # Add to tools list
+                    tools_list.append(obj)
+                    self.logger.debug(f"Loaded and globalized tool function: {name}")
+
+            self.logger.debug(f"Loaded {len(tools_list)} tool functions from tools.py")
+            self.logger.debug(f"Tools list: {tools_list}")
+            
+        except FileNotFoundError:
+            self.logger.debug("tools.py not found in current directory")
+        except Exception as e:
+            self.logger.warning(f"Error loading tools from tools.py: {e}")
+            
+        return tools_list
+
     def generate_crew_and_kickoff(self):
         """
         Generates a crew of agents and initiates tasks based on the provided configuration.
@@ -271,7 +312,7 @@ class AgentsGenerator:
         elif tools_dir_path.is_dir():
             tools_dict.update(self.load_tools_from_module_class(tools_dir_path))
             self.logger.debug("tools folder exists in the root directory")
-        
+
         framework = self.framework or config.get('framework')
 
         if framework == "autogen":
@@ -498,40 +539,26 @@ class AgentsGenerator:
         tasks = []
         tasks_dict = {}
 
+        # Load tools once at the beginning
+        tools_list = self.load_tools_from_tools_py()
+        self.logger.debug(f"Loaded tools: {tools_list}")
+
         # 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
+            # Pass all loaded tools to the agent
             agent = PraisonAgent(
                 name=role_filled,
                 role=role_filled,
                 goal=goal_filled,
                 backstory=backstory_filled,
-                tools=agent_tools,
+                tools=tools_list,  # Pass the entire tools list to the agent
                 allow_delegation=details.get('allow_delegation', False),
-                llm=llm,
-                function_calling_llm=function_calling_llm,
+                llm=details.get('llm', {}).get("model", os.environ.get("MODEL_NAME", "gpt-4o")),
+                function_calling_llm=details.get('function_calling_llm', {}).get("model", os.environ.get("MODEL_NAME", "gpt-4o")),
                 max_iter=details.get('max_iter', 15),
                 max_rpm=details.get('max_rpm'),
                 max_execution_time=details.get('max_execution_time'),
@@ -540,25 +567,27 @@ class AgentsGenerator:
                 system_template=details.get('system_template'),
                 prompt_template=details.get('prompt_template'),
                 response_template=details.get('response_template'),
+                reflect_llm=details.get('reflect_llm', {}).get("model", os.environ.get("MODEL_NAME", "gpt-4o")),
+                min_reflect=details.get('min_reflect', 1),
+                max_reflect=details.get('max_reflect', 3),
             )
             
-            # Set agent callback if provided
             if self.agent_callback:
                 agent.step_callback = self.agent_callback
 
             agents[role] = agent
+            self.logger.debug(f"Created agent {role_filled} with tools: {agent.tools}")
 
             # 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', []),
+                    tools=tools_list,  # Pass the same tools list to the task
                     async_execution=task_details.get('async_execution', False),
                     context=[],
                     config=task_details.get('config', {}),
@@ -568,8 +597,9 @@ class AgentsGenerator:
                     callback=task_details.get('callback'),
                     create_directory=task_details.get('create_directory', False)
                 )
+
+                self.logger.debug(f"Created task {task_name} with tools: {task.tools}")
                 
-                # Set task callback if provided
                 if self.task_callback:
                     task.callback = self.task_callback
 
@@ -581,10 +611,12 @@ class AgentsGenerator:
             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]
+                            if ctx in tasks_dict]
                 task.context = context_tasks
 
         # Create and run the PraisonAI agents
+        memory = config.get('memory', False)
+        self.logger.debug(f"Memory: {memory}")
         if config.get('process') == 'hierarchical':
             agents = PraisonAIAgents(
                 agents=list(agents.values()),
@@ -592,20 +624,21 @@ class AgentsGenerator:
                 verbose=True,
                 process="hierarchical",
                 manager_llm=config.get('manager_llm', 'gpt-4o'),
+                memory=memory
             )
         else:
             agents = PraisonAIAgents(
                 agents=list(agents.values()),
                 tasks=tasks,
-                verbose=2
+                verbose=2,
+                memory=memory
             )
-        
+
         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 = ""
         

praisonai/api/call.py

@@ -50,7 +50,7 @@ logger.handlers = []
 # Try to import tools from the root directory
 tools = []
 tools_path = os.path.join(os.getcwd(), 'tools.py')
-logger.info(f"Tools path: {tools_path}")
+logger.debug(f"Tools path: {tools_path}")
 
 def import_tools_from_file(file_path):
     spec = importlib.util.spec_from_file_location("custom_tools", file_path)
@@ -63,9 +63,9 @@ try:
     if os.path.exists(tools_path):
         # tools.py exists in the root directory, import from file
         custom_tools_module = import_tools_from_file(tools_path)
-        logger.info("Successfully imported custom tools from root tools.py")
+        logger.debug("Successfully imported custom tools from root tools.py")
     else:
-        logger.info("No custom tools.py file found in the root directory")
+        logger.debug("No custom tools.py file found in the root directory")
         custom_tools_module = None
 
     if custom_tools_module:

praisonai/cli.py

@@ -73,6 +73,12 @@ except ImportError:
     pass
 
 logging.basicConfig(level=os.environ.get('LOGLEVEL', 'INFO'), format='%(asctime)s - %(levelname)s - %(message)s')
+logging.getLogger('alembic').setLevel(logging.ERROR)
+logging.getLogger('gradio').setLevel(logging.ERROR)
+logging.getLogger('gradio').setLevel(os.environ.get('GRADIO_LOGLEVEL', 'WARNING'))
+logging.getLogger('rust_logger').setLevel(logging.WARNING)
+logging.getLogger('duckduckgo').setLevel(logging.ERROR)
+logging.getLogger('_client').setLevel(logging.ERROR)
 
 def stream_subprocess(command, env=None):
     """
@@ -478,7 +484,7 @@ class PraisonAI:
                     logging.info("Public folder not found in the package.")
             else:
                 logging.info("Public folder already exists.")
-            chainlit_ui_path = os.path.join(os.path.dirname(praisonai.__file__), 'chainlit_ui.py')
+            chainlit_ui_path = os.path.join(os.path.dirname(praisonai.__file__), 'ui', 'agents.py')
             chainlit_run([chainlit_ui_path])
         else:
             print("ERROR: Chainlit is not installed. Please install it with 'pip install \"praisonai[ui]\"' to use the UI.")

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