move to legacy: environment

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 . 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/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
+from weave.legacy import cache, engine_trace, environment
 
-from . import environment, errors, util
+from . import errors, util
 
 tracer = engine_trace.tracer()  # type: ignore
 async_utime = aiofiles_os.wrap(os.utime)  # type: ignore

weave/legacy/artifact_local.py

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

weave/legacy/cache.py

@@ -6,8 +6,8 @@
 import time
 import typing
 
-from weave import environment, errors
-from weave.legacy import context_state, wandb_api, engine_trace
+from weave import errors
+from weave.legacy import context_state, environment, wandb_api, engine_trace
 
 statsd = engine_trace.statsd()  # type: ignore
 logger = logging.getLogger("root")

weave/legacy/engine_trace.py

@@ -18,8 +18,8 @@
 import time
 import typing
 
-from .. import environment, logs
-from . import stream_data_interfaces
+from .. import logs
+from . import environment, stream_data_interfaces
 
 
 # Thanks co-pilot!

weave/environment.py → weave/legacy/environment.py

@@ -11,10 +11,10 @@
 from distutils.util import strtobool
 from urllib.parse import urlparse
 
-from . import errors, util
+from .. import errors, util
 
 if typing.TYPE_CHECKING:
-    from . import logs
+    from .. import logs
 
 WANDB_ERROR_REPORTING = "WANDB_ERROR_REPORTING"
 WEAVE_USAGE_ANALYTICS = "WEAVE_USAGE_ANALYTICS"
@@ -105,7 +105,7 @@ def is_public() -> bool:
 
 
 def weave_log_format(default: "logs.LogFormat") -> "logs.LogFormat":
-    from .logs import LogFormat
+    from ..logs import LogFormat
 
     return LogFormat(os.getenv("WEAVE_LOG_FORMAT", default))
 

weave/legacy/execute.py

@@ -10,7 +10,6 @@
 from collections.abc import Mapping
 
 from weave import (
-    environment,
     errors,
 )
 from weave import weave_types as types
@@ -23,6 +22,7 @@
 # Language Features
 from weave.legacy import (
     engine_trace,
+    environment,
     parallelism,
     ref_base,
     registry_mem,

weave/legacy/file_util.py

@@ -2,8 +2,8 @@
 import pathlib
 import typing
 
-from weave import environment, filesystem
-from weave.legacy import cache, path_util
+from weave import filesystem
+from weave.legacy import cache, environment, path_util
 
 
 def get_allowed_dir() -> pathlib.Path:

weave/legacy/gql_schema.py

@@ -2,7 +2,7 @@
 
 import graphql
 
-from weave import environment
+from weave.legacy import environment
 from weave.legacy import wandb_client_api
 
 _GQL_SCHEMA_CACHE: dict[typing.Optional[str], graphql.GraphQLSchema] = {}

weave/legacy/op_def_type.py

@@ -11,9 +11,9 @@
 from _ast import AsyncFunctionDef, ExceptHandler
 from typing import Any
 
-from weave import environment, errors, storage
+from weave import errors, storage
 from weave import weave_types as types
-from weave.legacy import artifact_fs, artifact_local, context_state, infer_types, registry_mem
+from weave.legacy import artifact_fs, artifact_local, context_state, environment, infer_types, registry_mem
 
 if typing.TYPE_CHECKING:
     from .op_def import OpDef

weave/legacy/ops_domain/wbgqlquery_op.py

@@ -1,10 +1,10 @@
 import logging
 import typing
 
-from weave import environment, errors
+from weave import errors
 from weave import weave_types as types
 from weave.legacy.api import op
-from weave.legacy import engine_trace, mappers_gql, partial_object
+from weave.legacy import engine_trace, environment, mappers_gql, partial_object
 from weave.legacy.language_features.tagging import tagged_value_type
 from weave.legacy.ops_domain import wb_domain_types as wdt
 from weave.legacy.wandb_client_api import wandb_gql_query

weave/legacy/ops_primitives/file.py

@@ -1,7 +1,7 @@
 import json
 import typing
 
-from weave import environment as weave_env
+from weave.legacy import environment as weave_env
 from weave import errors
 from weave import weave_types as types
 from weave.legacy.api import op

weave/legacy/ops_primitives/file_local.py

@@ -1,7 +1,7 @@
 import os
 import typing
 
-from weave import environment
+from weave.legacy import environment
 from weave import weave_types as types
 from weave.legacy.api import op
 from weave.legacy import file_local

weave/legacy/ops_primitives/projection_utils.py

@@ -9,8 +9,8 @@
 from sklearn.decomposition import PCA
 from sklearn.manifold import TSNE
 
-from weave import environment, errors
-from weave.legacy import context_state
+from weave import errors
+from weave.legacy import context_state, environment
 
 umap_lib = {}
 

weave/legacy/runfiles_wandb.py

@@ -6,7 +6,7 @@
 import shutil
 import typing
 
-from weave import environment as weave_env
+from weave.legacy import environment as weave_env
 from weave import errors, filesystem
 from weave import weave_types as types
 from weave.legacy import artifact_fs, file_util, memo, uris, wandb_client_api

weave/legacy/signal_handlers.py

@@ -10,7 +10,7 @@
 import typing
 from types import FrameType
 
-from weave import environment
+from weave.legacy import environment
 
 
 def dump_folder() -> pathlib.Path:

weave/legacy/usage_analytics.py

@@ -5,7 +5,7 @@
 
 from weave.legacy import context_state
 
-from .. import environment
+from . import environment
 
 analytics.write_key = "uJ8vZgKqTBVH6ZdhD4GZGZYsR7ucfJmb"
 

weave/legacy/wandb_api.py

@@ -15,7 +15,7 @@
 from requests.auth import HTTPBasicAuth
 
 from weave import errors
-from weave import environment as weave_env
+from weave.legacy import environment as weave_env
 from weave.legacy import wandb_client_api, engine_trace
 
 # Importing at the top-level namespace so other files can import from here.

weave/legacy/wandb_file_manager.py

@@ -13,7 +13,7 @@
 from wandb.sdk.lib import hashutil
 
 from weave import errors, filesystem, weave_http
-from weave import environment as weave_env
+from weave.legacy import environment as weave_env
 from weave.legacy import artifact_wandb, cache, wandb_api, engine_trace
 
 tracer = engine_trace.tracer()  # type: ignore

weave/legacy/wandb_interface/wandb_stream_table.py

@@ -15,10 +15,11 @@
 from wandb.sdk.lib.paths import LogicalPath
 from wandb.sdk.lib.printer import get_printer
 
-from weave import environment, errors, storage, weave_types
+from weave import errors, storage, weave_types
 from weave.legacy import (
     artifact_base,
     box,
+    environment,
     file_util,
     graph,
     runfiles_wandb,

weave/logs.py

@@ -12,7 +12,7 @@
 
 from pythonjsonlogger import jsonlogger
 
-from . import environment
+from weave.legacy import environment
 
 try:
     from flask.logging import wsgi_errors_stream

weave/tests/legacy/test_access.py

@@ -1,9 +1,9 @@
 import pytest
 
 import weave
-from weave.legacy import artifact_fs, artifact_local, wandb_api
+from weave.legacy import artifact_fs, artifact_local, environment, wandb_api
 
-from ... import environment, errors, storage
+from ... import errors, storage
 
 
 @pytest.fixture()

weave/tests/legacy/test_cache.py

@@ -2,8 +2,7 @@
 import os
 import time
 
-from weave import environment
-from weave.legacy import cache
+from weave.legacy import cache, environment
 
 
 def test_lru_time_window_cache():

weave/tests/legacy/test_execute.py

@@ -4,9 +4,9 @@
 import pytest
 
 import weave
-from weave.legacy import execute, ops
+from weave.legacy import environment, execute, ops
 
-from ... import api, environment, weave_internal
+from ... import api, weave_internal
 from ... import weave_types as types
 from . import test_wb
 

weave/tests/legacy/test_file.py

@@ -1,9 +1,9 @@
 import pytest
 
 import weave
-from weave.legacy import context_state, ops
+from weave.legacy import context_state, environment, ops
 
-from ... import api, environment, errors
+from ... import api, errors
 
 
 def test_dir():

weave/tests/legacy/test_filesystem.py

@@ -2,7 +2,9 @@
 
 import pytest
 
-from ... import environment, errors, filesystem
+from weave.legacy import environment
+
+from ... import errors, filesystem
 
 
 @pytest.fixture()

weave/trace/op_type.py

@@ -21,7 +21,8 @@
 )
 from weave.trace.refs import ObjectRef
 
-from .. import environment, errors, storage
+from .. import errors, storage
+from ..legacy import environment
 from . import serializer
 from .op import Op
 

weave/trace_server/remote_http_trace_server.py

@@ -6,7 +6,7 @@
 import tenacity
 from pydantic import BaseModel, ValidationError
 
-from weave.environment import weave_trace_server_url
+from weave.legacy.environment import weave_trace_server_url
 from weave.legacy.wandb_interface import project_creator
 
 from . import requests

weave/urls.py

@@ -2,9 +2,7 @@
 
 from wandb import util as wb_util
 
-from weave.legacy import context_state
-
-from . import environment
+from weave.legacy import context_state, environment
 
 BROWSE3_PATH = "browse3"
 WEAVE_SLUG = "weave"

weave/weave_server.py

@@ -26,7 +26,6 @@
 from werkzeug.exceptions import HTTPException
 
 from weave import (
-    environment,
     errors,
     filesystem,
     logs,
@@ -36,6 +35,7 @@
 from weave.legacy import (
     context_state,
     engine_trace,
+    environment,
     graph,
     registry_mem,
     server,