Rename any mentions of DataSet to Dataset (#1572)

Signed-off-by: Merel Theisen <[email protected]>
kedro-org · Oct 16, 2023 · cb62e7d · cb62e7d
1 parent e0ccc96
commit cb62e7d
Show file tree

Hide file tree

Showing 37 changed files with 236 additions and 237 deletions.
diff --git a/README.md b/README.md
@@ -151,7 +151,7 @@ Once the above set-up is complete, tracking datasets can be used to track releva
 
 ```yaml
 train_evaluation.r2_score_linear_regression:
-  type: tracking.MetricsDataSet
+  type: tracking.MetricsDataset
   filepath: ${base_location}/09_tracking/linear_score.json
   versioned: true
 ```

diff --git a/cypress/fixtures/graphql/compareThreeRuns.json b/cypress/fixtures/graphql/compareThreeRuns.json
@@ -2968,7 +2968,7 @@
                     ]
                 },
                 "datasetName": "reporting.feature_importance",
-                "datasetType": "plotly.json_dataset.JSONDataSet",
+                "datasetType": "plotly.json_dataset.JSONDataset",
                 "runIds": [
                     "2022-12-24T21.05.59.296Z",
                     "2022-10-05T12.22.35.825Z",
@@ -3050,7 +3050,7 @@
                     ]
                 },
                 "datasetName": "train_evaluation.linear_regression.r2_score",
-                "datasetType": "tracking.metrics_dataset.MetricsDataSet",
+                "datasetType": "tracking.metrics_dataset.MetricsDataset",
                 "runIds": [
                     "2022-12-24T21.05.59.296Z",
                     "2022-10-05T12.22.35.825Z",
@@ -3104,7 +3104,7 @@
                     ]
                 },
                 "datasetName": "train_evaluation.random_forest.r2_score",
-                "datasetType": "tracking.metrics_dataset.MetricsDataSet",
+                "datasetType": "tracking.metrics_dataset.MetricsDataset",
                 "runIds": [
                     "2022-12-24T21.05.59.296Z",
                     "2022-10-05T12.22.35.825Z",
@@ -3199,7 +3199,7 @@
                     ]
                 },
                 "datasetName": "train_evaluation.linear_regression.experiment_params",
-                "datasetType": "tracking.json_dataset.JSONDataSet",
+                "datasetType": "tracking.json_dataset.JSONDataset",
                 "runIds": [
                     "2022-12-24T21.05.59.296Z",
                     "2022-10-05T12.22.35.825Z",
@@ -3393,7 +3393,7 @@
                     ]
                 },
                 "datasetName": "train_evaluation.random_forest.experiment_params",
-                "datasetType": "tracking.json_dataset.JSONDataSet",
+                "datasetType": "tracking.json_dataset.JSONDataset",
                 "runIds": [
                     "2022-12-24T21.05.59.296Z",
                     "2022-10-05T12.22.35.825Z",
@@ -3403,4 +3403,4 @@
             }
         ]
     }
-}
+}
diff --git a/cypress/fixtures/graphql/compareTwoRuns.json b/cypress/fixtures/graphql/compareTwoRuns.json
@@ -1982,7 +1982,7 @@
                     ]
                 },
                 "datasetName": "reporting.feature_importance",
-                "datasetType": "plotly.json_dataset.JSONDataSet",
+                "datasetType": "plotly.json_dataset.JSONDataset",
                 "runIds": [
                     "2022-12-24T21.05.59.296Z",
                     "2022-10-05T12.22.35.825Z"
@@ -2046,7 +2046,7 @@
                     ]
                 },
                 "datasetName": "train_evaluation.linear_regression.r2_score",
-                "datasetType": "tracking.metrics_dataset.MetricsDataSet",
+                "datasetType": "tracking.metrics_dataset.MetricsDataset",
                 "runIds": [
                     "2022-12-24T21.05.59.296Z",
                     "2022-10-05T12.22.35.825Z"
@@ -2087,7 +2087,7 @@
                     ]
                 },
                 "datasetName": "train_evaluation.random_forest.r2_score",
-                "datasetType": "tracking.metrics_dataset.MetricsDataSet",
+                "datasetType": "tracking.metrics_dataset.MetricsDataset",
                 "runIds": [
                     "2022-12-24T21.05.59.296Z",
                     "2022-10-05T12.22.35.825Z"
@@ -2165,7 +2165,7 @@
                     ]
                 },
                 "datasetName": "train_evaluation.linear_regression.experiment_params",
-                "datasetType": "tracking.json_dataset.JSONDataSet",
+                "datasetType": "tracking.json_dataset.JSONDataset",
                 "runIds": [
                     "2022-12-24T21.05.59.296Z",
                     "2022-10-05T12.22.35.825Z"
@@ -2306,7 +2306,7 @@
                     ]
                 },
                 "datasetName": "train_evaluation.random_forest.experiment_params",
-                "datasetType": "tracking.json_dataset.JSONDataSet",
+                "datasetType": "tracking.json_dataset.JSONDataset",
                 "runIds": [
                     "2022-12-24T21.05.59.296Z",
                     "2022-10-05T12.22.35.825Z"
@@ -2315,4 +2315,4 @@
             }
         ]
     }
-}
+}
diff --git a/cypress/fixtures/graphql/getRunData.json b/cypress/fixtures/graphql/getRunData.json
@@ -668,7 +668,7 @@
           ]
         },
         "datasetName": "reporting.feature_importance",
-        "datasetType": "plotly.json_dataset.JSONDataSet",
+        "datasetType": "plotly.json_dataset.JSONDataset",
         "runIds": ["2022-12-24T21.05.59.296Z"],
         "__typename": "TrackingDataset"
       },
@@ -710,7 +710,7 @@
           ]
         },
         "datasetName": "train_evaluation.linear_regression.r2_score",
-        "datasetType": "tracking.metrics_dataset.MetricsDataSet",
+        "datasetType": "tracking.metrics_dataset.MetricsDataset",
         "runIds": ["2022-12-24T21.05.59.296Z"],
         "__typename": "TrackingDataset"
       },
@@ -736,7 +736,7 @@
           ]
         },
         "datasetName": "train_evaluation.random_forest.r2_score",
-        "datasetType": "tracking.metrics_dataset.MetricsDataSet",
+        "datasetType": "tracking.metrics_dataset.MetricsDataset",
         "runIds": ["2022-12-24T21.05.59.296Z"],
         "__typename": "TrackingDataset"
       }
@@ -786,7 +786,7 @@
           ]
         },
         "datasetName": "train_evaluation.linear_regression.experiment_params",
-        "datasetType": "tracking.json_dataset.JSONDataSet",
+        "datasetType": "tracking.json_dataset.JSONDataset",
         "runIds": ["2022-12-24T21.05.59.296Z"],
         "__typename": "TrackingDataset"
       },
@@ -872,7 +872,7 @@
           ]
         },
         "datasetName": "train_evaluation.random_forest.experiment_params",
-        "datasetType": "tracking.json_dataset.JSONDataSet",
+        "datasetType": "tracking.json_dataset.JSONDataset",
         "runIds": ["2022-12-24T21.05.59.296Z"],
         "__typename": "TrackingDataset"
       }

diff --git a/cypress/fixtures/mock/largeDataset.json b/cypress/fixtures/mock/largeDataset.json
@@ -48,7 +48,7 @@
         "type": "data",
         "modular_pipelines": [],
         "layer": "primary",
-        "dataset_type": "pandas.parquet_dataset.ParquetDataSet"
+        "dataset_type": "pandas.parquet_dataset.ParquetDataset"
       },
       {
         "id": "9f266f06",
@@ -63,7 +63,7 @@
         "type": "data",
         "modular_pipelines": [],
         "layer": "primary",
-        "dataset_type": "pandas.parquet_dataset.ParquetDataSet"
+        "dataset_type": "pandas.parquet_dataset.ParquetDataset"
       },
       {
         "id": "abed6a4d",
@@ -126,7 +126,7 @@
         "type": "data",
         "modular_pipelines": [],
         "layer": "feature",
-        "dataset_type": "pandas.csv_dataset.CSVDataSet"
+        "dataset_type": "pandas.csv_dataset.CSVDataset"
       },
       {
         "id": "9c43f772",
@@ -215,7 +215,7 @@
         "type": "data",
         "modular_pipelines": [],
         "layer": "raw",
-        "dataset_type": "pandas.csv_dataset.CSVDataSet"
+        "dataset_type": "pandas.csv_dataset.CSVDataset"
       },
       {
         "id": "f23ad217",
@@ -231,7 +231,7 @@
           "ingestion"
         ],
         "layer": "intermediate",
-        "dataset_type": "pandas.parquet_dataset.ParquetDataSet"
+        "dataset_type": "pandas.parquet_dataset.ParquetDataset"
       },
       {
         "id": "82d36a1b",
@@ -264,7 +264,7 @@
         "type": "data",
         "modular_pipelines": [],
         "layer": "raw",
-        "dataset_type": "pandas.csv_dataset.CSVDataSet"
+        "dataset_type": "pandas.csv_dataset.CSVDataset"
       },
       {
         "id": "b5609df0",
@@ -298,7 +298,7 @@
           "ingestion"
         ],
         "layer": "intermediate",
-        "dataset_type": "pandas.parquet_dataset.ParquetDataSet"
+        "dataset_type": "pandas.parquet_dataset.ParquetDataset"
       },
       {
         "id": "f33b9291",
@@ -327,7 +327,7 @@
         "type": "data",
         "modular_pipelines": [],
         "layer": "raw",
-        "dataset_type": "pandas.excel_dataset.ExcelDataSet"
+        "dataset_type": "pandas.excel_dataset.ExcelDataset"
       },
       {
         "id": "c0ddbcbf",
@@ -401,7 +401,7 @@
           "reporting"
         ],
         "layer": "reporting",
-        "dataset_type": "plotly.plotly_dataset.PlotlyDataSet"
+        "dataset_type": "plotly.plotly_dataset.PlotlyDataset"
       },
       {
         "id": "3fb71518",
@@ -430,7 +430,7 @@
           "reporting"
         ],
         "layer": null,
-        "dataset_type": "datasets.image_dataset.ImageDataSet"
+        "dataset_type": "datasets.image_dataset.ImageDataset"
       },
       {
         "id": "40886786",
@@ -459,7 +459,7 @@
           "reporting"
         ],
         "layer": "reporting",
-        "dataset_type": "plotly.json_dataset.JSONDataSet"
+        "dataset_type": "plotly.json_dataset.JSONDataset"
       },
       {
         "id": "178d37bb",
@@ -489,7 +489,7 @@
         "type": "data",
         "modular_pipelines": [],
         "layer": "model_input",
-        "dataset_type": "pandas.parquet_dataset.ParquetDataSet"
+        "dataset_type": "pandas.parquet_dataset.ParquetDataset"
       },
       {
         "id": "8de402c1",
@@ -549,7 +549,7 @@
           "reporting"
         ],
         "layer": "reporting",
-        "dataset_type": "plotly.json_dataset.JSONDataSet"
+        "dataset_type": "plotly.json_dataset.JSONDataset"
       },
       {
         "id": "25b1f0cf",
@@ -29736,7 +29736,7 @@
           "train_evaluation.linear_regression"
         ],
         "layer": null,
-        "dataset_type": "pickle.pickle_dataset.PickleDataSet"
+        "dataset_type": "pickle.pickle_dataset.PickleDataset"
       },
       {
         "id": "b701864d",
@@ -29752,7 +29752,7 @@
           "train_evaluation.linear_regression"
         ],
         "layer": null,
-        "dataset_type": "tracking.json_dataset.JSONDataSet"
+        "dataset_type": "tracking.json_dataset.JSONDataset"
       },
       {
         "id": "1c0614b4",
@@ -29818,7 +29818,7 @@
           "train_evaluation.random_forest"
         ],
         "layer": null,
-        "dataset_type": "pickle.pickle_dataset.PickleDataSet"
+        "dataset_type": "pickle.pickle_dataset.PickleDataset"
       },
       {
         "id": "4f79de77",
@@ -29834,7 +29834,7 @@
           "train_evaluation.random_forest"
         ],
         "layer": null,
-        "dataset_type": "tracking.json_dataset.JSONDataSet"
+        "dataset_type": "tracking.json_dataset.JSONDataset"
       },
       {
         "id": "d6a09df8",
@@ -29865,7 +29865,7 @@
           "train_evaluation.linear_regression"
         ],
         "layer": null,
-        "dataset_type": "tracking.metrics_dataset.MetricsDataSet"
+        "dataset_type": "tracking.metrics_dataset.MetricsDataset"
       },
       {
         "id": "0b70ae9d",
@@ -29896,7 +29896,7 @@
           "train_evaluation.random_forest"
         ],
         "layer": null,
-        "dataset_type": "tracking.metrics_dataset.MetricsDataSet"
+        "dataset_type": "tracking.metrics_dataset.MetricsDataset"
       },
       {
         "id": "feature_engineering",
@@ -51765,4 +51765,4 @@
       }
     },
     "selected_pipeline": "__default__"
-  }
+  }
diff --git a/demo-project/src/docker_requirements.txt b/demo-project/src/docker_requirements.txt
@@ -1,5 +1,5 @@
 kedro~=0.18.0
-kedro-datasets[pandas.CSVDataSet,pandas.ExcelDataSet, pandas.ParquetDataSet, plotly.PlotlyDataSet, matplotlib.MatplotlibWriter]>=1.0, <1.7.1
+kedro-datasets[pandas.CSVDataSet,pandas.ExcelDataSet, pandas.ParquetDataSet, plotly.PlotlyDataSet, matplotlib.MatplotlibWriter]~=1.0
 scikit-learn~=1.0
 pillow~=9.0
 seaborn~=0.11.2
diff --git a/package/kedro_viz/api/graphql/serializers.py b/package/kedro_viz/api/graphql/serializers.py
@@ -86,7 +86,7 @@ def format_run_tracking_data(
         Dictionary with formatted tracking data for selected runs
 
     Example:
-        >>> from kedro_datasets.tracking import MetricsDataSet
+        >>> from kedro_datasets.tracking import MetricsDataset
         >>> tracking_data = {
         >>>     'My Favorite Sprint': {
         >>>         'bootstrap':0.8

diff --git a/package/kedro_viz/api/rest/responses.py b/package/kedro_viz/api/rest/responses.py
@@ -95,7 +95,7 @@ class Config:
                 "modular_pipelines": [],
                 "type": "data",
                 "layer": "primary",
-                "dataset_type": "kedro.extras.datasets.pandas.csv_dataset.CSVDataSet",
+                "dataset_type": "kedro_datasets.pandas.csv_dataset.CSVDataset",
                 "stats": {"rows": 10, "columns": 2, "file_size": 2300},
             }
         }
@@ -142,7 +142,7 @@ class Config:
         schema_extra = {
             "example": {
                 "filepath": "/my-kedro-project/data/03_primary/master_table.csv",
-                "type": "pandas.csv_dataset.CSVDataSet",
+                "type": "kedro_datasets.pandas.csv_dataset.CSVDataset",
                 "run_command": "kedro run --to-outputs=master_table",
             }
         }