Merge pull request #2572 from hlohaus/15Jan

Readd JsApi for Webview UI

g4f/Provider/needs_auth/OpenaiChat.py

@@ -382,7 +382,7 @@ async def create_authed(
                 #     if auth_result.arkose_token is None:
                 #         raise MissingAuthError("No arkose token found in .har file")
                 if "proofofwork" in chat_requirements:
-                    if getattr(auth_result, "proof_token") is None:
+                    if getattr(auth_result, "proof_token", None) is None:
                         auth_result.proof_token = get_config(auth_result.headers.get("user-agent"))
                     proofofwork = generate_proof_token(
                         **chat_requirements["proofofwork"],
@@ -444,12 +444,9 @@ async def create_authed(
                     headers=headers
                 ) as response:
                     cls._update_request_args(auth_result, session)
-                    if response.status in (403, 404) and max_retries > 0:
-                        max_retries -= 1
-                        debug.log(f"Retry: Error {response.status}: {await response.text()}")
-                        conversation.conversation_id = None
-                        await asyncio.sleep(5)
-                        continue
+                    if response.status == 403:
+                        auth_result.proof_token = None
+                        RequestConfig.proof_token = None
                     await raise_for_status(response)
                     buffer = u""
                     async for line in response.iter_lines():

g4f/api/__init__.py

@@ -32,6 +32,7 @@
 from typing import Union, Optional, List
 
 import g4f
+import g4f.Provider
 import g4f.debug
 from g4f.client import AsyncClient, ChatCompletion, ImagesResponse, convert_to_provider
 from g4f.providers.response import BaseConversation, JsonConversation
@@ -223,7 +224,18 @@ async def models():
                     "created": 0,
                     "owned_by": model.base_provider,
                     "image": isinstance(model, g4f.models.ImageModel),
-                } for model_id, model in g4f.models.ModelUtils.convert.items()]
+                    "provider": False,
+                } for model_id, model in g4f.models.ModelUtils.convert.items()] +
+                [{
+                    "id": provider_name,
+                    "object": "model",
+                    "created": 0,
+                    "owned_by": getattr(provider, "label", None),
+                    "image": bool(getattr(provider, "image_models", False)),
+                    "provider": True,
+                } for provider_name, provider in g4f.Provider.ProviderUtils.convert.items()
+                    if provider.working and provider_name != "Custom"
+                ]
             }
 
         @self.app.get("/v1/models/{model_name}", responses={

g4f/gui/client/home.html

@@ -136,8 +136,7 @@
             font-size: 1.2rem;
             margin-bottom: 30px;
             color: var(--colour-2);
-        }    return app
-
+        }
 
         .input-field {
             width: 80%;
@@ -211,9 +210,7 @@
 
         <!-- Input and Button -->
         <form action="/chat/">
-            <!--
-                <input type="text" name="prompt" class="input-field" placeholder="Enter your query...">
-            -->
+            <input type="text" name="prompt" class="input-field" placeholder="Enter your query...">
             <button class="button">Open Chat</button>
         </form>
 

g4f/gui/client/index.html

@@ -10,11 +10,11 @@
     <meta property="og:description" content="A conversational AI system that listens, learns, and challenges">
     <meta property="og:url" content="https://g4f.ai">
     <link rel="stylesheet" href="/static/css/style.css">
+    <link rel="stylesheet" href="/static/css/all.min.css">
     <link rel="apple-touch-icon" sizes="180x180" href="/static/img/apple-touch-icon.png">
     <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon-16x16.png">
     <link rel="manifest" href="/static/img/site.webmanifest">
-    <script src="/static/js/icons.js"></script>
     <script src="/static/js/highlightjs-copy.min.js"></script>
     <script src="/static/js/chat.v1.js" defer></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/markdown-it.min.js"></script>
@@ -172,7 +172,7 @@ <h3>Settings</h3>
             </div>
             <div class="bottom_buttons">
                 <button onclick="delete_conversations()">
-                    <i class="fa-regular fa-trash"></i>
+                    <i class="fa-solid fa-trash"></i>
                     <span>Clear Conversations</span>
                 </button>
                 <button onclick="save_storage()">
@@ -243,7 +243,7 @@ <h3>Settings</h3>
                         <i class="fa-solid fa-microphone-slash"></i>
                     </label>
                     <div id="send-button">
-                        <i class="fa-solid fa-paper-plane-top"></i>
+                        <i class="fa-regular fa-paper-plane"></i>
                     </div>
                 </div>
             </div>

g4f/gui/client/static/css/style.css

@@ -1290,7 +1290,7 @@ ul {
     border: 1px dashed #e4d4ffa6;
     border-radius: 4px;
     cursor: pointer;
-    padding-left: 8px;
+    padding-left: 4px;
     padding-right: 5px;
     padding-top: 2px;
     padding-bottom: 2px;

g4f/gui/client/static/img/site.webmanifest

@@ -15,5 +15,13 @@
     ],
     "theme_color": "#ffffff",
     "background_color": "#ffffff",
-    "display": "standalone"
+    "display": "standalone",
+    "share_target": {
+        "action": "/chat/",
+        "method": "GET",
+        "enctype": "application/x-www-form-urlencoded",
+        "params": {
+            "title": "prompt"
+        }
+    }
 }