Updated space.

app.py

@@ -35,39 +35,6 @@ base_url = os.environ.get('OPENAI_BASE_URL', "https://api.openai.com/v1")
 def_models = '["gpt-4", "gpt-4-0125-preview", "gpt-4-0613", "gpt-4-1106-preview", "gpt-4-turbo", "gpt-4-turbo-2024-04-09", "gpt-4-turbo-preview", "chatgpt-4o-latest", "gpt-4o", "gpt-4o-2024-05-13", "gpt-4o-2024-08-06", "gpt-4o-mini", "gpt-4o-mini-2024-07-18"]'
 
 vision_models = {"gpt-4-turbo", "chatgpt-4o-latest", "gpt-4o", "gpt-4o-2024-05-13", "gpt-4o-2024-08-06", "gpt-4o-mini", "gpt-4o-mini-2024-07-18"}
-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 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 use calculator; you need to follow this example JSON:
@@ -351,45 +318,6 @@ 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(call='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(call='oai_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 searchEngine(query):
     ### This /search endpoint is custom made, OpenAI does not have it.
 	### If you dupelicate this space, please either try to find another API or make one yourself.
@@ -471,14 +399,11 @@ async def respond(
     top_p,
     seed,
     random_seed,
-    fakeTool,
     calcBeta,
     searchBeta,
 	betterSystemPrompt
 ):
     messages = [];
-    if fakeTool:
-        messages.append({"role": "system", "content": fakeToolPrompt});
     if calcBeta:
         messages.append({"role": "system", "content": calcPrompt});
     if searchBeta:
@@ -515,7 +440,7 @@ async def respond(
                     yield "[MODERATION] I'm sorry, but I can't assist with that."
                 return
     
-    async def handleResponse(completion, prefix="", image_count=0, didSearchedAlready=False):
+    async def handleResponse(completion, prefix="", didSearchedAlready=False):
         response = ""
         isRequeryNeeded = False
         async for token in completion:
@@ -536,24 +461,7 @@ async def respond(
         for line in response.split('\n'):
             try:
                 data = json.loads(line)
-                if isinstance(data, dict) and 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 isinstance(data, dict) and data.get("tool") == "calc" and data.get("isCall") and "prompt" in data:
+                if isinstance(data, dict) and data.get("tool") == "calc" and data.get("isCall") and "prompt" in data:
                     isRequeryNeeded = True
                     try:
                         result = safe_eval(data["prompt"])
@@ -588,7 +496,7 @@ async def respond(
                     "seed": (random.randint(0, 2**32) if random_seed else seed),
                     "user": rnd(),
                     "stream": True
-                }), f"{prefix}{response}\n\n", image_count, didSearchedAlready):
+                }), f"{prefix}{response}\n\n", didSearchedAlready):
                     yield res
     async for res in handleResponse(streamChat({
         "model": model_name,
@@ -604,7 +512,7 @@ async def respond(
         
 
 handleApiKeys();loadModels();checkModels();loadENV();
-lastUpdateMessage = "Rolledback the support on O1 model, due to lack of support on params/streaming/etc."
+lastUpdateMessage = "Back online yet again. Removed support for image generation."
 demo = gr.ChatInterface(
     respond,
     title="gpt-4o-mini",
@@ -618,7 +526,6 @@ demo = gr.ChatInterface(
         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="FakeTool [Calculator beta]", value=True),
         gr.Checkbox(label="FakeTool [Search engine beta (Warning; each query takes up to 30 seconds)]", value=True),
         gr.Checkbox(label="Better system prompt (ignores the system prompt set by user.)", value=True),