PraisonAI 2.0.15__cp312-cp312-manylinux_2_39_x86_64.whl → 2.0.17__cp312-cp312-manylinux_2_39_x86_64.whl

praisonai/agents_generator.py

@@ -202,54 +202,42 @@ class AgentsGenerator:
 
     def load_tools_from_tools_py(self):
         """
-        Automatically loads all tools (functions and tool definitions) from tools.py file.
+        Imports and returns all contents from tools.py file.
+        Also adds the tools to the global namespace.
 
         Returns:
-            dict: A dictionary containing:
-                - Function names as keys and function objects as values
-                - Tool definition names as keys and tool definition dictionaries as values
-
-        Note:
-            This function looks for:
-            1. Regular functions
-            2. Tool definition dictionaries (containing 'type' and 'function' keys)
-            3. Variables named as tools or ending with '_tool'
+            list: A list of callable functions with proper formatting
         """
-        tools_dict = {}
+        tools_list = []
         try:
             # Try to import tools.py from current directory
             spec = importlib.util.spec_from_file_location("tools", "tools.py")
+            self.logger.info(f"Spec: {spec}")
             if spec is None:
-                self.logger.warning("tools.py not found in current directory")
-                return tools_dict
+                self.logger.info("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
+            # Get all module attributes except private ones and classes
             for name, obj in inspect.getmembers(module):
-                # Skip private attributes
-                if name.startswith('_'):
-                    continue
-                    
-                # Case 1: Regular functions
-                if inspect.isfunction(obj) and obj.__module__ == "tools":
-                    tools_dict[name] = obj
-                    
-                # Case 2: Tool definition dictionaries
-                elif isinstance(obj, dict) and obj.get('type') == 'function' and 'function' in obj:
-                    tools_dict[name] = obj
-                    
-                # Case 3: Variables named as tools
-                elif (name.endswith('_tool') or name == 'tools') and not inspect.ismodule(obj):
-                    tools_dict[name] = obj
-
-            self.logger.debug(f"Loaded {len(tools_dict)} tools from tools.py")
+                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.info(f"Loaded and globalized tool function: {name}")
+
+            self.logger.info(f"Loaded {len(tools_list)} tool functions from tools.py")
+            self.logger.info(f"Tools list: {tools_list}")
             
         except Exception as e:
             self.logger.warning(f"Error loading tools from tools.py: {e}")
             
-        return tools_dict
+        return tools_list
 
     def generate_crew_and_kickoff(self):
         """
@@ -549,7 +537,9 @@ class AgentsGenerator:
         tasks = []
         tasks_dict = {}
 
-        tools_dict = self.load_tools_from_tools_py()
+        # Load tools once at the beginning
+        tools_list = self.load_tools_from_tools_py()
+        self.logger.info(f"Loaded tools: {tools_list}")
 
         # Create agents from config
         for role, details in config['roles'].items():
@@ -557,34 +547,16 @@ class AgentsGenerator:
             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'),
@@ -593,25 +565,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.info(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', {}),
@@ -621,8 +595,9 @@ class AgentsGenerator:
                     callback=task_details.get('callback'),
                     create_directory=task_details.get('create_directory', False)
                 )
+
+                self.logger.info(f"Created task {task_name} with tools: {task.tools}")
                 
-                # Set task callback if provided
                 if self.task_callback:
                     task.callback = self.task_callback
 
@@ -634,7 +609,7 @@ 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
@@ -652,13 +627,12 @@ class AgentsGenerator:
                 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 = ""
         

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

{praisonai-2.0.15.dist-info → praisonai-2.0.17.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 2.0.15
-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.
+Version: 2.0.17
+Summary: PraisonAI is an AI Agents Framework with Self Reflection. PraisonAI application combines PraisonAI Agents, AutoGen, and CrewAI into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customisation, and efficient human–agent collaboration.
 Author: Mervin Praison
 Requires-Python: >=3.10,<3.13
 Classifier: Programming Language :: Python :: 3
@@ -46,7 +46,7 @@ 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.7)
+Requires-Dist: praisonaiagents (>=0.0.13)
 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"
@@ -529,33 +529,7 @@ if __name__ == "__main__":
 
 ## Commands to Install Dependencies:
 
-1. **Install all dependencies, including dev dependencies:**
-
-   ```sh
-   poetry install
-   ```
-
-2. **Install only documentation dependencies:**
-
-   ```sh
-   poetry install --with docs
-   ```
-
-3. **Install only test dependencies:**
-
-   ```sh
-   poetry install --with test
-   ```
-
-4. **Install only dev dependencies:**
-
-   ```sh
-   poetry install --with dev
-   ```
-
-This configuration ensures that your development dependencies are correctly categorized and installed as needed.
-
-### Using uv (Fast Python Package Installer)
+### Using uv
 ```bash
 # Install uv if you haven't already
 pip install uv

{praisonai-2.0.15.dist-info → praisonai-2.0.17.dist-info}/RECORD

@@ -1,11 +1,11 @@
 praisonai/__init__.py,sha256=JrgyPlzZfLlozoW7SHZ1nVJ63rLPR3ki2k5ZPywYrnI,175
 praisonai/__main__.py,sha256=MVgsjMThjBexHt4nhd760JCqvP4x0IQcwo8kULOK4FQ,144
-praisonai/agents_generator.py,sha256=D9UOVyx0dzRw02rQ_qI1nU3sxqayY5PDy3t4OMW-ty8,29027
+praisonai/agents_generator.py,sha256=nA8duf4FxksuRf-luwSN6n1IKhPVqTiVHi32WCO79dA,28177
 praisonai/api/call.py,sha256=iHdAlgIH_oTsEbjaGGu1Jjo6DTfMR-SfFdtSxnOLCeY,11032
 praisonai/auto.py,sha256=uLDm8CU3L_3amZsd55yzf9RdBF1uW-BGSx7nl9ctNZ4,8680
 praisonai/chainlit_ui.py,sha256=bNR7s509lp0I9JlJNvwCZRUZosC64qdvlFCt8NmFamQ,12216
 praisonai/cli.py,sha256=O7abKND2MP_yDdD_OclPoiZG1JRoGc4u9KowbRzuQuQ,21209
-praisonai/deploy.py,sha256=zMk5X8hU_HqP0k8rsZr9qVe0bLbNMpEIihuJE1Py_ho,6028
+praisonai/deploy.py,sha256=Oex-u4Q6thJ55VdNXUntp2_2C1RZ0GUrWHl29Z6JX5g,6028
 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
@@ -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-2.0.15.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
-praisonai-2.0.15.dist-info/METADATA,sha256=X9ZH6sl93lxKN81Mt6C9fuleTtGGUU5WnZjBIkqLrTo,19757
-praisonai-2.0.15.dist-info/WHEEL,sha256=x1HiyTP_r-PIOu3STHzjukjf5kVLXzgVftSXf5bl8AU,110
-praisonai-2.0.15.dist-info/entry_points.txt,sha256=I_xc6a6MNTTfLxYmAxe0rgey0G-_hbY07oFW-ZDnkw4,135
-praisonai-2.0.15.dist-info/RECORD,,
+praisonai-2.0.17.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
+praisonai-2.0.17.dist-info/METADATA,sha256=SLmJ2xljw91aNYSGdH_Bdx3-P-0600zbFg-ZQM6NsjE,19304
+praisonai-2.0.17.dist-info/WHEEL,sha256=x1HiyTP_r-PIOu3STHzjukjf5kVLXzgVftSXf5bl8AU,110
+praisonai-2.0.17.dist-info/entry_points.txt,sha256=I_xc6a6MNTTfLxYmAxe0rgey0G-_hbY07oFW-ZDnkw4,135
+praisonai-2.0.17.dist-info/RECORD,,