#374: add more metadata to /v1/tables endpoint

app/commands/adminapi/command.py

@@ -53,7 +53,7 @@ def prepare(self):
         self.table_stats_cache = cache.BackgroundCache(
             "table_stats",
             refresh,
-            refresh_frequency=timedelta(minutes=2),
+            refresh_frequency=timedelta(minutes=5),
             refresh_timeout=timedelta(minutes=5),
         )
         self._table_stats_thread = threading.Thread(target=self.table_stats_cache.run, daemon=True)

app/data/model/table.py

@@ -50,6 +50,7 @@ class Layer0TableListItem:
     description: str
     num_fields: int
     modification_dt: datetime.datetime
+    bibcode: str
 
 
 @dataclass

app/data/repositories/layer0/tables.py

@@ -533,6 +533,7 @@ def search_tables(
             t.table_name,
             t.modification_dt,
             COALESCE(ti.param->>'description', '') AS description,
+            b.code AS bibcode,
             (
                 SELECT COUNT(*)::int
                 FROM meta.column_info c
@@ -541,6 +542,7 @@ def search_tables(
                   AND c.column_name != %s
             ) AS num_fields
         FROM layer0.tables t
+        JOIN common.bib b ON b.id = t.bib
         LEFT JOIN meta.table_info ti
             ON ti.schema_name = %s AND ti.table_name = t.table_name
         WHERE t.table_name ILIKE %s OR COALESCE(ti.param->>'description', '') ILIKE %s
@@ -563,6 +565,7 @@ def search_tables(
                 description=row["description"] or "",
                 num_fields=int(row["num_fields"]),
                 modification_dt=row["modification_dt"],
+                bibcode=row["bibcode"],
             )
             for row in rows
         ]

app/domain/adminapi/table_upload.py

@@ -178,18 +178,29 @@ def add_data(self, r: adminapi.AddDataRequest) -> adminapi.AddDataResponse:
     def get_table_list(self, r: adminapi.GetTableListRequest) -> adminapi.GetTableListResponse:
         items = self.layer0_repo.search_tables(r.query, r.page_size, r.page)
         cached_tables = self.table_stats_cache.get().tables
-        return adminapi.GetTableListResponse(
-            tables=[
+        empty_progress = adminapi.TableProgress(
+            total_records=0,
+            unprocessed=0,
+            pending_triage=0,
+            resolved_unsubmitted=0,
+            submitted=0,
+            catalogs={},
+        )
+        tables: list[adminapi.TableListItem] = []
+        for item in items:
+            progress = cached_tables.get(item.table_name) or empty_progress
+            tables.append(
                 adminapi.TableListItem(
                     name=item.table_name,
                     description=item.description,
-                    num_entries=cached_tables[item.table_name].total_records if item.table_name in cached_tables else 0,
+                    num_entries=progress.total_records,
                     num_fields=item.num_fields,
                     modification_dt=item.modification_dt,
+                    bibcode=item.bibcode,
+                    progress=progress,
                 )
-                for item in items
-            ]
-        )
+            )
+        return adminapi.GetTableListResponse(tables=tables)
 
     def get_table(self, r: adminapi.GetTableRequest) -> adminapi.GetTableResponse:
         meta = self.layer0_repo.fetch_metadata_by_name(r.table_name)

app/presentation/adminapi/interface.py

@@ -53,18 +53,6 @@ class GetTableListRequest(pydantic.BaseModel):
     page: int = 0
 
 
-class TableListItem(pydantic.BaseModel):
-    name: str
-    description: str
-    num_entries: int
-    num_fields: int
-    modification_dt: datetime.datetime
-
-
-class GetTableListResponse(pydantic.BaseModel):
-    tables: list[TableListItem]
-
-
 class CatalogProgress(pydantic.BaseModel):
     structured: int
     in_layer2: int
@@ -80,6 +68,20 @@ class TableProgress(pydantic.BaseModel):
     catalogs: dict[str, CatalogProgress]
 
 
+class TableListItem(pydantic.BaseModel):
+    name: str
+    description: str
+    num_entries: int
+    num_fields: int
+    modification_dt: datetime.datetime
+    bibcode: str
+    progress: TableProgress
+
+
+class GetTableListResponse(pydantic.BaseModel):
+    tables: list[TableListItem]
+
+
 class TableStatsSnapshot(pydantic.BaseModel):
     tables: dict[str, TableProgress]
     computed_at: datetime.datetime

tests/regression/upload_simple_table.py

@@ -390,6 +390,8 @@ def check_table_list(session: requests.Session, table_name: str):
         assert "description" in item
         assert "num_entries" in item
         assert "num_fields" in item
+        assert "bibcode" in item
+        assert "progress" in item
 
 
 @lib.test_logging_decorator

tests/unit/data/layer0_repository_test.py

@@ -69,6 +69,7 @@ def test_search_tables_calls_query_with_expected_structure(self):
                 "description": "A test table",
                 "num_fields": 6,
                 "modification_dt": datetime.datetime(2025, 1, 1, tzinfo=datetime.UTC),
+                "bibcode": "2024PDU....4601628D",
             }
         ]