feat: object and op deletion backend + basic sdk + basic fe

tests/trace/test_weave_client.py

@@ -1544,3 +1544,117 @@ def func():
     calls = list(func.calls())
     call = calls[0]
     assert len(call.display_name) <= MAX_DISPLAY_NAME_LENGTH
+
+
+def test_object_deletion(client):
+    # Simple case, delete a single version of an object
+    obj = {"a": 5}
+    weave_obj = client.save(obj, "my-obj")
+    assert client.get(weave_obj.ref) == obj
+
+    client.delete_object(weave_obj.ref)
+    with pytest.raises(weave.trace_server.errors.ObjectDeletedError):
+        client.get(weave_obj.ref)
+
+    # create 3 versions of the object
+    obj["a"] = 6
+    weave_obj2 = client.save(obj, "my-obj")
+    obj["a"] = 7
+    weave_obj3 = client.save(obj, "my-obj")
+    obj["a"] = 8
+    weave_obj4 = client.save(obj, "my-obj")
+
+    # delete weave_obj3 with class method
+    weave_obj3.delete()
+
+    # make sure we can't get the deleted object
+    with pytest.raises(weave.trace_server.errors.ObjectDeletedError):
+        client.get(weave_obj3.ref)
+
+    # count the number of versions of the object
+    versions = client.server.objs_query(
+        req=tsi.ObjQueryReq(
+            project_id=client._project_id(),
+            names=["my-obj"],
+        )
+    )
+    assert len(versions.objs) == 2
+
+    # make sure we can still get the existing object versions
+    assert client.get(weave_obj4.ref)
+    assert client.get(weave_obj2.ref)
+
+    weave_obj4.delete()
+    weave_obj2.delete()
+
+    versions = client.server.objs_query(
+        req=tsi.ObjQueryReq(
+            project_id=client._project_id(),
+            names=["my-obj"],
+        )
+    )
+    assert len(versions.objs) == 0
+
+
+def test_recursive_object_deletion(client):
+    # Create a bunch of objects that refer to each other
+    obj1 = {"a": 5}
+    obj1_ref = client.save(obj1, "obj1").ref
+
+    obj2 = {"b": obj1_ref}
+    obj2_ref = client.save(obj2, "obj2").ref
+
+    obj3 = {"c": obj2_ref}
+    obj3_ref = client.save(obj3, "obj3").ref
+
+    # Delete obj1
+    client.get(obj1_ref).delete()
+
+    # Make sure we can't get obj1
+    with pytest.raises(weave.trace_server.errors.ObjectDeletedError):
+        out = client.get(obj1_ref)
+        print(out)
+
+    # Make sure we can get obj2, but the ref to object 1 should return None
+    assert client.get(obj2_ref) == {"b": None}
+    # Object2 should store the ref to object2, as instantiated
+    assert client.get(obj3_ref) == {"c": obj2}
+
+
+def test_table_object_deletion(client):
+    # create a dataset
+    data = [{"a": 1}, {"a": 2}, {"a": 3}]
+    dataset = weave.Table(data)
+    dataset_ref = client.save(dataset, "my-dataset").ref
+
+    # get the dataset
+    assert client.get(dataset_ref) == dataset
+
+    # delete the dataset
+    client.delete_object(dataset_ref)
+
+    # make sure we can't get the dataset
+    with pytest.raises(weave.trace_server.errors.ObjectDeletedError):
+        client.get(dataset_ref)
+
+    # recreate the EXACT SAME dataset
+    dataset = weave.Table(data)
+    dataset_ref = client.save(dataset, "my-dataset").ref
+
+    assert client.get(dataset_ref) == dataset
+    read_res = client.server.obj_read(
+        tsi.ObjReadReq(
+            project_id=client._project_id(),
+            object_id=dataset_ref.name,
+            digest=dataset_ref.digest,
+        )
+    )
+    # Version should be bumped
+    assert read_res.obj.version_index == 1
+
+    # delete the dataset again
+    client.delete_object(dataset_ref)
+
+    # make sure we can't get the dataset
+    with pytest.raises(weave.trace_server.errors.ObjectDeletedError):
+        client.get(dataset_ref)

weave-js/src/components/PagePanelComponents/Home/Browse2/SmallRef.tsx

@@ -125,6 +125,11 @@ export const SmallRef: FC<{
   }
   const objectVersion = useObjectVersion(objVersionKey);
   const opVersion = useOpVersion(opVersionKey);
+
+  const isDeleted =
+    isObjDeleteError(objectVersion?.error) ||
+    isObjDeleteError(opVersion?.error);
+
   const versionIndex =
     objectVersion.result?.versionIndex ?? opVersion.result?.versionIndex;
 
@@ -140,7 +145,6 @@ export const SmallRef: FC<{
     rootType = {type: 'OpDef'};
   }
   const {label} = objectRefDisplayName(objRef, versionIndex);
-
   const rootTypeName = getTypeName(rootType);
   let icon: IconName = IconNames.CubeContainer;
   if (rootTypeName === 'Dataset') {
@@ -177,13 +181,14 @@ export const SmallRef: FC<{
             overflow: 'hidden',
             whiteSpace: 'nowrap',
             textOverflow: 'ellipsis',
+            textDecoration: isDeleted ? 'line-through' : 'none',
           }}>
           {label}
         </Box>
       )}
     </Box>
   );
-  if (refTypeQuery.loading) {
+  if (refTypeQuery.loading || isDeleted) {
     return Item;
   }
   if (!isArtifactRef && !isWeaveObjRef) {
@@ -200,3 +205,12 @@ export const SmallRef: FC<{
     </Link>
   );
 };
+
+export const isObjDeleteError = (e: any): boolean => {
+  if (e == null) {
+    return false;
+  }
+  const errorStr = String(e);
+  const regex = /Obj .* was deleted at .*/;
+  return regex.test(errorStr);
+};

weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/ObjectViewer.tsx

@@ -1,4 +1,4 @@
 import Box from '@mui/material/Box';
 import {
   DataGridProProps,
   GridApiPro,
@@ -7,6 +7,7 @@
   GridRowId,
 } from '@mui/x-data-grid-pro';
 import {Button} from '@wandb/weave/components/Button';
+import {parseRef} from '@wandb/weave/react';
 import _ from 'lodash';
 import React, {
   Dispatch,
@@ -47,6 +48,7 @@
   TraverseContext,
 } from './traverse';
 import {ValueView} from './ValueView';
+import {objectRefDisplayName} from '../../../Browse2/SmallRef';
 
 type Data = Record<string, any> | any[];
 
@@ -153,10 +155,17 @@
 
     const refValues: RefValues = {};
     for (const [r, v] of _.zip(refs, resolvedRefData)) {
-      if (!r || !v) {
+      if (!r) {
         // Shouldn't be possible
         continue;
       }
+      if (!v) {
+        // Value for ref not found, probably deleted
+        refValues[r] = {
+          _weave_is_deleted_ref: objectRefDisplayName(parseRef(r)).label,
+        };
+        continue;
+      }
       let val = r;
       if (v == null) {
         console.error('Error resolving ref', r);

weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/ObjectViewerGroupingCell.tsx

@@ -32,6 +32,8 @@ export const ObjectViewerGroupingCell: FC<
     event.stopPropagation();
   };
 
+  const deletedRef = row.value?._weave_is_deleted_ref;
+
   const tooltipContent = row.path.toString();
   const box = (
     <CursorBox
@@ -109,8 +111,9 @@ export const ObjectViewerGroupingCell: FC<
               textOverflow: 'ellipsis',
               whiteSpace: 'nowrap',
               flex: '1 1 auto',
+              textDecoration: deletedRef ? 'line-through' : 'none',
             }}>
-            {props.value}
+            {deletedRef ?? props.value}
           </Box>
         }
       />

weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectVersionPage.tsx

@@ -1,17 +1,21 @@
 import Box from '@mui/material/Box';
+import Stack from '@mui/material/Stack';
+import {Button} from '@wandb/weave/components/Button';
 import {useObjectViewEvent} from '@wandb/weave/integrations/analytics/useViewEvents';
-import React, {useMemo} from 'react';
+import React, {useMemo, useState} from 'react';
 
 import {maybePluralizeWord} from '../../../../../core/util/string';
 import {Icon, IconName} from '../../../../Icon';
 import {LoadingDots} from '../../../../LoadingDots';
 import {Tailwind} from '../../../../Tailwind';
 import {Tooltip} from '../../../../Tooltip';
+import {useClosePeek} from '../context';
 import {NotFoundPanel} from '../NotFoundPanel';
 import {CustomWeaveTypeProjectContext} from '../typeViews/CustomWeaveTypeDispatcher';
 import {WeaveCHTableSourceRefContext} from './CallPage/DataTableView';
 import {ObjectViewerSection} from './CallPage/ObjectViewerSection';
 import {WFHighLevelCallFilter} from './CallsPage/callsTableFilter';
+import {DeleteModal} from './common/DeleteModal';
 import {
   CallLink,
   CallsLink,
@@ -94,7 +98,9 @@ export const ObjectVersionPage: React.FC<{
     path: props.filePath,
     refExtra: props.refExtra,
   });
-  if (objectVersion.loading) {
+  if (objectVersion.error) {
+    return <NotFoundPanel title={objectVersion.error.message} />;
+  } else if (objectVersion.loading) {
     return <CenteredAnimatedLoader />;
   } else if (objectVersion.result == null) {
     return <NotFoundPanel title="Object not found" />;
@@ -108,7 +114,10 @@ const ObjectVersionPageInner: React.FC<{
 }> = ({objectVersion}) => {
   useObjectViewEvent(objectVersion);
 
-  const {useRootObjectVersions, useCalls, useRefsData} = useWFHooks();
+  const closePeek = useClosePeek();
+  const {useRootObjectVersions, useCalls, useRefsData, useObjectDeleteFunc} =
+    useWFHooks();
+  const objectDelete = useObjectDeleteFunc();
   const entityName = objectVersion.entity;
   const projectName = objectVersion.project;
   const objectName = objectVersion.objectId;
@@ -189,6 +198,7 @@ const ObjectVersionPageInner: React.FC<{
     return viewerData;
   }, [viewerData]);
 
+  const [deleteModalOpen, setDeleteModalOpen] = useState(false);
   const isDataset = baseObjectClass === 'Dataset' && refExtra == null;
   const isEvaluation = baseObjectClass === 'Evaluation' && refExtra == null;
   const evalHasCalls = (consumingCalls.result?.length ?? 0) > 0;
@@ -211,47 +221,70 @@ const ObjectVersionPageInner: React.FC<{
         </Tailwind>
       }
       headerContent={
-        <SimpleKeyValueTable
-          data={{
-            [refExtra ? 'Parent Object' : 'Name']: (
-              <>
-                {objectName}{' '}
-                {objectVersions.loading ? (
-                  <LoadingDots />
-                ) : (
+        <Stack
+          direction="row"
+          justifyContent="space-between"
+          alignItems="flex-start"
+          width="100%">
+          <Box flexGrow={1}>
+            <SimpleKeyValueTable
+              data={{
+                [refExtra ? 'Parent Object' : 'Name']: (
                   <>
-                    [
-                    <ObjectVersionsLink
-                      entity={entityName}
-                      project={projectName}
-                      filter={{
-                        objectName,
-                      }}
-                      versionCount={objectVersionCount}
-                      neverPeek
-                      variant="secondary"
-                    />
-                    ]
+                    {objectName}{' '}
+                    {objectVersions.loading ? (
+                      <LoadingDots />
+                    ) : (
+                      <>
+                        [
+                        <ObjectVersionsLink
+                          entity={entityName}
+                          project={projectName}
+                          filter={{
+                            objectName,
+                          }}
+                          versionCount={objectVersionCount}
+                          neverPeek
+                          variant="secondary"
+                        />
+                        ]
+                      </>
+                    )}
                   </>
-                )}
-              </>
-            ),
-            Version: <>{objectVersionIndex}</>,
-            ...(refExtra
-              ? {
-                  Subpath: refExtra,
-                }
-              : {}),
-            // 'Type Version': (
-            //   <TypeVersionLink
-            //     entityName={entityName}
-            //     projectName={projectName}
-            //     typeName={typeName}
-            //     version={typeVersionHash}
-            //   />
-            // ),
-          }}
-        />
+                ),
+                Version: <>{objectVersionIndex}</>,
+                ...(refExtra
+                  ? {
+                      Subpath: refExtra,
+                    }
+                  : {}),
+                // 'Type Version': (
+                //   <TypeVersionLink
+                //     entityName={entityName}
+                //     projectName={projectName}
+                //     typeName={typeName}
+                //     version={typeVersionHash}
+                //   />
+                // ),
+              }}
+            />
+          </Box>
+
+          <Box mr={1}>
+            <Button
+              icon="delete"
+              variant="ghost"
+              onClick={() => setDeleteModalOpen(true)}
+            />
+          </Box>
+          <DeleteModal
+            open={deleteModalOpen}
+            onClose={() => setDeleteModalOpen(false)}
+            deleteTargetStr={`${objectVersion.objectId}:v${objectVersion.versionIndex}`}
+            onDelete={() => objectDelete(objectVersion)}
+            onSuccess={closePeek}
+          />
+        </Stack>
       }
       // menuItems={[
       //   {