Merge pull request #106 from ttt246/feature/instant_answer_74

.gitignore

@@ -1,2 +1,3 @@
 /Brain/firebase_cred.json
 /.idea
+Brain/firebase_cred.json

Brain/src/common/program_type.py

@@ -21,3 +21,4 @@ class ProgramType:
         SCROLL_BOTTOM = "scroll_bottom"
         SELECT_ITEM_DETAIL_INFO = "select_item_detail_info"
         SELECT_ITEM = "select_item"
+        MESSAGE = "message"

Brain/src/model/requests/request_model.py

@@ -186,6 +186,14 @@ class BrowserItem(BasicReq):
     prompt: str
 
 
+"""endpoint /browser/ask"""
+
+
+class BrowserAsk(BasicReq):
+    items: list[str]
+    prompt: str
+
+
 """endpoint /train"""
 
 

Brain/src/rising_plugin/guardrails-config/actions/actions.py

@@ -92,6 +92,7 @@ async def general_question(query):
     page_content = json_query["page_content"]
     document_id = json_query["document_id"]
     setting = ReqModel(json_query["setting"])
+    is_browser = json_query["is_browser"]
 
     docs.append(Document(page_content=page_content, metadata=""))
     """ 1. calling gpt model to categorize for all message"""
@@ -108,8 +109,11 @@ async def general_question(query):
                 }
         """ 2. check program is message to handle it with falcon llm """
         if result["program"] == "message":
-            """FALCON_7B:"""
-            result["content"] = falcon_llm.query(question=query)
+            if is_browser:
+                result["program"] = "ask_website"
+            else:
+                # """FALCON_7B:"""
+                result["content"] = falcon_llm.query(question=query)
         return str(result)
     except ValueError as e:
         # Check sms and browser query

Brain/src/rising_plugin/risingplugin.py

@@ -57,6 +57,7 @@ def llm_rails(
     firebase_app: firebase_admin.App,
     query: str,
     image_search: bool = True,
+    is_browser: bool = False,
 ) -> Any:
     """step 0: convert string to json"""
     index = init_pinecone(index_name=PINECONE_INDEX_NAME, setting=setting)
@@ -91,6 +92,7 @@ def llm_rails(
                     image_search=image_search,
                     page_content=page_content,
                     document_id=document_id,
+                    is_browser=is_browser,
                 ),
             }
         ]
@@ -103,6 +105,7 @@ def processLargeText(
     app: any,
     chunks: any,
     firebase_app: firebase_admin.App,
+    is_browser: bool = False,
     image_search: bool = True,
 ):
     if len(chunks) == 1:
@@ -112,6 +115,7 @@ def processLargeText(
             firebase_app=firebase_app,
             query=chunks[0],
             image_search=image_search,
+            is_browser=is_browser,
         )
         result = json.dumps(message["content"])
         return parseJsonFromCompletion(result)
@@ -146,6 +150,7 @@ def processLargeText(
                     firebase_app=firebase_app,
                     query=chunk_query,
                     image_search=image_search,
+                    is_browser=is_browser,
                 )
             else:
                 last_query = (
@@ -167,6 +172,7 @@ def processLargeText(
                     firebase_app=firebase_app,
                     query=last_query,
                     image_search=image_search,
+                    is_browser=is_browser,
                 )
                 result = json.dumps(message["content"])
                 return parseJsonFromCompletion(result)
@@ -177,6 +183,7 @@ def getCompletion(
     query: str,
     setting: ReqModel,
     firebase_app: firebase_admin.App,
+    is_browser: bool = False,
     image_search: bool = True,
 ):
     llm = get_llm(model=DEFAULT_GPT_MODEL, setting=setting).get_llm()
@@ -192,6 +199,7 @@ def getCompletion(
         chunks=chunks,
         image_search=image_search,
         firebase_app=firebase_app,
+        is_browser=is_browser,
     )
 
 
@@ -297,6 +305,7 @@ def rails_input_with_args(
     image_search: bool,
     page_content: str,
     document_id: str,
+    is_browser: bool,
 ) -> str:
     # convert json with params for rails.
     json_query_with_params = {
@@ -305,6 +314,7 @@ def rails_input_with_args(
         "page_content": page_content,
         "document_id": document_id,
         "setting": setting.to_json(),
+        "is_browser": is_browser,
     }
     return json.dumps(json_query_with_params)
 

Brain/src/router/api.py

@@ -69,18 +69,22 @@ def construct_blueprint_api() -> APIRouter:
         # cloud message
         cloud_message = CloudMessage(firebase_app=firebase_app)
 
+        # test
+
         # parsing params
         query = data.message
         token = setting.token
         uuid = setting.uuid
         # check browser endpoint
-        if client_info.is_browser():
-            query = f"{query} in a web browser"
+        # if client_info.is_browser():
+        # query = f"{query} in a web browser"
+        is_browser = client_info.is_browser()
 
         result = getCompletion(
             query=query,
             setting=setting,
             firebase_app=firebase_app,
+            is_browser=is_browser,
         )
 
         # check contact querying

Brain/src/router/browser_router.py

@@ -6,6 +6,7 @@ from Brain.src.common.program_type import ProgramType
 from Brain.src.common.utils import parseUrlFromStr
 from Brain.src.firebase.firebase import firebase_admin_with_setting
 from Brain.src.model.requests.request_model import BrowserItem
+from Brain.src.model.requests.request_model import BrowserAsk
 from Brain.src.service.browser_service import BrowserService
 
 router = APIRouter()
@@ -57,4 +58,29 @@ def construct_blueprint_browser_api() -> APIRouter:
             ),
         )
 
+    @router.post("/ask")
+    def get_item(data: BrowserAsk):
+        # firebase admin init
+        try:
+            setting, firebase_app = firebase_admin_with_setting(data)
+        except BrainException as ex:
+            return ex.get_response_exp()
+
+        try:
+            # parsing contacts
+            # train contact
+            answer = browser_service.query_ask(items=data.items, query=data.prompt)
+        except Exception as e:
+            if isinstance(e, BrainException):
+                return e.get_response_exp()
+            return assembler.to_response(400, "Failed to get item in a browser", "")
+        return assembler.to_response(
+            200,
+            "Getting an item in a browser successfully",
+            assembler.to_result_format(
+                ProgramType.BrowserType.MESSAGE,
+                answer,
+            ),
+        )
+
     return router

Brain/src/service/browser_service.py

@@ -11,3 +11,12 @@ class BrowserService:
         User is trying to '{query}' and it includes the title of the item.
         Please return the link of best relatedness of the item with the title from the below data.\n {items}"""
         return getCompletionOnly(query=prompt_template)
+
+    def query_ask(self, items: list[str], query: str) -> str:
+        prompt_template = f"""
+        User is asking question related to website that users visit. The following is the user's question.
+        '{query}'.\n
+        Also the below data is list of sentence in the website.
+        '{items}' \n
+        Please provide me the proper answer.\n """
+        return getCompletionOnly(query=prompt_template)

Extension/src/pages/Panel/Panel.jsx

@@ -6,8 +6,23 @@ import Message from './Message'
 import './Panel.css';
 
 const {Footer, Content} = Layout;
+const confs = {
+    "openai_key": "string",
+    "pinecone_key": "string",
+    "pinecone_env": "string",
+    "firebase_key": "string",
+    "token": "",
+    "uuid": "",
+    "settings": {
+        "temperature": 0.6
+    }
+}
+
+const URL_BASE = 'https://ttt246-brain.hf.space/'
+const URL_SEND_NOTIFICATION = URL_BASE + 'sendNotification'
+const URL_BROWSER_ITEM = URL_BASE + 'browser/item'
+const URL_ASK_WEBSITE = URL_BASE + 'browser/ask_website'
 
-let currentATags = []
 let prompt = ""
 
 const Panel = () => {
@@ -16,6 +31,10 @@ const Panel = () => {
     const [isLoading, setLoadingStatus] = useState(false);
     const chat_box = useRef(null);
 
+    /*
+     * methods for states in ui
+     * lifecycle methods
+     */
     const handleQuestionUpdated = (event) => {
         if (event.key === "Enter" && !isLoading) {
             addMessage(question, true);
@@ -28,6 +47,10 @@ const Panel = () => {
         setQuestion(event.target.value);
     };
 
+    useEffect(() => {
+        chat_box.current.scrollTop = chat_box.current.scrollHeight;
+    }, [messages]);
+
     const addMessage = (message, type, isLoading = false) => {
         if (message === "") return;
 
@@ -45,24 +68,10 @@ const Panel = () => {
             }]);
     };
 
-    const sendNotification = async () => {
-        const params = {
-            "confs": {
-                "openai_key": "string",
-                "pinecone_key": "string",
-                "pinecone_env": "string",
-                "firebase_key": "string",
-                "token": "",
-                "uuid": "",
-                "settings": {
-                    "temperature": 0.6
-                }
-            },
-            "message": question
-        }
-
-        setQuestion("")
-
+    /*
+     * methods for sending request to server
+     */
+    const sendRequest =  async (params, url) => {
         const requestOptions = {
             method: 'POST', headers: {
                 'Content-Type': 'application/json'
@@ -70,10 +79,21 @@ const Panel = () => {
         }
 
         setLoadingStatus(true)
-        const response = await fetch('https://ttt246-brain.hf.space/sendNotification', requestOptions)
+        const response = await fetch(url, requestOptions)
         const data = await response.json()
         setLoadingStatus(false)
 
+        return data
+    }
+
+    const sendNotification = async () => {
+        const params = {
+            "confs": confs,
+            "message": question
+        }
+        setQuestion("")
+
+        const data = sendRequest(params, URL_SEND_NOTIFICATION)
         if (data.result === undefined || data.result == null) {
             return
         }
@@ -141,20 +161,10 @@ const Panel = () => {
                     break
                 case 'select_item_detail_info':
                     addMessage("I need more detail info to select item", false)
-                    setLoadingStatus(true)
-                    let data = await selectItem()
-                    setLoadingStatus(false)
-
-                    console.log(data)
-
-                    if(data.result.program === "select_item")
-                        window.open(data.result.content, '_blank', 'noreferrer')
-                    break
-                case 'select_item':
-                    addMessage("select item", false)
+                    selectItem()
                     break
                 case 'ask_website':
-                    askAboutCurrentWebsite();
+                    askAboutCurrentWebsite()
                     break
                 default:
                     break
@@ -166,44 +176,27 @@ const Panel = () => {
 
     const selectItem = async () => {
         const params = {
-            "confs": {
-                "openai_key": "string",
-                "pinecone_key": "string",
-                "pinecone_env": "string",
-                "firebase_key": "string",
-                "token": "",
-                "uuid": "",
-                "settings": {
-                    "temperature": 0.6
-                }
-            },
+            "confs": confs,
             "prompt": prompt,
             "items": scrapeATags()
         }
-        console.log(params)
+        const data = sendRequest(params, URL_BROWSER_ITEM)
+        window.open(data.result.content, '_blank', 'noreferrer')
+    }
 
-        const requestOptions = {
-            method: 'POST', headers: {
-                'Content-Type': 'application/json'
-            }, body: JSON.stringify(params)
+    const askAboutCurrentWebsite = async () => {
+        const params = {
+            "confs": confs,
+            "prompt": prompt,
+            "items": scrapeWebsites()
         }
-
-        setLoadingStatus(true)
-        const response = await fetch('https://ttt246-brain.hf.space/browser/item', requestOptions)
-        const data = await response.json()
-        setLoadingStatus(false)
-
-        return data
+        const data = sendRequest(params, URL_ASK_WEBSITE)
+        addMessage(data.result.content, false)
     }
 
-    useEffect(() => {
-        chat_box.current.scrollTop = chat_box.current.scrollHeight;
-    }, [messages]);
-
-    useEffect(() => {
-        currentATags = scrapeATags()
-    }, [])
-
+    /*
+     * methods for scraping websites
+     */
     const scrapeATags = () => {
         const links = []
 
@@ -224,50 +217,15 @@ const Panel = () => {
 
     const scrapeWebsites = () => {
         const data = []
-
         const tags = document.querySelectorAll(['a', 'p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'h7'])
-
         tags.forEach((tag) => {
             const content = tag.textContent || ''
-
-            data.push(content)
+            if(content !== '')
+                data.push(content)
         })
-
-        return data
-    }
-
-    const askAboutCurrentWebsite = async () => {
-        const params = {
-            "confs": {
-                "openai_key": "string",
-                "pinecone_key": "string",
-                "pinecone_env": "string",
-                "firebase_key": "string",
-                "token": "",
-                "uuid": "",
-                "settings": {
-                    "temperature": 0.6
-                }
-            },
-            "prompt": prompt,
-            "items": scrapeWebsites()
-        }
-
-        const requestOptions = {
-            method: 'POST', headers: {
-                'Content-Type': 'application/json'
-            }, body: JSON.stringify(params)
-        }
-
-        setLoadingStatus(true)
-        const response = await fetch('https://ttt246-brain.hf.space/browser/ask_website', requestOptions)
-        const data = await response.json()
-        setLoadingStatus(false)
-
         return data
     }
 
-
     return (
         <Layout className="main-layout">
             <div className="header">