Update app.py

app.py

@@ -20,7 +20,6 @@ import uvicorn
 import gradio as gr
 from datetime import datetime
 import sys
-from urllib.parse import urlparse, parse_qs, unquote
 
 
 
@@ -75,51 +74,6 @@ print(f"Imports are done: {time.strftime('%Y-%m-%d %H:%M:%S')}")
 
 
 
-# def openalex_url_to_pyalex_query(url):
-#     """
-#     Convert an OpenAlex search URL to a pyalex query.
-    
-#     Args:
-#     url (str): The OpenAlex search URL.
-    
-#     Returns:
-#     tuple: (Works object, dict of parameters)
-#     """
-#     parsed_url = urlparse(url)
-#     query_params = parse_qs(parsed_url.query)
-    
-#     # Initialize the Works object
-#     query = Works()
-    
-#     # Handle filters
-#     if 'filter' in query_params:
-#         filters = query_params['filter'][0].split(',')
-#         for f in filters:
-#             if ':' in f:
-#                 key, value = f.split(':', 1)
-#                 if key == 'default.search':
-#                     query = query.search(value)
-#                 else:
-#                     query = query.filter(**{key: value})
-    
-#     # Handle sort
-#     if 'sort' in query_params:
-#         sort_params = query_params['sort'][0].split(',')
-#         for s in sort_params:
-#             if s.startswith('-'):
-#                 query = query.sort(**{s[1:]: 'desc'})
-#             else:
-#                 query = query.sort(**{s: 'asc'})
-    
-#     # Handle other parameters
-#     params = {}
-#     for key in ['page', 'per-page', 'sample', 'seed']:
-#         if key in query_params:
-#             params[key] = query_params[key][0]
-    
-#     return query, params
-
-
 def openalex_url_to_pyalex_query(url):
     """
     Convert an OpenAlex search URL to a pyalex query.
@@ -143,7 +97,7 @@ def openalex_url_to_pyalex_query(url):
             if ':' in f:
                 key, value = f.split(':', 1)
                 if key == 'default.search':
-                    query = query.search(unquote(value))
+                    query = query.search(value)
                 else:
                     query = query.filter(**{key: value})
     
@@ -151,12 +105,10 @@ def openalex_url_to_pyalex_query(url):
     if 'sort' in query_params:
         sort_params = query_params['sort'][0].split(',')
         for s in sort_params:
-            if ':' in s:
-                field, order = s.split(':')
-                if order.lower() == 'desc':
-                    query = query.sort(f"-{field}")
-                else:
-                    query = query.sort(field)
+            if s.startswith('-'):
+                query = query.sort(**{s[1:]: 'desc'})
+            else:
+                query = query.sort(**{s: 'asc'})
     
     # Handle other parameters
     params = {}
@@ -167,10 +119,6 @@ def openalex_url_to_pyalex_query(url):
     return query, params
 
 
-
-
-
-
 def invert_abstract(inv_index):
     if inv_index is not None:
         l_inv = [(w, p) for w, pos in inv_index.items() for p in pos]
@@ -476,7 +424,6 @@ def predict(text_input, sample_size_slider, reduce_sample_checkbox,sample_reduct
 with gr.Blocks() as block:
     gr.Markdown("""
     ## Mapping OpenAlex-Queries
-
     Enter the URL to an OpenAlex-search below. It will take a few minutes, but then the result will be projected onto a map of the OA database as a whole.
     """)
 
@@ -492,8 +439,8 @@ with gr.Blocks() as block:
             
             
         new_btn = gr.Button("Run Query",variant='primary')
-        markdown = gr.Markdown(label="", show_label=False)
-        html = gr.HTML(label="Map", show_label=False)
+        markdown = gr.Markdown(label="")
+        html = gr.HTML(label="HTML preview", show_label=True)
     
     new_btn.click(fn=predict, inputs=[text_input, sample_size_slider, reduce_sample_checkbox,sample_reduction_method], outputs=[markdown, html])
 
@@ -554,4 +501,4 @@ if __name__ == "__main__":
 # run the app with
 # python app.py
 # or
-# uvicorn "app:app" --host "0.0.0.0" --port 7860 --reload
+# uvicorn "app:app" --host "0.0.0.0" --port 7860 --reload