Set cache directory in the services

hed-standard · Jun 23, 2022 · 60cb89c · 60cb89c
1 parent f49cad3
commit 60cb89c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/hedweb/_version.py b/hedweb/_version.py
@@ -608,8 +608,7 @@ def render(pieces, style):
         raise ValueError("unknown style '%s'" % style)
 
     return {"version": rendered, "full-revisionid": pieces["long"],
-            "dirty": pieces["dirty"], "error": None,
-            "date": pieces.get("date")}
+            "dirty": pieces["dirty"], "error": None, "date": pieces["date"]}
 
 
 def get_versions():

diff --git a/hedweb/routes.py b/hedweb/routes.py
@@ -13,6 +13,19 @@
 app_config = current_app.config
 route_blueprint = Blueprint(route_constants.ROUTE_BLUEPRINT, __name__)
 
+# with app.app_context():
+#     from hedweb.routes import route_blueprint
+#
+#     app.register_blueprint(route_blueprint, url_prefix=app.config['URL_PREFIX'])
+#     os.makedirs(app.config['UPLOAD_FOLDER'], exist_ok=True)
+#
+#     app.config['VERSIONS'] = get_version_dict()
+#     print(f"Versions: {app.config['VERSIONS']}")
+#     print(f"Using cache directory {app.config['HED_CACHE_FOLDER']}")
+#
+#     hedschema.set_cache_directory(app.config['HED_CACHE_FOLDER'])
+#
+# hedschema.set_cache_directory(app_config[])
 
 @route_blueprint.route(route_constants.COLUMNS_INFO_ROUTE, methods=['POST'])
 def columns_info_results():
@@ -121,6 +134,7 @@ def services_results():
     """
 
     try:
+        hedschema.set_cache_directory(current_app.config['HED_CACHE_FOLDER'])
         arguments = services.get_input_from_request(request)
         response = services.process(arguments)
         return json.dumps(response)

diff --git a/hedweb/web_util.py b/hedweb/web_util.py
@@ -181,6 +181,7 @@ def get_hed_schema_from_pull_down(request):
     if base_constants.SCHEMA_VERSION not in request.form:
         raise HedFileError("NoSchemaError", "Must provide a valid schema or schema version", "")
     elif request.form[base_constants.SCHEMA_VERSION] != base_constants.OTHER_VERSION_OPTION:
+
         hed_file_path = hedschema.get_path_from_hed_version(request.form[base_constants.SCHEMA_VERSION])
         hed_schema = hedschema.load_schema(hed_file_path)
     elif request.form[base_constants.SCHEMA_VERSION] == \