Perfeccionados winner prompts

app.py

@@ -10,7 +10,7 @@ app = FastAPI()
 @app.post("/partynight/")
 async def partynight(
     image: UploadFile = File(...),
-    outfit_color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    outfit_color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "sky blue", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}
@@ -19,7 +19,7 @@ async def partynight(
 @app.post("/babydoll/")
 async def babydoll(
     image: UploadFile = File(...),
-    outfit_color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    outfit_color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "sky blue", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
@@ -27,8 +27,7 @@ async def babydoll(
 
 @app.post("/leather/")
 async def leather(
-    image: UploadFile = File(...),
-    #outfit_color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    image: UploadFile = File(...)    
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
@@ -37,15 +36,14 @@ async def leather(
 @app.post("/stewardess/")
 async def stewardess(
     image: UploadFile = File(...),
-    color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)):    
+    color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "sky blue", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
     return await funciones.crea_stewardess(image, color)
 
 @app.post("/oktoberfest/")
 async def oktoberfest(
-    image: UploadFile = File(...),
-    #color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    image: UploadFile = File(...)
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
@@ -53,8 +51,7 @@ async def oktoberfest(
 
 @app.post("/ghibli/")
 async def ghibli(
-    image: UploadFile = File(...),
-    #color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    image: UploadFile = File(...)
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
@@ -62,8 +59,7 @@ async def ghibli(
 
 @app.post("/wildwest/")
 async def wildwest(
-    image: UploadFile = File(...),
-    #color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    image: UploadFile = File(...)
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
@@ -71,8 +67,7 @@ async def wildwest(
 
 @app.post("/bride/")
 async def bride(
-    image: UploadFile = File(...),
-    #color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    image: UploadFile = File(...)    
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
@@ -81,7 +76,7 @@ async def bride(
 @app.post("/swimsuit/")
 async def swimsuit(
     image: UploadFile = File(...),
-    color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "sky blue", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
@@ -89,8 +84,7 @@ async def swimsuit(
 
 @app.post("/lingerie/")
 async def lingerie(
-    image: UploadFile = File(...),
-    #color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    image: UploadFile = File(...)    
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
@@ -98,8 +92,7 @@ async def lingerie(
 
 @app.post("/schooluniform/")
 async def schooluniform(
-    image: UploadFile = File(...),
-    #color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    image: UploadFile = File(...)
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
@@ -107,8 +100,7 @@ async def schooluniform(
 
 @app.post("/frenchmaid/")
 async def frenchmaid(
-    image: UploadFile = File(...),
-    #color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None)
+    image: UploadFile = File(...)
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    
@@ -117,8 +109,8 @@ async def frenchmaid(
 @app.post("/cheerleader/")
 async def cheerleader(
     image: UploadFile = File(...),
-    color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "blue sky", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None),
-    hairstyle: Literal["ponytail", "pigtails", ""] = Form(None) 
+    color: Literal["red", "black", "blue", "golden", "pink", "green", "yellow", "purple", "silver", "white", "sky blue", "light blue", "royal blue", "navy blue", "orange", "random", ""] = Form(None),
+    hairstyle: Literal["ponytail", "pigtails", "random", ""] = Form(None) 
     ):    
     if not image.content_type.startswith("image/"):
         return {"error": "The file is not an image."}    

catalogo.py

@@ -1,2 +1,2 @@
-colores = ["green", "red", "golden", "blue", "pink", "yellow", "black", "silver", "white", "purple", "blue sky", "navy blue", "orange", "random"]
+colores = ["green", "red", "golden", "blue", "pink", "yellow", "black", "silver", "white", "purple", "sky blue", "navy blue", "orange"]
 accesorios_stewardess = ['beret', 'cap', 'pillbox hat', '']

databank.py

@@ -19,7 +19,7 @@ def obtenPrompt(endpoint, **kwargs): #Son opcionales todos los demás argumentos
     elif endpoint == "wildwest":
         return f"A Ghibli manga of a beautiful wild west girl with a poncho, a revolver and bullets bandolier"
     elif endpoint == "stewardess":  
-        return f"A Ghibli manga of a beautiful flight attendant in a {outfit_color} uniform skirt with a {obtenAccesorio('stewardess')}"
+        return f"A Ghibli manga of a beautiful flight attendant in a {outfit_color} uniform skirt {obtenAccesorio('stewardess')}"
     elif endpoint == "bride":
         return f"A {defineEstilo('bride')} art nouveau of a beautiful bride in a spectacular wedding dress"
     elif endpoint == "swimsuit":
@@ -31,7 +31,7 @@ def obtenPrompt(endpoint, **kwargs): #Son opcionales todos los demás argumentos
     elif endpoint == "frenchmaid":
         return f"A manga picture of a girl in french maid uniform with maid's tiara"
     elif endpoint == "cheerleader":
-        return f"A manga picture of a cheerleader with {outfit_color} uniform and {hair_style}"
+        return f"A manga picture of a cheerleader with {outfit_color} uniform and {hair_style} hair style."
     
 def obtenAccesorio(endpoint):
 
@@ -48,7 +48,13 @@ def obtenAccesorio(endpoint):
     elif endpoint == "wildwest":
         return 
     elif endpoint == "stewardess":
-        return random.choice(catalogo.colores) + ' ' + random.choice(catalogo.accesorios_stewardess)
+        accesorio = random.choice(catalogo.accesorios_stewardess)
+        if accesorio !='':
+            print("Si hay accesorio...")
+            return 'with a ' + random.choice(catalogo.colores) + ' ' + accesorio
+        else: 
+            return ''
+
     elif endpoint == "bride":
         return 
     elif endpoint == "swimsuit":
@@ -92,7 +98,4 @@ def defineEstilo(endpoint):
         return 
     elif endpoint == "cheerleader":
         return 
-    return random.choice(catalogo.estilo)
-
-    
-    
+    return random.choice(catalogo.estilo)

funciones.py

@@ -7,9 +7,10 @@ async def crea_partynight(image, outfit_color):
     endpoint = 'partynight'
     try:
         prompt = databank.obtenPrompt(endpoint, outfit_color=outfit_color) #Van a tener que ser kwargs porque variará de lo recibido de ep a ep.                                      
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt)
         if type(resultado) is str:            
-            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
+            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(endpoint)) #Usa el prompt como nombre en dev para info más rica, endpoint para usuario final.
         elif type(resultado) is dict:            
             return resultado         
     except Exception as e:
@@ -20,9 +21,10 @@ async def crea_babydoll(image, outfit_color):
     endpoint = 'babydoll'
     try:                   
         prompt = databank.obtenPrompt(endpoint, outfit_color=outfit_color)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt)
         if type(resultado) is str:
-            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
+            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(endpoint))
         elif type(resultado) is dict:
             return resultado     
     except Exception as e:
@@ -36,7 +38,7 @@ async def crea_leather(image):
         print("Prompt final: ", prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt)
         if type(resultado) is str:
-            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
+            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(endpoint))
         elif type(resultado) is dict:
             return resultado     
     except Exception as e:
@@ -47,9 +49,10 @@ async def crea_stewardess(image, outfit_color):
     endpoint = 'stewardess'
     try:
         prompt = databank.obtenPrompt(endpoint, outfit_color=outfit_color)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt) #execute ya debe recibir prompt hecho.
         if type(resultado) is str:
-            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
+            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(endpoint))
         elif type(resultado) is dict:
             return resultado     
     except Exception as e:
@@ -60,9 +63,10 @@ async def crea_oktoberfest(image):
     endpoint = 'oktoberfest'
     try:
         prompt = databank.obtenPrompt(endpoint)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt) #execute ya debe recibir prompt hecho.
         if type(resultado) is str:
-            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
+            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(endpoint))
         elif type(resultado) is dict:
             return resultado     
     except Exception as e:
@@ -73,9 +77,10 @@ async def crea_ghibli(image):
     endpoint = 'ghibli'
     try:
         prompt = databank.obtenPrompt(endpoint)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt) #execute ya debe recibir prompt hecho.
         if type(resultado) is str:
-            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
+            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(endpoint))
         elif type(resultado) is dict:
             return resultado     
     except Exception as e:
@@ -86,9 +91,10 @@ async def crea_wildwest(image):
     endpoint = 'wildwest'
     try:
         prompt = databank.obtenPrompt(endpoint)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt) #execute ya debe recibir prompt hecho.
         if type(resultado) is str:
-            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
+            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(endpoint))
         elif type(resultado) is dict:
             return resultado     
     except Exception as e:
@@ -99,9 +105,10 @@ async def crea_bride(image):
     endpoint = 'bride'
     try:
         prompt = databank.obtenPrompt(endpoint)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt) #execute ya debe recibir prompt hecho.
         if type(resultado) is str:
-            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
+            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(endpoint))
         elif type(resultado) is dict:
             return resultado     
     except Exception as e:
@@ -112,9 +119,10 @@ async def crea_swimsuit(image, outfit_color):
     endpoint = 'swimsuit'
     try:
         prompt = databank.obtenPrompt(endpoint, outfit_color=outfit_color)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt) #execute ya debe recibir prompt hecho.
         if type(resultado) is str:
-            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
+            return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(endpoint))
         elif type(resultado) is dict:
             return resultado     
     except Exception as e:
@@ -125,6 +133,7 @@ async def crea_lingerie(image):
     endpoint = 'lingerie'
     try:
         prompt = databank.obtenPrompt(endpoint)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt) #execute ya debe recibir prompt hecho.
         if type(resultado) is str:
             return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
@@ -138,6 +147,7 @@ async def crea_schooluniform(image):
     endpoint = 'schooluniform'
     try:
         prompt = databank.obtenPrompt(endpoint)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt) #execute ya debe recibir prompt hecho.
         if type(resultado) is str:
             return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
@@ -151,6 +161,7 @@ async def crea_frenchmaid(image):
     endpoint = 'frenchmaid'
     try:
         prompt = databank.obtenPrompt(endpoint)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt) #execute ya debe recibir prompt hecho.
         if type(resultado) is str:
             return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
@@ -164,6 +175,7 @@ async def crea_cheerleader(image, color, hairstyle):
     endpoint = 'cheerleader'
     try:
         prompt = databank.obtenPrompt(endpoint, outfit_color=color, hair_style = hairstyle)
+        print(prompt)
         resultado = await herramientas.exeCute(endpoint, image, prompt) #execute ya debe recibir prompt hecho.
         if type(resultado) is str:
             return FileResponse(resultado, media_type="image/jpg", filename=herramientas.formaFilename(prompt))
@@ -171,6 +183,4 @@ async def crea_cheerleader(image, color, hairstyle):
             return resultado     
     except Exception as e:
         print(f"Error: {e}")
-        return {"error": "Unable to detect a face in the image. Please upload a different photo with a clear face."} 
-    
-    
+        return {"error": "Unable to detect a face in the image. Please upload a different photo with a clear face."}  

herramientas.py

@@ -82,9 +82,7 @@ def getPosition(carpeta_positions):
         print("No hay carpeta de posiciones:", e)
         return e 
     
-async def exeCute(endpoint, image, prompt):
-
-    print(prompt)
+async def exeCute(endpoint, image, prompt):    
 
     temp_image = await imageToTemp(image)
     try:        
@@ -133,9 +131,4 @@ def formaFilename(prompt):
     timestamp_segundos = int(time.time())
     print(f"Printed at: {timestamp_segundos}.") 
     
-    return f"{prompt}-{timestamp_segundos}.jpg"
-    
-
-    
-
-    
+    return f"{prompt}-{timestamp_segundos}.jpg"