move to legacy: errors (and add relevant errors to trace)

weave/__init__.py

@@ -18,7 +18,7 @@
 from .legacy.api import *
 from .trace.api import *
 
-from .errors import *
+from .legacy.errors import *
 
 from weave.legacy import mappers_python_def
 

weave/client_context/weave_client.py

@@ -1,8 +1,8 @@
 import threading
 from typing import TYPE_CHECKING, Optional
 
-from weave.errors import WeaveInitError
 from weave.legacy import context_state
+from weave.legacy.errors import WeaveInitError
 
 if TYPE_CHECKING:
     from weave.trace.weave_client import WeaveClient

weave/filesystem.py

@@ -20,9 +20,9 @@
 from aiofiles.threadpool import binary as aiofiles_binary
 from aiofiles.threadpool import text as aiofiles_text
 
-from weave.legacy import cache, engine_trace, environment
+from weave.legacy import cache, engine_trace, environment, errors
 
-from . import errors, util
+from . import util
 
 tracer = engine_trace.tracer()  # type: ignore
 async_utime = aiofiles_os.wrap(os.utime)  # type: ignore

weave/legacy/_dict_utils.py

@@ -3,7 +3,7 @@
 from weave.legacy import box
 from weave.legacy.language_features.tagging import tag_store, tagged_value_type
 
-from .. import errors
+from weave.legacy import errors
 from .. import weave_types as types
 
 

weave/legacy/api.py

@@ -26,7 +26,7 @@
 # needed to enable automatic numpy serialization
 from . import types_numpy as _types_numpy
 
-from .. import errors
+from weave.legacy import errors
 from weave.legacy.decorators import weave_class, mutation, type
 
 from weave.legacy import usage_analytics

weave/legacy/arrow/arrow.py

@@ -11,7 +11,7 @@
 
 py_type = type
 
-from weave import errors
+from weave.legacy import errors
 from weave import weave_types as types
 from weave.legacy import artifact_fs, partial_object
 

weave/legacy/arrow/concat.py

@@ -12,7 +12,7 @@
 import pyarrow as pa
 from pyarrow import compute as pc
 
-from weave import errors
+from weave.legacy import errors
 from weave import weave_types as types
 from weave.legacy.arrow.list_ import (
     ArrowWeaveList,

weave/legacy/arrow/constructors.py

@@ -3,7 +3,7 @@
 
 import pyarrow as pa
 
-from weave import errors
+from weave.legacy import errors
 from weave import weave_types as types
 from weave.legacy import artifact_base, box
 from weave.legacy.arrow import arrow_tags, convert

weave/legacy/arrow/convert.py

@@ -4,9 +4,9 @@
 import pyarrow.compute as pc
 
 from weave.legacy import api as api
-from weave import errors, weave_internal
+from weave import weave_internal
 from weave import weave_types as types
-from weave.legacy import arrow_util, artifact_base, artifact_mem, box, mappers_arrow
+from weave.legacy import errors, arrow_util, artifact_base, artifact_mem, box, mappers_arrow
 from weave.legacy.arrow.arrow import (
     ArrowWeaveListType,
 )

weave/legacy/arrow/list_.py

@@ -11,11 +11,11 @@
 import typing_extensions
 
 from weave import (
-    errors,
     weave_internal,
 )
 from weave import weave_types as types
 from weave.legacy import (
+    errors,
     _dict_utils,
     artifact_base,
     box,

weave/legacy/artifact_fs.py

@@ -6,7 +6,7 @@
 import os
 import typing
 
-from weave import errors
+from weave.legacy import errors
 from weave import weave_types as types
 from weave.legacy import artifact_base, file_base, object_context, ref_base, uris
 from weave.legacy.language_features.tagging import tag_store

weave/legacy/artifact_local.py

@@ -9,9 +9,17 @@
 import typing
 from datetime import datetime
 
-from weave import errors, filesystem, util
+from weave import filesystem, util
 from weave import weave_types as types
-from weave.legacy import artifact_fs, artifact_wandb, environment, file_base, file_util, uris
+from weave.legacy import (
+    artifact_fs,
+    artifact_wandb,
+    environment,
+    errors,
+    file_base,
+    file_util,
+    uris,
+)
 
 WORKING_DIR_PREFIX = "__working__"
 

weave/legacy/artifact_mem.py

@@ -2,7 +2,7 @@
 
 from . import artifact_base
 from weave import weave_types as types
-from weave import errors
+from weave.legacy import errors
 from weave.legacy import ref_base
 
 

weave/legacy/artifact_wandb.py

@@ -14,13 +14,13 @@
 from wandb.sdk.lib.hashutil import b64_to_hex_id, hex_to_b64_id
 
 from weave import (
-    errors,
     filesystem,
     urls,
     util,
 )
 from weave import weave_types as types
 from weave.legacy import (
+    errors,
     engine_trace,
     artifact_fs,
     eager,

weave/legacy/cache.py

@@ -6,7 +6,7 @@
 import time
 import typing
 
-from weave import errors
+from weave.legacy import errors
 from weave.legacy import context_state, environment, wandb_api, engine_trace
 
 statsd = engine_trace.statsd()  # type: ignore

weave/legacy/compile.py

@@ -6,11 +6,11 @@
 import typing
 
 from weave import (
-    errors,
     weave_internal,
 )
 from weave import weave_types as types
 from weave.legacy import (
+    errors,
     engine_trace,
     box,
     compile_domain,

weave/legacy/compile_domain.py

@@ -2,7 +2,7 @@
 
 import graphql
 
-from weave import errors
+from weave.legacy import errors
 from weave import weave_types as types
 from weave.legacy import gql_op_plugin, gql_to_weave, graph, op_args, stitch, registry_mem
 from weave.legacy.input_provider import InputAndStitchProvider

weave/legacy/compile_table.py

@@ -2,7 +2,7 @@
 
 import typing
 
-from weave import errors
+from weave.legacy import errors
 from weave.legacy import stitch
 
 KeyTree = typing.Dict[str, "KeyTree"]  # type:ignore

weave/legacy/decorator_class.py

@@ -1,7 +1,7 @@
 import inspect
 import typing
 
-from weave import errors
+from weave.legacy import errors
 from weave import weave_types as types
 from weave.legacy import context_state, derive_op, op_def, registry_mem
 

weave/legacy/decorator_type.py

@@ -2,7 +2,7 @@
 import inspect
 import typing
 
-from weave import errors
+from weave.legacy import errors
 from weave import weave_types as types
 from weave.legacy import context_state, decorator_class, object_type_ref_util, infer_types
 

weave/legacy/derive_op.py

@@ -7,12 +7,12 @@
 import typing
 
 from weave import (
-    errors,
     storage,
     weave_internal,
 )
 from weave import weave_types as types
 from weave.legacy import (
+    errors,
     parallelism,
     registry_mem,
     box,

weave/legacy/dispatch.py

@@ -5,9 +5,9 @@
 import typing
 from dataclasses import dataclass
 
-from weave import errors, util
+from weave import util
 from weave import weave_types as types
-from weave.legacy import graph, memo, op_args, op_def, pyfunc_type_util, registry_mem
+from weave.legacy import graph, memo, op_args, op_def, pyfunc_type_util, registry_mem, errors
 from weave.legacy.language_features.tagging.is_tag_getter import is_tag_getter
 from weave.legacy.language_features.tagging.tagged_value_type import TaggedValueType
 

weave/legacy/environment.py

@@ -10,8 +10,8 @@
 import typing
 from distutils.util import strtobool
 from urllib.parse import urlparse
-
-from .. import errors, util
+from weave.legacy import errors
+from .. import util
 
 if typing.TYPE_CHECKING:
     from .. import logs