Updated Space

README.md

@@ -9,7 +9,43 @@ app_file: app.py
 pinned: false
 app_port: 7860
 license: wtfpl
-short_description: A simple OpenAI API proxy.
+short_description: An OpenAI API proxy.
 ---
 
-A simple OpenAI API proxy.
+# An OpenAI API proxy.
+Welcome to GPT-4O-mini! This space acts as a proxy to the OpenAI API, letting you interact with models to generate responses, images, and more. Here's a quick rundown:
+
+### Key Parts:
+- **app.py**: Handles API requests and responses.
+- **Gradio Interface**: Easy-to-use interface for text and image input.
+- **FastAPI**: Fast web framework for building APIs.
+
+### Features:
+- **Model Selection**: Pick from GPT-4, GPT-4-turbo, and GPT-4O-mini.
+- **Image Generation**: Create images with DALL-E-3.
+- **Math Calculations**: Do math with the fakeTool.
+- **Moderation**: Automated content checks.
+- **User Consent**: Agree to terms before use.
+
+### How to Use:
+1. **Select a Model**: Pick a model.
+2. **Input Your Message**: Type your prompt.
+3. **Generate Responses**: Click submit.
+4. **Image Generation**: Use fakeTool with a JSON prompt.
+5. **Math Calculations**: Use fakeTool with a JSON prompt.
+
+### Example Prompts:
+- **Image Generation**:
+  ```json
+  {"tool": "imagine", "isCall": true, "prompt": "A golden retriever on a modern couch"}
+  ```
+- **Math Calculation**:
+  ```json
+  {"tool": "calc", "isCall": true, "prompt": "math.pi * 5"}
+  ```
+
+### More Info:
+- **API Documentation**: [here](/api/v1/docs).
+- **Latest Update**: Added math faketool.
+
+Enjoy exploring GPT-4O-mini!

app.py

@@ -14,6 +14,7 @@ import string
 import base64
 import json
 import time
+import math
 import sys
 import os
 
@@ -24,7 +25,89 @@ IMAGE_HANDLE = "url"# or "base64"
 API_BASE = "env"# or "openai"
 api_key = os.environ['OPENAI_API_KEY']
 base_url = os.environ.get('OPENAI_BASE_URL', "https://api.openai.com/v1")
-def_models = '["gpt-3.5-turbo", "gpt-3.5-turbo-0125", "gpt-3.5-turbo-1106", "gpt-3.5-turbo-16k", "gpt-4", "gpt-4-0125-preview", "gpt-4-0314", "gpt-4-0613", "gpt-4-1106-preview", "gpt-4-1106-vision-preview", "gpt-4-32k-0314", "gpt-4-turbo", "gpt-4-turbo-2024-04-09", "gpt-4-turbo-preview", "gpt-4-vision-preview", "gpt-4o", "gpt-4o-2024-05-13", "gpt-4o-mini", "gpt-4o-mini-2024-07-18"]'
+def_models = '["gpt-4", "gpt-4-0125-preview", "gpt-4-0314", "gpt-4-0613", "gpt-4-1106-preview", "gpt-4-1106-vision-preview", "gpt-4-32k-0314", "gpt-4-turbo", "gpt-4-turbo-2024-04-09", "gpt-4-turbo-preview", "gpt-4-vision-preview", "gpt-4o", "gpt-4o-2024-05-13", "gpt-4o-mini", "gpt-4o-mini-2024-07-18"]'
+consentPrompt = """[CONSENT] You must agree to the terms to use this application.
+
+```
+By using our application, which integrates with OpenAI's API, you acknowledge and agree to the following terms regarding the data you provide:
+
+1. Data Collection: This application may collect data shared through the Gradio endpoint or the API endpoint.
+2. Privacy: Please avoid sharing any personal information.
+3. Data Retention and Removal: Data files are deleted every 30 days, and the API is restarted to ensure data clearance.
+4. Scope of Data Collected: The data collected includes model settings, chat history, and responses from the model. This applies only to 'chat' endpoints (Gradio and API) and excludes moderation checks.
+5. Data Usage: The collected data is periodically reviewed, and if any concerning activity is detected, the code is updated accordingly.
+
+By continuing to use our application, you explicitly consent to the collection, use, and potential sharing of your data as described above. If you disagree with our data collection, usage, and sharing practices, we advise you not to use our application.
+```
+
+To agree to user consent, please do the followings:
+1. Scroll down to find the section labeled 'Additional Inputs' below this page.
+2. Find and click the check box that says 'User Consent [I agree to the terms and conditions. (can't make a button for it)]'.
+3. After agreeing, click either the `🗑️ Clear` button, the `↩️ Undo` button, or the `🔄 Retry` button located above the message input area.""";
+fakeToolPrompt = """[System: You have ability to generate images, via tools provided to you by system.
+To call a tool you need to write a json in a empty line; like writing it at the end of message.
+To generate a image; you need to follow this example JSON:
+{"tool": "imagine", "isCall": true, "prompt": "golden retriever sitting comfortably on a luxurious, modern couch. The retriever should look relaxed and content, with fluffy fur and a friendly expression. The couch should be stylish, possibly with elegant details like cushions and a soft texture that complements the dog's golden coat"}
+> 'tool' variable is used to define which tool you are calling
+> 'isCall' used to confirm that you are calling that function and not showing it for example
+> 'prompt' the image prompt that will be given to image generation model.
+
+Here's few more example so you can under stand better
+To show as an example>
+    {"tool": "imagine", "isCall": false, "prompt": "futuristic robot playing chess against a human, with the robot confidently strategizing its next move while the human looks thoughtful and slightly perplexed"}
+    {"tool": "imagine", "isCall": false, "prompt": "colorful parrot perched on a wooden fence, pecking at a vibrant tropical fruit. The parrot's feathers should be bright and varied, with greens, blues, and reds. The background should feature a lush, green jungle with scattered rays of sunlight"}
+    {"tool": "imagine", "isCall": false, "prompt": "fluffy white cat lounging on a sunlit windowsill, with a gentle breeze blowing through the curtains"}
+To actually use the tool>
+    {"tool": "imagine", "isCall": true, "prompt": "golden retriever puppy happily playing with a red ball in a sunny park. The park should have green grass, a few trees in the background, and a clear blue sky"}
+    {"tool": "imagine", "isCall": true, "prompt": "red panda balancing on a tightrope, with a city skyline in the background"}
+    {"tool": "imagine", "isCall": true, "prompt": "corgi puppy wearing sunglasses and a red bandana, sitting on a beach chair under a colorful beach umbrella, with a surfboard leaning against the chair and the ocean waves in the background"}
+In chat use examples:
+1. 
+Alright, here's an image of an hedgehog riding a skateboard:
+{"tool": "imagine", "isCall": true, "prompt": "A hedgehog riding a skateboard in a suburban park"}
+2. 
+Okay, here's the image you requested:
+{"tool": "imagine", "isCall": true, "prompt": "Persian cat lounging on a plush velvet sofa in a cozy, sunlit living room. The cat is elegantly poised, with a calm and regal demeanor, its fur meticulously groomed and slightly fluffed up as it rests comfortably"}
+3. 
+This is how i generate images:
+{"tool": "imagine", "isCall": false, "prompt": "image prompt"}
+4. (Do not do this, this would block the user from seeing the image.)
+Alright! Here's an image of a whimsical scene featuring a cat wearing a wizard hat, casting a spell with sparkling magic in a mystical forest.] ```
+{"tool": "imagine", "isCall": true, "prompt": "A playful cat wearing a colorful wizard hat, surrounded by magical sparkles and glowing orbs in a mystical forest. The cat looks curious and mischievous, with its tail swishing as it focuses on casting a spell. The forest is lush and enchanting, with vibrant flowers and soft, dappled sunlight filtering through the trees."}
+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.`
+]""";
+calcPrompt = """[System: You have ability to calculate math problems (formated on python) via fakeTool, via tools provided to you by system.
+To call a tool you need to write a json in a empty line; like writing it at the end of message.
+To generate a image; you need to follow this example JSON:
+{"tool": "calc", "isCall": true, "prompt": "math.pi * 5"}
+> 'tool' variable is used to define which tool you are calling
+> 'isCall' used to confirm that you are calling that function and not showing it for example
+> 'prompt' the math that will be done via python.
+
+Here's few more example so you can under stand better
+To show as an example>
+    {"tool": "calc", "isCall": false, "prompt": "math.sqrt(16)"}
+    {"tool": "calc", "isCall": false, "prompt": "math.pow(2, 3)"}
+    {"tool": "calc", "isCall": false, "prompt": "math.sin(math.pi / 2)"}
+To actually use the tool>
+    {"tool": "calc", "isCall": true, "prompt": "math.factorial(5)"}
+    {"tool": "calc", "isCall": true, "prompt": "math.log(100, 10)"}
+    {"tool": "calc", "isCall": true, "prompt": "math.cos(0)"}
+In chat use examples:
+1. 
+Please, wait while I calculate 2+2...
+{"tool": "calc", "isCall": false, "prompt": "2+2"}
+2. 
+Plase, wait while I calculate the square root of 25...
+{"tool": "calc", "isCall": true, "prompt": "math.sqrt(25)"}
+3. 
+This is how I perform calculations:
+{"tool": "calc", "isCall": false, "prompt": "math.pow(3, 2)"}
+4. (Do not do this, this would block the user from seeing the result.)
+Alright! Here's the result of a complex calculation involving trigonometry and logarithms. ```
+{"tool": "calc", "isCall": true, "prompt": "math.sin(math.pi / 4) + math.log(10, 10)"}
+]""";
 
 # --- === CONFIG === ---
 
@@ -98,19 +181,28 @@ def handleApiKeys():
                 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 + "}"))
+                print((F"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 = requests.get(f"{base_url}/models", headers={"Authorization": f"Bearer {api_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 + "}")
-        
+            raise RuntimeError(f"Current API key is not valid or an actual error happened: {e}")
+
+def safe_eval(expression):
+    print(expression)
+    allowed_names = {name: obj for name, obj in math.__dict__.items() if not name.startswith("__")}
+    allowed_names['math'] = math
+    code = compile(expression, "<string>", "eval")
+    for name in code.co_names:
+        if name not in allowed_names and name != 'math':
+            raise NameError(f"Use of {name} is not allowed")
+    return eval(code, {"__builtins__": {}}, allowed_names)
 
 def get_api_key():
     if ',' in api_key:
@@ -324,70 +416,19 @@ async def respond(
     seed,
     random_seed,
     fakeTool,
+    calcBeta,
 	betterSystemPrompt,
     consent
 ):
     if not consent:
-        yield """[CONSENT] You must agree to the terms to use this application.
-
-```
-By using our application, which integrates with OpenAI's API, you acknowledge and agree to the following terms regarding the data you provide:
-
-1. Data Collection: This application may collect data shared through the Gradio endpoint or the API endpoint.
-2. Privacy: Please avoid sharing any personal information.
-3. Data Retention and Removal: Data files are deleted every 30 days, and the API is restarted to ensure data clearance.
-4. Scope of Data Collected: The data collected includes model settings, chat history, and responses from the model. This applies only to 'chat' endpoints (Gradio and API) and excludes moderation checks.
-5. Data Usage: The collected data is periodically reviewed, and if any concerning activity is detected, the code is updated accordingly.
-
-By continuing to use our application, you explicitly consent to the collection, use, and potential sharing of your data as described above. If you disagree with our data collection, usage, and sharing practices, we advise you not to use our application.
-```
-
-To agree to user consent, please do the followings:
-1. Scroll down to find the section labeled 'Additional Inputs' below this page.
-2. Find and click the check box that says 'User Consent [I agree to the terms and conditions. (can't make a button for it)]'.
-3. After agreeing, click either the `🗑️ Clear` button, the `↩️ Undo` button, or the `🔄 Retry` button located above the message input area."""
+        yield consentPrompt
         return
 
     messages = [];
     if fakeTool:
-        messages.append({"role": "system", "content": """[System: You have ability to generate images, via tools provided to you by system.
-To call a tool you need to write a json in a empty line; like writing it at the end of message.
-To generate a image; you need to follow this example JSON:
-{"tool": "imagine", "isCall": true, "prompt": "golden retriever sitting comfortably on a luxurious, modern couch. The retriever should look relaxed and content, with fluffy fur and a friendly expression. The couch should be stylish, possibly with elegant details like cushions and a soft texture that complements the dog's golden coat"}
-> 'tool' variable is used to define which tool you are calling
-> 'isCall' used to confirm that you are calling that function and not showing it for example
-> 'prompt' the image prompt that will be given to image generation model.
-
-Here's few more example so you can under stand better
-To show as an example>
-    {"tool": "imagine", "isCall": false, "prompt": "futuristic robot playing chess against a human, with the robot confidently strategizing its next move while the human looks thoughtful and slightly perplexed"}
-    {"tool": "imagine", "isCall": false, "prompt": "colorful parrot perched on a wooden fence, pecking at a vibrant tropical fruit. The parrot's feathers should be bright and varied, with greens, blues, and reds. The background should feature a lush, green jungle with scattered rays of sunlight"}
-    {"tool": "imagine", "isCall": false, "prompt": "fluffy white cat lounging on a sunlit windowsill, with a gentle breeze blowing through the curtains"}
-To actually use the tool>
-    {"tool": "imagine", "isCall": true, "prompt": "golden retriever puppy happily playing with a red ball in a sunny park. The park should have green grass, a few trees in the background, and a clear blue sky"}
-    {"tool": "imagine", "isCall": true, "prompt": "red panda balancing on a tightrope, with a city skyline in the background"}
-    {"tool": "imagine", "isCall": true, "prompt": "corgi puppy wearing sunglasses and a red bandana, sitting on a beach chair under a colorful beach umbrella, with a surfboard leaning against the chair and the ocean waves in the background"}
-In chat use examples:
-1. ```
-Alright, here's an image of an hedgehog riding a skateboard:
-{"tool": "imagine", "isCall": true, "prompt": "A hedgehog riding a skateboard in a suburban park"}
-```
-2. ```
-Okay, here's the image you requested:
-{"tool": "imagine", "isCall": true, "prompt": "Persian cat lounging on a plush velvet sofa in a cozy, sunlit living room. The cat is elegantly poised, with a calm and regal demeanor, its fur meticulously groomed and slightly fluffed up as it rests comfortably"}
-```]
-3. ```
-This is how i generate images:
-{"tool": "imagine", "isCall": false, "prompt": "image prompt"}
-```
-4. (Do not do this, this would block the user from seeing the image.) ```
-Alright! Here's an image of a whimsical scene featuring a cat wearing a wizard hat, casting a spell with sparkling magic in a mystical forest.] \`\`\`
-{"tool": "imagine", "isCall": true, "prompt": "A playful cat wearing a colorful wizard hat, surrounded by magical sparkles and glowing orbs in a mystical forest. The cat looks curious and mischievous, with its tail swishing as it focuses on casting a spell. The forest is lush and enchanting, with vibrant flowers and soft, dappled sunlight filtering through the trees."}
-\`\`\`
-```
-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": fakeToolPrompt});
+    if calcBeta:
+        messages.append({"role": "system", "content": calcPrompt});
     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:
@@ -403,9 +444,10 @@ Sure here's the prompt i wrote to generate the image below: `A colorful bird soa
             if assistant_message:
                 messages.append(assistant_message)
 
-    user_message = handleMultimodalData(model_name, "user", message)
-    if user_message:
-        messages.append(user_message)
+    if message:
+        user_message = handleMultimodalData(model_name, "user", message)
+        if user_message:
+            messages.append(user_message)
     
     mode = moderate(messages)
     if mode:
@@ -420,9 +462,57 @@ Sure here's the prompt i wrote to generate the image below: `A colorful bird soa
             yield "[MODERATION] I'm sorry, but I can't assist with that."
         return
     
-    response = ""
-
-    completion = streamChat({
+    image_count = 0
+    async def handleResponse(completion, prefix=""):
+        response = ""
+        didCalculationHappen = False
+        async for token in completion:
+            response += token['choices'][0]['delta'].get("content", "")
+            yield f"{prefix}{response}"
+        for line in response.split('\n'):
+            try:
+                data = json.loads(line)
+                if data.get("tool") == "imagine" and data.get("isCall") and "prompt" in data:
+                    if image_count < 4:
+                        image_count += 1
+                        def fetch_image_url(prompt, line):
+                            image_url = imagine(prompt)
+                            return line, f'<img src="{image_url}" alt="{prompt}" width="512"/>'
+
+                        def replace_line_in_response(line, replacement):
+                            nonlocal response
+                            response = response.replace(line, replacement)
+
+                        thread = threading.Thread(target=lambda: replace_line_in_response(*fetch_image_url(data["prompt"], line)))
+                        thread.start()
+                        thread.join()
+                    else:
+                        response = response.replace(line, f'[System: 4 image per message limit; prompt asked: `{data["prompt"]}]`')
+                    yield f"{prefix}{response}"
+                elif data.get("tool") == "calc" and data.get("isCall") and "prompt" in data:
+                    didCalculationHappen = True
+                    try:
+                        result = safe_eval(data["prompt"])
+                        response = response.replace(line, f'[System: `{data["prompt"]}` === `{result}`]')
+                    except Exception as e:
+                        response = response.replace(line, f'[System: Error in calculation; `{e}`]')
+                    yield f"{prefix}{response}"
+            except json.JSONDecodeError:
+                continue
+            if didCalculationHappen:
+                messages.append({"role": "assistant", "content": response})
+                async for res in handleResponse(streamChat({
+                    "model": model_name,
+                    "messages": messages,
+                    "max_tokens": max_tokens,
+                    "temperature": temperature,
+                    "top_p": top_p,
+                    "seed": (random.randint(0, 2**32) if random_seed else seed),
+                    "user": rnd(),
+                    "stream": True
+                }), f"{response}\n\n"):
+                    yield res
+    async for res in handleResponse(streamChat({
         "model": model_name,
         "messages": messages,
         "max_tokens": max_tokens,
@@ -431,24 +521,12 @@ Sure here's the prompt i wrote to generate the image below: `A colorful bird soa
         "seed": (random.randint(0, 2**32) if random_seed else seed),
         "user": rnd(),
         "stream": True
-    })
-
-    async for token in completion:
-        response += token['choices'][0]['delta'].get("content", "")
-        yield response
-    
-    for line in response.split('\n'):
-        try:
-            data = json.loads(line)
-            if "tool" in data and "isCall" in data and data["tool"] == "imagine" and data["isCall"] == True and "prompt" in data:
-                image_url = imagine(data["prompt"])
-                response = response.replace(line, f'<img src="{image_url}" alt="{data["prompt"]}" width="512"/>')
-                yield response
-        except json.JSONDecodeError:
-            continue
+    })):
+        yield res
+        
 
 handleApiKeys();loadModels();checkModels();loadENV();
-lastUpdateMessage = "Added image generation via DALL-E-3."
+lastUpdateMessage = "Added math faketool."
 demo = gr.ChatInterface(
     respond,
     title="GPT-4O-mini",
@@ -463,8 +541,9 @@ demo = gr.ChatInterface(
         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="FakeTool [Calculator 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)
+        gr.Checkbox(label="User Consent [I agree to the terms and conditions. (can't make a button for it)]", value=("--dev" in sys.argv or "-d" in sys.argv))
     ],
 )
 

index.html

@@ -37,6 +37,10 @@
 			<hr/>
 			<h2>Updates</h2>
 			<div>
+				<div>
+					<strong> - 7. Update.</strong>
+					<p> * Added a second faketool: math. Now the model can perform calculations.</p>
+				</div><hr/>
 				<div>
 					<strong> - 6. Update.</strong>
 					<p> * Added image generation via DALL-E-3.</p>

requirements.txt

@@ -2,4 +2,5 @@ uvicorn==0.27.1
 starlette==0.37.2
 sse-starlette==2.1.2
 requests==2.31.0
-aiohttp==3.8.5
+aiohttp==3.8.5
+asyncio