From e3538a0366db1deaf87fdab1747d95fe38807ae1 Mon Sep 17 00:00:00 2001
From: qjiang002 <jiangqi@jiangs-mbp-2.myfiosgateway.com>
Date: Fri, 18 Nov 2022 17:52:54 -0500
Subject: [PATCH] fix BenchmarkDatasetConfig sub_dataset nullable

---
 backend/src/impl/db_utils/benchmark_db_utils.py | 7 +++++--
 openapi/openapi.yaml                            | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/backend/src/impl/db_utils/benchmark_db_utils.py b/backend/src/impl/db_utils/benchmark_db_utils.py
index 26b74722..3ede7d22 100644
--- a/backend/src/impl/db_utils/benchmark_db_utils.py
+++ b/backend/src/impl/db_utils/benchmark_db_utils.py
@@ -205,11 +205,12 @@ def generate_dataframe_from_sys_infos(
         dataset_metadatas: list[DatasetMetadata] = []
         for x in dataset_configs:
             dataset_return = DatasetDBUtils.find_datasets(
-                dataset_name=x["dataset_name"], sub_dataset=x["sub_dataset"]
+                dataset_name=x["dataset_name"], sub_dataset=x.get("sub_dataset", None)
             )
             if dataset_return.total != 1:
                 raise ValueError(
-                    f'Could not find dataset {x["dataset_name"]}, {x["sub_dataset"]}'
+                    f"Could not find dataset "
+                    f'{x["dataset_name"]}, {x.get("sub_dataset", None)}'
                 )
             dataset_metadatas.append(dataset_return.datasets[0])
 
@@ -300,6 +301,8 @@ def generate_dataframe_from_sys_infos(
                     for df_key, df_arr in df_input.items():
                         if df_key in column_dict:
                             info = column_dict[df_key]
+                        elif df_key == "sub_dataset":
+                            info = None
                         elif df_key == "dataset_split":
                             info = "test"
                         elif df_key == "source_language":
diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml
index b864ec5f..3847a258 100644
--- a/openapi/openapi.yaml
+++ b/openapi/openapi.yaml
@@ -2,7 +2,7 @@ openapi: "3.0.0"
 info:
   title: "ExplainaBoard"
   description: "Backend APIs for ExplainaBoard"
-  version: "0.2.19"
+  version: "0.2.20"
   contact:
     email: "explainaboard@gmail.com"
   license:
@@ -1398,14 +1398,15 @@ components:
       properties:
         dataset_name:
           type: string
-        sub_dataset:
-          type: string
         split:
           type: string
         metrics:
           type: array
           items:
             $ref: '#/components/schemas/BenchmarkMetric'
+        sub_dataset:
+          type: string
+          nullable: true
       additionalProperties: true
       required: [dataset_name]