improved search

Author: emptymalei

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Lei Ma
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

dataherb/core/base.py

@@ -117,14 +117,14 @@ def download(self):
                 except Exception as e:
                     logger.error(f"Error loading remote file: {file_path}")
                     data = file_string_io
-            if file_format.lower() == "json":
+            elif file_format.lower() == "json":
                 if isinstance(file_content, bytes):
                     file_string_io = io.StringIO(file_content.decode(file_decode))
                 else:
                     file_string_io = file_content
 
                 try:
-                    data = pd.read_csv(file_path)
+                    data = pd.read_json(file_path)
                 except Exception as e:
                     logger.error(f"Error loading remote file: {file_path}")
                     data = file_string_io
@@ -135,7 +135,8 @@ def download(self):
                 "name": file.get("name"),
                 "description": file.get("description"),
                 "path": file_path,
-                "df": data
+                "file": file.get("path"),
+                "data": data
             })
 
         return data_files

dataherb/core/search.py

@@ -52,10 +52,10 @@ def search_by_ids_in_flora(flora, ids):
     herbs = []
     for herb in flora:
         if herb.id in ids:
-            herb_search_score = {
+            herb_matched = {
                 "herb": herb,
                 "id": herb.id
             }
-        herbs.append(herb_search_score)
+            herbs.append(herb_matched)
 
     return herbs

dataherb/dataherb.py

@@ -99,10 +99,6 @@ def herb(self, id):
         return herb.download()
 
 
-def main():
-
-    return
-
 
 if __name__ == "__main__":
 
@@ -112,8 +108,7 @@ def main():
     print(geo_datasets)
 
     print(
-        dataherb.herb("ecb_currency_exchange")
+        dataherb.herb("geonames_timezone")
     )
 
-
     logger.debug("End of Game")

environment.yml

@@ -9,4 +9,5 @@ dependencies:
   - pyyaml>=5.3
   - pip
   - pip:
-    - fuzzywuzzy==0.18.0
+    - fuzzywuzzy>=0.18.0
+    - python-Levenshtein>=0.12

requirements.txt

@@ -1,4 +1,5 @@
 pandas>=0.23
 requests>=2.22.0
 fuzzywuzzy>=0.18.0
-pyyaml>=1.18
+pyyaml>=1.18
+python-Levenshtein>=0.12