From f6ef3cb2237d8c336e915ef77ddbe6f37934c4fd Mon Sep 17 00:00:00 2001 From: MIDORIBIN Date: Fri, 28 Jul 2023 19:07:17 +0900 Subject: refactor: refactor provider --- g4f/.v1/unfinished/bard/README.md | 2 - g4f/.v1/unfinished/bard/__init__.py | 93 ------------------------------------- g4f/.v1/unfinished/bard/typings.py | 54 --------------------- 3 files changed, 149 deletions(-) delete mode 100644 g4f/.v1/unfinished/bard/README.md delete mode 100644 g4f/.v1/unfinished/bard/__init__.py delete mode 100644 g4f/.v1/unfinished/bard/typings.py (limited to 'g4f/.v1/unfinished/bard') diff --git a/g4f/.v1/unfinished/bard/README.md b/g4f/.v1/unfinished/bard/README.md deleted file mode 100644 index 67e8645c..00000000 --- a/g4f/.v1/unfinished/bard/README.md +++ /dev/null @@ -1,2 +0,0 @@ -to do: -- code refractoring \ No newline at end of file diff --git a/g4f/.v1/unfinished/bard/__init__.py b/g4f/.v1/unfinished/bard/__init__.py deleted file mode 100644 index f1d68b92..00000000 --- a/g4f/.v1/unfinished/bard/__init__.py +++ /dev/null @@ -1,93 +0,0 @@ -from json import dumps, loads -from os import getenv -from random import randint -from re import search -from urllib.parse import urlencode - -from bard.typings import BardResponse -from dotenv import load_dotenv -from requests import Session - -load_dotenv() -token = getenv('1psid') -proxy = getenv('proxy') - -temperatures = { - 0: "Generate text strictly following known patterns, with no creativity.", - 0.1: "Produce text adhering closely to established patterns, allowing minimal creativity.", - 0.2: "Create text with modest deviations from familiar patterns, injecting a slight creative touch.", - 0.3: "Craft text with a mild level of creativity, deviating somewhat from common patterns.", - 0.4: "Formulate text balancing creativity and recognizable patterns for coherent results.", - 0.5: "Generate text with a moderate level of creativity, allowing for a mix of familiarity and novelty.", - 0.6: "Compose text with an increased emphasis on creativity, while partially maintaining familiar patterns.", - 0.7: "Produce text favoring creativity over typical patterns for more original results.", - 0.8: "Create text heavily focused on creativity, with limited concern for familiar patterns.", - 0.9: "Craft text with a strong emphasis on unique and inventive ideas, largely ignoring established patterns.", - 1: "Generate text with maximum creativity, disregarding any constraints of known patterns or structures." -} - - -class Completion: - def create( - prompt: str = 'hello world', - temperature: int = None, - conversation_id: str = '', - response_id: str = '', - choice_id: str = '') -> BardResponse: - - if temperature: - prompt = f'''settings: follow these settings for your response: [temperature: {temperature} - {temperatures[temperature]}] | prompt : {prompt}''' - - client = Session() - client.proxies = { - 'http': f'http://{proxy}', - 'https': f'http://{proxy}'} if proxy else None - - client.headers = { - 'authority': 'bard.google.com', - 'content-type': 'application/x-www-form-urlencoded;charset=UTF-8', - 'origin': 'https://bard.google.com', - 'referer': 'https://bard.google.com/', - 'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36', - 'x-same-domain': '1', - 'cookie': f'__Secure-1PSID={token}' - } - - snlm0e = search(r'SNlM0e\":\"(.*?)\"', - client.get('https://bard.google.com/').text).group(1) - - params = urlencode({ - 'bl': 'boq_assistant-bard-web-server_20230326.21_p0', - '_reqid': randint(1111, 9999), - 'rt': 'c', - }) - - response = client.post( - f'https://bard.google.com/_/BardChatUi/data/assistant.lamda.BardFrontendService/StreamGenerate?{params}', - data={ - 'at': snlm0e, - 'f.req': dumps([None, dumps([ - [prompt], - None, - [conversation_id, response_id, choice_id], - ])]) - } - ) - - chat_data = loads(response.content.splitlines()[3])[0][2] - if not chat_data: - print('error, retrying') - Completion.create(prompt, temperature, - conversation_id, response_id, choice_id) - - json_chat_data = loads(chat_data) - results = { - 'content': json_chat_data[0][0], - 'conversation_id': json_chat_data[1][0], - 'response_id': json_chat_data[1][1], - 'factualityQueries': json_chat_data[3], - 'textQuery': json_chat_data[2][0] if json_chat_data[2] is not None else '', - 'choices': [{'id': i[0], 'content': i[1]} for i in json_chat_data[4]], - } - - return BardResponse(results) diff --git a/g4f/.v1/unfinished/bard/typings.py b/g4f/.v1/unfinished/bard/typings.py deleted file mode 100644 index 75b73bf9..00000000 --- a/g4f/.v1/unfinished/bard/typings.py +++ /dev/null @@ -1,54 +0,0 @@ -from typing import Dict, List, Union - - -class BardResponse: - def __init__(self, json_dict: Dict[str, Union[str, List]]) -> None: - """ - Initialize a BardResponse object. - - :param json_dict: A dictionary containing the JSON response data. - """ - self.json = json_dict - - self.content = json_dict.get('content') - self.conversation_id = json_dict.get('conversation_id') - self.response_id = json_dict.get('response_id') - self.factuality_queries = json_dict.get('factualityQueries', []) - self.text_query = json_dict.get('textQuery', []) - self.choices = [self.BardChoice(choice) - for choice in json_dict.get('choices', [])] - - def __repr__(self) -> str: - """ - Return a string representation of the BardResponse object. - - :return: A string representation of the BardResponse object. - """ - return f"BardResponse(conversation_id={self.conversation_id}, response_id={self.response_id}, content={self.content})" - - def filter_choices(self, keyword: str) -> List['BardChoice']: - """ - Filter the choices based on a keyword. - - :param keyword: The keyword to filter choices by. - :return: A list of filtered BardChoice objects. - """ - return [choice for choice in self.choices if keyword.lower() in choice.content.lower()] - - class BardChoice: - def __init__(self, choice_dict: Dict[str, str]) -> None: - """ - Initialize a BardChoice object. - - :param choice_dict: A dictionary containing the choice data. - """ - self.id = choice_dict.get('id') - self.content = choice_dict.get('content')[0] - - def __repr__(self) -> str: - """ - Return a string representation of the BardChoice object. - - :return: A string representation of the BardChoice object. - """ - return f"BardChoice(id={self.id}, content={self.content})" -- cgit v1.2.3