Merge branch 'main' into sticky-storybook-preview

extension/package.json

@@ -20,14 +20,18 @@
   "homepage": "https://github.com/iterative/vscode-dvc/README.md",
   "keywords": [
     "iterative",
-    "data",
-    "version",
-    "control",
+    "data version control",
+    "plots",
+    "experiment tracking",
+    "hyperparameters",
+    "dataset",
     "dvc"
   ],
   "categories": [
+    "Machine Learning",
     "Data Science",
-    "Visualization"
+    "Visualization",
+    "SCM Providers"
   ],
   "galleryBanner": {
     "color": "#333",
@@ -50,6 +54,14 @@
   },
   "contributes": {
     "colors": [
+      {
+        "id": "dvc.deps",
+        "description": "Color to indicate a DVC dep column in the experiments table",
+        "defaults": {
+          "dark": "#b079e7",
+          "light": "#4f1886"
+        }
+      },
       {
         "id": "dvc.metrics",
         "description": "Color to indicate a DVC metric column in the experiments table",

extension/src/cli/reader.ts

@@ -69,7 +69,7 @@ type RelPathObject<T> = {
 
 export type ValueTreeRoot = RelPathObject<ValueTreeOrError>
 
-interface ValueTreeNode {
+export interface ValueTreeNode {
   [key: string]: Value | ValueTree
 }
 
@@ -88,10 +88,12 @@ export interface BaseExperimentFields {
 type Dep = { hash: string; size: number; nfiles: null | number }
 type Out = Dep & { use_cache: boolean; is_data_source: boolean }
 
+export type Deps = RelPathObject<Dep>
+
 export interface ExperimentFields extends BaseExperimentFields {
   params?: ValueTreeRoot
   metrics?: ValueTreeRoot
-  deps?: RelPathObject<Dep>
+  deps?: Deps
   outs?: RelPathObject<Out>
 }
 

extension/src/config.ts

@@ -1,10 +1,12 @@
+import { Disposable } from '@hediet/std/disposable'
 import { EventEmitter, Event, workspace } from 'vscode'
 import {
   getOnDidChangePythonExecutionDetails,
   getPythonBinPath
 } from './extensions/python'
 import { ConfigKey, getConfigValue } from './vscode/config'
 import { DeferredDisposable } from './class/deferred'
+import { getOnDidChangeExtensions } from './vscode/extensions'
 
 export class Config extends DeferredDisposable {
   public readonly onDidChangeExecutionDetails: Event<void>
@@ -15,15 +17,20 @@ export class Config extends DeferredDisposable {
 
   private readonly executionDetailsChanged: EventEmitter<void>
 
-  constructor() {
+  private pythonExecutionDetailsListener?: Disposable
+  private readonly onDidChangeExtensionsEvent: Event<void>
+
+  constructor(onDidChangeExtensionsEvent = getOnDidChangeExtensions()) {
     super()
 
     this.executionDetailsChanged = this.dispose.track(new EventEmitter())
     this.onDidChangeExecutionDetails = this.executionDetailsChanged.event
+    this.onDidChangeExtensionsEvent = onDidChangeExtensionsEvent
 
     this.setPythonBinPath()
 
     this.onDidChangePythonExecutionDetails()
+    this.onDidChangeExtensions()
 
     this.onDidConfigurationChange()
   }
@@ -46,15 +53,25 @@ export class Config extends DeferredDisposable {
   }
 
   private async onDidChangePythonExecutionDetails() {
+    this.pythonExecutionDetailsListener?.dispose()
     const onDidChangePythonExecutionDetails =
       await getOnDidChangePythonExecutionDetails()
-    this.dispose.track(
+    this.pythonExecutionDetailsListener = this.dispose.track(
       onDidChangePythonExecutionDetails?.(() => {
         this.setPythonAndNotifyIfChanged()
       })
     )
   }
 
+  private onDidChangeExtensions() {
+    this.dispose.track(
+      this.onDidChangeExtensionsEvent(() => {
+        this.onDidChangePythonExecutionDetails()
+        this.setPythonAndNotifyIfChanged()
+      })
+    )
+  }
+
   private onDidConfigurationChange() {
     this.dispose.track(
       workspace.onDidChangeConfiguration(e => {