wandb 0.18.6__py3-none-macosx_11_0_arm64.whl → 0.19.0__py3-none-macosx_11_0_arm64.whl

wandb/sdk/lib/progress.py

@@ -50,7 +50,7 @@ class ProgressPrinter:
         progress_text_area: p.DynamicText | None,
         settings: wandb.Settings | None,
     ) -> None:
-        self._show_operation_stats = settings and settings._show_operation_stats
+        self._show_operation_stats = settings and settings.x_show_operation_stats
         self._printer = printer
         self._progress_text_area = progress_text_area
         self._tick = 0
@@ -189,8 +189,7 @@ class _DynamicOperationStatsPrinter:
             total_operations += stats.total_operations
 
         if self._ops_shown < total_operations:
-            # NOTE: In Python 3.8, we'd use a chained comparison here.
-            if 1 <= self._max_lines and self._max_lines <= len(self._lines):
+            if 1 <= self._max_lines <= len(self._lines):
                 self._lines.pop()
 
             remaining = total_operations - self._ops_shown

wandb/sdk/lib/run_moment.py

@@ -1,13 +1,7 @@
-import sys
 from dataclasses import dataclass
-from typing import Union, cast
+from typing import Literal, Union, cast
 from urllib import parse
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 _STEP = Literal["_step"]
 
 

wandb/sdk/lib/server.py

@@ -1,7 +1,9 @@
 """module server."""
 
+from __future__ import annotations
+
 import json
-from typing import TYPE_CHECKING, Any, Dict, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 from wandb import util
 from wandb.apis import InternalApi
@@ -10,43 +12,27 @@ if TYPE_CHECKING:
     from wandb.sdk.wandb_settings import Settings
 
 
-class ServerError(Exception):
-    pass
-
-
 class Server:
     def __init__(
         self,
-        api: Optional[InternalApi] = None,
-        settings: Optional["Settings"] = None,
+        settings: Settings,
     ) -> None:
-        self._api = api or InternalApi(default_settings=settings)
-        self._error_network: Optional[bool] = None
-        self._viewer: Dict[str, Any] = {}
-        self._flags: Dict[str, Any] = {}
-        self._settings = settings
+        self._api = InternalApi(default_settings=settings)
+        self._viewer: dict[str, Any] = {}
+        self._flags: dict[str, Any] = {}
+        self._settings: Settings = settings
 
-    def query_with_timeout(self, timeout: Union[int, float, None] = None) -> None:
-        if self._settings and self._settings._disable_viewer:
+    def query_with_timeout(self, timeout: int | float = 5) -> None:
+        if self._settings.x_disable_viewer:
             return
-        timeout = timeout or 5
         async_viewer = util.async_call(self._api.viewer_server_info, timeout=timeout)
         try:
             viewer_tuple, viewer_thread = async_viewer()
         except Exception:
-            # TODO: currently a bare exception as lots can happen, we should classify
-            self._error_network = True
             return
         if viewer_thread.is_alive():
             # this is likely a DNS hang
-            self._error_network = True
             return
-        self._error_network = False
         # TODO(jhr): should we kill the thread?
         self._viewer, self._serverinfo = viewer_tuple
         self._flags = json.loads(self._viewer.get("flags", "{}"))
-
-    def is_valid(self) -> bool:
-        if self._error_network is None:
-            raise Exception("invalid usage: must query server")
-        return self._error_network

wandb/sdk/lib/sock_client.py

@@ -7,8 +7,6 @@ from typing import TYPE_CHECKING, Any, List, Optional
 
 from wandb.proto import wandb_server_pb2 as spb
 
-from . import tracelog
-
 if TYPE_CHECKING:
     from wandb.proto import wandb_internal_pb2 as pb
 
@@ -145,7 +143,6 @@ class SockClient:
                     time.sleep(self._retry_delay - delta_time)
 
     def _send_message(self, msg: Any) -> None:
-        tracelog.log_message_send(msg, self._sockid)
         raw_size = msg.ByteSize()
         data = msg.SerializeToString()
         assert len(data) == raw_size, "invalid serialization"
@@ -280,7 +277,6 @@ class SockClient:
             return None
         rec = spb.ServerRequest()
         rec.ParseFromString(data)
-        tracelog.log_message_recv(rec, self._sockid)
         return rec
 
     def read_server_response(
@@ -291,5 +287,4 @@ class SockClient:
             return None
         rec = spb.ServerResponse()
         rec.ParseFromString(data)
-        tracelog.log_message_recv(rec, self._sockid)
         return rec

wandb/sdk/service/server.py

@@ -10,7 +10,6 @@ from typing import Optional
 
 import wandb
 
-from ..lib import tracelog
 from . import _startup_debug, port_file
 from .server_sock import SocketServer
 from .streams import StreamMux
@@ -69,22 +68,15 @@ class WandbServer:
         if self._sock_server:
             self._sock_server.stop()
 
-    def _setup_tracelog(self) -> None:
-        # TODO: remove this temporary hack, need to find a better way to pass settings
-        # to the server.  for now lets just look at the environment variable we need
-        tracelog_mode = os.environ.get("WANDB_TRACELOG")
-        if tracelog_mode:
-            tracelog.enable(tracelog_mode)
-
     def _startup_debug_print(self, message: str) -> None:
         if not self._startup_debug_enabled:
             return
         _startup_debug.print_message(message)
 
     def _setup_proctitle(self, sock_port: Optional[int]) -> None:
-        # TODO: similar to _setup_tracelog, the internal_process should have
-        # a better way to have access to settings.
-        disable_setproctitle = os.environ.get("WANDB__DISABLE_SETPROCTITLE")
+        # TODO: the internal_process should have a better way to have access to
+        # settings.
+        disable_setproctitle = os.environ.get("WANDB_X_DISABLE_SETPROCTITLE")
         if disable_setproctitle:
             return
 
@@ -103,7 +95,6 @@ class WandbServer:
             self._startup_debug_print("after_setproctitle")
 
     def serve(self) -> None:
-        self._setup_tracelog()
         mux = StreamMux()
         self._startup_debug_print("before_network")
         sock_port = self._start_sock(mux=mux)

wandb/sdk/service/server_sock.py

@@ -7,7 +7,6 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, Optional
 from wandb.proto import wandb_server_pb2 as spb
 from wandb.sdk.internal.settings_static import SettingsStatic
 
-from ..lib import tracelog
 from ..lib.sock_client import SockClient, SockClientClosedError
 from .streams import StreamMux
 
@@ -65,7 +64,6 @@ class SockServerInterfaceReaderThread(threading.Thread):
             except ValueError:
                 # queue is closed
                 break
-            tracelog.log_message_dequeue(result, self._iface.relay_q)
             sockid = result.control.relay_id
             assert sockid
             sock_client = self._clients.get_client(sockid)

wandb/sdk/service/service.py

@@ -76,7 +76,7 @@ class _Service:
             ServiceStartProcessError: If the service process exits unexpectedly.
 
         """
-        time_max = time.monotonic() + self._settings._service_wait
+        time_max = time.monotonic() + self._settings.x_service_wait
         while time.monotonic() < time_max:
             if proc and proc.poll():
                 # process finished
@@ -97,7 +97,7 @@ class _Service:
                     f"The wandb service process exited with {proc.returncode}. "
                     "Ensure that `sys.executable` is a valid python interpreter. "
                     "You can override it with the `_executable` setting "
-                    "or with the `WANDB__EXECUTABLE` environment variable."
+                    "or with the `WANDB_X_EXECUTABLE` environment variable."
                     f"\n{context}",
                     context=context,
                 )
@@ -120,7 +120,7 @@ class _Service:
             return
         raise ServiceStartTimeoutError(
             "Timed out waiting for wandb service to start after "
-            f"{self._settings._service_wait} seconds. "
+            f"{self._settings.x_service_wait} seconds. "
             "Try increasing the timeout with the `_service_wait` setting."
         )
 
@@ -143,7 +143,7 @@ class _Service:
         with tempfile.TemporaryDirectory() as tmpdir:
             fname = os.path.join(tmpdir, f"port-{pid}.txt")
 
-            executable = self._settings._executable
+            executable = self._settings.x_executable
             exec_cmd_list = [executable, "-m"]
 
             service_args = []
@@ -212,7 +212,7 @@ class _Service:
 
             try:
                 internal_proc = subprocess.Popen(
-                    exec_cmd_list + service_args,
+                    exec_cmd_list + service_args,  # type: ignore[arg-type]
                     env=os.environ,
                     **kwargs,
                 )