Updated space

app.py

@@ -38,6 +38,7 @@ def loadENV():
                     env_data = response.json()
                     for key, value in env_data.items():
                         os.environ[key] = value
+                    handleApiKeys()
                     checkModels()
                     loadModels()
                 except Exception as e:
@@ -51,6 +52,7 @@ def loadENV():
             env_data = response.json()
             for key, value in env_data.items():
                 os.environ[key] = value
+            handleApiKeys()
             checkModels()
             loadModels()
         except Exception as e:
@@ -62,7 +64,7 @@ def checkModels():
     global base_url
     if API_BASE == "env":
         try:
-            response = requests.get(f"{base_url}/models", headers={"Authorization": f"Bearer {api_key}"})
+            response = requests.get(f"{base_url}/models", headers={"Authorization": f"Bearer {get_api_key()}"})
             response.raise_for_status()
             if not ('data' in response.json()):
                 base_url = "https://api.openai.com/v1"
@@ -85,6 +87,36 @@ def loadModels():
         "data": [{"id": v, "object": "model", "created": 0, "owned_by": "system"} for v in models]
     }
 
+def handleApiKeys():
+    global api_key
+    if ',' in api_key:
+        output = []
+        for key in api_key.split(','):
+            try:
+                response = requests.get(f"{base_url}/models", headers={"Authorization": f"Bearer {key}"})
+                response.raise_for_status()
+                if ('data' in response.json()):
+                    output.append(key)
+            except Exception as e:
+                print(("API key {" + key + "} is not valid or an actuall error happend {" + e + "}"))
+        if len(output)==1:
+            raise RuntimeError("No API key is working")
+        api_key = ",".join(output)
+    else:
+        try:
+            response = requests.get(f"{base_url}/models", headers={"Authorization": f"Bearer {key}"})
+            response.raise_for_status()
+            if not ('data' in response.json()):
+                raise RuntimeError("Current API key is not valid")
+        except Exception as e:
+            raise RuntimeError("Current API key is not valid or an actuall error happend {" + e + "}")
+        
+
+def get_api_key():
+    if ',' in api_key:
+        return random.choice(api_key.split(','))
+    return api_key
+
 def encodeChat(messages):
     output = []
     for message in messages:
@@ -101,7 +133,7 @@ def moderate(messages):
             f"{base_url}/moderations",
             headers={
                 "Content-Type": "application/json",
-                "Authorization": f"Bearer {api_key}"
+                "Authorization": f"Bearer {get_api_key()}"
             },
             json={"input": encodeChat(messages)}
         )
@@ -114,7 +146,7 @@ def moderate(messages):
                 "https://api.openai.com/v1/moderations",
                 headers={
                     "Content-Type": "application/json",
-                    "Authorization": f"Bearer {api_key}"
+                    "Authorization": f"Bearer {get_api_key()}"
                 },
                 json={"input": encodeChat(messages)}
             )
@@ -136,7 +168,7 @@ def moderate(messages):
 async def streamChat(params):
     async with aiohttp.ClientSession() as session:
         try:
-            async with session.post(f"{base_url}/chat/completions", headers={"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}, json=params) as r:
+            async with session.post(f"{base_url}/chat/completions", headers={"Authorization": f"Bearer {get_api_key()}", "Content-Type": "application/json"}, json=params) as r:
                 r.raise_for_status()
                 async for line in r.content:
                     if line:
@@ -152,7 +184,7 @@ async def streamChat(params):
                             continue
         except aiohttp.ClientError:
             try:
-                async with session.post("https://api.openai.com/v1/chat/completions", headers={"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}, json=params) as r:
+                async with session.post("https://api.openai.com/v1/chat/completions", headers={"Authorization": f"Bearer {get_api_key()}", "Content-Type": "application/json"}, json=params) as r:
                     r.raise_for_status()
                     async for line in r.content:
                         if line:
@@ -169,6 +201,45 @@ async def streamChat(params):
             except aiohttp.ClientError:
                 return
 
+def imagine(prompt):
+    try:
+        response = requests.post(
+            f"{base_url}/images/generations",
+            headers={
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {get_api_key()}"
+            },
+            json={
+                "model": "dall-e-3",
+                "prompt": prompt,
+            	"quality": "hd",
+            }
+        )
+        response.raise_for_status()
+        result = response.json()
+    except requests.exceptions.RequestException as e:
+        print(f"Error during moderation request to {base_url}: {e}")
+        try:
+            response = requests.post(
+                "https://api.openai.com/v1/images/generations",
+                headers={
+                    "Content-Type": "application/json",
+                    "Authorization": f"Bearer {get_api_key()}"
+                },
+                json={
+                	"model": "dall-e-3",
+                	"prompt": prompt,
+            		"quality": "hd",
+            	}
+            )
+            response.raise_for_status()
+            result = response.json()
+        except requests.exceptions.RequestException as e:
+            print(f"Error during moderation request to fallback URL: {e}")
+            return False
+
+    return result.get('data', [{}])[0].get('url')
+
 def rnd(length=8):
     letters = string.ascii_letters + string.digits
     return ''.join(random.choice(letters) for i in range(length))
@@ -231,45 +302,6 @@ def handleMultimodalData(model, role, data):
             return {"role": role, "content": str(data)}
         return {"role": role, "content": getattr(data, 'text', str(data))}
 
-def imagine(prompt):
-    try:
-        response = requests.post(
-            f"{base_url}/images/generations",
-            headers={
-                "Content-Type": "application/json",
-                "Authorization": f"Bearer {api_key}"
-            },
-            json={
-                "model": "dall-e-3",
-                "prompt": prompt,
-            	"quality": "hd",
-            }
-        )
-        response.raise_for_status()
-        result = response.json()
-    except requests.exceptions.RequestException as e:
-        print(f"Error during moderation request to {base_url}: {e}")
-        try:
-            response = requests.post(
-                "https://api.openai.com/v1/images/generations",
-                headers={
-                    "Content-Type": "application/json",
-                    "Authorization": f"Bearer {api_key}"
-                },
-                json={
-                	"model": "dall-e-3",
-                	"prompt": prompt,
-            		"quality": "hd",
-            	}
-            )
-            response.raise_for_status()
-            result = response.json()
-        except requests.exceptions.RequestException as e:
-            print(f"Error during moderation request to fallback URL: {e}")
-            return False
-
-    return result.get('data', [{}])[0].get('url')
-
 class FileMessage(GradioModel):
     file: FileData
     alt_text: Optional[str] = None
@@ -292,6 +324,7 @@ async def respond(
     seed,
     random_seed,
     fakeTool,
+	betterSystemPrompt,
     consent
 ):
     if not consent:
@@ -355,7 +388,10 @@ Alright! Here's an image of a whimsical scene featuring a cat wearing a wizard h
 5. (if in any case the user asks for the prompt)```
 Sure here's the prompt i wrote to generate the image below: `A colorful bird soaring through a bustling city skyline. The bird should have vibrant feathers, contrasting against the modern buildings and blue sky. Below, the city is alive with activity, featuring tall skyscrapers, busy streets, and small parks, creating a dynamic urban scene.`
 ```]"""})
-    messages.append({"role": "system", "content": system_message});
+    if betterSystemPrompt:
+        messages.append({"role": "system", "content": f"You are a helpful assistant. You are an OpenAI GPT model named {model_name}. The current time is {time.strftime('%Y-%m-%d %H:%M:%S')}. Please adhere to OpenAI's usage policies and guidelines. Ensure your responses are accurate, respectful, and within the scope of OpenAI's rules."});
+    else:
+        messages.append({"role": "system", "content": system_message});
 
     for val in history:
         if val[0] is not None:
@@ -411,8 +447,7 @@ Sure here's the prompt i wrote to generate the image below: `A colorful bird soa
         except json.JSONDecodeError:
             continue
 
-loadModels();checkModels();loadENV();
-
+handleApiKeys();loadModels();checkModels();loadENV();
 lastUpdateMessage = "Added image generation via DALL-E-3."
 demo = gr.ChatInterface(
     respond,
@@ -420,20 +455,15 @@ demo = gr.ChatInterface(
     description=f"A simple proxy to OpenAI!<br/>You can use this space as a proxy! click [here](/api/v1/docs) to view the documents. <strong>[last update: {lastUpdateMessage}]</strong><br/>Also you can only submit images to vision/4o models but can submit txt/code/etc. files to all models.",
     multimodal=True,
     additional_inputs=[
-        gr.Textbox(value="You are a helpful assistant.", label="System message"),
+        gr.Textbox(value="You are a helpful assistant. You are an OpenAI GPT model. Please adhere to OpenAI's usage policies and guidelines. Ensure your responses are accurate, respectful, and within the scope of OpenAI's rules.", label="System message"),
         gr.Dropdown(choices=models, value="gpt-4o-mini-2024-07-18", label="Model"),
         gr.Slider(minimum=1, maximum=4096, value=4096, step=1, label="Max new tokens"),
         gr.Slider(minimum=0.1, maximum=2.0, value=0.7, step=0.05, label="Temperature"),
-        gr.Slider(
-            minimum=0.05,
-            maximum=1.0,
-            value=0.95,
-            step=0.05,
-            label="Top-p (nucleus sampling)",
-        ),
+        gr.Slider(minimum=0.05, maximum=1.0, value=0.95, step=0.05, label="Top-p (nucleus sampling)"),
         gr.Slider(minimum=0, maximum=2**32, value=0, step=1, label="Seed"),
         gr.Checkbox(label="Randomize Seed", value=True),
         gr.Checkbox(label="FakeTool [Image generation beta]", value=True),
+        gr.Checkbox(label="Better system prompt (ignores the system prompt set by user.)", value=True),
         gr.Checkbox(label="User Consent [I agree to the terms and conditions. (can't make a button for it)]", value=False)
     ],
 )

index.html

@@ -37,6 +37,10 @@
 			<hr/>
 			<h2>Updates</h2>
 			<div>
+				<div>
+					<strong> - 6. Update.</strong>
+					<p> * Added image generation via DALL-E-3.</p>
+				</div><hr/>
 				<div>
 					<strong> - 5. Update Rollback (part 2).</strong>
 					<p> * Switched back to old model, as it at least did some enough check</p>