wandb 0.19.6rc4__py3-none-any.whl → 0.19.8__py3-none-any.whl

wandb/apis/public/utils.py

@@ -1,8 +1,11 @@
 import re
 from enum import Enum
+from typing import Optional
 from urllib.parse import urlparse
 
+from wandb._iterutils import one
 from wandb.sdk.artifacts._validators import is_artifact_registry_project
+from wandb.sdk.internal.internal_api import Api as InternalApi
 
 
 def parse_s3_url_to_s3_uri(url) -> str:
@@ -66,3 +69,36 @@ def parse_org_from_registry_path(path: str, path_type: PathType) -> str:
         if is_artifact_registry_project(project):
             return org
     return ""
+
+
+def fetch_org_from_settings_or_entity(
+    settings: dict, default_entity: Optional[str] = None
+) -> str:
+    """Fetch the org from either the settings or deriving it from the entity.
+
+    Returns the org from the settings if available. If no org is passed in or set, the entity is used to fetch the org.
+
+    Args:
+        organization (str | None): The organization to fetch the org for.
+        settings (dict): The settings to fetch the org for.
+        default_entity (str | None): The default entity to fetch the org for.
+    """
+    if (organization := settings.get("organization")) is None:
+        # Fetch the org via the Entity. Won't work if default entity is a personal entity and belongs to multiple orgs
+        entity = settings.get("entity") or default_entity
+        if entity is None:
+            raise ValueError(
+                "No entity specified and can't fetch organization from the entity"
+            )
+        entity_orgs = InternalApi()._fetch_orgs_and_org_entities_from_entity(entity)
+        entity_org = one(
+            entity_orgs,
+            too_short=ValueError(
+                "No organizations found for entity. Please specify an organization in the settings."
+            ),
+            too_long=ValueError(
+                "Multiple organizations found for entity. Please specify an organization in the settings."
+            ),
+        )
+        organization = entity_org.display_name
+    return organization

wandb/cli/cli.py

@@ -241,32 +241,21 @@ def login(key, host, cloud, relogin, anonymously, verify, no_offline=False):
     wandb_sdk.wandb_login._handle_host_wandb_setting(host, cloud)
     # A change in click or the test harness means key can be none...
     key = key[0] if key is not None and len(key) > 0 else None
-    if key:
-        relogin = True
+    relogin = True if key or relogin else False
 
-    login_settings = dict(
-        x_cli_only_mode=True,
-        x_disable_viewer=relogin and not verify,
-        anonymous=anon_mode,
-        base_url=host,
-    )
-
-    try:
-        wandb.setup(
-            settings=wandb.Settings(
-                **{k: v for k, v in login_settings.items() if v is not None}
-            )
+    wandb.setup(
+        settings=wandb.Settings(
+            x_cli_only_mode=True,
+            x_disable_viewer=relogin and not verify,
         )
-    except TypeError as e:
-        wandb.termerror(str(e))
-        sys.exit(1)
+    )
 
     wandb.login(
-        relogin=relogin,
-        key=key,
         anonymous=anon_mode,
-        host=host,
         force=True,
+        host=host,
+        key=key,
+        relogin=relogin,
         verify=verify,
     )
 
@@ -2805,11 +2794,13 @@ def verify(host):
     wandb_verify.check_wandb_version(api)
     check_run_success = wandb_verify.check_run(api)
     check_artifacts_success = wandb_verify.check_artifacts()
+    check_sweeps_success = wandb_verify.check_sweeps(api)
     if not (
         check_artifacts_success
         and check_run_success
         and large_post_success
         and url_success
+        and check_sweeps_success
     ):
         sys.exit(1)
 

wandb/data_types.py

@@ -6,7 +6,7 @@ flexible containers for information, like tables and HTML, and more.
 For more on logging media, see [our guide](https://docs.wandb.com/guides/track/log/media)
 
 For more on logging structured data for interactive dataset and model analysis,
-see [our guide to W&B Tables](https://docs.wandb.com/guides/tables/).
+see [our guide to W&B Tables](https://docs.wandb.com/guides/models/tables/).
 
 All of these special data types are subclasses of WBValue. All the data types
 serialize to JSON, since that is what wandb uses to save the objects locally

wandb/env.py

@@ -34,6 +34,7 @@ USERNAME = "WANDB_USERNAME"
 USER_EMAIL = "WANDB_USER_EMAIL"
 PROJECT = "WANDB_PROJECT"
 ENTITY = "WANDB_ENTITY"
+ORGANIZATION = "WANDB_ORGANIZATION"
 BASE_URL = "WANDB_BASE_URL"
 APP_URL = "WANDB_APP_URL"
 PROGRAM = "WANDB_PROGRAM"
@@ -284,6 +285,15 @@ def get_entity(
     return env.get(ENTITY, default)
 
 
+def get_organization(
+    default: str | None = None, env: MutableMapping | None = None
+) -> str | None:
+    if env is None:
+        env = os.environ
+
+    return env.get(ORGANIZATION, default)
+
+
 def get_base_url(
     default: str | None = None, env: MutableMapping | None = None
 ) -> str | None:

wandb/filesync/dir_watcher.py

@@ -233,6 +233,7 @@ class DirWatcher:
             self._savename_file_policies[save_name] = policy
         else:
             self._user_file_policies[policy].add(path)
+
         for src_path in glob.glob(os.path.join(self._dir, path)):
             save_name = LogicalPath(os.path.relpath(src_path, self._dir))
             feh = self._get_file_event_handler(src_path, save_name)
@@ -285,7 +286,7 @@ class DirWatcher:
     #     return LogicalPath(os.path.relpath(path, self._dir))
 
     def _on_file_modified(self, event: "wd_events.FileModifiedEvent") -> None:
-        logger.info(f"file/dir modified: { event.src_path}")
+        logger.info(f"file/dir modified: {event.src_path}")
         if os.path.isdir(event.src_path):
             return None
         save_name = LogicalPath(os.path.relpath(event.src_path, self._dir))