Merge branch 'remove_langchain' into database_diagnosis

OpenBMB · May 22, 2023 · 8dc861b · 8dc861b
2 parents d4ea3ab + 71dd784
commit 8dc861b
Show file tree

Hide file tree

Showing 4,312 changed files with 306,053 additions and 794 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,9 @@ __pycache__/
 .Python
 build/
 develop-eggs/
-dist/
+**/dist/*
+!**/dist/assets
+!**/dist/index.html
 downloads/
 eggs/
 .eggs/
@@ -163,4 +165,4 @@ cython_debug/
 figs
 frontend
 
-g_push.sh
+g_push.sh
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/AgentVerse 2.iml b/.idea/AgentVerse 2.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/agentverse/UI.py b/agentverse/UI.py
diff --git a/agentverse/__init__.py b/agentverse/__init__.py
@@ -1,5 +1,6 @@
 from .tasks import *
-from .agents import Agent
+
+# from .agents import Agent
 from .environments import env_registry
 from .environments.rules import Rule
 from .environments.rules.order import order_registry
@@ -8,4 +9,11 @@
 from .environments.rules.updater import updater_registry
 from .environments.rules.visibility import visibility_registry
 from .agentverse import AgentVerse
-from .initialization import prepare_task_config, load_agent, load_environment, load_tools, load_llm, load_memory
+from .initialization import (
+    prepare_task_config,
+    load_agent,
+    load_environment,
+    load_tools,
+    load_llm,
+    load_memory,
+)
diff --git a/agentverse/agents/__init__.py b/agentverse/agents/__init__.py
@@ -1 +1,9 @@
-from .agent import Agent
+# from .agent import Agent
+from agentverse.registry import Registry
+
+agent_registry = Registry(name="AgentRegistry")
+
+from .base import BaseAgent
+from .conversation_agent import ConversationAgent
+from .tool_agent import ToolAgent
+from .prisoner_dilema_agent import PoliceAgent, PrisonerAgent