Update app.py

app.py

@@ -17,16 +17,11 @@ import PIL.Image
 import tensorflow as tf
 import piexif
 import piexif.helper
-import re
 
 TITLE = 'DeepDanbooru String'
 
-url = 'https://huggingface.co/spaces/yo2266911/DeepDanbooru_string'
-matches = re.findall(r'https://huggingface.co/([^/]+)/([^/]+)/([^/]+)', url)
-repo_id = matches[0][1]
-repo_type = matches[0][2]
-MODEL_REPO = f'{repo_id}/{repo_type}'
-TOKEN = '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'
+TOKEN = os.environ['TOKEN']
+MODEL_REPO = 'NoCrypt/DeepDanbooru_string'
 MODEL_FILENAME = 'model-resnet_custom_v3.h5'
 LABEL_FILENAME = 'tags.txt'
 
@@ -100,6 +95,7 @@ def predict(image: PIL.Image.Image, score_threshold: float,
         res[label] = prob
     b = dict(sorted(res.items(),key=lambda item:item[1], reverse=True))
     a = ', '.join(list(b.keys())).replace('_',' ').replace('(','\(').replace(')','\)')
+    c = ', '.join(list(b.keys()))
     
     items = rawimage.info
     geninfo = ''
@@ -136,7 +132,7 @@ def predict(image: PIL.Image.Image, score_threshold: float,
         message = "Nothing found in the image."
         info = f"<div><p>{message}<p></div>"
     
-    return (info,a,res)
+    return (a,c,res,info)
 
 
 def main():
@@ -158,9 +154,10 @@ def main():
                              label='Score Threshold'),
         ],
         [
-            gr.outputs.HTML(),
-            gr.outputs.Textbox(label='DeepDanbooru Output (string)'), 
-            gr.outputs.Label(label='DeepDanbooru Output (label)')
+            gr.outputs.Textbox(label='Output (string)'), 
+            gr.outputs.Textbox(label='Output (raw string)'), 
+            gr.outputs.Label(label='Output (label)'),
+            gr.outputs.HTML()
         ],
         examples=[
         ['miku.jpg',0.5],
@@ -169,7 +166,6 @@ def main():
         title=TITLE,
         description='''
 Demo for [KichangKim/DeepDanbooru](https://github.com/KichangKim/DeepDanbooru) with "ready to copy" prompt and a prompt analyzer.
-
 Modified from [hysts/DeepDanbooru](https://huggingface.co/spaces/hysts/DeepDanbooru)
 PNG Info code forked from [AUTOMATIC1111/stable-diffusion-webui](https://github.com/AUTOMATIC1111/stable-diffusion-webui)
         ''',