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

feat: Merge the modifications resulting from integrating with the agent store. #768

Merged
merged 27 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4ed6883
Merge pull request #679 from iorisa/fixbug/v0.6-release
geekan Jan 4, 2024
02d6db6
release v0.6.1
shenchucheng Jan 4, 2024
5115e04
Merge branch 'v0.6-release' of https://github.com/geekan/MetaGPT into…
Jan 4, 2024
f8dd30f
fixbug: invalid default project name
Jan 4, 2024
174da4f
feat: ver +1
Jan 4, 2024
94a16f7
Merge pull request #681 from iorisa/fixbug/v0.6-release
garylin2099 Jan 4, 2024
e975a43
fixbug: an unexpected UserRequirement type message is thrown when the…
Jan 6, 2024
f445dac
Merge pull request #701 from iorisa/fixbug/error_cause_by
geekan Jan 7, 2024
7f04eaa
fixbug: unit test
Jan 8, 2024
708748d
Merge pull request #708 from iorisa/fixbug/unittest_20240108
garylin2099 Jan 8, 2024
2ec2e71
fixbug: rename folder does not work in windows os
Jan 8, 2024
6613237
Merge pull request #716 from iorisa/fixbug/rename_dir
geekan Jan 8, 2024
12ac57a
release 0.6.3
shenchucheng Jan 8, 2024
0788080
fixbug: fix todo_description
Jan 10, 2024
cf2366b
feat: +ver
Jan 10, 2024
7493a23
Merge pull request #735 from iorisa/feature/agentstore/v0.6
garylin2099 Jan 10, 2024
29d8326
feat: +ver
Jan 10, 2024
e4e90b0
Merge branch 'v0.6-release' of https://github.com/geekan/MetaGPT into…
Jan 16, 2024
b275f1a
feat: +ver
Jan 16, 2024
dddf501
feat: merge v0.6-release
Jan 17, 2024
05aa9b3
feat: Merge the modifications resulting from integrating with the age…
Jan 17, 2024
2b522ff
fixbug: engineer action_description
Jan 17, 2024
8b84e26
feat: remove error print
Jan 22, 2024
bda2e06
feat: +note
Jan 22, 2024
525d943
feat: +note
Jan 22, 2024
f15b772
feat: +note
Jan 22, 2024
85465fe
feat: +note
Jan 22, 2024
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,3 @@ htmlcov.*
*.pkl
*-structure.csv
*-structure.json
*.dot
2 changes: 1 addition & 1 deletion metagpt/roles/engineer.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,6 @@ async def _new_summarize_actions(self):
self.set_todo(self.summarize_todos[0])

@property
def todo(self) -> str:
def action_description(self) -> str:
"""AgentStore uses this attribute to display to the user what actions the current role should take."""
return self.next_todo_action
25 changes: 20 additions & 5 deletions metagpt/roles/role.py
Original file line number Diff line number Diff line change
Expand Up @@ -523,19 +523,34 @@ def is_idle(self) -> bool:
return not self.rc.news and not self.rc.todo and self.rc.msg_buffer.empty()

async def think(self) -> Action:
"""The exported `think` function"""
"""
Export SDK API, used by AgentStore RPC.
The exported `think` function
"""
await self._observe() # For compatibility with the old version of the Agent.
await self._think()
return self.rc.todo

async def act(self) -> ActionOutput:
"""The exported `act` function"""
"""
Export SDK API, used by AgentStore RPC.
The exported `act` function
"""
msg = await self._act()
return ActionOutput(content=msg.content, instruct_content=msg.instruct_content)

@property
def first_action(self) -> str:
"""AgentStore uses this attribute to display to the user what actions the current role should take."""
# FIXME: this is a hack, we should not use the first action to represent the todo
def action_description(self) -> str:
"""
Export SDK API, used by AgentStore RPC and Agent.
AgentStore uses this attribute to display to the user what actions the current role should take.
iorisa marked this conversation as resolved.
Show resolved Hide resolved
`Role` provides the default property, and this property should be overridden by children classes if necessary,
as demonstrated by the `Engineer` class.
"""
if self.rc.todo:
if self.rc.todo.desc:
return self.rc.todo.desc
return any_to_name(self.rc.todo)
if self.actions:
return any_to_name(self.actions[0])
return ""
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ lancedb==0.4.0
langchain==0.0.352
loguru==0.6.0
meilisearch==0.21.0
numpy==1.24.3
numpy>=1.24.3
openai==1.6.0
openpyxl
beautifulsoup4==4.12.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def run(self):

setup(
name="metagpt",
version="0.6.0",
version="0.7.0",
description="The Multi-Agent Framework",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down
Loading