Skip to content

Commit

Permalink
split: ref_util into trace and legacy components (this one is hard copy)
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewtruong committed Aug 26, 2024
1 parent e1a30d9 commit c72fef0
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 5 deletions.
2 changes: 1 addition & 1 deletion weave/legacy/tests/test_refs.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from weave.flow.obj import Object
from weave.legacy.weave import artifact_local, storage
from weave.legacy.weave import ops_arrow as arrow
from weave.trace import ref_util
from weave.legacy.weave import ref_util
from weave.trace_server.refs_internal import (
DICT_KEY_EDGE_NAME,
LIST_INDEX_EDGE_NAME,
Expand Down
2 changes: 1 addition & 1 deletion weave/legacy/weave/arrow/list_.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
tag_store,
tagged_value_type,
)
from weave.trace import ref_util
from weave.legacy.weave import ref_util


def reverse_dict(d: dict) -> dict:
Expand Down
2 changes: 1 addition & 1 deletion weave/legacy/weave/artifact_fs.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from weave.legacy.weave import weave_types as types
from weave.legacy.weave import artifact_base, file_base, object_context, ref_base, uris
from weave.legacy.weave.language_features.tagging import tag_store
from weave.trace import ref_util
from weave.legacy.weave import ref_util

if typing.TYPE_CHECKING:
from weave.legacy.weave import graph
Expand Down
2 changes: 1 addition & 1 deletion weave/legacy/weave/box.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import numpy as np

from weave.trace import ref_util
from weave.legacy.weave import ref_util
from weave.legacy.weave import context_state


Expand Down
2 changes: 1 addition & 1 deletion weave/legacy/weave/object_type_ref_util.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import typing

from weave.trace import ref_util
from weave.legacy.weave import ref_util
from weave.legacy.weave import context_state


Expand Down
105 changes: 105 additions & 0 deletions weave/legacy/weave/ref_util.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
import dataclasses
import typing
from urllib import parse

from weave.legacy.weave import box
from weave.trace_server import refs_internal

DICT_KEY_EDGE_NAME = refs_internal.DICT_KEY_EDGE_NAME
LIST_INDEX_EDGE_NAME = refs_internal.LIST_INDEX_EDGE_NAME
OBJECT_ATTR_EDGE_NAME = refs_internal.OBJECT_ATTR_EDGE_NAME
AWL_ROW_EDGE_NAME = "row"
AWL_COL_EDGE_NAME = "col"


def parse_local_ref_str(s: str) -> typing.Tuple[str, typing.Optional[list[str]]]:
if "#" not in s:
return s, None
path, extra = s.split("#", 1)
return path, extra.split("/")


def val_with_relative_ref(
parent_object: typing.Any, child_object: typing.Any, ref_extra_parts: list[str]
) -> typing.Any:
from weave.legacy.weave import context_state, ref_base

# If we already have a ref, resolve it
if isinstance(child_object, ref_base.Ref):
child_object = child_object.get()

# Only do this if ref_tracking_enabled right now. I just want to
# avoid introducing new behavior into W&B prod for the moment.
if context_state.ref_tracking_enabled():
from weave.legacy.weave import storage

child_ref = storage.get_ref(child_object)
parent_ref = ref_base.get_ref(parent_object)

# This first check is super important - if the child ref is pointing
# to a completely different artifact (ref), then we want to point to
# the child's inherent ref, not the relative ref from the parent.
if child_ref is not None:
if parent_ref is not None:
if hasattr(child_ref, "digest") and hasattr(parent_ref, "digest"):
if child_ref.digest != parent_ref.digest:
return child_object

if parent_ref is not None:
child_object = box.box(child_object)
sub_ref = parent_ref.with_extra(None, child_object, ref_extra_parts)
ref_base._put_ref(child_object, sub_ref)
return child_object

return child_object


@dataclasses.dataclass
class RefExtraTuple:
edge_type: str
part: str


@dataclasses.dataclass
class ParsedRef:
scheme: str
entity: typing.Optional[str]
project: typing.Optional[str]
artifact: str
alias: str
file_path_parts: list[str]
ref_extra_tuples: list[RefExtraTuple]


def parse_ref_str(s: str) -> ParsedRef:
scheme, _, path, _, _, ref_extra = parse.urlparse(s)
entity = None
project = None
assert path.startswith("/")
path = path[1:]
path_parts = path.split("/")
if scheme == "wandb-artifact":
entity = path_parts[0]
project = path_parts[1]
path_parts = path_parts[2:]

artifact, alias = path_parts[0].split(":")
file_path_parts = path_parts[1:]
ref_extra_tuples = []
if ref_extra:
ref_extra_parts = ref_extra.split("/")
assert len(ref_extra_parts) % 2 == 0
for i in range(0, len(ref_extra_parts), 2):
edge_type = ref_extra_parts[i]
part = ref_extra_parts[i + 1]
ref_extra_tuples.append(RefExtraTuple(edge_type, part))

return ParsedRef(
scheme=scheme,
entity=entity,
project=project,
artifact=artifact,
alias=alias,
file_path_parts=file_path_parts,
ref_extra_tuples=ref_extra_tuples,
)

0 comments on commit c72fef0

Please sign in to comment.