From 8f0ae729ea18a84c4f6930234e5add81fe6fac59 Mon Sep 17 00:00:00 2001
From: yuruo <yuruotong1@163.com>
Date: Sun, 21 Jan 2024 11:58:15 +0800
Subject: [PATCH] new

---
 .gitignore                                    |   3 ++
 README.md                                     |  13 +++++-
 agent/__pycache__/agent_base.cpython-39.pyc   | Bin 1649 -> 1085 bytes
 .../__pycache__/manager_agent.cpython-39.pyc  | Bin 1650 -> 1821 bytes
 agent/agent_base.py                           |  35 +---------------
 agent/manager_agent.py                        |  17 ++++----
 agent/plan_agent.py                           |  24 +++++++----
 main.py                                       |   9 ++++-
 requirements.txt                              | Bin 0 -> 1208 bytes
 tools/llm_tools.py                            |  38 ++++++++++++++++--
 tools/tools_base.py                           |  12 +++---
 tools/web_browser_tools.py                    |   7 ++--
 .../__pycache__/okr_principle.cpython-39.pyc  | Bin 2720 -> 2730 bytes
 work_principle/object_components.py           |   2 +-
 14 files changed, 96 insertions(+), 64 deletions(-)
 create mode 100644 requirements.txt

diff --git a/.gitignore b/.gitignore
index b621af0..f066aac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
 # Ignore environment-specific files
 .venv
 config.yaml
+
+# Ignore Python cache files
+**/__pycache__/
\ No newline at end of file
diff --git a/README.md b/README.md
index 42a6441..9cfad41 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,17 @@ print(objective.progress)  # 输出应该是两个关键成果进度的平均值
 ```
 
 # 工具
-使用selenium工具操作浏览器进行网络搜索和内容爬取。
+使用selenium工具操作浏览器进行网络搜索和内容爬取。以下是一个简单的示例：
 
+```python
+from selenium import webdriver
 
+driver = webdriver.Firefox()
+driver.get("http://www.python.org")
+assert "Python" in driver.title
+driver.quit()
+```
+# 安装和运行
+```commandline
+pip install -r requirements.txt
+```
\ No newline at end of file
diff --git a/agent/__pycache__/agent_base.cpython-39.pyc b/agent/__pycache__/agent_base.cpython-39.pyc
index 4c3de5d76290462168493d58ae7d19f2a31b99c9..188d704d7baf141589a36d9d9e8a1ed297f87b6f 100644
GIT binary patch
delta 428
zcmZutJxc^J5X~gFZanr*Y;64K7eOnn4jT)b^ANO<ZI<N{#3Q?VWOFEZaK+hL$Xfab
z1RL$O@MmmiY3V<3CL$IZ$mGq}n>YE4USv1xblMEh(cPn-^V{y)&IWplDKIRD1b`hd
z#g({bO3Zn}RqL3=!3VX((8zxO@T4qF^>n%lGQi*ivtfM&yAagR@V?!mI&K&6No1if
zQd=5rLv+85MAXPiJD*st-}vT?V~qOt@m4En9GkNdOxcJ}LBTy&{02~k7$7svY{Fq#
zI9<3Hl3<+KERTgHmPXh~;Y)rrw9kw2#HCJOx<4w0nK9|vICASWnEDyiuR(9Nh{)0}
z*$$as^&Zg*R-hrx6>Ta(Ml$lTK`fFbM?bV>OrCn=rTOfCRE_NArJ5MM2gHXm1dGHM
D_+?Yn

literal 1649
zcmbtUy^kX`6t_LjWHR{>AEJP2KuAZ5i|&MIR*1WW0&Q^taY*Q_m8{wEOLlUTnP58y
z8)d7#3hAJt08!kQtNTlk_zR|`;$OG|@$A`zu)7opkNo`kKKy&XH)+2g6KpS@y?~1r
zA-}uDZVPa6AG>)6g(8X;L^LB6^i!gk3Z4=boH4-^eMpA<54=alnUlMX;o?4a^DYV?
zf-2%P6njcUpaR8l<f^4Y99yc5mZG||KZVkMoEpfS`lh+L>z`mZF8VcH6N#ar5?g&A
zCztJ@%x#_)`3jP>OuVh6I+{UdNAdR3zMh)B?aFEDs(|D@WA$(^`SKW=bu~#W&QllA
zj`kN|m%6-SU|f~3wK%?@HFqY5tmX!aiRKvb1<@f6FK=aghYFrRQ7sPBrL7*M77o3W
zM#>|6{Ah7fM^fha94Vce@o2=W*S7eKHpl+~s2{g6J_PGu=U@IWFTIXa3E#-8SmECP
z#Y;QJ4VgwV5)o~jc(@wT#)CRCV7>R(Z^mPD{0}@Fb`f?@obPaAku-{(u^*CCX6bXb
zX6N)dvhkdr244}yIpO3iprm}|E-`oR5bD22DAxhrYn@ZeWy{Y)KMyURwP(?+quMH3
zlUb}fzc3ZAsT-$Ebye?KaLU(w)>ZvC$*ec)pSIR5B<^7K+cqB$(#J@(Buk4Tv6WBF
zXA3Cz50dOSwaNbH2RjtJo|wE`EUmQgt=*-u-%b4Pq|)B#4c2ZXG}b~>3dnxYNKtiZ
zM_2PJhBmdg>Sk3r$)}@}bY9d{*I|V(Nb_;sP8Yd+3@5@*mbzH=rwe=g{m}=vv6hai
zIy5K7!W=2!Dy43tA&XU4^Q8ej{rM-?e!VvgL~C9tC`2>|W3Xn7=%U)f1-R6pDJl;K
zHFth%?!piqlTJVuRjTS>3RZXViteEhk*hO_!3gd^5g7e^QGm^>(ugqAfRFa!h<0{d
z<r$c|ed$&YoTISeYy3C%HJ{`Kpt8q7L>kNjt$`S9QS>>w#%z~%iIBXFcFkKTNVi8v
ztVeq+qKw5f`jc_?GVBc4?jK;IHXerVZ&9Xmkg|@YM3k0=oA;#rdYKl@iFSpcJ5Ide
ygsY7m;fhSV-;66m;|qsI{b=C#hCu_}tD8$Zir!9Bq8~P%KXREcE|(FFg1-Q&Opk>C

diff --git a/agent/__pycache__/manager_agent.cpython-39.pyc b/agent/__pycache__/manager_agent.cpython-39.pyc
index 4c3c9eb57cef6538c2cfa4195dc2b568d4790ad3..5eb2715e042eecc241398ea1a73200d06262b0eb 100644
GIT binary patch
delta 927
zcmZ`%&1(}u6rb7eq)8e-NL!_Xg$9;N5A{;87g0p0wxS0iAj_HwB_G{QXEz9%kk%So
zREp_(P}@kN_<=}r=%JNX`hV;>Nz;o3{{ZWoZE1UPV1D!4_ug;ky*KYqpb`q|!Jr?(
z+FJgR$d!Zr_-1)1dP>NM(^5>rh#-P9a!f9hOP76jGP-efDq+|vcKws%ceTlfsYKk4
zGyTcMAAVS)<?X@Vgh2RJOe7*d6JpW=5>QOOhg7Bf`xcHlSMbHL=EhR1{;|Ed-fH~Z
z{q=fhrQWVC>}|aQd#7G&EiSiTKJR?})R`?E1hh(PyKm|{n@;<~s#CyoSaJ4owCFd}
zR5K4!;!flv0#{&PgKbp-@;HT3_&R#9T;K>M9OTCp_&iU9J}5WM(Ip~647Y-al;?=t
zhkz+Z%vX^Mg3VWjJgSO$p@wUisf$PQ2on=O2)aCJpu+bcTOvWYBIH@REBrj}fkZTJ
zCURhf=+GFNQ3!(OgeP3iFkPf_u8_1Q)2<vh4I4U7&p`gUa{!&~ckQ>0=EiJu<9l;+
zv-M(aoFB!-v&<g>@OK*P?Wf;5wa=|mskvQi&o%b8-m9`J*t(UbEY1y5{gIZl5>#V0
zS4df=;ffhkCss^}>zRx;m9<?lX=HP@D$*{{&@dC?WUSlso7se+CpDU|Tq#S<X(ud3
z`-2c-u?r9vz<wOS12_yA!J&OW=iC<uit&^0!#IZRz0YYN2k(QC&CP?uYY3iDdCJP7
zJq*}{soZfwG{mePbOUqybjwOk8D3eMZE9JVTuo=Admh}@hyaMNf*(h3>jv1VH`c@d
zRjG>eL>%m5GTP7Jg7ZZjx*-F#Bme~m#88N`NmG5a7miriyKdM+?V%1$W_7xU=HrAY
V@B9@9eBQ6wlsaS5h!DUE_Yak~15E$`

delta 597
zcmYjO&ubG=5PtLC+n02+iJ^hUkhC>I3rP!t;7##R5jE0Ky)9^H@-~_^G<0`qFB?Q!
z2uQVr2Og|}<e-QiB6yMt+Pi;2&JB$h5B>q-Y|=v>e8c?sX6DUIC-&EfZbqXz!T0$6
zXN$I@^Kh@dvYddrW@?sZ3q(lrR{*44UcI6h3lB=gvTaqo91OI&wPV#QLH6`x=Z2ea
zpDgJu!igy!lALJ&yAL;20kYX)|J&*D@$hAD^y6sMI~X4Jf42^Y2XD^a?vMKWr{BM*
zkMIIQDo>X;L}T2pLZ?~?)We81g!>DH4>qyk7J2lkNl}L;lOU;N?`V_zT=Eo=@QgYi
zq~<f#qv_|GPi)#{zShIZJl;jSD*~$rm@$d*AU2hq@tM?pDkCX!M5NJSN#ccM6dAFx
z=R$|=L6S7tc4p#3ZtObQ4o~WN;mI%eu!jyr65L6A-Bj}|3A10Xu?>KPYVpOz8PllN
zcC6BF$=hv|o;nE}&<Sod;I*x4L!I!2)PT93lM_xPh{b~#)W$^hhu_EsUiTsj!VM7E
z&45dYIKqHD#6aEAF4J5{rNxp6&gEoOL9EOLdv!UAFc{p?P|3|WbLzE7tDj;aGiC;R
dHzVauw^mteY*lMdOn!I$c2S*)t2~UQ{{za@iYx#C

diff --git a/agent/agent_base.py b/agent/agent_base.py
index 55daf03..ca0a0df 100644
--- a/agent/agent_base.py
+++ b/agent/agent_base.py
@@ -1,5 +1,4 @@
-import openai
-import yaml
+from tools.llm_tools import LLMTools
 
 
 class AgentBase:
@@ -14,7 +13,6 @@ class AgentBase:
             None
         """
         self.role = role
-        
 
     def set_role(self, new_role):
         """
@@ -28,34 +26,5 @@ class AgentBase:
         """
         self.role = new_role
 
-    
-
     def call_gpt(self, input_text):
-        """
-        Make a call to the OpenAI chat API.
-
-        Args:
-            input_text (str): The input text for the chat API.
-
-        Returns:
-            str: The generated text from the chat API.
-        """
-        # Load API configuration from YAML file
-        with open("config.yaml", "r") as file:
-            config = yaml.safe_load(file).get("openai")
-
-        openai.api_key = config.get("api_key")
-        openai.base_url = config.get("api_url")
-
-        response = openai.chat.completions.create(
-            model="gpt-3.5-turbo",  # GPT-3.5 model
-            messages=[
-                {"role": "system", "content": self.role},
-                {"role": "user", "content": input_text}
-            ],
-            temperature=0.2
-        )
-
-        generated_text = response.choices[0].message.content
-
-        return generated_text
\ No newline at end of file
+        return LLMTools().run(param={"role": self.role, "content": input_text})
diff --git a/agent/manager_agent.py b/agent/manager_agent.py
index 9ad776c..3512182 100644
--- a/agent/manager_agent.py
+++ b/agent/manager_agent.py
@@ -3,28 +3,27 @@ from agent.agent_base import AgentBase
 from agent.plan_agent import PlanAgent
 from work_principle.okr_principle import OKR_Object
 import logging
-logging.basicConfig(level=logging.INFO)
+
 class ManagerAgent(AgentBase):
     def __init__(self):
         super().__init__("你是一名总经理，负责与客户对齐目标，与计划拆解者对齐关键结果")
         self.logger = logging.getLogger(__name__)
 
     # 与用户对齐目标，填充缺失的信息
-    def optimization_Object(self, okr_object:OKR_Object):
+    def optimization_Object(self, okr_object: OKR_Object):
         # todo 待加入 PDCA循环规则
         for i in okr_object.task.content:
             call_openai_res = {'isOk': 'no', 'content': ''}
-            while call_openai_res["isOk"]=="no" :
+            while call_openai_res["isOk"] == "no":
                 prompt = f"这是一个任务描述:'{okr_object.raw_user_task}'。你觉得这个任务描述具备{i['descriptions']}吗？如果具备返回格式如下：{{\"isOk\":\"yes\", \"content\":\"提炼出任务的{i['descriptions']}\"}}，如果不具备返回格式如下：{{\"isOk\":\"no\",\"content\":\"返回不具备的原因并给出完善建议\"}}"
-                self.logger.info(prompt)
                 call_openai_res = json.loads(self.call_gpt(prompt))
-                self.logger.info(call_openai_res)
-                if call_openai_res["isOk"]=="no":
-                    okr_object.raw_user_task  = okr_object.raw_user_task + f"，{i['target']}：" +input(f"【警告】{call_openai_res['content']}\n请您补充信息：")
+                if call_openai_res["isOk"] == "no":
+                    okr_object.raw_user_task = okr_object.raw_user_task + f"，{i['target']}：" + input(
+                        f"【警告】{call_openai_res['content']}\n请您补充信息：")
             i['content'] = call_openai_res["content"]
 
-    
+
     # 与计划拆解者对齐关键结果，填充缺失的信息
-    def assign_task_to_plan_agent(self, okr_object:OKR_Object):
+    def assign_task_to_plan_agent(self, okr_object: OKR_Object):
         okr_object.task.raw_user_task
         PlanAgent()
diff --git a/agent/plan_agent.py b/agent/plan_agent.py
index f9a6de3..a55a466 100644
--- a/agent/plan_agent.py
+++ b/agent/plan_agent.py
@@ -1,15 +1,23 @@
+import logging
 from agent.agent_base import AgentBase
+from tools.tools_base import ToolsBase
 from work_principle.okr_principle import OKR_Object
 
 class PlanAgent(AgentBase):
     def __init__(self):
-        super().__init__("你是一名计划拆解者，负责对OKR中的O进行拆解并制定KR，向总经理汇报")
+        self.logger = logging.getLogger(__name__)
+        super().__init__('你是一名计划拆解者，利用工具将object拆解成key_result，请你返回json格式的内容，比如["使用工具a进行xx操作", "使用工具b进行xx操作"]')
 
+    # 根据object和已有的工具能力拆解成key result，key
+    def aligning(self, okr_object: OKR_Object):
+        raw = okr_object.raw_user_task
+        tools_list = [i().get_info() for i in self.get_subclasses(ToolsBase)]
+        r = self.call_gpt(f"object为'{raw}'， 工具列表为{tools_list}")
+        print(r)
+        self.logger.info(f"Alignment result: {r}")
 
-     # 与用户对齐目标，填充缺失的信息
-    def aligning(self, okr_object:OKR_Object):
-        pass
-
-
-
-    
\ No newline at end of file
+    def get_subclasses(self, cls):
+        subclasses = []
+        for subclass in cls.__subclasses__():
+            subclasses.append(subclass)
+        return subclasses
diff --git a/main.py b/main.py
index a4e1f4f..82f90d7 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,10 @@
 from agent.manager_agent import ManagerAgent
+from agent.plan_agent import PlanAgent
 from work_principle.okr_principle import OKR_Object
+import logging
 
+# 设置日志
+logging.basicConfig(level=logging.INFO)
 
 class AutoMate:
     def __init__(self):
@@ -10,11 +14,14 @@ class AutoMate:
     def rule_define(self):
         # 与用户对齐任务
         while True:
-            o_kr = OKR_Object("对比一下copilot和curson谁更好用，比较提示词数量、安装易用性，给出不少于100字的文章")
+            o_kr = OKR_Object("因为想要增加编程效率，对比一下copilot和curson谁更好用，比较提示词数量、安装易用性，给出不少于100字的文章")
             ManagerAgent().optimization_Object(o_kr)
             r = input(f"最终对齐的任务是：{o_kr.raw_user_task}，一切都OK对吧？y/n")
             if r == "y":
                 break
+        
+        # 让计划拆解者拆解任务
+        PlanAgent().aligning(o_kr)
 
 
 
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..10c190dc2ef0926134fbadf80db194f7715f5cb2
GIT binary patch
literal 1208
zcmZvb%}(P$5QO`@5|82tJ8W1E9Jqso#A#0v*xtk<ag1X~mWOBetL_Xo5{d?rnd++Q
zzkeT(*7DieV2_;ID$Dr)*E+uM?V8WI&1}Irw=??zs^zsILT?w`7n8Sv*!~n(*!;_D
z31iQDV}Ce`F5nDQZaLW8E?uJpkuY&T>X)|0gEVTmGWXuwmb(qC@2(+kX@|aCm-yXq
zdT_#~yySo3nibJ|cORKa_lgr)*LH-XrYiEkLv;n$&R)3@m(XJ!*8I*tHFB>~@T`d+
zh>@Qjz7(q(7w#h=j-T<xr1}m0X;1!@U3lMlw{#zMm78Cj(3H!;6}J;bMN75AiSiC?
z2S;ho{9VDNEafnDQkCrJe#zg|gZ_k&|J*YWqT;=UwE-IpGy93!{9DA*-KBb{j#0D7
z?jF7eT*_BWr1HCTRB|*h73xZcvSzvF`<p8Zt2`q=as9R%yR%z=jk%JZnB?GvYH9L^
zla}1fc~1<QyN&ZVAh*t<Dat2Z+M}*1*9?!-6cv}wo?C5#woQ|uN~w1(H{<rqCUZ03
ztD2}STrFH{<C0Fyk^Dry=`FJZ+)u8oI%;>+7va<H$yscEbbbly=q_90V(O#*;vaY8
t75$BG-xHNe-5x6z%9Xo(^9(cJLCx#Re=8<Dr%oJD?1)e=#|n-c_8*s7umAu6

literal 0
HcmV?d00001

diff --git a/tools/llm_tools.py b/tools/llm_tools.py
index e06d820..bbcd807 100644
--- a/tools/llm_tools.py
+++ b/tools/llm_tools.py
@@ -1,7 +1,39 @@
-
+import openai
+import yaml
 from tools.tools_base import ToolsBase
 
 
 class LLMTools(ToolsBase):
-    def get_describe(self):
-        return "利用大模型进行回答"
\ No newline at end of file
+    def __init__(self):
+        self.name = "llm_tools"
+        self.description = "利用大模型进行回答，入参格式为字典：{role:大模型的角色, content:问题}"
+    
+    def run(self, param=None):
+        """
+        Make a call to the OpenAI chat API.
+
+        Args:
+            param: The input text for the chat API.
+
+        Returns:
+            str: The generated text from the chat API.
+        """
+        with open("config.yaml", "r") as file:
+            config = yaml.safe_load(file).get("openai")
+
+        openai.api_key = config.get("api_key")
+        openai.base_url = config.get("api_url")
+        messages = []
+        if "role" in param:
+            messages.append({"role": "system", "content": param["role"]})
+        messages.append({"role": "user", "content": param["content"]})
+
+        response = openai.chat.completions.create(
+            model="gpt-3.5-turbo",  # GPT-3.5 model
+            messages=messages,
+            temperature=0.2
+        )
+
+        generated_text = response.choices[0].message.content
+
+        return generated_text
diff --git a/tools/tools_base.py b/tools/tools_base.py
index b31c803..0821a88 100644
--- a/tools/tools_base.py
+++ b/tools/tools_base.py
@@ -1,8 +1,10 @@
 class ToolsBase:
-    def get_describe(self):
-        return ["内容总结", "感性信息"]
+    def __init__(self):
+        self.name = ""
+        self.description = ""
+        
+    def get_info(self):
+        return {"name": self.name, "description": self.description}
 
-
-    def run(self):
+    def run(self, param=None):
         pass
- 
\ No newline at end of file
diff --git a/tools/web_browser_tools.py b/tools/web_browser_tools.py
index 41b14fa..d2faf9c 100644
--- a/tools/web_browser_tools.py
+++ b/tools/web_browser_tools.py
@@ -12,10 +12,11 @@ from selenium.webdriver.common.by import By
 from tools.tools_base import ToolsBase
 
 class WebBrowser(ToolsBase):
-    def get_describe(self):
-        return ["最新信息", "链接", "具体针对性信息", "专业信息"]
+    def __init__(self):
+        self.name = "web_browser"
+        self.description = "利用浏览器进行搜索，入参格式为字符串"
 
-    def run(self):
+    def run(self, param=None):
         # Load browser configuration from YAML file
         with open("config.yaml", "r") as file:
             config = yaml.safe_load(file)
diff --git a/work_principle/__pycache__/okr_principle.cpython-39.pyc b/work_principle/__pycache__/okr_principle.cpython-39.pyc
index b3d47e2b168fcbe09fe5fc847a9a3fcac3ce3ec1..42656528d420ddda03bc33f3180c5d19aa22d39e 100644
GIT binary patch
delta 111
zcmZ1=x=NHUk(ZZ?0SGeQtWM=)pU4*`DBz!zm6}}QoS$2epO>0fQamwlIUjFPVtIUN
zacWU~Nn&yKWLZX8Ru&LzvpXX*r=mi6eo=OOK~ZL2a%MqJs$M?Wg!p8*5tGxntN^pl
BC6E9B

delta 105
zcmZ1_x<HgKk(ZZ?0SH$2txo;OHjyuki_<N$EHyl&Jl|uoADh&~{$39D<ovvn)Vz|(
xT8y&1JZV7b`11IY^8EOW%|49GoHEko`9<0B1x1;8$(aQ?sd~sNCKqs70RYXrBL4sY

diff --git a/work_principle/object_components.py b/work_principle/object_components.py
index 381b775..4648c15 100644
--- a/work_principle/object_components.py
+++ b/work_principle/object_components.py
@@ -3,7 +3,7 @@ class ObjectComponents:
         self.content = [
             {"target": "任务主体", "content": "", "descriptions": "任务主体"},
             {"target": "执行动作", "content": "", "descriptions": "执行动作"},
-            {"target": "任务背景", "content": "", "descriptions": "任务背景或原因"},
+            {"target": "任务背景", "content": "", "descriptions": "任务背景，为了xx、因为xx"},
             # "how": {"content": "", "descriptions": "这个任务如何做", "example": ["通过线上直播发布会，合作伙伴渠道和社交媒体宣传", "通过增加人员、改善流程和引入新的服务软件"]},
             {"target": "任务完成程度", "content": "", "descriptions": "任务要做到什么程度，给出具体的几个要求"}
         ]