Merge branch 'master' into spencerpearson/no-retry-conflict

wandb/apis/public.py

@@ -23,7 +23,16 @@
 import urllib
 from collections import namedtuple
 from functools import partial
-from typing import Any, Dict, List, Mapping, MutableMapping, Optional, Sequence
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Dict,
+    List,
+    Mapping,
+    MutableMapping,
+    Optional,
+    Sequence,
+)
 
 import requests
 from wandb_gql import Client, gql
@@ -44,6 +53,10 @@
 from wandb.sdk.lib import ipython, retry
 from wandb.sdk.wandb_require_helpers import requires
 
+if TYPE_CHECKING:
+    import wandb.apis.reports
+    import wandb.apis.reports.util
+
 logger = logging.getLogger(__name__)
 
 # Only retry requests for 20 seconds in the public api
@@ -409,7 +422,7 @@ def create_report(
         title: Optional[str] = "Untitled Report",
         description: Optional[str] = "",
         width: Optional[str] = "readable",
-        blocks: "Optional[wandb.apis.reports.Block]" = None,
+        blocks: "Optional[wandb.apis.reports.util.Block]" = None,
     ) -> "wandb.apis.reports.Report":
         if entity == "":
             entity = self.default_entity or ""

wandb/apis/reports/reports.py

@@ -3,7 +3,7 @@
 import re
 import urllib
 from copy import deepcopy
-from typing import Any, Dict
+from typing import TYPE_CHECKING, Any, Dict
 from typing import List as LList
 from typing import Optional, Union
 
@@ -37,6 +37,9 @@
     TypeValidator,
 )
 
+if TYPE_CHECKING:
+    import wandb.apis.public
+
 
 class LineKey:
     def __init__(self, key: str) -> None:

wandb/apis/reports/util.py

@@ -1,10 +1,24 @@
-from typing import Any, Dict, List, Optional, Tuple, TypeVar, Union, get_type_hints
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Dict,
+    List,
+    Optional,
+    Tuple,
+    TypeVar,
+    Union,
+    get_type_hints,
+)
 
 import wandb
 from wandb.sdk.wandb_require_helpers import RequiresReportEditingMixin
 
 from .validators import UNDEFINED_TYPE, TypeValidator, Validator
 
+if TYPE_CHECKING:
+    import wandb.apis.reports.reports
+
+
 Func = TypeVar("Func")
 T = TypeVar("T")
 V = TypeVar("V")

wandb/sdk/internal/internal_api.py

@@ -54,6 +54,9 @@
     else:
         from typing_extensions import Literal, Protocol, TypedDict
 
+    import wandb.sdk.internal.settings_static
+    import wandb.sdk.wandb_settings
+
     from .progress import ProgressFn
 
     class CreateArtifactFileSpecInput(TypedDict, total=False):

wandb/sdk/wandb_run.py

@@ -87,6 +87,10 @@
     else:
         from typing_extensions import TypedDict
 
+    import wandb.apis.public
+    import wandb.sdk.backend.backend
+    import wandb.sdk.interface.interface_grpc
+    import wandb.sdk.interface.interface_queue
     from wandb.proto.wandb_internal_pb2 import (
         CheckVersionResponse,
         GetSummaryResponse,

wandb/util.py

@@ -33,6 +33,7 @@
 from types import ModuleType, TracebackType
 from typing import (
     IO,
+    TYPE_CHECKING,
     Any,
     Callable,
     Dict,
@@ -58,6 +59,12 @@
 from wandb.env import SENTRY_DSN, error_reporting_enabled, get_app_url
 from wandb.errors import CommError, UsageError, term
 
+if TYPE_CHECKING:
+    import wandb.apis.public
+    import wandb.sdk.internal.settings_static
+    import wandb.sdk.wandb_artifacts
+    import wandb.sdk.wandb_settings
+
 CheckRetryFnType = Callable[[Exception], Union[bool, timedelta]]
 
 logger = logging.getLogger(__name__)