Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename any mentions to data set #1572

Merged
merged 7 commits into from
Oct 16, 2023
Merged

Rename any mentions to data set #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
09db0a6
Rename DataSet to Dataset or add Dataset where missing.
merelcht Oct 11, 2023
f00e75c
Fix lint + unpin docer reqs
merelcht Oct 11, 2023
7542612
Make sure experiment tracking works with new dataset names
merelcht Oct 12, 2023
f91b893
Try rename all mentions of DataSet to Dataset
merelcht Oct 12, 2023
96cf33e
Fix lint
merelcht Oct 12, 2023
a4f111b
Merge branch 'main' into rename-any-mentions-to-DataSet
merelcht Oct 13, 2023
2b6df2f
Merge branch 'main' into rename-any-mentions-to-DataSet
merelcht Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
12 changes: 6 additions & 6 deletions cypress/fixtures/graphql/compareThreeRuns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -3403,4 +3403,4 @@
}
]
}
}
}
12 changes: 6 additions & 6 deletions cypress/fixtures/graphql/compareTwoRuns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -2315,4 +2315,4 @@
}
]
}
}
}
10 changes: 5 additions & 5 deletions cypress/fixtures/graphql/getRunData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand All @@ -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"
}
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
}
Expand Down
40 changes: 20 additions & 20 deletions cypress/fixtures/mock/largeDataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"type": "data",
"modular_pipelines": [],
"layer": "primary",
"dataset_type": "pandas.parquet_dataset.ParquetDataSet"
"dataset_type": "pandas.parquet_dataset.ParquetDataset"
},
{
"id": "9f266f06",
Expand All @@ -63,7 +63,7 @@
"type": "data",
"modular_pipelines": [],
"layer": "primary",
"dataset_type": "pandas.parquet_dataset.ParquetDataSet"
"dataset_type": "pandas.parquet_dataset.ParquetDataset"
},
{
"id": "abed6a4d",
Expand Down Expand Up @@ -126,7 +126,7 @@
"type": "data",
"modular_pipelines": [],
"layer": "feature",
"dataset_type": "pandas.csv_dataset.CSVDataSet"
"dataset_type": "pandas.csv_dataset.CSVDataset"
},
{
"id": "9c43f772",
Expand Down Expand Up @@ -215,7 +215,7 @@
"type": "data",
"modular_pipelines": [],
"layer": "raw",
"dataset_type": "pandas.csv_dataset.CSVDataSet"
"dataset_type": "pandas.csv_dataset.CSVDataset"
},
{
"id": "f23ad217",
Expand All @@ -231,7 +231,7 @@
"ingestion"
],
"layer": "intermediate",
"dataset_type": "pandas.parquet_dataset.ParquetDataSet"
"dataset_type": "pandas.parquet_dataset.ParquetDataset"
},
{
"id": "82d36a1b",
Expand Down Expand Up @@ -264,7 +264,7 @@
"type": "data",
"modular_pipelines": [],
"layer": "raw",
"dataset_type": "pandas.csv_dataset.CSVDataSet"
"dataset_type": "pandas.csv_dataset.CSVDataset"
},
{
"id": "b5609df0",
Expand Down Expand Up @@ -298,7 +298,7 @@
"ingestion"
],
"layer": "intermediate",
"dataset_type": "pandas.parquet_dataset.ParquetDataSet"
"dataset_type": "pandas.parquet_dataset.ParquetDataset"
},
{
"id": "f33b9291",
Expand Down Expand Up @@ -327,7 +327,7 @@
"type": "data",
"modular_pipelines": [],
"layer": "raw",
"dataset_type": "pandas.excel_dataset.ExcelDataSet"
"dataset_type": "pandas.excel_dataset.ExcelDataset"
},
{
"id": "c0ddbcbf",
Expand Down Expand Up @@ -401,7 +401,7 @@
"reporting"
],
"layer": "reporting",
"dataset_type": "plotly.plotly_dataset.PlotlyDataSet"
"dataset_type": "plotly.plotly_dataset.PlotlyDataset"
},
{
"id": "3fb71518",
Expand Down Expand Up @@ -430,7 +430,7 @@
"reporting"
],
"layer": null,
"dataset_type": "datasets.image_dataset.ImageDataSet"
"dataset_type": "datasets.image_dataset.ImageDataset"
},
{
"id": "40886786",
Expand Down Expand Up @@ -459,7 +459,7 @@
"reporting"
],
"layer": "reporting",
"dataset_type": "plotly.json_dataset.JSONDataSet"
"dataset_type": "plotly.json_dataset.JSONDataset"
},
{
"id": "178d37bb",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -549,7 +549,7 @@
"reporting"
],
"layer": "reporting",
"dataset_type": "plotly.json_dataset.JSONDataSet"
"dataset_type": "plotly.json_dataset.JSONDataset"
},
{
"id": "25b1f0cf",
Expand Down Expand Up @@ -29736,7 +29736,7 @@
"train_evaluation.linear_regression"
],
"layer": null,
"dataset_type": "pickle.pickle_dataset.PickleDataSet"
"dataset_type": "pickle.pickle_dataset.PickleDataset"
},
{
"id": "b701864d",
Expand All @@ -29752,7 +29752,7 @@
"train_evaluation.linear_regression"
],
"layer": null,
"dataset_type": "tracking.json_dataset.JSONDataSet"
"dataset_type": "tracking.json_dataset.JSONDataset"
},
{
"id": "1c0614b4",
Expand Down Expand Up @@ -29818,7 +29818,7 @@
"train_evaluation.random_forest"
],
"layer": null,
"dataset_type": "pickle.pickle_dataset.PickleDataSet"
"dataset_type": "pickle.pickle_dataset.PickleDataset"
},
{
"id": "4f79de77",
Expand All @@ -29834,7 +29834,7 @@
"train_evaluation.random_forest"
],
"layer": null,
"dataset_type": "tracking.json_dataset.JSONDataSet"
"dataset_type": "tracking.json_dataset.JSONDataset"
},
{
"id": "d6a09df8",
Expand Down Expand Up @@ -29865,7 +29865,7 @@
"train_evaluation.linear_regression"
],
"layer": null,
"dataset_type": "tracking.metrics_dataset.MetricsDataSet"
"dataset_type": "tracking.metrics_dataset.MetricsDataset"
},
{
"id": "0b70ae9d",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -51765,4 +51765,4 @@
}
},
"selected_pipeline": "__default__"
}
}
2 changes: 1 addition & 1 deletion demo-project/src/docker_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion package/kedro_viz/api/graphql/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package/kedro_viz/api/rest/responses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
}
}
Expand Down Expand Up @@ -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",
}
}
Expand Down
Loading
Loading