Upload folder using huggingface_hub

app.py

@@ -4,26 +4,46 @@ from datetime import datetime
 import json
 import pandas as pd
 import os
+from watchdog.observers import Observer
+from watchdog.events import FileSystemEventHandler
+from functools import wraps
 
 shortcuts_list = []
 
+# Add file change handler
+class JSONFileHandler(FileSystemEventHandler):
+    def on_modified(self, event):
+        if event.src_path.endswith('shortcuts.json'):
+            load_shortcuts()
+
+# Add decorator for file operations
+def ensure_fresh_data(func):
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        load_shortcuts()  # Reload before each operation
+        result = func(*args, **kwargs)
+        return result
+    return wrapper
+
 def save_shortcuts():
-    global shortcuts_list
     with open('shortcuts.json', 'w') as f:
         json.dump(shortcuts_list, f, default=str)
+    load_shortcuts()
 
 def load_shortcuts():
     global shortcuts_list
     if os.path.exists('shortcuts.json'):
-        with open('shortcuts.json', 'r') as f:
-            shortcuts_list = json.load(f)
+        # Open the file in binary mode with no buffering to avoid cached data
+        with open('shortcuts.json', 'rb', buffering=0) as f:
+            data = f.read()
+            shortcuts_list = json.loads(data.decode('utf-8'))
             for shortcut in shortcuts_list:
                 shortcut['date_added'] = datetime.fromisoformat(shortcut['date_added'])
     else:
         shortcuts_list = []
 
+@ensure_fresh_data
 def add_shortcut(name, tags, link, emojis, color_from, color_to, short_description):
-    global shortcuts_list
     new_shortcut = {
         'name': name.strip(),
         'tags': [tag.strip() for tag in tags.split('/') if tag.strip()],
@@ -41,8 +61,8 @@ def add_shortcut(name, tags, link, emojis, color_from, color_to, short_descripti
     # Return updated HTML
     return update_display()
 
+@ensure_fresh_data
 def get_shortcuts_dataframe(sort_by='Recently Added', search_query='', filter_tags=[]):
-    global shortcuts_list
     datafra = pd.DataFrame(shortcuts_list)
     if datafra.empty:
         return datafra
@@ -63,8 +83,8 @@ def get_shortcuts_dataframe(sort_by='Recently Added', search_query='', filter_ta
     datafra = datafra.reset_index(drop=True)
     return datafra
 
+@ensure_fresh_data
 def generate_cards_html(datafra):
-    global shortcuts_list
     if datafra.empty:
         return "<p>No shortcuts available.</p>"
     cards_html = '<div style="display: flex; flex-wrap: wrap;">'
@@ -102,51 +122,63 @@ def generate_cards_html(datafra):
                 </div>
             """
         card_html = f"""
-        <div style="{style}" onmouseover="handleHover({idx})" onmouseout="handleHoverOut({idx})" id="card-{idx}">
+        <div style="{style}" 
+             onmouseover="window.handleHover(event, {idx})" 
+             onmouseout="window.handleHoverOut(event, {idx})">
             {labels_html}
             <div style='font-size: 40px; text-align: center;'>{shortcut['emojis']}</div>
             <h3 style='text-align: center;'>{shortcut['name']}</h3>
             <p style='text-align: center;'>{shortcut['short_description']}</p>
             <div style='text-align: center;'>
-                <button style="background: none; border: none; cursor: pointer; {pin_style}" onclick="togglePin({idx})">{pin_icon}</button>
-                <button style="background: none; border: none; cursor: pointer;" onclick="toggleFavorite({idx})">{favorite_icon}</button>
+                <button style="background: none; border: none; cursor: pointer; {pin_style}" onclick="window.togglePin({idx})">{pin_icon}</button>
+                <button style="background: none; border: none; cursor: pointer;" onclick="window.toggleFavorite({idx})">{favorite_icon}</button>
                 <button onclick="window.open('{shortcut['link']}', '_blank')">🔗 Open</button>
             </div>
-            <div id="delete-{idx}" style="display: none; position: absolute; top: 10px; left: 10px; cursor: pointer;" onclick="deleteShortcut({idx})">
+            <div id="delete-{idx}" style="display: none; position: absolute; top: 10px; left: 10px; cursor: pointer;" onclick="window.deleteShortcut({idx})">
                 🗑️
             </div>
         </div>
         """
         cards_html += card_html
     cards_html += '</div>'
-    
-    # Add JavaScript for handling hover and command/control key
-    
     return cards_html
 
+@ensure_fresh_data
 def update_display(sort_by='Recently Added', search_query='', filter_tags=[]):
     datafra = get_shortcuts_dataframe(sort_by, search_query, filter_tags)
     return generate_cards_html(datafra)
 
+@ensure_fresh_data
 def toggle_pin(index):
-    global shortcuts_list
-    index = int(index) + 1
-    shortcuts_list[index]['pinned'] = not shortcuts_list[index]['pinned']
-    save_shortcuts()
+    index = int(index)
+    if 0 <= index < len(shortcuts_list):
+        shortcuts_list[index]['pinned'] = not shortcuts_list[index]['pinned']
+        save_shortcuts()
     # Return updated HTML
     return update_display()
 
+@ensure_fresh_data
 def toggle_favorite(index):
-    global shortcuts_list
-    index = int(index) - 1
+    index = int(index)
     if 0 <= index < len(shortcuts_list):
         shortcuts_list[index]['favorited'] = not shortcuts_list[index]['favorited']
         save_shortcuts()
     # Return updated HTML
     return update_display()
 
+@ensure_fresh_data
+def delete_shortcut(index):
+    index = int(index)
+    if 0 <= index < len(shortcuts_list):
+        del shortcuts_list[index]
+        save_shortcuts()
+    # Return updated HTML
+    return update_display()
+
 load_shortcuts()
 
+# JavaScript code attached to window object
+
 js_code = f"""
 function my_func() {{
 window.isCmdOrCtrl = false;
@@ -172,7 +204,7 @@ window.handleHover = function(event, idx) {{
 }};
 
 window.handleHoverOut = function(event, idx) {{
-    document.getElementById('card-' + idx).style.display = 'none';
+    document.getElementById('card-'+ idx).style.display = 'none';
 }};
 
 window.showDeleteIcons = function() {{
@@ -189,7 +221,6 @@ window.hideDeleteIcons = function() {{
     }});
 }};
 
-
 window.togglePin = function(idx) {{
     // Implement the delete functionality, e.g., call an API endpoint
     fetch('/toggle_pin', {{
@@ -199,6 +230,7 @@ window.togglePin = function(idx) {{
         }},
         body: JSON.stringify({{ index: idx }})
     }})
+    .then(response => response.json())
     .then(data => {{
         // Update the grid display
         document.getElementById('grid_output').innerHTML = data.grid_html;
@@ -222,8 +254,9 @@ window.deleteShortcut = function(idx) {{
 }};
 }}
 """
+
 # Build the Gradio App
-with gr.Blocks(theme="charbelgrower/Crystal",js=js_code) as demo:
+with gr.Blocks(theme="charbelgrower/Crystal", js=js_code) as demo:
 
     gr.Markdown("## Website Shortcuts")
     with gr.Row():
@@ -251,8 +284,10 @@ with gr.Blocks(theme="charbelgrower/Crystal",js=js_code) as demo:
     add_button = gr.Button("Add Shortcut")
 
     # Update display when filters change
-    def refresh_display(search_query, sort_by, filter_tags):
-        return update_display(sort_by, search_query, filter_tags)
+    def refresh_display(search_query='', sort_by='Recently Added', filter_tags=[]):
+        grid_html = update_display(sort_by, search_query, filter_tags)
+        filter_tags_options = get_all_tags()
+        return grid_html, gr.update(choices=filter_tags_options)
 
     search_bar.change(fn=refresh_display, inputs=[search_bar, sort_options, filter_tags], outputs=grid_output)
     sort_options.change(fn=refresh_display, inputs=[search_bar, sort_options, filter_tags], outputs=grid_output)
@@ -264,39 +299,43 @@ with gr.Blocks(theme="charbelgrower/Crystal",js=js_code) as demo:
         inputs=[name, tags, link, emojis, color_from, color_to, short_description],
         outputs=grid_output
     )
-# Expose endpoints for toggle functions
+
+# Expose endpoints for custom functions using FastAPI
 api = FastAPI()
 
-@api.post("/toggle_pin")
-async def toggle_pin_route(request: Request):
+@api.post('/delete_shortcut')
+async def delete_shortcut_endpoint(request: Request):
     data = await request.json()
-    index = data['index']
-    grid_html = toggle_pin(index)
+    index = data.get('index')
+    grid_html = delete_shortcut(index)
     return {'grid_html': grid_html}
 
-@api.post("/delete_shortcut")
-async def delete_shortcut_route(request: Request):
-    global shortcuts_list
+@api.post('/toggle_pin')
+async def toggle_pin_endpoint(request: Request):
     data = await request.json()
-    index = int(data['index']) - 1
-    if 0 <= index < len(shortcuts_list):
-        del shortcuts_list[index]
-        save_shortcuts()
-    # Return updated HTML
-    grid_html = update_display()
+    index = data.get('index')
+    grid_html = toggle_pin(index)
     return {'grid_html': grid_html}
 
-@api.post("/toggle_favorite")
-async def toggle_favorite_route(request: Request):
+@api.post('/toggle_favorite')
+async def toggle_favorite_endpoint(request: Request):
     data = await request.json()
-    index = data['index']
+    index = data.get('index')
     grid_html = toggle_favorite(index)
     return {'grid_html': grid_html}
 
-# Mount the Gradio app onto the FastAPI app
-app = gr.mount_gradio_app(api, demo, path="/")
-demo.launch(ssr_mode=False)
+app = gr.mount_gradio_app(api, demo,"/")
+# Initialize file watcher
 if __name__ == "__main__":
     import uvicorn
-    load_shortcuts()
-    uvicorn.run(app, host="https://api.hf.space/v1/charbel-malo/LinkMaster-XS", port=443)
+    demo.unload(fn=load_shortcuts)
+    event_handler = JSONFileHandler()
+    observer = Observer()
+    observer.schedule(event_handler, path='shortcuts.json', recursive=False)
+    observer.start()
+
+    try:
+        uvicorn.run(app, host="127.0.0.1", port=7860)
+    finally:
+        observer.stop()
+        observer.join()

shortcuts.json

@@ -1 +1 @@
-[{"name": "Charbel", "tags": ["Personal"], "link": "example.com", "emojis": "\ud83e\udd70", "color_from": "rgba(157.78125, 125.2561677631579, 125.2561677631579, 1)", "color_to": "rgba(255, 0, 0, 1)", "short_description": "ssadasd", "pinned": false, "favorited": false, "date_added": "2024-11-13T16:25:36.058089"}]
+[{"name": "Charbel", "tags": ["Personal"], "link": "example.com", "emojis": "\ud83e\udd70", "color_from": "rgba(157.78125, 125.2561677631579, 125.2561677631579, 1)", "color_to": "rgba(255, 0, 0, 1)", "short_description": "ssadasd", "pinned": true, "favorited": false, "date_added": "2024-11-13 16:25:36.058089"}]