From 34484dd80b3a22436167e7567f96ae73d273c07f Mon Sep 17 00:00:00 2001 From: Andrew Truong Date: Fri, 23 Aug 2024 11:36:30 -0400 Subject: [PATCH] move to legacy: urls --- weave/init_message.py | 2 +- weave/legacy/artifact_wandb.py | 2 +- weave/legacy/context.py | 4 ++-- weave/{ => legacy}/urls.py | 0 weave/trace/api.py | 2 +- weave/trace/weave_client.py | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) rename weave/{ => legacy}/urls.py (100%) diff --git a/weave/init_message.py b/weave/init_message.py index 34f107139dd..d76b8e963be 100644 --- a/weave/init_message.py +++ b/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] diff --git a/weave/legacy/artifact_wandb.py b/weave/legacy/artifact_wandb.py index 8f9a2fcfae1..1b44de0bfe4 100644 --- a/weave/legacy/artifact_wandb.py +++ b/weave/legacy/artifact_wandb.py @@ -15,11 +15,11 @@ from weave import ( filesystem, - urls, util, ) from weave import weave_types as types from weave.legacy import ( + urls, errors, engine_trace, artifact_fs, diff --git a/weave/legacy/context.py b/weave/legacy/context.py index 1dfb3fab302..8333bcd9692 100644 --- a/weave/legacy/context.py +++ b/weave/legacy/context.py @@ -4,8 +4,8 @@ import typing from urllib.parse import urlparse -from weave import urls, util -from weave.legacy import client, context_state +from weave import util +from weave.legacy import urls, client, context_state from weave.legacy.client_interface import ClientInterface diff --git a/weave/urls.py b/weave/legacy/urls.py similarity index 100% rename from weave/urls.py rename to weave/legacy/urls.py diff --git a/weave/trace/api.py b/weave/trace/api.py index 5fd03e25d67..449c1b34758 100644 --- a/weave/trace/api.py +++ b/weave/trace/api.py @@ -7,13 +7,13 @@ from typing import Any, Callable, Iterator, Optional, Union from weave.client_context import weave_client as weave_client_context +from weave.legacy import urls from weave.trace.call_context import get_current_call # TODO: type_serializers is imported here to trigger registration of the image serializer. # There is probably a better place for this, but including here for now to get the fix in. from .. import ( type_serializers, # noqa: F401 - urls, util, weave_init, ) diff --git a/weave/trace/weave_client.py b/weave/trace/weave_client.py index 3a3af5e6166..b856c059df4 100644 --- a/weave/trace/weave_client.py +++ b/weave/trace/weave_client.py @@ -9,8 +9,9 @@ import pydantic from requests import HTTPError -from weave import urls, version +from weave import version from weave.client_context import weave_client as weave_client_context +from weave.legacy import urls from weave.trace import call_context, trace_sentry from weave.trace.exception import exception_to_json_str from weave.trace.feedback import FeedbackQuery, RefFeedbackQuery