chore(weave): Legacy Refactor pt14

examples/experimental/skip_test/Confusion Matrix.ipynb

@@ -12,7 +12,7 @@
     "import itertools\n",
     "from PIL import Image\n",
     "import weave\n",
-    "from weave import storage\n",
+    "from weave.legacy import storage\n",
     "from weave import weave_internal\n",
     "#weave.use_frontend_devmode()"
    ]
@@ -89,7 +89,7 @@
    "id": "6583e01c",
    "metadata": {},
    "source": [
-    "## Facet is fun!"
+    "## Facet is fun!\n"
    ]
   },
   {

examples/experimental/skip_test/Performance profiling.ipynb

@@ -29,7 +29,7 @@
     "import os\n",
     "import cProfile\n",
     "import weave\n",
-    "from weave import storage\n",
+    "from weave.legacy import storage\n",
     "import random\n",
     "import time\n",
     "import pyarrow as pa\n",

examples/experimental/skip_test/Vectorizing.ipynb

@@ -9,8 +9,8 @@
    "source": [
     "import weave\n",
     "import time\n",
-    "from weave import storage\n",
-    "from weave import geom"
+    "from weave.legacy import storage\n",
+    "from weave.legacy.ops_primitives import geom"
    ]
   },
   {

examples/experimental/skip_test/branching_runs.ipynb

@@ -11,8 +11,9 @@
     "import weave\n",
     "from weave.legacy.ops_primitives import ArrowWeaveList\n",
     "from weave.legacy.ops_domain import RunSegment\n",
-    "from weave import storage, publish, type_of\n",
-    "from weave.weave_types import List\n",
+    "from weave.legacy import storage\n",
+    "from weave import publish, type_of\n",
+    "from weave.legacy.weave_types import List\n",
     "import typing\n",
     "import time\n",
     "import sys\n",

mypy.ini

@@ -151,7 +151,7 @@ disallow_untyped_calls = False
 disallow_untyped_defs = False
 disallow_untyped_calls = False
 
-[mypy-weave.weave_types]
+[mypy-weave.legacy.weave_types]
 disallow_untyped_defs = False
 disallow_untyped_calls = False
 

weave/__init__.py

@@ -12,13 +12,13 @@
 
 _loading_builtins_token = _context_state.set_loading_built_ins()
 
-from . import weave_types as types
-from . import storage
+from weave.legacy import weave_types as types
+from .legacy import storage
 
-from .query_api import *
-from .trace_api import *
+from .legacy.api import *
+from .trace.api import *
 
-from .errors import *
+from .legacy.errors import *
 
 from weave.legacy import mappers_python_def
 
@@ -64,7 +64,7 @@
 # Special object informing doc generation tooling which symbols
 # to document & to associate with this module.
 __docspec__ = [
-    # Re-exported from trace_api
+    # Re-exported from trace.api
     init,
     publish,
     ref,

weave/api.py

@@ -1,4 +1,4 @@
 """These are the top-level functions in the `import weave` namespace."""
 
-from .query_api import *
-from .trace_api import *
+from .legacy.api import *
+from .trace.api import *

weave/cli.py

@@ -26,7 +26,7 @@ def cli() -> None:
 # def start_ui() -> None:
 #     print("Starting server...")
 #     try:
-#         from weave import server
+#         from weave.legacy import server
 #     except ModuleNotFoundError:
 #         print("Run 'pip install weave[engine]' to use the local server.")
 #         sys.exit(1)

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/conftest.py

@@ -15,7 +15,7 @@
 import weave
 from weave import weave_init
 from weave.legacy import client as client_legacy
-from weave.legacy import context_state, io_service, serialize
+from weave.legacy import context_state, environment, io_service, serialize
 from weave.legacy.language_features.tagging.tag_store import isolated_tagging_context
 from weave.trace_server import (
     clickhouse_trace_server_batched,
@@ -24,7 +24,7 @@
 )
 from weave.trace_server import trace_server_interface as tsi
 
-from . import environment, logs
+from .legacy import logs
 from .tests import fixture_fakewandb
 from .tests.trace.trace_server_clickhouse_conftest import *
 from .tests.wandb_system_tests_conftest import *

weave/deploy/gcp/__init__.py

@@ -7,7 +7,8 @@
 import typing
 from pathlib import Path
 
-from weave import __version__, environment
+from weave import __version__
+from weave.legacy import environment
 from weave.legacy.artifact_wandb import WeaveWBArtifactURI as WeaveWBArtifactURI
 from weave.trace.refs import ObjectRef, parse_uri
 

weave/deploy/modal/__init__.py

@@ -5,8 +5,8 @@
 import typing
 from pathlib import Path
 
-from weave import environment
 from weave.legacy import artifact_wandb as artifact_wandb
+from weave.legacy import environment
 from weave.trace.refs import ObjectRef, parse_uri
 
 try:

weave/deploy/modal/stub.py

@@ -27,7 +27,7 @@
 @asgi_app(label=safe_name(uri.name))
 def fastapi_app() -> FastAPI:
     from weave import api
-    from weave.serve_fastapi import object_method_app
+    from weave.trace.serve_fastapi import object_method_app
 
     uri_ref = parse_uri(os.environ["MODEL_REF"])
     if not isinstance(uri_ref, ObjectRef):

weave/init_message.py

@@ -1,6 +1,6 @@
 import typing
 
-from weave import urls
+from weave.legacy import urls
 
 if typing.TYPE_CHECKING:
     import packaging.version  # type: ignore[import-not-found]

weave/legacy/_dict_utils.py

@@ -3,8 +3,8 @@
 from weave.legacy import box
 from weave.legacy.language_features.tagging import tag_store, tagged_value_type
 
-from .. import errors
-from .. import weave_types as types
+from weave.legacy import errors
+from weave.legacy import weave_types as types
 
 
 def typeddict_pick_output_type(input_types):