From 9dd63b3d422ea4609216e9c8e3be3aef7e44b0e3 Mon Sep 17 00:00:00 2001
From: Davidson Gomes <davidsongviolao@gmail.com>
Date: Fri, 25 Apr 2025 19:16:56 -0300
Subject: [PATCH] structure saas with tools and mcps with load_memory

---
 src/api/__pycache__/routes.cpython-310.pyc    | Bin 5071 -> 5085 bytes
 .../__pycache__/agent_builder.cpython-310.pyc | Bin 8523 -> 8621 bytes
 .../__pycache__/agent_runner.cpython-310.pyc  | Bin 2985 -> 3072 bytes
 src/services/agent_builder.py                 |  19 ++++++++++--------
 src/services/agent_runner.py                  |  12 ++++++++++-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/api/__pycache__/routes.cpython-310.pyc b/src/api/__pycache__/routes.cpython-310.pyc
index 7fbe2fc735b5184cf76fcb0284dc42fb6c31c40a..465c6c9cd4a7f8acf83d041e93aaf2a03146c1f3 100644
GIT binary patch
delta 137
zcmV;40CxY+C*3CvZw(C!00000KL`wH;gJm;0p^h_*0J@(1_33Lx(BuaLX&X_lmSMQ
z1_|5&N|WOWqXAKqhYG?0Sd&T%f&pKX%?qjlW0QCcw*hC9Fb#GAZj+}CoB?%{L=JWV
re3QElg8_h(KM$z^gp=tHbODQ#UJ#f8lC$>^WC8(llUx%alY0|Xa^Npv

delta 152
zcmcbseqNn7pO=@50SG+4ac8WZ$SccuYohkG&Af~|*ceqNA7kIf=s3BSV+y0|WFgKw
zjGmL<b1r5Km^_*55M%h{FzzPCxXCxUS1~3{ZsFO^m^Rslw~R4&@@C#Sj3tu;_{tco
zCm-i)W~`s=&A*bn8E8q77l=ro%*Z7(Sz5r4v1@XczzoKTo0$bum>3HtX9z1!?iLOL
E0M5KHNdN!<

diff --git a/src/services/__pycache__/agent_builder.cpython-310.pyc b/src/services/__pycache__/agent_builder.cpython-310.pyc
index 73c61dc1302f8eb77b0f47f68ff9882b06c68aaa..6bb48ab7dca7f8cee2510eac3c18bb93aab7d484 100644
GIT binary patch
delta 2288
zcmZuyO>Epm6!y&8Ua$9mlQcg~noZKAY?3CWt<;uADQ%(rRXxzsG>e40*_qvL<6Vcb
z4Ncf|Tcr{L)I;%!TOt7xAWnPXzy-ktao}ztPMnZ>syKlP@7e9<huWIYZ{FX$_vX#`
zmvi5qPg%*NF2S=JOWfeI4^o3<{=w8wt&#d@ag<0*Vi{Aa(;^M%tT|R3176lVSUebf
z$BX0e&6yMRiQ)v2c$y#DAjRic7awBXJkNSK<-`3_MP>U~?>)I#s7e*W`uJppvVJyj
zPbp5lBC-8!@Sem5H)wI1WiLyGq4p9vK$3pkv`WmV^SUKg+qdaolnl2WWsD|AAYxxx
zDGA3G!`|mnH{J^z(T6bZ9n|vbD3T-I>)Jdy<$a`;Nx%0{bIIv;Ii||lIkb;Cyisa6
zMvaN%?X~0uLdLuwQitLbXgY;($a|DJN{)IH>8Zt8WIPX0hzT?o#{v9^D@^ecPA}jz
zx>8!jn0-xfd&O$l+*g5eO-GzWrBfYv0jX&K?tPs$$h4<thFag_Tq+VK6)7V;0!5-M
z0%en#%oVQkDA%Bv6bDn73X&L$a-GNfCD71!>wuQbG!_G`#53%576(Z(kfeC}oWxrh
zfSpSuSQ1pSPmEI_MYX+JDV7GU9LvDYW&On2DsMRF+?vU_@F`m=Q^@M+gEWrwFzf+<
zCTU8B<d6-iDfJlCi6CLfOaf=*Qb7?5-j(cZt3Z9(=4M4KfX$vV`kG<X8a2l-zC^Do
zfJ!uyAZtB4W0`rXCHg^QS5ygLL}C00!~O%{E~!fEv`KDCn}m@q;-zx0wj5<s-ICVT
zrn(tr@)lW-29yGn7Emfsv4DyKrGvS4GuDhYwPviTGwr^-9)IF8wndn}Ooh=@HgzYy
zMTpdlGic)VxRU^#q>}<n!^p72ecD93bhfFm<b9<nS11%G<^7hs;2r5|v_ua?d}Ynm
z^||n<Ks9VfxMimX9XNmX;=<X*%X!!4dFKYt?>JI<$FfX-yx@+g@%MOsxnaF;a#rQ}
ziY4-^mMijQtKsll&fM&?eCv9F_K6`_-;b77YQ{2OEhxU+DAl<b^1kaDZ549jFo?xP
zglni6U&7unaBW*GB6}aQBe1luLEIIm2G$IDDnwB)IbssEFiW8zlo9aO3RV_NNO6Ed
zLKNZSD<y0}KT&pVZ?Su}C90_L4uXMj9iar^XTk*>&Wsgd)mNOot(7&(f|nd_m}cDw
z+<pUg_KN`Yj;tg|j>r)idaaLW5sm63eANgg;j8|W>5Az@qZHIqz?5<P-9Fi~Kw3dF
zWAlkTfUjRInJ#}>2ulPx`V_9F6%=Cu3eg}t@ou1MyGvm_wx8(Gc$M8maje7gb$$zu
zhV7Kf%l}I*ZB#kPI<9_i5BH`CalP5T6URDt)mIUp&KwCH6JxIvea@`eP8o_f|JeJi
z@63tq>vMbKS22ko6Bjd4!+p|)WjSFM!u8Vq)8n^Lud}egOVUq={nFWhNA2tVKZijM
z&4{(#79Z@Mq62XoAWeX1dG7vFFLsI;04PMlPQs7`_a5$lD-(29I7jA(-kXEt*R~VN
zBQwZlJ2kv+LO*ze2o1poD9GV<-9g4(guw5P<h)-82Z-AKbC8fT0u(MmKzUT$K==rt
zKzI1qVF{wA$0+E@W8UO}Y0~8_9GGmqjm9!Ua8@EnWf6k%<J~KQUs;ewuu_o0cJR2c
z_!wb(#efQmc@+d-z_76;H3>ReNm2bVJ*E=+Z;tAoGTf)4QsHoWZ1_{s%2X|@YVw&9
zTb>Eed=E(dsA*NJwMJFE1~c&n0$u~+6NI4Rr;!Rm#owerpU;ZO*XHULb4@-ETP)f5
XYwng3q#Mp8zTVJCjwYx#J2Lnmr{M`H

delta 2083
zcmZuyOKclO7~UDL*X#8=O`14y;y8~MH&tlbLql5ikt!_$R1Wk3meAsO#;%*S9nG#u
zTWs9Yf`lMKWyFa~D#`&QkdV29R5+kY+*x`@+>kgR0Yd!$nC3-yHQ#>ozviER9{a_a
zhl}w>EM{r&{1}Q}`D*rVJVOrOo%yb#)o6hdjcF|D<O(_UohVGG?_^;TzA0y_HdUA+
z8c*=)+oZ6M_3=@*hmW&<PI)%1l?^t)_TJG8`zu<RutEM*nX)04z7s6u&uMI!joi`L
z$Zc9Uz>+U%`OL4FMn2%{FI3&`4bn%tAJg9{8S8!!oTRaFQ2N2uqVQZXCcg<aBYQz2
z1`(#@NpsxDAsv_8JVEB=eX~Rcr5SFLh3=bSLr)z;|FFmF#kyx#nK;t@D0Y^R3Hd0#
zKQfK32N3qjc;Yablcy6ixmgq(0?3C2x{D(KexNBFaR$3fay^kvA4NL93C|##0Vv7u
z6Lv>2=<Rq+=$(S*eha|00%2N#GQtCla=omx0MnstK^Ei&4{?)+p_mjKGgt^T7BhK-
zN7EWuM0VPMmCnM<0;?EkJG%o!SQJ!o6*|F_iyBWs+df2$#lfQQzrhoreUepzCBbSB
zOTo(Z`O(uAUiTK8RflomQ?~5KYrNJF*C%b4i`T0qUJAfeA3w+`G_0aKF6UC|RExGW
zJIFK$N6zOBaY<fGJ>3zP!2-90%bl{g1RW*WRc_z3?P|U1+4g-5h}AWS39m(N3~bMA
z_OYE90-F-1@c4-VLB|Ks+(!VnNJW!>q%L$AZ5u6eRofs;zeiYbg^GDE*fu<4BXmz|
zhgzWxlNt9&+f*zBEUcIb%u*~2ECMmYSFM)W3b(9Qgjwr)JL;h{>cs%#&=M@NPFqo6
z$yTssu;{wc3h8AEMTyCu`p(Avh|?%CyI0!_GP|cfoTnlK>H4AKYSmuh*Yk$2*NZhS
zGIFYaA}$s{nNNv>@Db0;7yCz+P$CA<Cs1#!`KIfMvR4HUjxwX%5VfKwf@sAM@On^V
zh!V0g0HpJE|EZ2Yyv)Iz+qDMcj$JA`&T_G|VwaoslDLA#Ho|KNMTBJlKiM0><IG+a
zjoPZWdpT2fN${e_ZO5tEMci4RgP*$yKyT{7C|nJCKqt{TGDOUP9!L_MnAC#h#@7f?
z(tC}+si~7V^mHZB|LndqaG7+}K8j*KS<J_}RCJnrNr;9}6ZR=w4+7PBfP6?4kh{v%
zZ7%mRa{cHg$LnMT)!|K%Z}DreAzcs3@xSRM><S0nW~iULwZQ}-YqC9b^vLE-@>#&A
zvxj<tiM>0Bb=;}CUJ1%~;xGBj(8;4)S6FYUG3PfB)J)cZ!KuQT_?BoiyxuItntU~V
zaQX(?Z4NB(3iA`oc$&AC;J5CV=^uJYj?RkKPLKA^uDSznf-FiP@GbdZq&SG%Mx+7q
zf!?;lltft`%Un#VZPx3f@Ljo)nSOa|Lbyu3xol0%K$-FjA;Y69ngDsdw_I<b;5LGa
zyKQoEbaa>my7Qxiob<rpJS3z>cpI(X1Arr?mR!Zy<_Ri4(kqMFm51cDv4f;vemZu5
zgyqArQCroTVjT7FQ1w?~Rk~Z5;wa*Mgst$3smfgh#V62Q{3DrKAE8E^TK~{Fc`lnZ
zP@A9WI@u4&D<P**sZ{F~@hk|%a|n2_#X5p2-~uw04E~7(IzMSl-#iXyxasf{uwt6K
MAnUoDyqnAX3q)hfOaK4?

diff --git a/src/services/__pycache__/agent_runner.cpython-310.pyc b/src/services/__pycache__/agent_runner.cpython-310.pyc
index 8362fc0ea08c1ce962cc253e702641dd97a1c877..800abf619f63ad40d0eda05527a481daf9b2a180 100644
GIT binary patch
delta 438
zcmY*UJxc>Y5S`iEOLCV>OfKJAi3k>{L=-G+RM222Xkii5J&3`0a(5sJ8;Pc{iU`{X
zA|!SxHMLb*tpy9Q)L$SdqI=>8&M=ReH*X$HH`B;Q?MOri85bd=R2sO9UXxTpjy~6y
z<>m>%0oESGBPo$4iX|l<;40Hws^Cf;XT+;gnC41Z<62qa$PE^0DfKv4+a`~95MdR#
z?%Z&_o#?<KFjxSDov`HYd`@i8k<Ax`x`|LTJZL9b#!GRtiDz(5{CjR5B9r@la}Oza
z=@YD`zV)UD<s{4g=~<2qwg`gv?a{=aTk%A%P!(tDnCcA4zj}SuLClKD;Bh*&&REg4
zTzAXfDSCFXVpVLXD*C}uOo->;X)eBLS9Z58&-#_!qtyjxRvd-a#!sXjX%LNK6zNAy
z(Fw(*>_Rk#Ati}AAxMzQ@-y&e1cj+hM5&a05${HTQc=)`alW^$-QwVsG<4>DnEelP
IVmZ9>3F8N7!T<mO

delta 356
zcmZpWSSikz&&$ij00c`vaA#=oZRFd_Bq{{tg2WC3aj^gs14AQY)rH9qm@-&uSeuz9
zdok;<q;U1JOs-+BWi*)li`h#qoS}xRXkQK20-=Qro(w4r9t?~OdE7v;lOVClbu7yD
zFButX1sNHtcuE)+2&agbh|~x+GtOq1%e0V@k)cMgi7^EzUnf}3$ih$}I)Sm09jaca
zgds~fMFOEdMKVRImx+;~L<}O<%!tri&Y&snS1J#5w`X2va%N&)O1?sBMQU>C;mHcD
z(->JMZ)erm{DifLkx_hdID6mZKkO=uLX#CaX0S1)u4E{3oP3ERnz3cF9;dVj7qbW>
z7ZVdB6C(={GcmIL;bEH`&uPNK^pk~a@<L8UM(53kInOdmnE`Dpat0BOsD#txRor0!
D$go!}

diff --git a/src/services/agent_builder.py b/src/services/agent_builder.py
index 416d3bec..9d34cd56 100644
--- a/src/services/agent_builder.py
+++ b/src/services/agent_builder.py
@@ -12,6 +12,8 @@ from sqlalchemy.orm import Session
 from contextlib import AsyncExitStack
 from google.adk.agents.callback_context import CallbackContext
 from google.adk.models import LlmResponse, LlmRequest
+from google.adk.tools import load_memory
+
 from typing import Optional
 import logging
 import os
@@ -161,11 +163,10 @@ def search_knowledge_base_function_sync(query: str, history=[]):
 
 
 class AgentBuilder:
-    def __init__(self, db: Session, memory_service: InMemoryMemoryService):
+    def __init__(self, db: Session):
         self.db = db
         self.custom_tool_builder = CustomToolBuilder()
         self.mcp_service = MCPService()
-        self.memory_service = memory_service
 
     async def _create_llm_agent(
         self, agent
@@ -184,11 +185,6 @@ class AgentBuilder:
 
         # Combina todas as ferramentas
         all_tools = custom_tools + mcp_tools
-
-        # Verifica se load_memory está habilitado
-        before_model_callback_func = None
-        if agent.config.get("load_memory") == True:
-            before_model_callback_func = before_model_callback
             
         now = datetime.now()
         current_datetime = now.strftime("%d/%m/%Y %H:%M")
@@ -204,6 +200,13 @@ class AgentBuilder:
             current_time=current_time,
         )
 
+        # Verifica se load_memory está habilitado
+        # before_model_callback_func = None
+        if agent.config.get("load_memory") == True:
+            all_tools.append(load_memory)
+            # before_model_callback_func = before_model_callback
+            formatted_prompt = formatted_prompt + "\n\n<memory_instructions>ALWAYS use the load_memory tool to retrieve knowledge for your context</memory_instructions>\n\n"
+
         return (
             LlmAgent(
                 name=agent.name,
@@ -211,7 +214,7 @@ class AgentBuilder:
                 instruction=formatted_prompt,
                 description=agent.description,
                 tools=all_tools,
-                before_model_callback=before_model_callback_func,
+                # before_model_callback=before_model_callback_func,
             ),
             mcp_exit_stack,
         )
diff --git a/src/services/agent_runner.py b/src/services/agent_runner.py
index 2a88e590..cc884ba2 100644
--- a/src/services/agent_runner.py
+++ b/src/services/agent_runner.py
@@ -42,7 +42,7 @@ async def run_agent(
             raise AgentNotFoundError(f"Agente com ID {agent_id} não encontrado")
 
         # Usando o AgentBuilder para criar o agente
-        agent_builder = AgentBuilder(db, memory_service)
+        agent_builder = AgentBuilder(db)
         root_agent, exit_stack = await agent_builder.build_agent(get_root_agent)
 
         logger.info("Configurando Runner")
@@ -51,6 +51,7 @@ async def run_agent(
             app_name=get_root_agent.name,
             session_service=session_service,
             artifact_service=artifacts_service,
+            memory_service=memory_service,
         )
         session_id = contact_id + "_" + agent_id
 
@@ -82,6 +83,15 @@ async def run_agent(
                 if event.is_final_response() and event.content and event.content.parts:
                     final_response_text = event.content.parts[0].text
                     logger.info(f"Resposta final recebida: {final_response_text}")
+        
+            completed_session = session_service.get_session(
+                app_name=root_agent.name,
+                user_id=contact_id,
+                session_id=session_id,
+            )
+            
+            memory_service.add_session_to_memory(completed_session)
+        
         finally:
             # Garante que o exit_stack seja fechado corretamente
             if exit_stack: