Merge branch 'master' into deploy-improve

datacommonsorg · May 23, 2024 · 87a31ce · 87a31ce
2 parents 9a305b5 + a16b8c7
commit 87a31ce
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/nl_server/routes.py b/nl_server/routes.py
@@ -33,9 +33,20 @@
 
 bp = Blueprint('main', __name__, url_prefix='/')
 
+#
+# A global bool to ensure we keep failing healthz till we
+# load the default embeddings fully on the server.
+#
+default_embeddings_loaded = False
+
 
 @bp.route('/healthz')
 def healthz():
+  global default_embeddings_loaded
+
+  if default_embeddings_loaded:
+    return 'OK', 200
+
   default_index_type = current_app.config[
       config.EMBEDDINGS_SPEC_KEY].default_index
   if not default_index_type:
@@ -48,6 +59,7 @@ def healthz():
     result: VarCandidates = search.search_vars([nl_embeddings],
                                                [query]).get(query)
     if result and result.svs:
+      default_embeddings_loaded = True
       return 'OK', 200
     else:
       logging.warning(f'Health Check Failed: query "{query}" failed!')

diff --git a/server/templates/base.html b/server/templates/base.html
@@ -147,7 +147,7 @@
                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-about-dropdown">
                   <a class="dropdown-item" href="{{ url_for('static.about') }}">{% trans %}About Data Commons{% endtrans
                     %}</a>
-                  <a class="dropdown-item" href="https://docs.datacommons.org/blog.html">{% trans %}Blog{% endtrans
+                  <a class="dropdown-item" href="https://blog.datacommons.org/">{% trans %}Blog{% endtrans
                     %}</a>
                   <a class="dropdown-item" href="https://docs.datacommons.org/datasets/">{% trans %}Data Sources{%
                     endtrans %}</a>
@@ -223,7 +223,7 @@ <h6>{% trans %}Data Commons{% endtrans %}</h6>
             {# TRANSLATORS: The label for a link to the project's about page. #}
             <a href="{{ url_for('static.about') }}"><span class="material-icons-outlined">arrow_forward</span><span>{% trans %}About Data Commons{% endtrans %}</span></a>
             {# TRANSLATORS: The label for a link to the project's blog. #}
-            <a href="https://docs.datacommons.org/blog.html"><span class="material-icons-outlined">arrow_forward</span><span>{% trans %}Blog{% endtrans %}</span></a>
+            <a href="https://blog.datacommons.org/"><span class="material-icons-outlined">arrow_forward</span><span>{% trans %}Blog{% endtrans %}</span></a>
             {# TRANSLATORS: The label for a link to data sources included in the Data Commons knowledge graph. #}
             <a href="https://docs.datacommons.org/datasets/"><span class="material-icons-outlined">arrow_forward</span><span>{% trans %}Data Sources{% endtrans %}</span></a>
             {# TRANSLATORS: The label for a link to instructions about sending feedback. #}

diff --git a/server/templates/custom_dc/stanford/base.html b/server/templates/custom_dc/stanford/base.html
@@ -135,7 +135,7 @@
                 <div class="dropdown-menu dropdown-menu-right" aria-labelledby="nav-about-dropdown">
                   <a class="dropdown-item" href="{{ url_for('static.about') }}">{% trans %}About Data Commons{% endtrans
                     %}</a>
-                  <a class="dropdown-item" href="https://docs.datacommons.org/blog.html">{% trans %}Blog{% endtrans
+                  <a class="dropdown-item" href="https://blog.datacommons.org">{% trans %}Blog{% endtrans
                     %}</a>
                   <a class="dropdown-item" href="https://docs.datacommons.org/datasets/">{% trans %}Data Sources{%
                     endtrans %}</a>
@@ -206,7 +206,7 @@ <h6>{% trans %}Data Commons{% endtrans %}</h6>
             {# TRANSLATORS: The label for a link to the project's about page. #}
             <a href="{{ url_for('static.about') }}">{% trans %}About Data Commons{% endtrans %}</a>
             {# TRANSLATORS: The label for a link to the project's blog. #}
-            <a href="https://docs.datacommons.org/blog.html">{% trans %}Blog{% endtrans %}</a>
+            <a href="https://blog.datacommons.org/">{% trans %}Blog{% endtrans %}</a>
             {# TRANSLATORS: The label for a link to data sources included in the Data Commons knowledge graph. #}
             <a href="https://docs.datacommons.org/datasets/">{% trans %}Data Sources{% endtrans %}</a>
             {# TRANSLATORS: The label for a link to instructions about sending feedback. #}