improvemnts

app.py

@@ -5,7 +5,6 @@ import pytz
 import time
 import json
 import re
-from typing import List
 from transformers import AutoTokenizer
 from gradio_client import Client
 from tools import toolsInfo
@@ -45,14 +44,14 @@ You are a personalized email generator for cold outreach. You take the user thro
 - His/her role
 - More details about the recipient
 
-Highlight the exact entity you're requesting for.
+Highlight the exact entity you're requesting for by making it CAPITAL CASE.
 Once collected, you store these info in a Google Sheet
 
 """
 
 USER_ICON = "icons/man.png"
-ASSISTANT_ICON = "icons/magic-wand(1).png"
-TOOL_ICON = "icons/completed-task.png"
+ASSISTANT_ICON = "icons/magic-wand-1.png"
+TOOL_ICON = "icons/check.png"
 
 IMAGE_LOADER = "icons/ripple.svg"
 TEXT_LOADER = "icons/balls.svg"
@@ -129,21 +128,6 @@ def __isInvalidResponse(response: str):
         return True
 
 
-def __matchingKeywordsCount(keywords: List[str], text: str):
-    return sum([
-        1 if keyword in text else 0
-        for keyword in keywords
-    ])
-
-
-def __isStringNumber(s: str) -> bool:
-    try:
-        float(s)
-        return True
-    except ValueError:
-        return False
-
-
 def __resetButtonState():
     st.session_state["buttonValue"] = ""
 
@@ -164,6 +148,8 @@ if "buttonValue" not in st.session_state:
 if "startMsg" not in st.session_state:
     st.session_state.startMsg = ""
 
+st.session_state.toolResponseDisplay = {}
+
 
 def __getMessages():
     def getContextSize():
@@ -183,47 +169,26 @@ tools = [
 ]
 
 
-def __showTaskStatus(msg):
-    taskContainer = st.container()
-    taskContainer.image(TOOL_ICON, width=30)
-    taskContainer.markdown(
-        f"""
-        <div class='code'>
-        {msg}
-        </div>
-        """,
-        unsafe_allow_html=True
-    )
-
-
-def __processToolCalls(tool_calls):
-    for toolCall in tool_calls:
-        functionName = toolCall.function.name
-        functionToCall = toolsInfo[functionName]["func"]
-        functionArgs = json.loads(toolCall.function.arguments)
-        functionResult = functionToCall(**functionArgs)
-        functionResponse = functionResult["response"]
-        shouldShow = functionResult["shouldShow"]
-        pprint(f"{functionResponse=}")
-
-        if shouldShow:
-            st.session_state.chatHistory.append(
-                {
-                    "role": "tool",
-                    "content": functionResponse,
-                }
-            )
-           
-            __showTaskStatus(functionResponse)
+def __showToolResponse(toolResponseDisplay: dict):
+    msg = toolResponseDisplay.get("text")
+    icon = toolResponseDisplay.get("icon")
 
-        st.session_state.messages.append(
-            {
-                "role": "tool",
-                "tool_call_id": toolCall.id,
-                "name": functionName,
-                "content": functionResponse,
-            }
+    col1, col2 = st.columns([1, 20])
+    with col1:
+        st.image(
+            icon or TOOL_ICON,
+            width=30
         )
+    with col2:
+        st.markdown(
+            f"""
+            <div class='code'>
+            {msg}
+            </div>
+            """,
+            unsafe_allow_html=True
+        )
+
 
 def __process_stream_chunk(chunk):
     delta = chunk.choices[0].delta
@@ -252,59 +217,48 @@ def __addToolCallsToMsgs(toolCalls):
         }
     )
 
-def __add_tool_call(tool_call):
-    st.session_state.messages.append({
-        "role": "assistant",
-        "tool_calls": [{
-            "id": tool_call.id,
-            "function": {
-                "name": tool_call.function.name,
-                "arguments": tool_call.function.arguments,
-            },
-            "type": tool_call.type,
-        }]
-    })
-
-def predict1():
-    shouldStream = True
-
-    messagesFormatted = [{"role": "system", "content": SYSTEM_MSG}]
-    messagesFormatted.extend(__getMessages())
-    contextSize = countTokens(messagesFormatted)
-    pprint(f"{contextSize=} | {MODEL}")
 
-    response = client.chat.completions.create(
-        model=MODEL,
-        messages=messagesFormatted,
-        temperature=0.8,
-        max_tokens=4000,
-        stream=shouldStream,
-        tools=tools
+def __addToolCallToMsgs(toolCall: dict):
+    st.session_state.messages.append(
+        {
+            "role": "assistant",
+            "tool_calls": [
+                {
+                    "id": toolCall.id,
+                    "function": {
+                        "name": toolCall.function.name,
+                        "arguments": toolCall.function.arguments,
+                    },
+                    "type": toolCall.type,
+                }
+            ],
+        }
     )
 
-    content = ""
-    tool_call = None
 
-    for chunk in response:
-        chunk_content = __process_stream_chunk(chunk)
-        if isinstance(chunk_content, str):
-            content += chunk_content
-            yield chunk_content
-        elif chunk_content:
-            if not tool_call:
-                tool_call = chunk_content
-            else:
-                tool_call.function.arguments += chunk_content.function.arguments
+def __processToolCalls(toolCalls):
+    for toolCall in toolCalls:
+        functionName = toolCall.function.name
+        functionToCall = toolsInfo[functionName]["func"]
+        functionArgs = json.loads(toolCall.function.arguments)
+        functionResult = functionToCall(**functionArgs)
+        functionResponse = functionResult["response"]
+        responseDisplay = functionResult.get("display")
+        pprint(f"{functionResponse=}")
 
-    if tool_call:
-        pprint(f"{tool_call=}")
+        if responseDisplay:
+            __showToolResponse(responseDisplay)
+            st.session_state.toolResponseDisplay = responseDisplay
 
-        __addToolCallsToMsgs([tool_call])
-        try:
-            __processToolCalls([tool_call])
-            return predict()
-        except Exception as e:
-            pprint(e)
+        __addToolCallToMsgs(toolCall)
+        st.session_state.messages.append(
+            {
+                "role": "tool",
+                "tool_call_id": toolCall.id,
+                "name": functionName,
+                "content": functionResponse,
+            }
+        )
 
 
 def __dedupeToolCalls(toolCalls: list):
@@ -343,23 +297,23 @@ def predict():
         content = ""
         toolCall = None
 
-        for chunk in response:
-            chunkContent = __process_stream_chunk(chunk)
-            if isinstance(chunkContent, str):
-                content += chunkContent
-                yield chunkContent
-            elif chunkContent:
-                if not toolCall:
-                    toolCall = chunkContent
-                else:
-                    toolCall.function.arguments += chunkContent.function.arguments
-
-        toolCalls = [toolCall] if toolCall else []
+        # for chunk in response:
+        #     chunkContent = __process_stream_chunk(chunk)
+        #     if isinstance(chunkContent, str):
+        #         content += chunkContent
+        #         yield chunkContent
+        #     elif chunkContent:
+        #         if not toolCall:
+        #             toolCall = chunkContent
+        #         else:
+        #             toolCall.function.arguments += chunkContent.function.arguments
+
+        # toolCalls = [toolCall] if toolCall else []
     else:
         responseMessage = response.choices[0].message
         # pprint(f"{responseMessage=}")
         responseContent = responseMessage.content
-        pprint(f"{responseContent=}")
+        # pprint(f"{responseContent=}")
         if responseContent:
             yield responseContent
         toolCalls = responseMessage.tool_calls
@@ -368,7 +322,6 @@ def predict():
     if toolCalls:
         pprint(f"{toolCalls=}")
         toolCalls = __dedupeToolCalls(toolCalls)
-        __addToolCallsToMsgs(toolCalls)
         try:
             __processToolCalls(toolCalls)
             return predict()
@@ -384,19 +337,12 @@ for chat in st.session_state.chatHistory:
     role = chat["role"]
     content = chat["content"]
     imagePath = chat.get("image")
+    toolResponseDisplay = chat.get("toolResponseDisplay")
     avatar = ROLE_TO_AVATAR[role]
     with st.chat_message(role, avatar=avatar):
-        if role == "tool":
-            st.markdown(
-                f"""
-                <div class='code'>
-                {content}
-                </div>
-                """,
-                unsafe_allow_html=True
-            )
-        else:
-            st.markdown(content)
+        st.markdown(content)
+        if toolResponseDisplay:
+            __showToolResponse(toolResponseDisplay)
 
         if imagePath:
             st.image(imagePath)
@@ -408,8 +354,8 @@ if prompt := (st.chat_input() or st.session_state["buttonValue"] or st.session_s
     with st.chat_message("user", avatar=USER_ICON):
         st.markdown(prompt)
     pprint(f"{prompt=}")
-    st.session_state.messages.append({"role": "user", "content": prompt })
     st.session_state.chatHistory.append({"role": "user", "content": prompt })
+    st.session_state.messages.append({"role": "user", "content": prompt })
 
     with st.chat_message("assistant", avatar=ASSISTANT_ICON):
         responseContainer = st.empty()
@@ -463,11 +409,15 @@ if prompt := (st.chat_input() or st.session_state["buttonValue"] or st.session_s
         #     except Exception as e:
         #         pprint(e)
 
-        st.session_state.messages.append({
+        toolResponseDisplay = st.session_state.toolResponseDisplay
+        st.session_state.chatHistory.append({
             "role": "assistant",
             "content": response,
+            "toolResponseDisplay": toolResponseDisplay
         })
-        st.session_state.chatHistory.append({
+
+        st.session_state.messages.append({
             "role": "assistant",
             "content": response,
         })
+

tools.py

@@ -1,6 +1,5 @@
 
 import gspread
-from oauth2client.service_account import ServiceAccountCredentials
 import os
 import json
 
@@ -8,6 +7,7 @@ import json
 # load_dotenv()
 
 GCP_JSON_KEY = os.environ.get("GCP_JSON_KEY")
+MY_EMAIL = "[email protected]"
 
 
 def saveInGSheet(
@@ -17,13 +17,18 @@ def saveInGSheet(
 ):
     client = gspread.service_account_from_dict(json.loads(GCP_JSON_KEY))
 
-    workBook = "test_sheet"
+    workBook = "Cold Outreach - User Prof"
     try:
         spreadsheet = client.open(workBook)
     except gspread.SpreadsheetNotFound:
+        print(f"Creating new sheet: {workBook}")
         spreadsheet = client.create(workBook)
-        spreadsheet.share('[email protected]', perm_type='user', role='writer')
         print(f"Created new sheet: {spreadsheet.url}")
+        spreadsheet.share(
+            MY_EMAIL,
+            perm_type='user',
+            role='writer',
+        )
 
     sheet = spreadsheet.sheet1
     sheet.append_row([
@@ -32,20 +37,14 @@ def saveInGSheet(
         profileDetails
     ])
     return {
-        "response": "Saved in GSheet",
-        "shouldShow": True
+        "response": f"Saved in Google Sheet. [Link]({spreadsheet.url})",
+        "display": {
+            "text": "Saved in Google Sheet",
+            "icon": "icons/completed-task.png",
+        }
     }
 
 
-# saveInGSheet({
-#     "name": "Ashhar",
-#     "email": "XXXXXXXXXXXXXXXXXXXXX",
-#     "subject": "Test Subject",
-#     "message": "Test Message",
-#     "sent": True
-# })
-
-
 toolsInfo = {
     "saveInGSheet": {
         "func": saveInGSheet,
@@ -53,7 +52,7 @@ toolsInfo = {
             "type": "function",
             "function": {
                 "name": "saveInGSheet",
-                "description": "Saves the profile details in the GSheet",
+                "description": "Saves the profile details in Google Sheet",
                 "parameters": {
                     "type": "object",
                     "properties": {
@@ -63,7 +62,7 @@ toolsInfo = {
                         },
                         "role": {
                             "type": "string",
-                            "description": "Role of the person"
+                            "description": "Role of the person in the Company"
                         },
                         "profileDetails": {
                             "type": "string",
@@ -77,11 +76,3 @@ toolsInfo = {
     }
 }
 
-
-# def load_json_and_print():
-#     with open('emailgenie-434420-b9c81c93bb39.json', 'r') as json_file:
-#         data = json.load(json_file)
-#         json_string = json.dumps(data)
-#         print(json_string)
-
-# load_json_and_print()