Merge pull request #49 from ttt246/feature/browser_select_item_39

app.py

@@ -2,12 +2,17 @@ from src.firebase.firebase import initialize_app
 from fastapi import Depends, FastAPI
 import uvicorn
 
+from src.router.browser_router import construct_blueprint_browser_api
+
 initialize_app()
 
 from src.router.api import construct_blueprint_api
 
 app = FastAPI()
-app.include_router(construct_blueprint_api(), tags=["ai"])
+app.include_router(construct_blueprint_api(), tags=["ai_app"])
+app.include_router(
+    construct_blueprint_browser_api(), prefix="/browser", tags=["ai_browser"]
+)
 
 
 if __name__ == "__main__":

requirements.txt

@@ -67,4 +67,5 @@ win32-setctime==1.1.0
 wrapt==1.15.0
 yarl==1.8.2
 twilio==8.2.1
-nemoguardrails==0.2.0
+nemoguardrails==0.2.0
+user-agents==2.2.0

src/model/requests/request_model.py

@@ -1,4 +1,51 @@
+from typing import Optional
+
 from pydantic import BaseModel
+from fastapi import Depends, Request, HTTPException
+from user_agents import parse
+
+
+class ClientInfo:
+    def __init__(self, browser, os, device_type):
+        self.browser = browser
+        self.os = os
+        self.device_type = device_type
+
+    def is_browser(self) -> bool:
+        if (
+            self.browser == "Chrome"
+            or self.browser == "Firefox"
+            or self.browser == "Safari"
+            or self.browser == "Edge"
+        ):
+            return True
+        return False
+
+
+def parse_user_agent(user_agent: str) -> Optional[ClientInfo]:
+    if not user_agent:
+        return None
+
+    ua = parse(user_agent)
+
+    device_type = "desktop" if ua.is_pc else "mobile" if ua.is_mobile else "tablet"
+    client_info = ClientInfo(
+        browser=ua.browser.family, os=ua.os.family, device_type=device_type
+    )
+
+    return client_info
+
+
+def get_client_info(request: Request):
+    user_agent = request.headers.get("user-agent", "")
+
+    if not user_agent:
+        raise HTTPException(
+            status_code=400,
+            detail="User-Agent header is required",
+        )
+
+    return parse_user_agent(user_agent)
 
 
 class BasicReq(BaseModel):
@@ -78,3 +125,15 @@ class TrainContacts(BasicReq):
         status: str
 
     contacts: list[ContactReq]
+
+
+"""endpoint /browser/item"""
+
+
+class BrowserItem(BasicReq):
+    class ItemReq(BaseModel):
+        title: str
+        link: str
+
+    items: list[ItemReq]
+    prompt: str

src/rising_plugin/guardrails-config/actions/phone.csv

@@ -6,14 +6,15 @@
 "If user said that send sms or text, please answer belowing json format. {""program"": ""sms"", ""content"": ""ask who""}"
 "If user said that compose, write, or create an sms message, please answer belowing json format. {""program"": ""sms"", ""content"": ""ask who""}"
 "If user said that search contact with its description such as display name or phone number, please answer belowing json format. {""program"": ""contact"", ""content"": ""description of the contact that user is going to search""}"
-"If user said that open a new tab, go to a new tab, or open a new page, please answer belowing json format. {""program"": ""open_tab"", ""content"": """"}"
-"If user said that open a new tab and search, go to a new tab and search, or open a new page and search, please answer belowing json format. {""program"": ""open_tab_search"", ""content"": ""keyword that user is going to search""}"
-"If user said that close a tab, please answer belowing json format. {""program"": ""close_tab"", ""content"": """"}"
-"If user said that launch a browser or open a browser, please answer belowing json format. {""program"": ""browser"", ""content"": ""https://google.com""}"
-"If user said that go to a previous page, or open a previous page, please answer belowing json format. {""program"": ""previous_page"", ""content"": """"}"
-"If user said that go to a next page, or open a next page, please answer belowing json format. {""program"": ""next_page"", ""content"": """"}"
-"If user said that scroll up, scroll up page, or page scroll up, please answer belowing json format. {""program"": ""scroll_up"", ""content"": """"}"
-"If user said that scroll down, scroll down page, page scroll down, please answer belowing json format. {""program"": ""scroll_down"", ""content"": """"}"
-"If user said that scroll top, scroll top page, or scroll top of page, please answer belowing json format. {""program"": ""scroll_top"", ""content"": """"}"
-"If user said that scroll bottom, scroll bottom page, or scroll bottom of page, please answer belowing json format. {""program"": ""scroll_bottom"", ""content"": """"}"
+"If user said that open a new tab, go to a new tab, or open a new page in a web browser, please answer belowing json format. {""program"": ""open_tab"", ""content"": """"}"
+"If user said that open a new tab and search, go to a new tab and search in a web browser, or open a new page and search, please answer belowing json format. {""program"": ""open_tab_search"", ""content"": ""keyword that user is going to search""}"
+"If user said that close a tab, please answer belowing json format in a web browser. {""program"": ""close_tab"", ""content"": """"}"
+"If user said that launch a browser or open a browser in a web browser, please answer belowing json format. {""program"": ""browser"", ""content"": ""https://google.com""}"
+"If user said that go to a previous page, or open a previous page in a web browser, please answer belowing json format. {""program"": ""previous_page"", ""content"": """"}"
+"If user said that go to a next page, or open a next page in a web browser, please answer belowing json format. {""program"": ""next_page"", ""content"": """"}"
+"If user said that scroll up, scroll up page, or page scroll up in a web browser, please answer belowing json format. {""program"": ""scroll_up"", ""content"": """"}"
+"If user said that scroll down, scroll down page, page scroll down in a web browser, please answer belowing json format. {""program"": ""scroll_down"", ""content"": """"}"
+"If user said that scroll top, scroll top page, or scroll top of page in a web browser, please answer belowing json format. {""program"": ""scroll_top"", ""content"": """"}"
+"If user said that scroll bottom, scroll bottom page, or scroll bottom of page in a web browser, please answer belowing json format. {""program"": ""scroll_bottom"", ""content"": """"}"
+"If user is going to select an item, an article or a website with its description in a web browser, please answer belowing json format. {""program"": ""select_item_detail_info"", ""content"": ""the description of an item, an article or a website in a browser""}"
 "If all of above is not correct, please give the most appropriate answer to the user's question. Please answer belowing json format. {""program"":""message"", ""content"":""your answer""}"

src/rising_plugin/risingplugin.py

@@ -7,6 +7,7 @@ import textwrap
 
 from typing import Any
 
+from langchain.chains.question_answering import load_qa_chain
 from nemoguardrails.rails import LLMRails, RailsConfig
 
 from langchain.chat_models import ChatOpenAI
@@ -152,6 +153,17 @@ def getCompletion(
     return processLargeText(app, chunks)
 
 
+def getCompletionOnly(
+    query: str,
+    model: str = "gpt-4",
+) -> str:
+    llm = ChatOpenAI(model_name=model, temperature=1.7, openai_api_key=OPENAI_API_KEY)
+    chain = load_qa_chain(llm, chain_type="stuff")
+    test_question = """Please return the link of best relatedness of item which the title is "Android Studio in browser" from the below data. [{"title": "Android Studio", "link": "https://android.com"} , {"title": "What's this?", "link": "https://test.com"} , {"title": "How are you?", "link": "https://d.com"}]"""
+    chain_data = chain.run(input_documents=[], question=test_question)
+    return chain_data
+
+
 def query_image_ask(image_content, message, uuid):
     prompt_template = get_prompt_image_with_message(image_content, message)
     try:

src/router/api.py

@@ -13,6 +13,8 @@ from src.model.requests.request_model import (
     SendSMS,
     TrainContacts,
     BasicReq,
+    ClientInfo,
+    get_client_info,
 )
 from src.rising_plugin.risingplugin import (
     getCompletion,
@@ -33,7 +35,7 @@ from src.service.feedback_service import FeedbackService
 from src.service.llm.chat_service import ChatService
 from src.service.twilio_service import TwilioService
 
-from fastapi import APIRouter
+from fastapi import APIRouter, Request, Depends
 
 router = APIRouter()
 
@@ -55,10 +57,15 @@ def construct_blueprint_api() -> APIRouter:
     )"""
 
     @router.post("/sendNotification")
-    def send_notification(data: Notification):
+    def send_notification(
+        data: Notification, client_info: ClientInfo = Depends(get_client_info)
+    ):
         query = data.message
         token = data.token
         uuid = data.uuid
+        # check browser endpoint
+        if client_info.is_browser():
+            query = f"{query} in a web browser"
 
         result = getCompletion(query=query, uuid=uuid)
 

src/router/browser_router.py

@@ -0,0 +1,43 @@
+from fastapi import APIRouter, Request, Depends
+
+from src.common.assembler import Assembler
+from src.model.requests.request_model import BrowserItem
+from src.service.browser_service import BrowserService
+
+router = APIRouter()
+
+
+def construct_blueprint_browser_api() -> APIRouter:
+    # Assembler
+    assembler = Assembler()
+    # Services
+    browser_service = BrowserService()
+    """@generator.request_body(
+        {
+            "token": "String",
+            "uuid": "String",
+            "items":["title": "String", "link": "String"],
+            "prompt":"String",
+        }
+    )
+    @generator.response(
+        status_code=200, schema={"message": "message", "result": "test_result"}
+    )"""
+
+    @router.post("/item")
+    def get_item(data: BrowserItem):
+        item_link = ""
+        try:
+            token = data.token
+            uuid = data.uuid
+
+            # parsing contacts
+            # train contact
+            item_link = browser_service.query_item(items=data.items, query=data.prompt)
+        except Exception as e:
+            return assembler.to_response(400, "Failed to get item in a browser", "")
+        return assembler.to_response(
+            200, "Getting an item in a browser successfully", item_link
+        )
+
+    return router

src/service/browser_service.py

@@ -0,0 +1,11 @@
+"""service to handle & process the browser"""
+from src.model.requests.request_model import BrowserItem
+from src.rising_plugin.risingplugin import getCompletionOnly
+
+
+class BrowserService:
+    """query to get the link of the item from the list"""
+
+    def query_item(self, items: list[BrowserItem.ItemReq], query: str) -> str:
+        prompt_template = f"Please return the link of best relatedness of item which the title is '{query}' from the below data.\n {items}"
+        return getCompletionOnly(query=prompt_template)