Resolve "Extract basic statistics from router.info"

Author: Sideboard

nomad/app/v1/routers/info.py

@@ -30,11 +30,10 @@
 from pydantic.main import BaseModel
 
 from nomad import normalizing
-from nomad.app.v1.models import Aggregation, StatisticsAggregation
 from nomad.config import config
 from nomad.parsing import parsers
 from nomad.parsing.parsers import code_metadata
-from nomad.search import search
+from nomad.search import get_statistics
 from nomad.utils import strip
 
 INFO_CACHE_TTL: Final[int] = 1 * 24 * 60 * 60  # 1 day in seconds
@@ -120,26 +119,6 @@ class InfoModel(BaseModel):
     )
 
 
-def get_statistics():
-    search_response = search(
-        aggregations=dict(
-            statistics=Aggregation(
-                statistics=StatisticsAggregation(
-                    metrics=[
-                        'n_entries',
-                        'n_materials',
-                        'n_uploads',
-                        'n_quantities',
-                        'n_calculations',
-                    ]
-                )
-            )
-        )
-    )
-    statistics = search_response.aggregations['statistics'].statistics.data
-    return statistics
-
-
 @router.get(
     '',
     tags=[APITag.DEFAULT],

nomad/processing/base.py

@@ -49,9 +49,9 @@
 
 import nomad.patch  # noqa: F401
 from nomad import infrastructure, utils
-from nomad.app.v1.routers.info import get_statistics
 from nomad.config import config
 from nomad.config.models.config import CELERY_WORKER_ROUTING
+from nomad.search import get_statistics
 
 if config.logstash.enabled:
     from nomad.utils import structlogging

nomad/search.py

@@ -1973,3 +1973,23 @@ def quantity_values(
         page_after_value = value_agg.pagination.next_page_after_value
         if page_after_value is None:
             break
+
+
+def get_statistics():
+    search_response = search(
+        aggregations=dict(
+            statistics=Aggregation(
+                statistics=StatisticsAggregation(
+                    metrics=[
+                        'n_entries',
+                        'n_materials',
+                        'n_uploads',
+                        'n_quantities',
+                        'n_calculations',
+                    ]
+                )
+            )
+        )
+    )
+    statistics = search_response.aggregations['statistics'].statistics.data
+    return statistics