add permission_required property to base_tool.py

superagi/agent/super_agi.py

@@ -174,10 +174,15 @@ def execute(self, template_step: AgentTemplateStep):
                                                       role="assistant")
             session.add(agent_execution_feed)
             session.commit()
+
             action = self.output_parser.parse(assistant_reply)
+            tools = {t.name: t for t in self.tools}
+
+            excluded_tools = [FINISH, '', None]
 
             # get the last agent execution permission for this agent execution
-            if self.agent_config["permission_type"].upper() == "RESTRICTED":
+            if self.agent_config["permission_type"].upper() == "RESTRICTED" and action.name not in excluded_tools and \
+                    tools[action.name].permission_required:
                 new_agent_execution_permission = AgentExecutionPermission(
                     agent_execution_id=self.agent_config["agent_execution_id"],
                     agent_id=self.agent_config["agent_id"],

superagi/controllers/agent_execution.py

@@ -146,27 +146,8 @@ def update_agent_execution_permission(agent_execution_permission_id: int,
     if status is None:
         raise HTTPException(status_code=400, detail="Invalid Request status is required")
     agent_execution_permission.status = status
-    # if status:
-    #     agent_execution_permission.status = True
-    #     # result = SuperAgi(ai_name=None, ai_role=None,
-    #     #                          llm=None, tools=,
-    #     #                          memory=memory,
-    #     #                          agent_config=parsed_config).handle_tool_response(agent_execution_permission.assistant_reply)['result']
-    # else:
-    #     agent_execution_permission.status = False
-    #     result = f"user rejected to access to run {agent_execution_permission.tool_name}"
-    # agent_execution_permission.response = response
     db.session.commit()
-    # db_agent_execution = db.session.query(AgentExecution). \
-    #     get(agent_execution_permission.agent_execution_id)
-    # db_agent_execution.status = "RUNNING"
-    # agent_execution_feed = AgentExecutionFeed(agent_execution_id=agent_execution_permission.agent_execution_id,
-    #                                           agent_id=agent_execution_permission.agent_id,
-    #                                           feed=result,
-    #                                           role="system"
-    #                                           )
-    # db.session.add(agent_execution_feed)
-    # db.session.commit()
+
     execute_agent.delay(agent_execution_permission.agent_execution_id, datetime.now())
 
     return {"success": True}

superagi/jobs/agent_executor.py

@@ -154,12 +154,14 @@ def execute_next_action(self, agent_execution_id):
             agent_execution.status = "RUNNING"
             agent_execution_permission = session.query(AgentExecutionPermission).filter(
                                         AgentExecutionPermission.id == agent_execution.permission_id).first()
-
-            result = spawned_agent.handle_tool_response(agent_execution_permission.assistant_reply)
+            if agent_execution_permission.status:
+                result = spawned_agent.handle_tool_response(agent_execution_permission.assistant_reply).get("result")
+            else:
+                result = f"user denied the permission to run the tool {agent_execution_permission.tool_name}"
 
             agent_execution_feed = AgentExecutionFeed(agent_execution_id=agent_execution_permission.agent_execution_id,
                                                       agent_id=agent_execution_permission.agent_id,
-                                                      feed=result.get("result"),
+                                                      feed=result,
                                                       role="system"
                                                       )
             session.add(agent_execution_feed)

superagi/tools/base_tool.py

@@ -78,6 +78,11 @@ def _execute(self, *args: Any, **kwargs: Any):
     def max_token_limit(self):
         return get_config("MAX_TOOL_TOKEN_LIMIT", 600)
 
+    # permission required to run tool in Restricted mode
+    @property
+    def permission_required(self):
+        return True
+
     def _parse_input(
             self,
             tool_input: Union[str, Dict],

superagi/tools/thinking/tools.py

@@ -26,6 +26,10 @@ class ThinkingTool(BaseTool):
     args_schema: Type[ThinkingSchema] = ThinkingSchema
     goals: List[str] = []
 
+    @property
+    def permission_required(self):
+        return False
+
     class Config:
         arbitrary_types_allowed = True