From 71e7a3c3ec578526bbd864bb8fcf32fdbb84b9ea Mon Sep 17 00:00:00 2001 From: Thamognya Kodi Date: Fri, 30 Dec 2022 12:28:26 +0700 Subject: [PATCH] update: look at todo --- internet_ml/NLP/no_context/QA.py | 11 ++++++++++- internet_ml/tools/NLP/data/internet.py | 15 ++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/internet_ml/NLP/no_context/QA.py b/internet_ml/NLP/no_context/QA.py index e9b8c4b..a50e320 100644 --- a/internet_ml/NLP/no_context/QA.py +++ b/internet_ml/NLP/no_context/QA.py @@ -1,11 +1,15 @@ from typing import Any, List, Tuple import logging +import os import sys from pathlib import Path +import dotenv from transformers import pipeline +dotenv.load_dotenv() + logging.basicConfig( filename="QA.log", filemode="w", @@ -18,12 +22,17 @@ sys.path.append(str(Path(__file__).parent.parent.parent) + "/utils") import config import internet +GOOGLE_SEARCH_API_KEY = str(os.environ["INTERNET_ML_GOOGLE_API"]) +GOOGLE_SEARCH_ENGINE_ID = str(os.environ["INTERNET_ML_GOOGLE_SEARCH_ENGINE_ID"]) + QA_MODEL: Any = pipeline("question-answering") def answer(query: str) -> tuple[Any, list[str]]: global QA_MODEL - results: tuple[list[str], list[str]] = internet.google(query) + results: tuple[list[str], list[str]] = internet.Google( + query, GOOGLE_SEARCH_API_KEY, GOOGLE_SEARCH_ENGINE_ID + ).google() answer: tuple[Any, list[str]] = ( QA_MODEL(question=query, context=str(results[0])), results[1], diff --git a/internet_ml/tools/NLP/data/internet.py b/internet_ml/tools/NLP/data/internet.py index 7141b53..67d6777 100644 --- a/internet_ml/tools/NLP/data/internet.py +++ b/internet_ml/tools/NLP/data/internet.py @@ -11,8 +11,8 @@ import requests dotenv.load_dotenv() -GOOGLE_SEARCH_API_KEY = str(os.environ["INTERNET_ML_GOOGLE_API"]) -GOOGLE_SEARCH_ENGINE_ID = str(os.environ["INTERNET_ML_GOOGLE_SEARCH_ENGINE_ID"]) +# GOOGLE_SEARCH_API_KEY = str(os.environ["INTERNET_ML_GOOGLE_API"]) +# GOOGLE_SEARCH_ENGINE_ID = str(os.environ["INTERNET_ML_GOOGLE_SEARCH_ENGINE_ID"]) HTTP_USERAGENT: dict[str, str] = { "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3" @@ -46,7 +46,12 @@ from urlextract import URLExtract class Google: - def __init__(self: "Google", query: str) -> None: + def __init__( + self: "Google", + query: str, + GOOGLE_SEARCH_API_KEY: str, + GOOGLE_SEARCH_ENGINE_ID: str, + ) -> None: self.__GOOGLE_SEARCH_API_KEY: str = GOOGLE_SEARCH_API_KEY self.__GOOGLE_SEARCH_ENGINE_ID: str = GOOGLE_SEARCH_ENGINE_ID self.__num_res: int = ( @@ -147,8 +152,8 @@ class Google: return (self.__content, self.__urls) -def google(query: str) -> tuple[list[str], list[str]]: - return Google(query).google() +# def google(query: str) -> tuple[list[str], list[str]]: +# return Google(query).google() """