Merge branch 'unstable' into stable

app/coordinators/art_coordinator.py

@@ -1,7 +1,7 @@
 import requests
 from services import art_services, data_services, logging_services
 
-def update_art_data(arguments):
+def update_data(arguments):
     directory = arguments.target
     v_setting = arguments.verbose
     v_out = logging_services.log # Partial function -- for brevity.
@@ -19,26 +19,29 @@ def update_art_data(arguments):
         v_out(v_setting, "Art creation dates processed.")
         
         save(art_services.get_db_column_totals(raw_art_data, "category"),
-             f"{directory}/art_category_totals.json")
+             f"{directory}/art_category.json")
         v_out(v_setting, "Art categories processed.")
         
         save(art_services.get_db_column_totals(raw_art_data, "medium"),
-             f"{directory}/art_medium_total.json")
+             f"{directory}/art_medium.json")
         v_out(v_setting, "Art medium(s) totals processed.")
 
-        save(art_services.get_dimension_totals(raw_art_data, "dimensions", "width"),
-             f"{directory}/art_width_totals.json")
+        save(art_services.get_dimension_totals
+             (raw_art_data, "dimensions", "width"),
+             f"{directory}/art_width.json")
         v_out(v_setting, "Art width totals processed.")
     
-        save(art_services.get_dimension_totals(raw_art_data, "dimensions", "height"),
-             f"{directory}/art_height_totals.json")
+        save(art_services.get_dimension_totals
+             (raw_art_data, "dimensions", "height"),
+             f"{directory}/art_height.json")
         v_out(v_setting, "Art height totals processed.")
 
-        save(art_services.get_dimension_totals(raw_art_data, "dimensions", "depth"),
-             f"{directory}/art_depth_totals.json")
+        save(art_services.get_dimension_totals
+             (raw_art_data, "dimensions", "depth"),
+             f"{directory}/art_depth.json")
         v_out(v_setting, "Art depth totals processed.")
 
         v_out(v_setting, "Completed updating Art data.")
              
     except Exception:
-        print("ERROR: Unable to update Art data.")
+        print("ERROR: [art_coordinator] Unable to update Art data.")

app/main.py

@@ -3,7 +3,7 @@ from coordinators import art_coordinator
 
 def main():
     args = parser_services.create_args()
-    art_coordinator.update_art_data(args)
+    art_coordinator.update_data(args)
     # update_software_data(args) # Future update.
     # update_article_data(args) # Future update.
 

app/services/data_services.py

@@ -9,4 +9,13 @@ def get_json(url):
 
 def store_json(data, file_name):
     with open (file_name, "w") as outfile:
-        json.dump(data, outfile)
+        json.dump(data, outfile, indent = 4)
+
+def load_json(file_name):
+    with open(file_name, "r") as infile:
+        data = json.load(infile)
+    return data
+
+def store_txt(data, file_name):
+    with open(file_name, "w") as outfile:
+        outfile.write(data)

requirements.txt

@@ -1,6 +1,18 @@
+bokeh==2.0.2
 certifi==2020.4.5.1
 chardet==3.0.4
 idna==2.9
+Jinja2==2.11.2
+MarkupSafe==1.1.1
+numpy==1.18.3
+packaging==20.3
+Pillow==7.1.1
 pkg-resources==0.0.0
+pyparsing==2.4.7
+python-dateutil==2.8.1
+PyYAML==5.3.1
 requests==2.23.0
+six==1.14.0
+tornado==6.0.4
+typing-extensions==3.7.4.2
 urllib3==1.25.9