better back-compat for osf-metrics

Author: aaxelb

elasticsearch_metrics/imps/elastic6.py

@@ -3,6 +3,7 @@
 consider this code frozen/deprecated -- will be removed once no longer needed
 """
 
+from __future__ import annotations
 import collections
 from collections.abc import Iterator
 import dataclasses
@@ -13,11 +14,13 @@
 from django.conf import settings
 from django.utils import timezone
 from elasticsearch6.exceptions import NotFoundError
-import elasticsearch6_dsl
 from elasticsearch6_dsl import Document, connections, Date
 from elasticsearch6_dsl.document import IndexMeta, MetaField
 from elasticsearch6_dsl.index import Index
 
+# re-export all fields, for back-compat convenience
+from elasticsearch6_dsl.field import *  # noqa: F40
+
 from elasticsearch_metrics import signals
 from elasticsearch_metrics import exceptions
 from elasticsearch_metrics.protocols import ProtoDjelmeBackend
@@ -27,8 +30,6 @@
 
 logger = logging.getLogger(__name__)
 
-fields = elasticsearch6_dsl.field
-
 
 class ReadonlyAttrMap:
     def __init__(self, inner_obj):

elasticsearch_metrics/tests/dummy6app/metrics.py

@@ -2,11 +2,11 @@
 
 
 class Dummy6Metric(elastic6.Metric):
-    my_int = elastic6.fields.Integer()
+    my_int = elastic6.Integer()
 
 
 class Dummy6MetricWithExplicitTemplateName(elastic6.Metric):
-    my_keyword = elastic6.fields.Keyword()
+    my_keyword = elastic6.Keyword()
 
     class Meta:
         template_name = "dummy6metric"

elasticsearch_metrics/tests/test_imps_elastic6.py

@@ -34,10 +34,10 @@
 
 
 class PreprintView(elastic6.Metric):
-    provider_id = elastic6.fields.Keyword(index=True)
-    page_id = elastic6.fields.Keyword(index=True)
-    preprint_id = elastic6.fields.Keyword(index=True)
-    route_name = elastic6.fields.Text(analyzer=route_prefix_analyzer)
+    provider_id = elastic6.Keyword(index=True)
+    page_id = elastic6.Keyword(index=True)
+    preprint_id = elastic6.Keyword(index=True)
+    route_name = elastic6.Text(analyzer=route_prefix_analyzer)
 
     class Index:
         settings = {"refresh_interval": "-1"}
@@ -158,7 +158,7 @@ def test_template_name_defined_with_no_template_falls_back_to_default_template(
 
     def test_inheritance(self):
         class MyBaseMetric(elastic6.Metric):
-            page_id = elastic6.fields.Keyword(index=True)
+            page_id = elastic6.Keyword(index=True)
 
             class Index:
                 settings = {"number_of_shards": 2}