Begin implementing DB framework

core/views/ui/drilldown.py

@@ -11,10 +11,8 @@ from django_tables2 import SingleTableView
 from rest_framework.parsers import FormParser
 from rest_framework.views import APIView
 
+from core.db.storage import db
 from core.lib.context import construct_query
-
-# from core.lib.opensearch import query_results
-from core.lib.manticore import query_results
 from core.lib.threshold import (
     annotate_num_chans,
     annotate_num_users,
@@ -87,7 +85,7 @@ def make_graph(results):
         date = str(index)
         graph.append(
             {
-                "text": item.get("tokens", None)
+                "text": item.get("words_noun", None)
                 or item.get("msg", None)
                 or item.get("id"),
                 "nick": item.get("nick", None),
@@ -108,9 +106,9 @@ def drilldown_search(request, return_context=False, template=None):
     else:
         template_name = template
     if request.user.is_anonymous:
-        sizes = settings.MANTICORE_MAIN_SIZES_ANON
+        sizes = settings.MAIN_SIZES_ANON
     else:
-        sizes = settings.MANTICORE_MAIN_SIZES
+        sizes = settings.MAIN_SIZES
 
     if request.GET:
         if not request.htmx:
@@ -165,7 +163,7 @@ def drilldown_search(request, return_context=False, template=None):
             tags = parse_tags(query_params["tags"])
             extra_params["tags"] = tags
 
-    context = query_results(request, query_params, **extra_params)
+    context = db.query_results(request, query_params, **extra_params)
     context["unique"] = "results"
 
     # Valid sizes
@@ -375,7 +373,7 @@ class DrilldownContextModal(APIView):
             type=type,
             nicks=nicks_sensitive,
         )
-        results = query_results(
+        results = db.query_results(
             request,
             query_params,
             size=size,

core/views/ui/insights.py

@@ -7,9 +7,9 @@ from django.views import View
 from rest_framework.parsers import FormParser
 from rest_framework.views import APIView
 
+from core.db.druid import query_single_result
 from core.lib.meta import get_meta
 from core.lib.nicktrace import get_nicks
-from core.lib.opensearch import query_single_result
 from core.lib.threshold import (
     annotate_num_chans,
     annotate_num_users,

core/views/ui/tables.py

@@ -65,7 +65,13 @@ class DrilldownTable(Table):
     realname = Column()
     server = Column()
     mtype = Column()
-    tokens = Column()
+    # tokens = Column()
+    lang_code = Column()
+    lang_name = Column()
+    words_noun = Column()
+    words_adj = Column()
+    words_verb = Column()
+    words_adv = Column()
     hidden = Column()
     filename = Column()
     file_md5 = Column()