Merge pull request #358 from helxplatform/order_program_list

order_program_list

src/dug/config.py

@@ -27,6 +27,10 @@ class Config:
     nboost_host: str = "nboost"
     nboost_port: int = 8000
 
+    program_sort_list: str = ""
+    program_name_mappings: dict=field(
+        default_factory=lambda:{})
+
     # Preprocessor config that will be passed to annotate.Preprocessor constructor
     preprocessor: dict = field(
         default_factory=lambda: {
@@ -137,6 +141,8 @@ def from_env(cls):
             "redis_host": "REDIS_HOST",
             "redis_port": "REDIS_PORT",
             "redis_password": "REDIS_PASSWORD",
+            "program_sort_list": "PROGRAM_SORT_LIST",
+            "program_name_mappings" : "PROGRAM_NAME_MAPPINGS"
         }
 
         kwargs = {}

src/dug/core/async_search.py

@@ -2,7 +2,7 @@
 import logging
 from elasticsearch import AsyncElasticsearch
 from elasticsearch.helpers import async_scan
-import ssl
+import ssl,os,json
 
 from dug.config import Config
 
@@ -553,7 +553,15 @@ async def search_program_list(self):
         )
         # The unique data_types and their counts of unique collection_ids will be in the 'aggregations' field of the response
         unique_data_types = search_results['aggregations']['unique_program_names']['buckets']
-
+        data=unique_data_types
+        program_keys =self._cfg.program_sort_list.split(',')
+        #key_mapping = self._cfg.program_name_mappings
+        #key_mapping = json.loads(key_mapping)
+        key_index_map = {key: index for index, key in enumerate(program_keys)}
+        unique_data_types = sorted(data, key=lambda x: key_index_map.get(x['key'], len(program_keys)))
+        #for item in unique_data_types:
+        #    if item['key'] in key_mapping:
+        #        item['key'] = key_mapping[item['key']]
         return unique_data_types
 
 

src/dug/server.py

@@ -150,7 +150,7 @@ async def search_program( program_name: Optional[str] = None):
 @APP.get('/program_list')
 async def get_program_list():
     """
-    Search for studies by unique_id (ID or name) and/or study_name.
+    Search for program by program name.
     """
     result = await search.search_program_list()
     return {
@@ -159,4 +159,4 @@ async def get_program_list():
         "status": "success"
     }
 if __name__ == '__main__':
-    uvicorn.run(APP)
+    uvicorn.run(APP,port=8181)