ui changes

gui/package.json

@@ -12,15 +12,13 @@
   "dependencies": {
     "axios": "^1.4.0",
     "bootstrap": "^5.2.3",
-    "d3": "^7.8.5",
     "date-fns": "^2.30.0",
     "echarts": "^5.4.2",
     "eslint": "8.40.0",
     "eslint-config-next": "13.4.2",
     "mitt": "^3.0.0",
     "next": "13.4.2",
     "react": "18.2.0",
-    "react-apexcharts": "^1.4.0",
     "react-dom": "18.2.0",
     "react-markdown": "^8.0.7",
     "react-toastify": "^9.1.3"

migrations/versions/e39295ec089c_creating_events.py

@@ -0,0 +1,36 @@
+"""creating events
+
+Revision ID: e39295ec089c
+Revises: 7a3e336c0fba
+Create Date: 2023-06-30 12:23:12.269999
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'e39295ec089c'
+down_revision = '7a3e336c0fba'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('events',
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('event_name', sa.String(), nullable=False),
+    sa.Column('event_value', sa.Integer(), nullable=False),
+    sa.Column('json_property', postgresql.JSONB(astext_type=sa.Text()), nullable=True),
+    sa.Column('agent_id', sa.Integer(), nullable=True),
+    sa.Column('org_id', sa.Integer(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+
+
+def downgrade() -> None:
+    op.drop_table('events')
+    # ### end Alembic commands ###

package.json

@@ -1,7 +1,6 @@
 {
   "dependencies": {
     "axios": "^1.4.0",
-    "echarts": "^5.4.2",
     "react-toastify": "^9.1.3"
   }
 }

superagi/agent/super_agi.py

@@ -241,11 +241,11 @@ def handle_tool_response(self, assistant_reply):
         if action.name.lower() == FINISH or action.name == "":
             logger.info("\nTask Finished :) \n")
             output = {"result": "COMPLETE", "retry": False}
-            AnalyticsHelper.create_event(session, 'tool_used', 0, {'tool_name':action.name}, self.agent_config["agent_id"], 0),
+            AnalyticsHelper(session=session).create_event('tool_used', 0, {'tool_name':action.name}, self.agent_config["agent_id"], 0),
             return output
         if action.name.lower() in tools:
             tool = tools[action.name.lower()]
-            AnalyticsHelper.create_event(session, 'tool_used', 0, {'tool_name':action.name}, self.agent_config["agent_id"], 0),
+            AnalyticsHelper(session=session).create_event('tool_used', 0, {'tool_name':action.name}, self.agent_config["agent_id"], 0),
             try:
                 observation = tool.execute(action.args)
                 logger.info("Tool Observation : ")

superagi/controllers/agent.py

@@ -175,8 +175,8 @@ def create_agent_with_config(agent_with_config: AgentWithConfig,
     db.session.add(execution)
     db.session.commit()
 
-    AnalyticsHelper.create_event(db.session, 'run_created', 0, {'run_id': execution.id,'name':execution.name}, db_agent.id, 0),
-    AnalyticsHelper.create_event(db.session, 'agent_created', 1, {'name': agent_with_config.name, 'model': agent_with_config.model}, agent_id, 0)
+    AnalyticsHelper(session=db.session).create_event('run_created', 0, {'run_id': execution.id,'name':execution.name}, agent_id, 0),
+    AnalyticsHelper(session=db.session).create_event('agent_created', 1, {'name': agent_with_config.name, 'model': agent_with_config.model}, agent_id, 0)
 
     execute_agent.delay(execution.id, datetime.now())
 

superagi/controllers/agent_execution.py

@@ -47,7 +47,7 @@ def create_agent_execution(agent_execution: sqlalchemy_to_pydantic(AgentExecutio
     db.session.add(db_agent_execution)
     db.session.commit()
 
-    AnalyticsHelper.create_event(db.session, 'run_created', 0, {'run_id': db_agent_execution.id,'name':db_agent_execution.name},
+    AnalyticsHelper(session=db.session).create_event('run_created', 0, {'run_id': db_agent_execution.id,'name':db_agent_execution.name},
                                  agent_execution.agent_id, 0)
 
     if db_agent_execution.status == "RUNNING":

superagi/controllers/analytics.py

@@ -16,38 +16,38 @@ def get_metrics(Authorize: AuthJWT = Depends(check_auth)):
 
     """
     try:
-        return AnalyticsHelper.calculate_run_completed_metrics(db.session)
+        return AnalyticsHelper(session=db.session).calculate_run_completed_metrics()
     except:
         raise HTTPException(status_code=500, detail="Internal Server Error")
 
 
 @router.get("/agents/all", status_code=200)
 def get_agents(Authorize: AuthJWT = Depends(check_auth)):
     try:
-        return AnalyticsHelper.fetch_agent_data(db.session)
+        return AnalyticsHelper(session=db.session).fetch_agent_data()
     except:
         raise HTTPException(status_code=500, detail="Internal Server Error")
 
 
 @router.get("/agents/{agent_id}", status_code=200)
 def get_agent_runs(agent_id: int, Authorize: AuthJWT = Depends(check_auth)):
     try:
-        return AnalyticsHelper.fetch_agent_runs(agent_id,db.session)
+        return AnalyticsHelper(session=db.session).fetch_agent_runs(agent_id)
     except:
         raise HTTPException(status_code=500, detail=str(e))
 
 
 @router.get("/runs/active", status_code=200)
 def get_active_runs(Authorize: AuthJWT = Depends(check_auth)):
     try:
-        return AnalyticsHelper.get_active_runs(db.session)
+        return AnalyticsHelper(session=db.session).get_active_runs()
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 
 
 @router.get("/tools/used", status_code=200)
 def get_tools_used(Authorize: AuthJWT = Depends(check_auth)):
     try:
-        return AnalyticsHelper.calculate_tool_usage(db.session)
+        return AnalyticsHelper(session=db.session).calculate_tool_usage()
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))

superagi/helper/analytics_helper.py

@@ -7,8 +7,11 @@
 
 
 class AnalyticsHelper:
-    @classmethod
-    def create_event(cls, session: Session, event_name: str, event_value: int,
+
+    def __init__(self,session):
+        self.session = session
+
+    def create_event(self, event_name: str, event_value: int,
                      json_property: dict, agent_id: int, org_id: int) -> Event:
         event = Event(
             event_name=event_name,
@@ -17,16 +20,15 @@ def create_event(cls, session: Session, event_name: str, event_value: int,
             agent_id=agent_id,
             org_id=org_id,
         )
-        session.add(event)
-        session.commit()
+        self.session.add(event)
+        self.session.commit()
         return event
 
-    @classmethod
-    def calculate_run_completed_metrics(cls, session: Session) -> dict:
+    def calculate_run_completed_metrics(self) -> dict:
         result = {'total_tokens': 0, 'total_calls': 0, 'runs_completed': 0}
 
         try:
-            query_result = session.query(Event).filter_by(event_name="run_completed").all()
+            query_result = self.session.query(Event).filter_by(event_name="run_completed").all()
 
             for res in query_result:
                 if 'tokens_consumed' in res.json_property:
@@ -36,20 +38,19 @@ def calculate_run_completed_metrics(cls, session: Session) -> dict:
 
                 result['runs_completed'] += 1
 
-            session.close()
+            self.session.close()
 
         except SQLAlchemyError as e:
             print(str(e))
 
         return result
 
-    @classmethod
-    def fetch_agent_data(cls, session: Session) -> dict:
+    def fetch_agent_data(self) -> dict:
         agent_details_dict = {}
         models_used_dict = {}
 
         try:
-            agent_created_events = session.query(Event).filter_by(event_name="agent_created").all()
+            agent_created_events = self.session.query(Event).filter_by(event_name="agent_created").all()
 
             for event in agent_created_events:
                 agent_id = event.agent_id
@@ -70,7 +71,7 @@ def fetch_agent_data(cls, session: Session) -> dict:
                 else:
                     models_used_dict[model_type] = 1  # first time seeing this model, initialize with 1
 
-            run_completed_events = session.query(Event).filter_by(event_name="run_completed").all()
+            run_completed_events = self.session.query(Event).filter_by(event_name="run_completed").all()
 
             for event in run_completed_events:
                 agent_id = event.agent_id
@@ -84,7 +85,7 @@ def fetch_agent_data(cls, session: Session) -> dict:
                     if 'calls' in event.json_property:
                         agent_details_dict[agent_id]['total_calls'] += event.json_property['calls']
 
-            session.close()
+            self.session.close()
 
         except SQLAlchemyError as e:
             print(str(e))
@@ -94,12 +95,11 @@ def fetch_agent_data(cls, session: Session) -> dict:
 
         return {'agent_details':agent_details, 'model_info':models_used}
 
-    @classmethod
-    def fetch_agent_runs(cls, agent_id: int, session: Session) -> list:
+    def fetch_agent_runs(self, agent_id: int) -> list:
         agent_runs = []
         try:
-            query_result_completed = session.query(Event).filter_by(event_name="run_completed", agent_id=agent_id).all()
-            query_result_created = session.query(Event).filter_by(event_name="run_created", agent_id=agent_id).all()
+            query_result_completed = self.session.query(Event).filter_by(event_name="run_completed", agent_id=agent_id).all()
+            query_result_created = self.session.query(Event).filter_by(event_name="run_created", agent_id=agent_id).all()
 
             # create a dictionary of created_at times for run_created events
             created_dict = {run.json_property['run_id']: run.created_at for run in query_result_created}
@@ -121,22 +121,21 @@ def fetch_agent_runs(cls, agent_id: int, session: Session) -> list:
         except SQLAlchemyError as e:
             print(str(e))
 
-        session.close()
+        self.session.close()
 
         return agent_runs
 
-    @classmethod
-    def get_active_runs(cls, session: Session) -> list:
+    def get_active_runs(self) -> list:
         running_executions = []
         try:
-            start_events = session.query(Event).filter_by(event_name="run_created").all()
-            completed_events = session.query(Event).filter_by(event_name="run_completed").all()
+            start_events = self.session.query(Event).filter_by(event_name="run_created").all()
+            completed_events = self.session.query(Event).filter_by(event_name="run_completed").all()
 
             completed_run_ids = [event.json_property['run_id'] for event in completed_events]
 
             for event in start_events:
                 if event.json_property['run_id'] not in completed_run_ids:
-                    agent_event = session.query(Event).filter_by(agent_id=event.agent_id, event_name="agent_created").first()
+                    agent_event = self.session.query(Event).filter_by(agent_id=event.agent_id, event_name="agent_created").first()
                     agent_name = agent_event.json_property['name'] if agent_event else 'Unknown'
                     execution_data = {
                         'name': event.json_property['name'],
@@ -149,16 +148,15 @@ def get_active_runs(cls, session: Session) -> list:
             print(str(e))
             return {"error": str(e)}
         finally:
-            session.close()
+            self.session.close()
 
         return running_executions
 
-    @classmethod
-    def calculate_tool_usage(cls, session: Session) -> list:
+    def calculate_tool_usage(self) -> list:
         tool_usage_dict = {}
 
         try:
-            tool_used_events = session.query(Event).filter_by(event_name="tool_used").all()
+            tool_used_events = self.session.query(Event).filter_by(event_name="tool_used").all()
 
             for event in tool_used_events:
                 tool_name = event.json_property['tool_name']
@@ -173,7 +171,7 @@ def calculate_tool_usage(cls, session: Session) -> list:
                 tool_usage_dict[tool_name]["unique_agents"].add(agent_id)
                 tool_usage_dict[tool_name]["total_usage"] += 1
 
-            session.close()
+            self.session.close()
 
         except SQLAlchemyError as e:
             print(str(e))

superagi/jobs/agent_executor.py

@@ -235,7 +235,7 @@ def execute_next_action(self, agent_execution_id):
             db_agent_execution = session.query(AgentExecution).filter(AgentExecution.id == agent_execution_id).first()
             db_agent_execution.status = "COMPLETED"
             session.commit()
-            AnalyticsHelper.create_event(session, 'run_completed', 1, {'run_id':db_agent_execution.id,'name': db_agent_execution.name,'tokens_consumed':db_agent_execution.num_of_tokens,"calls":db_agent_execution.num_of_calls}, db_agent_execution.agent_id, organisation.id)
+            AnalyticsHelper(session=session).create_event('run_completed', 1, {'run_id':db_agent_execution.id,'name': db_agent_execution.name,'tokens_consumed':db_agent_execution.num_of_tokens,"calls":db_agent_execution.num_of_calls}, db_agent_execution.agent_id, organisation.id)
         elif response["result"] == "WAITING_FOR_PERMISSION":
             db_agent_execution = session.query(AgentExecution).filter(AgentExecution.id == agent_execution_id).first()
             db_agent_execution.status = "WAITING_FOR_PERMISSION"