[project][ENG-7225] shtrove clean(up)grade 2025 (milestone 3: enhance)

project/settings.py

@@ -16,15 +16,7 @@
 import jwe
 
 from share import __version__
-
-
-def strtobool(s: str) -> bool:
-    s = s.lower()
-    if s in ('t', 'true', '1'):
-        return True
-    if s in ('f', 'false', '0'):
-        return False
-    raise ValueError(f'unboolable string: "{s}"')
+from trove.util.queryparams import parse_booly_str
 
 
 def split(string, delim):
@@ -463,7 +455,7 @@ def route_urgent_task(name, args, kwargs, options, task=None, **kw):
 
 SUBJECTS_CENTRAL_TAXONOMY = os.environ.get('SUBJECTS_CENTRAL_TAXONOMY', 'bepress')
 
-HIDE_DEPRECATED_VIEWS = strtobool(os.environ.get('HIDE_DEPRECATED_VIEWS', 'False'))
+HIDE_DEPRECATED_VIEWS = parse_booly_str(os.environ.get('HIDE_DEPRECATED_VIEWS', 'False'))
 
 # Regulator pipeline, names of setuptools entry points
 SHARE_REGULATOR_CONFIG = {

project/urls.py

@@ -12,13 +12,14 @@
 from share.admin import admin_site
 from share.oaipmh.views import OAIPMHView
 from trove.views.vocab import TroveVocabView
+from trove.views.shtrove_root import ShtroveRootView
 
 
 urlpatterns = [
     url(r'^admin/', admin_site.urls),
     # url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
-    path('api/v3/', include('trove.urls', namespace='trove')),  # same as 'trove/' but more subtle
-    path('trove/', include('trove.urls', namespace='trovetrove')),
+    path('api/v3/', include('trove.urls', namespace='apiv3')),  # same as 'trove/' but more subtle
+    path('trove/', include('trove.urls', namespace='trove')),
     path('vocab/2023/trove/<path:vocab_term>', view=TroveVocabView.as_view(), name='trove-vocab'),
     url(r'^api/v2/', include('api.urls', namespace='api')),
     url(r'^api/(?P<path>(?!v\d+).*)', APIVersionRedirectView.as_view()),
@@ -32,6 +33,7 @@
         permanent=False
     ), name='favicon'),
     url(r'^icons/(?P<source_name>[^/]+).ico$', source_icon_view, name='source_icon'),
+    path('', ShtroveRootView.as_view()),
 ]
 
 if settings.DEBUG:

share/admin/__init__.py

@@ -213,6 +213,7 @@ class FeatureFlagAdmin(admin.ModelAdmin):
     readonly_fields = ('name',)
     search_fields = ('name',)
     list_display = ('name', 'is_up', 'is_defined')
+    list_editable = ('is_up',)
 
 
 admin_site.register(AccessToken, AccessTokenAdmin)

share/models/feature_flag.py

@@ -30,7 +30,6 @@ class FeatureFlag(models.Model):
     ELASTIC_EIGHT_DEFAULT = 'elastic_eight_default'
     SUGGEST_CREATOR_FACET = 'suggest_creator_facet'
     FORBID_UNTRUSTED_FEED = 'forbid_untrusted_feed'
-    TROVESEARCH_DENORMILY = 'trovesearch_denormily'
     PREPRINT_AFFILIATIONS = 'preprint_affiliations'
 
     # name _should_ be one of the constants above, but that is not enforced by `choices`

share/search/index_strategy/__init__.py

@@ -9,7 +9,6 @@
 from trove.trovesearch import search_params
 from .sharev2_elastic5 import Sharev2Elastic5IndexStrategy
 from .sharev2_elastic8 import Sharev2Elastic8IndexStrategy
-from .trove_indexcard_flats import TroveIndexcardFlatsIndexStrategy
 from .trovesearch_denorm import TrovesearchDenormIndexStrategy
 from ._base import IndexStrategy
 from ._indexnames import parse_indexname_parts
@@ -38,7 +37,6 @@ class _AvailableStrategies(enum.Enum):
 
     if settings.ELASTICSEARCH8_URL:
         sharev2_elastic8 = Sharev2Elastic8IndexStrategy('sharev2_elastic8')
-        trove_indexcard_flats = TroveIndexcardFlatsIndexStrategy('trove_indexcard_flats')
         trovesearch_denorm = TrovesearchDenormIndexStrategy('trovesearch_denorm')
 
 
@@ -96,13 +94,8 @@ def get_strategy_for_sharev2_search(requested_name: str | None = None) -> IndexS
 def get_strategy_for_trovesearch(params: search_params.CardsearchParams) -> IndexStrategy:
     if params.index_strategy_name:  # specific strategy requested
         _strategy = parse_strategy_name(params.index_strategy_name, for_search=True)
-    else:
-        _strategy_name = (
-            _AvailableStrategies.trovesearch_denorm.name
-            if FeatureFlag.objects.flag_is_up(FeatureFlag.TROVESEARCH_DENORMILY)
-            else _AvailableStrategies.trove_indexcard_flats.name
-        )
-        _strategy = get_strategy(_strategy_name, for_search=True)
+    else:  # hard-coded default (...for now)
+        _strategy = get_strategy(_AvailableStrategies.trovesearch_denorm.name, for_search=True)
     return _strategy