diff --git a/config.py.example b/config.py.example index cfc9ba547..10c31fa44 100644 --- a/config.py.example +++ b/config.py.example @@ -67,8 +67,6 @@ FEATURE_EVAL_FILTERING = True # Choose settings used for model training FEATURE_EVAL_MODEL_SELECTION = False -# Enable similarity API endpoints and webpages -FEATURE_SIMILARITY = True # Allow submission of feedback on the quality of similarity results FEATURE_SIMILARITY_FEEDBACK = False diff --git a/consul_config.py.ctmpl b/consul_config.py.ctmpl index ec064f14a..38e4bea69 100644 --- a/consul_config.py.ctmpl +++ b/consul_config.py.ctmpl @@ -57,8 +57,6 @@ FEATURE_EVAL_LOCATION = {{template "KEY" "feature/eval_location"}} FEATURE_EVAL_FILTERING = {{template "KEY" "feature/eval_filtering"}} # Choose settings used for model training FEATURE_EVAL_MODEL_SELECTION = {{template "KEY" "feature/eval_model_selection"}} -# Enable similarity API endpoints and webpages -FEATURE_SIMILARITY = {{template "KEY" "feature/similarity"}} # Allow submission of feedback on the quality of similarity results FEATURE_SIMILARITY_FEEDBACK = {{template "KEY" "feature/similarity_feedback"}} diff --git a/webserver/__init__.py b/webserver/__init__.py index cbad86009..14a4f10ec 100644 --- a/webserver/__init__.py +++ b/webserver/__init__.py @@ -169,7 +169,6 @@ def create_app_sphinx(): blueprints/views are needed to build documentation. """ app = CustomFlask(import_name=__name__, use_flask_uuid=True) - app.config["FEATURE_SIMILARITY"] = True _register_blueprints(app) return app @@ -190,8 +189,7 @@ def register_ui(app): app.register_blueprint(login_bp, url_prefix='/login') app.register_blueprint(user_bp) app.register_blueprint(datasets_bp, url_prefix='/datasets') - if app.config.get("FEATURE_SIMILARITY", False): - app.register_blueprint(similarity_bp, url_prefix='/similarity') + app.register_blueprint(similarity_bp, url_prefix='/similarity') def register_api(app): v1_prefix = os.path.join(API_PREFIX, 'v1') @@ -202,8 +200,7 @@ def register_api(app): app.register_blueprint(bp_core, url_prefix=v1_prefix) app.register_blueprint(bp_datasets, url_prefix=v1_prefix + '/datasets') app.register_blueprint(bp_dataset_eval, url_prefix=v1_prefix + '/datasets/evaluation') - if app.config.get("FEATURE_SIMILARITY", False): - app.register_blueprint(bp_similarity, url_prefix=v1_prefix + '/similarity') + app.register_blueprint(bp_similarity, url_prefix=v1_prefix + '/similarity') from webserver.views.api.legacy import api_legacy_bp app.register_blueprint(api_legacy_bp) diff --git a/webserver/templates/data/summary.html b/webserver/templates/data/summary.html index fb9271d79..0b9434026 100644 --- a/webserver/templates/data/summary.html +++ b/webserver/templates/data/summary.html @@ -8,9 +8,7 @@

Recording "{{ metadata['title'] }}" by {{ metadata['artist'] }}

- {%- if config.get('FEATURE_SIMILARITY') %} -

See Similar

- {% endif -%} +

See Similar

{%- include 'data/summary-metadata.html' -%}