wandb 0.15.10__py3-none-any.whl → 0.15.11__py3-none-any.whl

wandb/__init__.py

@@ -11,7 +11,8 @@ For scripts and interactive notebooks, see https://github.com/wandb/examples.
 
 For reference documentation, see https://docs.wandb.com/ref/python.
 """
-__version__ = "0.15.10"
+__version__ = "0.15.11"
+_minimum_nexus_version = "0.16.0b1"
 
 # Used with pypi checks and other messages related to pip
 _wandb_module = "wandb"

wandb/apis/public.py

@@ -395,6 +395,9 @@ class Api:
         auth = None
         if not _thread_local_api_settings.cookies:
             auth = ("api", self.api_key)
+        proxies = self.settings.get("_proxies") or json.loads(
+            os.environ.get("WANDB__PROXIES", "{}")
+        )
         self._base_client = Client(
             transport=GraphQLSession(
                 headers={
@@ -409,6 +412,7 @@ class Api:
                 auth=auth,
                 url="%s/graphql" % self.settings["base_url"],
                 cookies=_thread_local_api_settings.cookies,
+                proxies=proxies,
             )
         )
         self._client = RetryingClient(self._base_client)
@@ -1992,11 +1996,18 @@ class Run(Attrs):
                     withRuns=False,
                 )
 
-        self._attrs["summaryMetrics"] = (
-            json.loads(self._attrs["summaryMetrics"])
-            if self._attrs.get("summaryMetrics")
-            else {}
-        )
+        try:
+            self._attrs["summaryMetrics"] = (
+                json.loads(self._attrs["summaryMetrics"])
+                if self._attrs.get("summaryMetrics")
+                else {}
+            )
+        except json.decoder.JSONDecodeError:
+            # ignore invalid utf-8 or control characters
+            self._attrs["summaryMetrics"] = json.loads(
+                self._attrs["summaryMetrics"],
+                strict=False,
+            )
         self._attrs["systemMetrics"] = (
             json.loads(self._attrs["systemMetrics"])
             if self._attrs.get("systemMetrics")
@@ -2619,8 +2630,6 @@ class QueuedRun:
     def wait_until_running(self):
         if self._run is not None:
             return self._run
-        if self.container_job:
-            raise LaunchError("Container jobs cannot be waited on")
 
         while True:
             # sleep here to hide an ugly warning
@@ -2672,6 +2681,7 @@ class RunQueue:
         self._default_resource_config = _default_resource_config
         self._type = None
         self._items = None
+        self._id = None
 
     @property
     def name(self):
@@ -2703,6 +2713,12 @@ class RunQueue:
             self._get_default_resource_config()
         return self._default_resource_config
 
+    @property
+    def id(self) -> str:
+        if self._id is None:
+            self._get_metadata()
+        return self._id
+
     @property
     def items(self) -> List[QueuedRun]:
         """Up to the first 100 queued runs. Modifying this list will not modify the queue or any enqueued items!"""
@@ -2711,6 +2727,30 @@ class RunQueue:
             self._get_items()
         return self._items
 
+    @normalize_exceptions
+    def delete(self):
+        """Delete the run queue from the wandb backend."""
+        query = gql(
+            """
+            mutation DeleteRunQueue($id: ID!) {
+                deleteRunQueues(input: {queueIDs: [$id]}) {
+                    success
+                    clientMutationId
+                }
+            }
+            """
+        )
+        variable_values = {"id": self.id}
+        res = self._client.execute(query, variable_values)
+        if res["deleteRunQueues"]["success"]:
+            self._id = None
+            self._access = None
+            self._default_resource_config_id = None
+            self._default_resource_config = None
+            self._items = None
+        else:
+            raise CommError(f"Failed to delete run queue {self.name}")
+
     def __repr__(self):
         return f"<RunQueue {self._entity}/{self._name}>"
 
@@ -2721,6 +2761,7 @@ class RunQueue:
             query GetRunQueueMetadata($projectName: String!, $entityName: String!, $runQueue: String!) {
                 project(name: $projectName, entityName: $entityName) {
                     runQueue(name: $runQueue) {
+                        id
                         access
                         defaultResourceConfigID
                     }
@@ -2734,6 +2775,7 @@ class RunQueue:
             "runQueue": self._name,
         }
         res = self._client.execute(query, variable_values)
+        self._id = res["project"]["runQueue"]["id"]
         self._access = res["project"]["runQueue"]["access"]
         self._default_resource_config_id = res["project"]["runQueue"][
             "defaultResourceConfigID"
@@ -4830,7 +4872,7 @@ class Job:
         resource_args=None,
         project_queue=None,
     ):
-        from wandb.sdk.launch import launch_add
+        from wandb.sdk.launch import _launch_add
 
         run_config = {}
         for key, item in config.items():
@@ -4850,7 +4892,7 @@ class Job:
             if isinstance(assigned_config_type, InvalidType):
                 raise TypeError(self._input_types.explain(run_config))
 
-        queued_run = launch_add.launch_add(
+        queued_run = _launch_add.launch_add(
             job=self._name,
             config={"overrides": {"run_config": run_config}},
             project=project or self._project,

wandb/apis/reports/blocks.py

@@ -23,4 +23,5 @@ from ._blocks import (
     WeaveBlockArtifact,
     WeaveBlockArtifactVersionedFile,
     WeaveBlockSummaryTable,
+    Twitter,
 )

wandb/cli/cli.py

@@ -34,8 +34,8 @@ from wandb.apis import InternalApi, PublicApi
 from wandb.integration.magic import magic_install
 from wandb.sdk.artifacts.artifacts_cache import get_artifacts_cache
 from wandb.sdk.launch import utils as launch_utils
+from wandb.sdk.launch._launch_add import _launch_add
 from wandb.sdk.launch.errors import ExecutionError, LaunchError
-from wandb.sdk.launch.launch_add import _launch_add
 from wandb.sdk.launch.sweeps import utils as sweep_utils
 from wandb.sdk.launch.sweeps.scheduler import Scheduler
 from wandb.sdk.lib import filesystem
@@ -1281,7 +1281,7 @@ def launch(
     logger.info(
         f"=== Launch called with kwargs {locals()} CLI Version: {wandb.__version__}==="
     )
-    from wandb.sdk.launch import launch as wandb_launch
+    from wandb.sdk.launch._launch import _launch
 
     api = _get_cling_api()
     wandb._sentry.configure_scope(process_context="launch_cli")
@@ -1291,6 +1291,11 @@ def launch(
             "Cannot use both --async and --queue with wandb launch, see help for details."
         )
 
+    if queue and docker_image and not project:
+        raise LaunchError(
+            "Cannot use --queue and --docker together without a project. Please specify a project with --project or -p."
+        )
+
     if resource_args is not None:
         resource_args = util.load_json_yaml_dict(resource_args)
         if resource_args is None:
@@ -1329,19 +1334,19 @@ def launch(
     if queue is None:
         # direct launch
         try:
-            run = wandb_launch.run(
+            run = _launch(
                 api,
                 uri,
                 job,
-                entry_point,
-                git_version,
                 project=project,
                 entity=entity,
                 docker_image=docker_image,
                 name=name,
+                entry_point=entry_point,
+                version=git_version,
                 resource=resource,
                 resource_args=resource_args,
-                config=config,
+                launch_config=config,
                 synchronous=(not run_async),
                 run_id=run_id,
                 repository=repository,
@@ -1444,11 +1449,11 @@ def launch_agent(
             "--url is not supported in this version, upgrade with: pip install -u wandb"
         )
 
-    from wandb.sdk.launch import launch as wandb_launch
+    import wandb.sdk.launch._launch as _launch
 
     api = _get_cling_api()
     wandb._sentry.configure_scope(process_context="launch_agent")
-    agent_config, api = wandb_launch.resolve_agent_config(
+    agent_config, api = _launch.resolve_agent_config(
         entity, project, max_jobs, queues, config
     )
     if agent_config.get("project") is None:
@@ -1465,7 +1470,7 @@ def launch_agent(
 
     wandb.termlog("Starting launch agent ✨")
     try:
-        wandb_launch.create_and_run_agent(api, agent_config)
+        _launch.create_and_run_agent(api, agent_config)
     except Exception as e:
         wandb._sentry.exception(e)
         raise e

wandb/env.py

@@ -74,6 +74,7 @@ JUPYTER = "WANDB_JUPYTER"
 CONFIG_DIR = "WANDB_CONFIG_DIR"
 DATA_DIR = "WANDB_DATA_DIR"
 ARTIFACT_DIR = "WANDB_ARTIFACT_DIR"
+ARTIFACT_FETCH_FILE_URL_BATCH_SIZE = "WANDB_ARTIFACT_FETCH_FILE_URL_BATCH_SIZE"
 CACHE_DIR = "WANDB_CACHE_DIR"
 DISABLE_SSL = "WANDB_INSECURE_DISABLE_SSL"
 SERVICE = "WANDB_SERVICE"
@@ -122,6 +123,7 @@ def immutable_keys() -> List[str]:
         HOST,
         DATA_DIR,
         ARTIFACT_DIR,
+        ARTIFACT_FETCH_FILE_URL_BATCH_SIZE,
         CACHE_DIR,
         USE_V1_ARTIFACTS,
         DISABLE_SSL,
@@ -193,7 +195,7 @@ def get_docker(
     return env.get(DOCKER, default)
 
 
-def get_http_timeout(default: int = 30, env: Optional[Env] = None) -> int:
+def get_http_timeout(default: int = 20, env: Optional[Env] = None) -> int:
     if env is None:
         env = os.environ
 
@@ -380,6 +382,14 @@ def get_artifact_dir(env: Optional[Env] = None) -> str:
     return val
 
 
+def get_artifact_fetch_file_url_batch_size(env: Optional[Env] = None) -> int:
+    default_batch_size = 5000
+    if env is None:
+        env = os.environ
+    val = int(env.get(ARTIFACT_FETCH_FILE_URL_BATCH_SIZE, default_batch_size))
+    return val
+
+
 def get_cache_dir(env: Optional[Env] = None) -> Path:
     env = env or os.environ
     return Path(env.get(CACHE_DIR, appdirs.user_cache_dir("wandb")))

wandb/integration/xgboost/xgboost.py

@@ -64,10 +64,10 @@ class WandbCallback(xgb.callback.TrainingCallback):
     Passing `WandbCallback` to XGBoost will:
 
     - log the booster model configuration to Weights & Biases
-    - log evaluation metrics collected by XGBoost, such as rmse, accuracy etc to Weights & Biases
+    - log evaluation metrics collected by XGBoost, such as rmse, accuracy etc. to Weights & Biases
     - log training metric collected by XGBoost (if you provide training data to eval_set)
     - log the best score and the best iteration
-    - save and upload your trained model to to Weights & Biases Artifacts (when `log_model = True`)
+    - save and upload your trained model to Weights & Biases Artifacts (when `log_model = True`)
     - log feature importance plot when `log_feature_importance=True` (default).
     - Capture the best eval metric in `wandb.summary` when `define_metric=True` (default).
 
@@ -81,6 +81,7 @@ class WandbCallback(xgb.callback.TrainingCallback):
             alpha=10,
             n_estimators=10,
             tree_method="hist",
+            callbacks=[WandbCallback()],
         )
 
         xg_reg = xgb.XGBRegressor(**bst_params)
@@ -88,7 +89,6 @@ class WandbCallback(xgb.callback.TrainingCallback):
             X_train,
             y_train,
             eval_set=[(X_test, y_test)],
-            callbacks=[WandbCallback()],
         )
         ```
     """