Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toolkit feature backend #452

Merged
merged 145 commits into from
Jun 23, 2023
Merged
Changes from 1 commit
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
06a72f4
Oauth Authentication for google calendar
Jun 13, 2023
86ad742
Updated APIs
luciferlinx101 Jun 14, 2023
e42c72d
integration
Vibhusha22 Jun 14, 2023
b6c71c9
Updated APIs
luciferlinx101 Jun 14, 2023
3cf386a
Refresh token error resolved
Jun 14, 2023
7fac5ed
Minor bug fix
Jun 14, 2023
75783f2
Update APIs
luciferlinx101 Jun 14, 2023
80d56e2
Added subtool for delete event and get detail of an event
Jun 14, 2023
d9da44d
Added Market place APIs
luciferlinx101 Jun 15, 2023
f015c6c
Updated tool-kit, marketplace APIs
luciferlinx101 Jun 15, 2023
d1871de
toolkit
Vibhusha22 Jun 15, 2023
4e5cffe
Google Calendar Tool completed
Jun 16, 2023
d2ad5dc
Fixed File Process bug
luciferlinx101 Jun 17, 2023
e38aff7
Merged With Dev
luciferlinx101 Jun 17, 2023
ff6aee6
minor fix
luciferlinx101 Jun 17, 2023
27d1375
Modified Toolkit stats
luciferlinx101 Jun 17, 2023
1cc8e25
Fixed Migrations, added tools manager,tools.json
luciferlinx101 Jun 18, 2023
e12bb30
Download working with toolkit registration
luciferlinx101 Jun 18, 2023
e9296d3
toolkit
Vibhusha22 Jun 18, 2023
1600c7b
Update Toolkit for github
luciferlinx101 Jun 18, 2023
43d8327
toolkit
Vibhusha22 Jun 19, 2023
2cb46d3
Added unit test cases and basic codifications
Jun 19, 2023
0f0dc48
Fixed Update Config error, changed basetool
luciferlinx101 Jun 19, 2023
812981f
Merge conficts resolved with google calendar
Jun 19, 2023
eb3979b
google calendar
Jun 19, 2023
31e0996
Api call to fetch data
Jun 19, 2023
1852b83
Minor error solved
Jun 19, 2023
b4a2f99
tool-kit
Vibhusha22 Jun 19, 2023
5d33623
tool-kit
Vibhusha22 Jun 19, 2023
464e45c
Fixed get tools
luciferlinx101 Jun 19, 2023
48f704f
Merge branch 'toolkit-feature' of github.com:TransformerOptimus/Super…
luciferlinx101 Jun 19, 2023
e2a23fd
toolkit-merge
Vibhusha22 Jun 19, 2023
b1a3b83
final
Vibhusha22 Jun 19, 2023
2d756d5
Updated google config auth api
luciferlinx101 Jun 19, 2023
2ae3b53
Merge branch 'toolkit-feature' of github.com:TransformerOptimus/Super…
luciferlinx101 Jun 19, 2023
fc758fd
calendar
Vibhusha22 Jun 19, 2023
7e5e4f1
get_tool_config added for tool conigs
luciferlinx101 Jun 20, 2023
a50197c
calendar
Vibhusha22 Jun 20, 2023
9948308
Merge branch 'toolkit-feature' of https://github.com/TransformerOptim…
Vibhusha22 Jun 20, 2023
aa3779b
Minor bug fixes for calendar flow
Jun 20, 2023
129a9db
change
Vibhusha22 Jun 20, 2023
4626031
changed get_config to get_tool_conifg and some fixes for email
Jun 20, 2023
f250ce4
Merge branch 'toolkit-feature' of https://github.com/TransformerOptim…
Vibhusha22 Jun 20, 2023
81d8fec
Merge branch 'toolkit-feature' of https://github.com/TransformerOptim…
Vibhusha22 Jun 20, 2023
059c18b
Minor fixes
Jun 20, 2023
d6628af
Change in directories
Jun 20, 2023
82f181a
Added resource for calendar list
Jun 20, 2023
7e6d737
Merge branch 'toolkit-feature' of https://github.com/TransformerOptim…
Vibhusha22 Jun 20, 2023
b0282c3
Refactored BaseTool
luciferlinx101 Jun 20, 2023
87df55e
Merge branch 'toolkit-feature' of github.com:TransformerOptimus/Super…
luciferlinx101 Jun 20, 2023
b1886ce
hsj
Vibhusha22 Jun 20, 2023
d62f9b8
Updated tools
luciferlinx101 Jun 20, 2023
5d12514
Merge branch 'toolkit-feature' of github.com:TransformerOptimus/Super…
luciferlinx101 Jun 20, 2023
6592784
Merged with dev
luciferlinx101 Jun 20, 2023
9c986a6
removed misc
luciferlinx101 Jun 20, 2023
d81552a
removed unused code
luciferlinx101 Jun 20, 2023
884a155
tab content type condition
NishantBorthakur Jun 20, 2023
dd334aa
removing agent create
NishantBorthakur Jun 20, 2023
accd77e
Update tool_config.py
Jun 21, 2023
736df64
Frontend bug fix
luciferlinx101 Jun 21, 2023
329c7ff
Merge branch 'toolkit-feature' of github.com:TransformerOptimus/Super…
luciferlinx101 Jun 21, 2023
3e3bb68
market tool adding
namansleeps2 Jun 21, 2023
a274ff5
minor fix
luciferlinx101 Jun 21, 2023
4d42a2b
minor fix
luciferlinx101 Jun 21, 2023
ca050a9
Fixes for email tool and changed the redirect uri
Jun 21, 2023
c6022a3
Fixed marketplace Toolkit details API
luciferlinx101 Jun 21, 2023
2b2ed18
Merge branch 'toolkit-feature' of github.com:TransformerOptimus/Super…
luciferlinx101 Jun 21, 2023
c5b478d
frontend fixes
NishantBorthakur Jun 21, 2023
b917c70
adding tabs using index
NishantBorthakur Jun 21, 2023
0425f83
Minor fixes for google calendar
Jun 21, 2023
3077a8c
add tab fixes
NishantBorthakur Jun 21, 2023
7e3e229
Minor Fix
luciferlinx101 Jun 21, 2023
89e754a
Merge branch 'toolkit-feature' of github.com:TransformerOptimus/Super…
luciferlinx101 Jun 21, 2023
dd6e967
Removed google calendar
Jun 21, 2023
99216d5
Removed google calendar toolkit file and test cases
Jun 21, 2023
1545ea3
closing tab issue using index
NishantBorthakur Jun 21, 2023
1623f3a
Merge branch 'toolkit-feature' of github.com:TransformerOptimus/Super…
luciferlinx101 Jun 21, 2023
915858d
closing tab issue using index 2
NishantBorthakur Jun 21, 2023
13a0337
minor fixes
NishantBorthakur Jun 21, 2023
3473a6e
solved toolkit tab change issue
NishantBorthakur Jun 21, 2023
14ab165
minor fix
NishantBorthakur Jun 21, 2023
02876d0
cancel button removed
NishantBorthakur Jun 21, 2023
869a8a9
market tool adding complete almost
namansleeps2 Jun 21, 2023
aa3aea1
tool kit to toolkit
NishantBorthakur Jun 21, 2023
4f05e81
merging frontend of tools marketplace
namansleeps2 Jun 21, 2023
c558ef5
minor changes for toolkit template
namansleeps2 Jun 21, 2023
513283d
minot fix
NishantBorthakur Jun 21, 2023
b462d90
Updated Code
luciferlinx101 Jun 21, 2023
4aace12
toolkit removed
NishantBorthakur Jun 21, 2023
70d2435
Merge branch 'toolkit-feature' of github.com:TransformerOptimus/Super…
luciferlinx101 Jun 21, 2023
e2f2b07
minor changes for toolkit template
namansleeps2 Jun 21, 2023
1947d08
Merge branch 'toolkit-feature' of github.com:TransformerOptimus/Super…
namansleeps2 Jun 21, 2023
e8280a6
adding of install for template
namansleeps2 Jun 21, 2023
0cb0f9a
Minor Fix
luciferlinx101 Jun 21, 2023
2650395
Merge remote-tracking branch 'origin/toolkit-feature' into toolkit-fe…
namansleeps2 Jun 21, 2023
506fdd4
Update db.py
Jun 21, 2023
2fa32ad
minor fixes
NishantBorthakur Jun 22, 2023
9d2e586
removed package lock
namansleeps2 Jun 22, 2023
7d5625e
Merge remote-tracking branch 'origin/toolkit-feature' into toolkit-fe…
namansleeps2 Jun 22, 2023
3ec6862
marketplace fixes
NishantBorthakur Jun 22, 2023
63d01d1
fixes to each tool
NishantBorthakur Jun 22, 2023
2fa25b9
toolkit description fixes
NishantBorthakur Jun 22, 2023
6731a84
toolkit description fixes 2
NishantBorthakur Jun 22, 2023
728c4ad
minor fixes
NishantBorthakur Jun 22, 2023
b265946
run history scrollable
NishantBorthakur Jun 22, 2023
a26ed88
Added Commits
luciferlinx101 Jun 22, 2023
6f2f68f
Added Unit Test
luciferlinx101 Jun 22, 2023
ac70e53
dropdown fixes
NishantBorthakur Jun 22, 2023
0cda0f7
test
luciferlinx101 Jun 22, 2023
4c51d61
refactored
luciferlinx101 Jun 23, 2023
5b7cfde
refactored
luciferlinx101 Jun 23, 2023
c8876b7
Refactored
luciferlinx101 Jun 23, 2023
c764c7e
refactored tool config method
luciferlinx101 Jun 23, 2023
dd98022
Current Unit Tests working
luciferlinx101 Jun 23, 2023
fae310e
Reverted back frontend changes
luciferlinx101 Jun 23, 2023
ce7fcaa
Reverted frontend changes
luciferlinx101 Jun 23, 2023
2d87109
Reverted frontend changes
luciferlinx101 Jun 23, 2023
6b76ddd
refactored
luciferlinx101 Jun 23, 2023
189a200
Update task_queue.py
Jun 23, 2023
361c04c
reverted back changes
luciferlinx101 Jun 23, 2023
8c465ee
Merge branch 'toolkit-feature-backend' of github.com:TransformerOptim…
luciferlinx101 Jun 23, 2023
5f3d898
minor changes
Jun 23, 2023
f85ded6
renaming tool_kit with proper convention
Jun 23, 2023
adee09d
renaming tools tests
Jun 23, 2023
a29f8b1
refactored
luciferlinx101 Jun 23, 2023
d9f94d9
Merge branch 'toolkit-feature-backend' of github.com:TransformerOptim…
luciferlinx101 Jun 23, 2023
cdaa295
using get_tool_config in tools instead of get_config
Jun 23, 2023
9da89d4
using get_tool_config in tools instead of get_config
Jun 23, 2023
c7991ea
reverted back few changes
luciferlinx101 Jun 23, 2023
ed5a1e5
Merge branch 'dev' into toolkit-feature-backend
Jun 23, 2023
6714850
updated auth middleware
luciferlinx101 Jun 23, 2023
75195fb
Merge branch 'toolkit-feature-backend' of github.com:TransformerOptim…
luciferlinx101 Jun 23, 2023
b838561
fixing tests structure
Jun 23, 2023
965001d
Merge branch 'toolkit-feature-backend' of github.com:TransformerOptim…
luciferlinx101 Jun 23, 2023
1e5e28c
fixing unit tests
Jun 23, 2023
66ff32b
removing tool_statistics model
Jun 23, 2023
7ab5cb2
fixing toolkit class name
Jun 23, 2023
c177ed9
Merge branch 'toolkit-feature-backend' of github.com:TransformerOptim…
luciferlinx101 Jun 23, 2023
c4c74c5
adding proper tools in coding toolkit
Jun 23, 2023
3b24cec
moving tool manager to superagi folder
Jun 23, 2023
eb954bb
Merge branch 'toolkit-feature-backend' of github.com:TransformerOptim…
luciferlinx101 Jun 23, 2023
3d69a0a
refactored validate helper
luciferlinx101 Jun 23, 2023
fd82ee9
removed unused file
luciferlinx101 Jun 23, 2023
725f50b
Minor Fix
luciferlinx101 Jun 23, 2023
ae5d0be
Minor Fix
luciferlinx101 Jun 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Modified Toolkit stats
  • Loading branch information
luciferlinx101 committed Jun 17, 2023
commit 27d13755cc96860f163ce203e90246df1e2139c3
14 changes: 7 additions & 7 deletions superagi/models/tool_statistics.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
from sqlalchemy import Column, Integer, String, ForeignKey
from sqlalchemy.orm import relationship
from superagi.models.base_model import DBBaseModel
import json

from sqlalchemy import Column, Integer, String

from superagi.models.base_model import DBBaseModel


class ToolStatistics(DBBaseModel):
"""ToolStatistics - used to store statistics for tool kits"""
__tablename__ = 'tool_statistics'

id = Column(Integer, primary_key=True)
"""id - id of the statistics entry"""
toolkit_id = Column(Integer, ForeignKey('tool_kits.id'))
toolkit_id = Column(Integer)
"""toolkit_id - foreign key reference to the tool kit"""

key = Column(String)
"""key - key for the statistic"""
value = Column(String)
"""value - value associated with the statistic"""

toolkit = relationship("ToolKit", back_populates="statistics")

def __repr__(self):
return f"ToolStatistics(id={self.id}, toolkit_id={self.toolkit_id}, key='{self.key}', value='{self.value}')"

Expand All @@ -41,4 +41,4 @@ def from_json(cls, json_data):
toolkit_id=data['toolkit_id'],
key=data['key'],
value=data['value']
)
)