From 2ee724f93e36ecdf8ddfbbbb69f26ce7f7ba3760 Mon Sep 17 00:00:00 2001 From: Heiner Lohaus Date: Fri, 22 Mar 2024 12:48:59 +0100 Subject: Add webview docs and examples, Set webview as default --- g4f/Provider/Bing.py | 2 +- g4f/gui/client/static/js/chat.v1.js | 16 ++++++++-------- g4f/gui/server/api.py | 8 ++++---- g4f/gui/webview.py | 3 ++- 4 files changed, 15 insertions(+), 14 deletions(-) (limited to 'g4f') diff --git a/g4f/Provider/Bing.py b/g4f/Provider/Bing.py index a1d14d87..f8b06dd1 100644 --- a/g4f/Provider/Bing.py +++ b/g4f/Provider/Bing.py @@ -414,7 +414,7 @@ async def stream_generate( image_request = await upload_image( session, image, - "Balanced" if Tones.copilot == "Copilot" else tone, + "Balanced" if tone == Tones.copilot else tone, headers ) if image else None async with session.ws_connect( diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js index bcef4a78..f9bc4568 100644 --- a/g4f/gui/client/static/js/chat.v1.js +++ b/g4f/gui/client/static/js/chat.v1.js @@ -240,26 +240,26 @@ async function add_message_chunk(message) { } } -cameraInput?.addEventListener("click", (e) => { - if (window?.pywebview) { - e.preventDefault(); - pywebview.api.choose_file(); - } -}) +// fileInput?.addEventListener("click", (e) => { +// if (window?.pywebview) { +// e.preventDefault(); +// pywebview.api.choose_file(); +// } +// }); cameraInput?.addEventListener("click", (e) => { if (window?.pywebview) { e.preventDefault(); pywebview.api.take_picture(); } -}) +}); imageInput?.addEventListener("click", (e) => { if (window?.pywebview) { e.preventDefault(); pywebview.api.choose_image(); } -}) +}); const ask_gpt = async () => { regenerate.classList.add(`regenerate-hidden`); diff --git a/g4f/gui/server/api.py b/g4f/gui/server/api.py index 3adb88f4..e7683812 100644 --- a/g4f/gui/server/api.py +++ b/g4f/gui/server/api.py @@ -19,12 +19,12 @@ try: filters=[["Image", "*.jpg", "*.jpeg", "*.png", "*.webp", "*.svg"]], ) has_plyer = True -except (ImportError, NameError): +except ImportError: has_plyer = False try: from android.runnable import run_on_ui_thread - from android.storage import app_storage_path - from android.permissions import request_permissions, Permission + import android.permissions + from android.permissions import Permission from android.permissions import _RequestPermissionsManager _RequestPermissionsManager.register_callback() from .android_gallery import user_select_image @@ -161,7 +161,7 @@ class Api(): def request_permissions(self): if has_android: - request_permissions([ + android.permissions.request_permissions([ Permission.CAMERA, Permission.READ_EXTERNAL_STORAGE, Permission.WRITE_EXTERNAL_STORAGE diff --git a/g4f/gui/webview.py b/g4f/gui/webview.py index 36ad0e60..b015dbed 100644 --- a/g4f/gui/webview.py +++ b/g4f/gui/webview.py @@ -16,6 +16,7 @@ import g4f.debug def run_webview( debug: bool = False, + ssl: bool = True, storage_path: str = None ): if getattr(sys, 'frozen', False): @@ -36,7 +37,7 @@ def run_webview( private_mode=False, storage_path=storage_path, debug=debug, - ssl=True + ssl=ssl ) if __name__ == "__main__": -- cgit v1.2.3