Skip to content

Commit 9b49eb6

Browse files
authored
Remove dvc_data_version_info from plot values (#4262)
1 parent 58802a6 commit 9b49eb6

File tree

2 files changed

+6
-121
lines changed

2 files changed

+6
-121
lines changed

extension/src/plots/model/collect.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import {
3333
} from '../multiSource/collect'
3434
import { StrokeDashEncoding } from '../multiSource/constants'
3535
import { exists } from '../../fileSystem'
36+
import { hasKey } from '../../util/object'
3637

3738
export const getCustomPlotId = (metric: string, param: string) =>
3839
`custom-${metric}-${param}`
@@ -156,12 +157,16 @@ const collectDatapoints = (
156157
) => {
157158
for (const value of values) {
158159
const dvc_data_version_info = getDvcDataVersionInfo(value)
159-
const data: { rev: string } = {
160+
const data: { rev: string; dvc_data_version_info?: unknown } = {
160161
...value,
161162
...dvc_data_version_info,
162163
rev
163164
}
164165

166+
if (hasKey(data, 'dvc_data_version_info')) {
167+
delete data.dvc_data_version_info
168+
}
169+
165170
;(acc[rev][path] as unknown[]).push(data)
166171
}
167172
}

extension/src/test/fixtures/plotsDiff/template/smoothTemplatePlot.ts

Lines changed: 0 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -8,300 +8,180 @@ const smoothTemplatePlotContent = {
88
timestamp: '1651815999735',
99
step: '0',
1010
acc: '0.2712',
11-
dvc_data_version_info: {
12-
revision: EXPERIMENT_WORKSPACE_ID,
13-
filename: 'training_metrics/scalars/acc.tsv'
14-
},
1511
rev: EXPERIMENT_WORKSPACE_ID
1612
},
1713
{
1814
timestamp: '1651816000510',
1915
step: '1',
2016
acc: '0.4104',
21-
dvc_data_version_info: {
22-
revision: EXPERIMENT_WORKSPACE_ID,
23-
filename: 'training_metrics/scalars/acc.tsv'
24-
},
2517
rev: EXPERIMENT_WORKSPACE_ID
2618
},
2719
{
2820
timestamp: '1651816001808',
2921
step: '2',
3022
acc: '0.5052',
31-
dvc_data_version_info: {
32-
revision: EXPERIMENT_WORKSPACE_ID,
33-
filename: 'training_metrics/scalars/acc.tsv'
34-
},
3523
rev: EXPERIMENT_WORKSPACE_ID
3624
},
3725
{
3826
timestamp: '1651816003335',
3927
step: '3',
4028
acc: '0.6678',
41-
dvc_data_version_info: {
42-
revision: EXPERIMENT_WORKSPACE_ID,
43-
filename: 'training_metrics/scalars/acc.tsv'
44-
},
4529
rev: EXPERIMENT_WORKSPACE_ID
4630
},
4731
{
4832
timestamp: '1651816005282',
4933
step: '4',
5034
acc: '0.5457',
51-
dvc_data_version_info: {
52-
revision: EXPERIMENT_WORKSPACE_ID,
53-
filename: 'training_metrics/scalars/acc.tsv'
54-
},
5535
rev: EXPERIMENT_WORKSPACE_ID
5636
},
5737
{
5838
timestamp: '1651816006730',
5939
step: '5',
6040
acc: '0.6654',
61-
dvc_data_version_info: {
62-
revision: EXPERIMENT_WORKSPACE_ID,
63-
filename: 'training_metrics/scalars/acc.tsv'
64-
},
6541
rev: EXPERIMENT_WORKSPACE_ID
6642
},
6743
{
6844
timestamp: '1651816008092',
6945
step: '6',
7046
acc: '0.6689',
71-
dvc_data_version_info: {
72-
revision: EXPERIMENT_WORKSPACE_ID,
73-
filename: 'training_metrics/scalars/acc.tsv'
74-
},
7547
rev: EXPERIMENT_WORKSPACE_ID
7648
},
7749
{
7850
timestamp: '1651816009423',
7951
step: '7',
8052
acc: '0.6841',
81-
dvc_data_version_info: {
82-
revision: EXPERIMENT_WORKSPACE_ID,
83-
filename: 'training_metrics/scalars/acc.tsv'
84-
},
8553
rev: EXPERIMENT_WORKSPACE_ID
8654
},
8755
{
8856
timestamp: '1651816010848',
8957
step: '8',
9058
acc: '0.7325',
91-
dvc_data_version_info: {
92-
revision: EXPERIMENT_WORKSPACE_ID,
93-
filename: 'training_metrics/scalars/acc.tsv'
94-
},
9559
rev: EXPERIMENT_WORKSPACE_ID
9660
},
9761
{
9862
timestamp: '1651816012290',
9963
step: '9',
10064
acc: '0.6935',
101-
dvc_data_version_info: {
102-
revision: EXPERIMENT_WORKSPACE_ID,
103-
filename: 'training_metrics/scalars/acc.tsv'
104-
},
10565
rev: EXPERIMENT_WORKSPACE_ID
10666
},
10767
{
10868
timestamp: '1651816013666',
10969
step: '10',
11070
acc: '0.7514',
111-
dvc_data_version_info: {
112-
revision: EXPERIMENT_WORKSPACE_ID,
113-
filename: 'training_metrics/scalars/acc.tsv'
114-
},
11571
rev: EXPERIMENT_WORKSPACE_ID
11672
},
11773
{
11874
timestamp: '1651816014874',
11975
step: '11',
12076
acc: '0.691',
121-
dvc_data_version_info: {
122-
revision: EXPERIMENT_WORKSPACE_ID,
123-
filename: 'training_metrics/scalars/acc.tsv'
124-
},
12577
rev: EXPERIMENT_WORKSPACE_ID
12678
},
12779
{
12880
timestamp: '1651816016290',
12981
step: '12',
13082
acc: '0.7712',
131-
dvc_data_version_info: {
132-
revision: EXPERIMENT_WORKSPACE_ID,
133-
filename: 'training_metrics/scalars/acc.tsv'
134-
},
13583
rev: EXPERIMENT_WORKSPACE_ID
13684
},
13785
{
13886
timestamp: '1651816017814',
13987
step: '13',
14088
acc: '0.7105',
141-
dvc_data_version_info: {
142-
revision: EXPERIMENT_WORKSPACE_ID,
143-
filename: 'training_metrics/scalars/acc.tsv'
144-
},
14589
rev: EXPERIMENT_WORKSPACE_ID
14690
},
14791
{
14892
timestamp: '1651816018919',
14993
step: '14',
15094
acc: '0.7735',
151-
dvc_data_version_info: {
152-
revision: EXPERIMENT_WORKSPACE_ID,
153-
filename: 'training_metrics/scalars/acc.tsv'
154-
},
15595
rev: EXPERIMENT_WORKSPACE_ID
15696
},
15797
{
15898
timestamp: '1651815999735',
15999
step: '0',
160100
acc: '0.2712',
161-
dvc_data_version_info: {
162-
revision: '208f073',
163-
filename: 'training_metrics/scalars/acc.tsv'
164-
},
165101
rev: 'smooth-plots'
166102
},
167103
{
168104
timestamp: '1651816000510',
169105
step: '1',
170106
acc: '0.4104',
171-
dvc_data_version_info: {
172-
revision: '208f073',
173-
filename: 'training_metrics/scalars/acc.tsv'
174-
},
175107
rev: 'smooth-plots'
176108
},
177109
{
178110
timestamp: '1651816001808',
179111
step: '2',
180112
acc: '0.5052',
181-
dvc_data_version_info: {
182-
revision: '208f073',
183-
filename: 'training_metrics/scalars/acc.tsv'
184-
},
185113
rev: 'smooth-plots'
186114
},
187115
{
188116
timestamp: '1651816003335',
189117
step: '3',
190118
acc: '0.6678',
191-
dvc_data_version_info: {
192-
revision: '208f073',
193-
filename: 'training_metrics/scalars/acc.tsv'
194-
},
195119
rev: 'smooth-plots'
196120
},
197121
{
198122
timestamp: '1651816005282',
199123
step: '4',
200124
acc: '0.5457',
201-
dvc_data_version_info: {
202-
revision: '208f073',
203-
filename: 'training_metrics/scalars/acc.tsv'
204-
},
205125
rev: 'smooth-plots'
206126
},
207127
{
208128
timestamp: '1651816006730',
209129
step: '5',
210130
acc: '0.6654',
211-
dvc_data_version_info: {
212-
revision: '208f073',
213-
filename: 'training_metrics/scalars/acc.tsv'
214-
},
215131
rev: 'smooth-plots'
216132
},
217133
{
218134
timestamp: '1651816008092',
219135
step: '6',
220136
acc: '0.6689',
221-
dvc_data_version_info: {
222-
revision: '208f073',
223-
filename: 'training_metrics/scalars/acc.tsv'
224-
},
225137
rev: 'smooth-plots'
226138
},
227139
{
228140
timestamp: '1651816009423',
229141
step: '7',
230142
acc: '0.6841',
231-
dvc_data_version_info: {
232-
revision: '208f073',
233-
filename: 'training_metrics/scalars/acc.tsv'
234-
},
235143
rev: 'smooth-plots'
236144
},
237145
{
238146
timestamp: '1651816010848',
239147
step: '8',
240148
acc: '0.7325',
241-
dvc_data_version_info: {
242-
revision: '208f073',
243-
filename: 'training_metrics/scalars/acc.tsv'
244-
},
245149
rev: 'smooth-plots'
246150
},
247151
{
248152
timestamp: '1651816012290',
249153
step: '9',
250154
acc: '0.6935',
251-
dvc_data_version_info: {
252-
revision: '208f073',
253-
filename: 'training_metrics/scalars/acc.tsv'
254-
},
255155
rev: 'smooth-plots'
256156
},
257157
{
258158
timestamp: '1651816013666',
259159
step: '10',
260160
acc: '0.7514',
261-
dvc_data_version_info: {
262-
revision: '208f073',
263-
filename: 'training_metrics/scalars/acc.tsv'
264-
},
265161
rev: 'smooth-plots'
266162
},
267163
{
268164
timestamp: '1651816014874',
269165
step: '11',
270166
acc: '0.691',
271-
dvc_data_version_info: {
272-
revision: '208f073',
273-
filename: 'training_metrics/scalars/acc.tsv'
274-
},
275167
rev: 'smooth-plots'
276168
},
277169
{
278170
timestamp: '1651816016290',
279171
step: '12',
280172
acc: '0.7712',
281-
dvc_data_version_info: {
282-
revision: '208f073',
283-
filename: 'training_metrics/scalars/acc.tsv'
284-
},
285173
rev: 'smooth-plots'
286174
},
287175
{
288176
timestamp: '1651816017814',
289177
step: '13',
290178
acc: '0.7105',
291-
dvc_data_version_info: {
292-
revision: '208f073',
293-
filename: 'training_metrics/scalars/acc.tsv'
294-
},
295179
rev: 'smooth-plots'
296180
},
297181
{
298182
timestamp: '1651816018919',
299183
step: '14',
300184
acc: '0.7735',
301-
dvc_data_version_info: {
302-
revision: '208f073',
303-
filename: 'training_metrics/scalars/acc.tsv'
304-
},
305185
rev: 'smooth-plots'
306186
}
307187
]

0 commit comments

Comments
 (0)