add passwords

app.py

@@ -114,18 +114,18 @@ def detect_features(image_paths, garment_type, language="English"):
             "content": [
                 {
                 "type": "text",
-                "text": """Describe the features of the %s in the photos in less than 100 words.
-                What is the intended use of the %s in this image, use at most 5 words for intended use?
+                "text": f"""Describe the features of the {garment_type} in the photos in less than 100 words.
+                What is the intended use of the {garment_type} in this image, use at most 5 words for intended use?
                 Generate alt text for each of the images.
-                Make sure to output the alt text in %s language.
+                Make sure to output the alt text in {language} language.
                 If the photo does not contain a garment, return 'No garment detected'.
                 If the photo contains a garment, return the result in in the following JSON format without any preceding or trailing text: 
 
-                {
+                {{
                     "features": [list of comma separated features], 
                     "intended_use": [list of comma separated intended uses], 
                     "alt_text": [list of alt text for image 1, alt text for image 2]
-                }""" % (garment_type, garment_type, language)
+                }}"""
                 },
             ] + [{
                 "type": "image_url",
@@ -157,11 +157,19 @@ def generate(*data):
     global visible
     print("visible", visible)
     
-
-    feature, image, garment_type, model, temperature, excluded_words, included_words = data[:7]
-    struct_ref = data[7:]
-
-    print(f"features {feature},\n image {image},\n garment_type {garment_type},\n model {model},\n temperature {temperature},\n struct_ref {struct_ref}")
+    nargs = 8 
+    feature, image, garment_type, model, temperature, excluded_words, included_words, glossary = data[:nargs]
+    struct_ref = data[nargs:]
+
+    print(f"{feature=}")
+    print(f"{image=}")
+    print(f"{garment_type=}")
+    print(f"{model=}")
+    print(f"{temperature=}")
+    print(f"{excluded_words=}")
+    print(f"{included_words=}")
+    print(f"{glossary=}")
+    print(f"{struct_ref=}")
 
     image_features, base64_images = detect_features(image, garment_type)
     detected_features = ""
@@ -276,6 +284,7 @@ with gr.Blocks() as demo:
                 temperature = gr.Slider(minimum=0., maximum=1.0, value=0., interactive=True, label="Temperature", visible=True)
                 excluded_words = gr.Textbox(label="Excluded words", interactive=True, lines=2)
                 included_words = gr.Textbox(label="Included words", interactive=True, lines=2)
+                glossary = gr.Dataframe(row_count = (2, "dynamic"), col_count=(2,"static"), headers=["Description", "Way of writing"], label="Glossary", interactive=True)
             with gr.Row():
                 submit = gr.Button(value="Submit")
                 # advanced = gr.Button(value="Advanced")
@@ -295,7 +304,7 @@ with gr.Blocks() as demo:
         with gr.Column():
             md_output = gr.Markdown(label="Output", show_label=True)
             json_output = gr.JSON(label="JSON Output")  
-        submit.click(generate, inputs=[feature, image, garment_type, model, temperature, excluded_words, included_words, *struct_ref], 
+        submit.click(generate, inputs=[feature, image, garment_type, model, temperature, excluded_words, included_words, glossary, *struct_ref], 
                      outputs=[md_output, json_output])
         # advanced.click(show_advanced, inputs=[], outputs=[model, temperature])
         

passwords.txt

@@ -1,2 +1,4 @@
-admin $2b$12$MVN9ESLVpa5U2fWXUA6VneR23haEZf629xWu384EGcJ7baO.pW8ge
-user1@dreem.ai $2b$12$Ea1Gzf9psuUN/Urqc1bRJuFKool9Duy1rHpTfayfXdbWKxO67W0qe
+admin $2b$12$3GY/E7b.Zm1B77iVhDbEZOA/3nJw0qxcI0korp4/3DBGU82816gBe
+user1@dreem.ai $2b$12$Ea1Gzf9psuUN/Urqc1bRJuFKool9Duy1rHpTfayfXdbWKxO67W0qe
+vuong@creativeforce.io $2b$12$Ea1Gzf9psuUN/Urqc1bRJuFKool9Duy1rHpTfayfXdbWKxO67W0qe
+user2@dreem.ai $2b$12$ujCWCn1Oo0bDthaktJqJyuUl/QeXWXKN5FsRrBCl0r2oZUeiS07u2