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

Remove dvc_data_version_info from plot values #4262

Merged
merged 3 commits into from
Jul 18, 2023
Merged

Remove dvc_data_version_info from plot values #4262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9560298
Remove `dvc_data_version_info` from export plot data
julieg18 Jul 11, 2023
e540fb7
Remove obj entirely
julieg18 Jul 17, 2023
1fefeb6
Merge branch 'main' into rm-dvc-data-version-info-from-export-data
julieg18 Jul 18, 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
7 changes: 6 additions & 1 deletion extension/src/plots/model/collect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
} from '../multiSource/collect'
import { StrokeDashEncoding } from '../multiSource/constants'
import { exists } from '../../fileSystem'
import { hasKey } from '../../util/object'

export const getCustomPlotId = (metric: string, param: string) =>
`custom-${metric}-${param}`
Expand Down Expand Up @@ -156,12 +157,16 @@ const collectDatapoints = (
) => {
for (const value of values) {
const dvc_data_version_info = getDvcDataVersionInfo(value)
const data: { rev: string } = {
const data: { rev: string; dvc_data_version_info?: unknown } = {
...value,
...dvc_data_version_info,
rev
}

if (hasKey(data, 'dvc_data_version_info')) {
delete data.dvc_data_version_info
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the code, revisionData is only used for template plots, so should be safe to delete the key here. But please let me know if I missed something or if there is a better spot.

}

;(acc[rev][path] as unknown[]).push(data)
}
}
Expand Down
120 changes: 0 additions & 120 deletions extension/src/test/fixtures/plotsDiff/template/smoothTemplatePlot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,300 +8,180 @@ const smoothTemplatePlotContent = {
timestamp: '1651815999735',
step: '0',
acc: '0.2712',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816000510',
step: '1',
acc: '0.4104',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816001808',
step: '2',
acc: '0.5052',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816003335',
step: '3',
acc: '0.6678',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816005282',
step: '4',
acc: '0.5457',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816006730',
step: '5',
acc: '0.6654',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816008092',
step: '6',
acc: '0.6689',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816009423',
step: '7',
acc: '0.6841',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816010848',
step: '8',
acc: '0.7325',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816012290',
step: '9',
acc: '0.6935',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816013666',
step: '10',
acc: '0.7514',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816014874',
step: '11',
acc: '0.691',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816016290',
step: '12',
acc: '0.7712',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816017814',
step: '13',
acc: '0.7105',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651816018919',
step: '14',
acc: '0.7735',
dvc_data_version_info: {
revision: EXPERIMENT_WORKSPACE_ID,
filename: 'training_metrics/scalars/acc.tsv'
},
rev: EXPERIMENT_WORKSPACE_ID
},
{
timestamp: '1651815999735',
step: '0',
acc: '0.2712',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816000510',
step: '1',
acc: '0.4104',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816001808',
step: '2',
acc: '0.5052',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816003335',
step: '3',
acc: '0.6678',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816005282',
step: '4',
acc: '0.5457',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816006730',
step: '5',
acc: '0.6654',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816008092',
step: '6',
acc: '0.6689',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816009423',
step: '7',
acc: '0.6841',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816010848',
step: '8',
acc: '0.7325',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816012290',
step: '9',
acc: '0.6935',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816013666',
step: '10',
acc: '0.7514',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816014874',
step: '11',
acc: '0.691',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816016290',
step: '12',
acc: '0.7712',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816017814',
step: '13',
acc: '0.7105',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
},
{
timestamp: '1651816018919',
step: '14',
acc: '0.7735',
dvc_data_version_info: {
revision: '208f073',
filename: 'training_metrics/scalars/acc.tsv'
},
rev: 'smooth-plots'
}
]
Expand Down
Loading