wandb 0.19.6rc4__py3-none-win32.whl → 0.19.7__py3-none-win32.whl

wandb/apis/public/registries.py

@@ -0,0 +1,573 @@
+"""Public API: registries."""
+
+import json
+from typing import TYPE_CHECKING, Any, Dict, Mapping, Optional, Sequence
+
+if TYPE_CHECKING:
+    from wandb_gql import Client
+
+from wandb_gql import gql
+
+import wandb
+from wandb.apis.paginator import Paginator
+from wandb.apis.public.artifacts import ArtifactCollection
+from wandb.sdk.artifacts._graphql_fragments import (
+    _gql_artifact_fragment,
+    _gql_registry_fragment,
+)
+from wandb.sdk.artifacts._validators import REGISTRY_PREFIX
+
+
+class Registries(Paginator):
+    """Iterator that returns Registries."""
+
+    QUERY = gql(
+        """
+        query Registries($organization: String!, $filters: JSONString, $cursor: String, $perPage: Int) {
+            organization(name: $organization) {
+                orgEntity {
+                    name
+                    projects(filters: $filters, after: $cursor, first: $perPage) {
+                        pageInfo {
+                            endCursor
+                            hasNextPage
+                        }
+                        edges {
+                            node {
+                                ...RegistryFragment
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        """
+        + _gql_registry_fragment()
+    )
+
+    def __init__(
+        self,
+        client: "Client",
+        organization: str,
+        filter: Optional[Dict[str, Any]] = None,
+        per_page: Optional[int] = 100,
+    ):
+        self.client = client
+        self.organization = organization
+        self.filter = _ensure_registry_prefix_on_names(filter or {})
+        variables = {
+            "organization": organization,
+            "filters": json.dumps(self.filter),
+        }
+
+        super().__init__(client, variables, per_page)
+
+    def __bool__(self):
+        return len(self) > 0 or len(self.objects) > 0
+
+    def __next__(self):
+        # Implement custom next since its possible to load empty pages because of auth
+        self.index += 1
+        while len(self.objects) <= self.index:
+            if not self._load_page():
+                raise StopIteration
+        return self.objects[self.index]
+
+    def collections(self, filter: Optional[Dict[str, Any]] = None) -> "Collections":
+        return Collections(
+            self.client,
+            self.organization,
+            registry_filter=self.filter,
+            collection_filter=filter,
+        )
+
+    def versions(self, filter: Optional[Dict[str, Any]] = None) -> "Versions":
+        return Versions(
+            self.client,
+            self.organization,
+            registry_filter=self.filter,
+            collection_filter=None,
+            artifact_filter=filter,
+        )
+
+    @property
+    def length(self):
+        if self.last_response:
+            return len(
+                self.last_response["organization"]["orgEntity"]["projects"]["edges"]
+            )
+        else:
+            return None
+
+    @property
+    def more(self):
+        if self.last_response:
+            return self.last_response["organization"]["orgEntity"]["projects"][
+                "pageInfo"
+            ]["hasNextPage"]
+        else:
+            return True
+
+    @property
+    def cursor(self):
+        if self.last_response:
+            return self.last_response["organization"]["orgEntity"]["projects"][
+                "pageInfo"
+            ]["endCursor"]
+        else:
+            return None
+
+    def convert_objects(self):
+        if not self.last_response:
+            return []
+        if (
+            not self.last_response["organization"]
+            or not self.last_response["organization"]["orgEntity"]
+        ):
+            raise ValueError(
+                f"Organization '{self.organization}' not found. Please verify the organization name is correct"
+            )
+
+        return [
+            Registry(
+                self.client,
+                self.organization,
+                self.last_response["organization"]["orgEntity"]["name"],
+                r["node"]["name"],
+                r["node"],
+            )
+            for r in self.last_response["organization"]["orgEntity"]["projects"][
+                "edges"
+            ]
+        ]
+
+
+class Registry:
+    """A single registry in the Registry."""
+
+    def __init__(
+        self,
+        client: "Client",
+        organization: str,
+        entity: str,
+        full_name: str,
+        attrs: Dict[str, Any],
+    ):
+        self.client = client
+        self._full_name = full_name
+        self._name = full_name.replace(REGISTRY_PREFIX, "")
+        self._entity = entity
+        self._organization = organization
+        self._description = attrs.get("description", "")
+        self._allow_all_artifact_types = attrs.get(
+            "allowAllArtifactTypesInRegistry", False
+        )
+        self._artifact_types = [
+            t["node"]["name"] for t in attrs.get("artifactTypes", {}).get("edges", [])
+        ]
+        self._id = attrs.get("id", "")
+        self._created_at = attrs.get("createdAt", "")
+        self._updated_at = attrs.get("updatedAt", "")
+
+    @property
+    def full_name(self):
+        return self._full_name
+
+    @property
+    def name(self):
+        return self._name
+
+    @property
+    def entity(self):
+        return self._entity
+
+    @property
+    def organization(self):
+        return self._organization
+
+    @property
+    def description(self):
+        return self._description
+
+    @property
+    def allow_all_artifact_types(self):
+        return self._allow_all_artifact_types
+
+    @property
+    def artifact_types(self):
+        return self._artifact_types
+
+    @property
+    def created_at(self):
+        return self._created_at
+
+    @property
+    def updated_at(self):
+        return self._updated_at
+
+    @property
+    def path(self):
+        return [self.entity, self.name]
+
+    def collections(self, filter: Optional[Dict[str, Any]] = None):
+        registry_filter = {
+            "name": self.full_name,
+        }
+        return Collections(self.client, self.organization, registry_filter, filter)
+
+    def versions(self, filter: Optional[Dict[str, Any]] = None):
+        registry_filter = {
+            "name": self.full_name,
+        }
+        return Versions(self.client, self.organization, registry_filter, None, filter)
+
+
+class Collections(Paginator):
+    """Iterator that returns Artifact collections in the Registry."""
+
+    QUERY = gql(
+        """
+        query Collections(
+            $organization: String!,
+            $registryFilter: JSONString,
+            $collectionFilter: JSONString,
+            $collectionTypes: [ArtifactCollectionType!],
+            $cursor: String,
+            $perPage: Int
+        ) {
+            organization(name: $organization) {
+                orgEntity {
+                    name
+                    artifactCollections(
+                        projectFilters: $registryFilter,
+                        filters: $collectionFilter,
+                        collectionTypes: $collectionTypes,
+                        after: $cursor,
+                        first: $perPage
+                    ) {
+                        totalCount
+                        pageInfo {
+                            endCursor
+                            hasNextPage
+                        }
+                        edges {
+                            cursor
+                            node {
+                                id
+                                name
+                                description
+                                createdAt
+                                tags {
+                                    edges {
+                                        node {
+                                            name
+                                        }
+                                    }
+                                }
+                                project {
+                                    name
+                                    entity {
+                                        name
+                                    }
+                                }
+                                defaultArtifactType {
+                                    name
+                                }
+                                aliases {
+                                    edges {
+                                        node {
+                                            alias
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        """
+    )
+
+    def __init__(
+        self,
+        client: "Client",
+        organization: str,
+        registry_filter: Optional[Dict[str, Any]] = None,
+        collection_filter: Optional[Dict[str, Any]] = None,
+        per_page: Optional[int] = 100,
+    ):
+        self.client = client
+        self.organization = organization
+        self.registry_filter = registry_filter
+        self.collection_filter = collection_filter or {}
+
+        variables = {
+            "registryFilter": json.dumps(self.registry_filter)
+            if self.registry_filter
+            else None,
+            "collectionFilter": json.dumps(self.collection_filter)
+            if self.collection_filter
+            else None,
+            "organization": self.organization,
+            "collectionTypes": ["PORTFOLIO"],
+            "perPage": per_page,
+        }
+
+        super().__init__(client, variables, per_page)
+
+    def __bool__(self):
+        return len(self) > 0 or len(self.objects) > 0
+
+    def __next__(self):
+        # Implement custom next since its possible to load empty pages because of auth
+        self.index += 1
+        while len(self.objects) <= self.index:
+            if not self._load_page():
+                raise StopIteration
+        return self.objects[self.index]
+
+    def versions(self, filter: Optional[Dict[str, Any]] = None) -> "Versions":
+        return Versions(
+            self.client,
+            self.organization,
+            registry_filter=self.registry_filter,
+            collection_filter=self.collection_filter,
+            artifact_filter=filter,
+        )
+
+    @property
+    def length(self):
+        if self.last_response:
+            return self.last_response["organization"]["orgEntity"][
+                "artifactCollections"
+            ]["totalCount"]
+        else:
+            return None
+
+    @property
+    def more(self):
+        if self.last_response:
+            return self.last_response["organization"]["orgEntity"][
+                "artifactCollections"
+            ]["pageInfo"]["hasNextPage"]
+        else:
+            return True
+
+    @property
+    def cursor(self):
+        if self.last_response:
+            return self.last_response["organization"]["orgEntity"][
+                "artifactCollections"
+            ]["pageInfo"]["endCursor"]
+        else:
+            return None
+
+    def convert_objects(self):
+        if not self.last_response:
+            return []
+        if (
+            not self.last_response["organization"]
+            or not self.last_response["organization"]["orgEntity"]
+        ):
+            raise ValueError(
+                f"Organization '{self.organization}' not found. Please verify the organization name is correct"
+            )
+
+        return [
+            ArtifactCollection(
+                self.client,
+                r["node"]["project"]["entity"]["name"],
+                r["node"]["project"]["name"],
+                r["node"]["name"],
+                r["node"]["defaultArtifactType"]["name"],
+                self.organization,
+                r["node"],
+            )
+            for r in self.last_response["organization"]["orgEntity"][
+                "artifactCollections"
+            ]["edges"]
+        ]
+
+
+class Versions(Paginator):
+    """Iterator that returns Artifact versions in the Registry."""
+
+    def __init__(
+        self,
+        client: "Client",
+        organization: str,
+        registry_filter: Optional[Dict[str, Any]] = None,
+        collection_filter: Optional[Dict[str, Any]] = None,
+        artifact_filter: Optional[Dict[str, Any]] = None,
+        per_page: int = 100,
+    ):
+        self.client = client
+        self.organization = organization
+        self.registry_filter = registry_filter
+        self.collection_filter = collection_filter
+        self.artifact_filter = artifact_filter or {}
+        self.QUERY = gql(
+            """
+            query Versions(
+                $organization: String!,
+                $registryFilter: JSONString,
+                $collectionFilter: JSONString,
+                $artifactFilter: JSONString,
+                $cursor: String,
+                $perPage: Int
+            ) {
+                organization(name: $organization) {
+                    orgEntity {
+                        name
+                        artifactMemberships(
+                            projectFilters: $registryFilter,
+                            collectionFilters: $collectionFilter,
+                            filters: $artifactFilter,
+                            after: $cursor,
+                            first: $perPage
+                        ) {
+                            pageInfo {
+                                endCursor
+                                hasNextPage
+                            }
+                            edges {
+                                node {
+                                    artifactCollection {
+                                        project {
+                                            name
+                                            entity {
+                                                name
+                                            }
+                                        }
+                                        name
+                                    }
+                                    versionIndex
+                                    artifact {
+                                        ...ArtifactFragment
+                                    }
+                                    aliases {
+                                        alias
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            """
+            + _gql_artifact_fragment(include_aliases=False)
+        )
+
+        variables = {
+            "registryFilter": json.dumps(self.registry_filter)
+            if self.registry_filter
+            else None,
+            "collectionFilter": json.dumps(self.collection_filter)
+            if self.collection_filter
+            else None,
+            "artifactFilter": json.dumps(self.artifact_filter)
+            if self.artifact_filter
+            else None,
+            "organization": self.organization,
+        }
+
+        super().__init__(client, variables, per_page)
+
+    def __next__(self):
+        # Implement custom next since its possible to load empty pages because of auth
+        self.index += 1
+        while len(self.objects) <= self.index:
+            if not self._load_page():
+                raise StopIteration
+        return self.objects[self.index]
+
+    def __bool__(self):
+        return len(self) > 0 or len(self.objects) > 0
+
+    @property
+    def length(self):
+        if self.last_response:
+            return len(
+                self.last_response["organization"]["orgEntity"]["artifactMemberships"][
+                    "edges"
+                ]
+            )
+        else:
+            return None
+
+    @property
+    def more(self):
+        if self.last_response:
+            return self.last_response["organization"]["orgEntity"][
+                "artifactMemberships"
+            ]["pageInfo"]["hasNextPage"]
+        else:
+            return True
+
+    @property
+    def cursor(self):
+        if self.last_response:
+            return self.last_response["organization"]["orgEntity"][
+                "artifactMemberships"
+            ]["pageInfo"]["endCursor"]
+        else:
+            return None
+
+    def convert_objects(self):
+        if not self.last_response:
+            return []
+        if (
+            not self.last_response["organization"]
+            or not self.last_response["organization"]["orgEntity"]
+        ):
+            raise ValueError(
+                f"Organization '{self.organization}' not found. Please verify the organization name is correct"
+            )
+
+        artifacts = (
+            wandb.Artifact._from_attrs(
+                a["node"]["artifactCollection"]["project"]["entity"]["name"],
+                a["node"]["artifactCollection"]["project"]["name"],
+                a["node"]["artifactCollection"]["name"]
+                + ":v"
+                + str(a["node"]["versionIndex"]),
+                a["node"]["artifact"],
+                self.client,
+                [alias["alias"] for alias in a["node"]["aliases"]],
+            )
+            for a in self.last_response["organization"]["orgEntity"][
+                "artifactMemberships"
+            ]["edges"]
+        )
+        return artifacts
+
+
+def _ensure_registry_prefix_on_names(query, in_name=False):
+    """Traverse the filter to prepend the `name` key value with the registry prefix unless the value is a regex.
+
+    - in_name: True if we are under a "name" key (or propagating from one).
+
+    EX: {"name": "model"} -> {"name": "wandb-registry-model"}
+    """
+    if isinstance((txt := query), str):
+        if in_name:
+            return txt if txt.startswith(REGISTRY_PREFIX) else f"{REGISTRY_PREFIX}{txt}"
+        return txt
+    if isinstance((dct := query), Mapping):
+        new_dict = {}
+        for key, obj in dct.items():
+            if key == "name":
+                new_dict[key] = _ensure_registry_prefix_on_names(obj, in_name=True)
+            elif key == "$regex":
+                # For regex operator, we skip transformation of its value.
+                new_dict[key] = obj
+            else:
+                # For any other key, propagate the in_name and skip_transform flags as-is.
+                new_dict[key] = _ensure_registry_prefix_on_names(obj, in_name=in_name)
+        return new_dict
+    if isinstance((objs := query), Sequence):
+        return list(
+            map(lambda x: _ensure_registry_prefix_on_names(x, in_name=in_name), objs)
+        )
+    return query

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/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: