wandb 0.22.2__py3-none-win_arm64.whl → 0.22.3__py3-none-win_arm64.whl

wandb/__init__.py

@@ -10,7 +10,7 @@ For reference documentation, see https://docs.wandb.com/ref/python.
 """
 from __future__ import annotations
 
-__version__ = "0.22.2"
+__version__ = "0.22.3"
 
 
 from wandb.errors import Error

wandb/__init__.pyi

@@ -107,7 +107,7 @@ if TYPE_CHECKING:
     import wandb
     from wandb.plot import CustomChart
 
-__version__: str = "0.22.2"
+__version__: str = "0.22.3"
 
 run: Run | None
 config: wandb_config.Config
@@ -580,7 +580,7 @@ def log(
         run.log({"accuracy": 0.8}, step=current_step)
         current_step += 1
         run.log({"train-loss": 0.4}, step=current_step)
-        run.log({"accuracy": 0.9}, step=current_step)
+        run.log({"accuracy": 0.9}, step=current_step, commit=True)
     ```
 
     Args:

wandb/_pydantic/__init__.py

@@ -5,6 +5,12 @@ __all__ = [
     "CompatBaseModel",
     "JsonableModel",
     "GQLBase",
+    "GQLInput",
+    "GQLResult",
+    "Connection",
+    "ConnectionWithTotal",
+    "Edge",
+    "PageInfo",
     "Typename",
     "GQLId",
     "AliasChoices",
@@ -18,8 +24,9 @@ __all__ = [
     "gql_typename",
 ]
 
-from .base import CompatBaseModel, GQLBase, JsonableModel
+from .base import CompatBaseModel, GQLBase, GQLInput, GQLResult, JsonableModel
 from .field_types import GQLId, Typename
+from .pagination import Connection, ConnectionWithTotal, Edge, PageInfo
 from .utils import IS_PYDANTIC_V2, from_json, gql_typename, pydantic_isinstance, to_json
 from .v1_compat import (
     AliasChoices,

wandb/_pydantic/base.py

@@ -1,29 +1,37 @@
 """Base classes and other customizations for generated pydantic types."""
 
+# Older-style type annotations required for Pydantic v1 / python 3.8 compatibility.
+# ruff: noqa: UP006
+
 from __future__ import annotations
 
 from abc import ABC
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Literal
+from typing import TYPE_CHECKING, Any, Callable, ClassVar, Dict, Literal, overload
 
 from pydantic import BaseModel, ConfigDict
 from typing_extensions import TypedDict, Unpack, override
 
-from .v1_compat import PydanticCompatMixin
+from .v1_compat import PydanticCompatMixin, to_camel
 
 if TYPE_CHECKING:
     from pydantic.main import IncEx
 
 
 class ModelDumpKwargs(TypedDict, total=False):
-    """Shared keyword arguments for `BaseModel.model_{dump,dump_json}`."""
+    """Shared keyword arguments for `BaseModel.model_{dump,dump_json}`.
+
+    Newer pydantic versions may accept more arguments than are listed here.
+    Last updated for pydantic v2.12.0.
+    """
 
     include: IncEx | None
     exclude: IncEx | None
-    context: dict[str, Any] | None
+    context: Any | None
     by_alias: bool | None
     exclude_unset: bool
     exclude_defaults: bool
     exclude_none: bool
+    exclude_computed_fields: bool
     round_trip: bool
     warnings: bool | Literal["none", "warn", "error"]
     fallback: Callable[[Any], Any] | None
@@ -76,33 +84,61 @@ class JsonableModel(CompatBaseModel, ABC):
     # Custom defaults keyword args for `JsonableModel.model_{dump,dump_json}`:
     # - by_alias: Convert keys to JSON-ready names and objects to JSON-ready dicts.
     # - round_trip: Ensure round-trippable result
-    __DUMP_DEFAULTS: ClassVar[ModelDumpKwargs] = dict(by_alias=True, round_trip=True)
+    __DUMP_DEFAULTS: ClassVar[Dict[str, Any]] = dict(by_alias=True, round_trip=True)
 
-    @override
+    @overload  # Actual signature
     def model_dump(
-        self,
-        *,
-        mode: Literal["json", "python"] | str = "json",  # NOTE: changed default
-        **kwargs: Unpack[ModelDumpKwargs],
-    ) -> dict[str, Any]:
+        self, *, mode: str, **kwargs: Unpack[ModelDumpKwargs]
+    ) -> dict[str, Any]: ...
+    @overload  # In case pydantic adds more kwargs in future releases
+    def model_dump(self, **kwargs: Any) -> dict[str, Any]: ...
+
+    @override
+    def model_dump(self, *, mode: str = "json", **kwargs: Any) -> dict[str, Any]:
         kwargs = {**self.__DUMP_DEFAULTS, **kwargs}  # allows overrides, if needed
         return super().model_dump(mode=mode, **kwargs)
 
-    @override
+    @overload  # Actual signature
     def model_dump_json(
-        self,
-        *,
-        indent: int | None = None,
-        **kwargs: Unpack[ModelDumpKwargs],
-    ) -> str:
+        self, *, indent: int | None, **kwargs: Unpack[ModelDumpKwargs]
+    ) -> str: ...
+    @overload  # In case pydantic adds more kwargs in future releases
+    def model_dump_json(self, **kwargs: Any) -> str: ...
+
+    @override
+    def model_dump_json(self, *, indent: int | None = None, **kwargs: Any) -> str:
         kwargs = {**self.__DUMP_DEFAULTS, **kwargs}  # allows overrides, if needed
         return super().model_dump_json(indent=indent, **kwargs)
 
 
-# Base class for all GraphQL-generated types.
+# Base class for all GraphQL-derived types.
 class GQLBase(JsonableModel, ABC):
     model_config = ConfigDict(
         validate_default=True,
         revalidate_instances="always",
         protected_namespaces=(),  # Some GraphQL fields may begin with "model_"
     )
+
+
+# Base class for GraphQL result types, i.e. parsed GraphQL response data.
+class GQLResult(GQLBase, ABC):
+    model_config = ConfigDict(
+        alias_generator=to_camel,  # Assume JSON names are camelCase, by default
+        frozen=True,  # Keep the actual response data immutable
+    )
+
+
+# Base class for GraphQL input types, i.e. prepared GraphQL variables or input objects for queries and mutations.
+class GQLInput(GQLBase, ABC):
+    # For GraphQL input types, exclude null input values when preparing the JSON-able request data.
+    __DUMP_DEFAULTS: ClassVar[Dict[str, Any]] = dict(exclude_none=True)
+
+    @override
+    def model_dump(self, *, mode: str = "json", **kwargs: Any) -> dict[str, Any]:
+        kwargs = {**self.__DUMP_DEFAULTS, **kwargs}
+        return super().model_dump(mode=mode, **kwargs)
+
+    @override
+    def model_dump_json(self, *, indent: int | None = None, **kwargs: Any) -> str:
+        kwargs = {**self.__DUMP_DEFAULTS, **kwargs}
+        return super().model_dump_json(indent=indent, **kwargs)

wandb/_pydantic/field_types.py

@@ -11,13 +11,18 @@ from .utils import IS_PYDANTIC_V2
 
 T = TypeVar("T")
 
+# HACK: Pydantic no longer seems to like it when you define a type alias
+# at the module level with `Annotated[...]`.
+# The commented TypeAliases are a hack to unblock CI for now.
 
-#: GraphQL `__typename` fields
-Typename = Annotated[T, Field(repr=False, frozen=True, alias="__typename")]
+# Typename = Annotated[T, Field(repr=False, frozen=True, alias="__typename")]
+Typename = Annotated[T, Field(alias="__typename")]
+"""Annotates GraphQL `__typename` fields."""
 
 
 if IS_PYDANTIC_V2 or TYPE_CHECKING:
-    GQLId = Annotated[StrictStr, Field(repr=False, frozen=True)]
+    # GQLId = Annotated[StrictStr, Field(repr=False, frozen=True)]
+    GQLId = StrictStr
 
 else:
     # FIXME: Find a way to fix this for pydantic v1, which doesn't like when

wandb/_pydantic/pagination.py

@@ -0,0 +1,46 @@
+"""Definitions and utilities for client-side handling of "relay-style" GraphQL types for pagination.
+
+For formal specs and definitions, see: https://relay.dev/graphql/connections.htm
+"""
+
+from typing import Generic, Iterator, List, Literal, Optional, TypeVar
+
+from pydantic import NonNegativeInt
+
+from .base import GQLResult
+
+NodeT = TypeVar("NodeT", bound=GQLResult)
+"""A generic type variable for a GraphQL relay node."""
+
+
+class PageInfo(GQLResult):
+    typename__: Literal["PageInfo"] = "PageInfo"
+    end_cursor: Optional[str]
+    has_next_page: bool
+
+
+class Edge(GQLResult, Generic[NodeT]):
+    node: NodeT
+
+
+class Connection(GQLResult, Generic[NodeT]):
+    edges: List[Edge[NodeT]]
+    page_info: PageInfo
+
+    def nodes(self) -> Iterator[NodeT]:
+        """Returns an iterator over the nodes in the connection."""
+        return (node for edge in self.edges if (node := edge.node))
+
+    @property
+    def has_next(self) -> bool:
+        """Returns True if there are more pages to fetch."""
+        return self.page_info.has_next_page
+
+    @property
+    def next_cursor(self) -> Optional[str]:
+        """Returns the start cursor for the next page to fetch."""
+        return self.page_info.end_cursor
+
+
+class ConnectionWithTotal(Connection[NodeT], Generic[NodeT]):
+    total_count: NonNegativeInt

wandb/_pydantic/utils.py

@@ -30,7 +30,7 @@ def gql_typename(cls: type[BaseModel]) -> str:
 if IS_PYDANTIC_V2:
     import pydantic_core  # pydantic_core is only installed by pydantic v2
 
-    def from_json(s: str) -> Any:
+    def from_json(s: str | bytes) -> Any:
         """Quickly deserialize a JSON string to a Python object."""
         return pydantic_core.from_json(s)
 
@@ -63,7 +63,7 @@ else:
 
     from pydantic.json import pydantic_encoder  # Only valid in pydantic v1
 
-    def from_json(s: str) -> Any:
+    def from_json(s: str | bytes) -> Any:
         return json.loads(s)
 
     def to_json(v: Any) -> str:

wandb/apis/public/api.py

@@ -313,7 +313,9 @@ class Api:
             )
             self.settings["entity"] = _overrides["username"]
 
-        if _thread_local_api_settings.cookies is None:
+        use_api_key = api_key is not None or _thread_local_api_settings.cookies is None
+
+        if use_api_key:
             self.api_key = self._load_api_key(
                 base_url=self.settings["base_url"],
                 init_api_key=api_key,
@@ -331,7 +333,7 @@ class Api:
         self._default_entity = None
         self._timeout = timeout if timeout is not None else self._HTTP_TIMEOUT
         auth = None
-        if not _thread_local_api_settings.cookies:
+        if use_api_key:
             auth = ("api", self.api_key)
         proxies = self.settings.get("_proxies") or json.loads(
             os.environ.get("WANDB__PROXIES", "{}")
@@ -365,17 +367,18 @@ class Api:
         """Attempts to load a configured API key or prompt if one is not found.
 
         The API key is loaded in the following order:
-            1. Thread local api key
-            2. User explicitly provided api key
+            1. User explicitly provided api key
+            2. Thread local api key
             3. Environment variable
             4. Netrc file
             5. Prompt for api key using wandb.login
         """
-        # just use thread local api key if it's set
-        if _thread_local_api_settings.api_key:
-            return _thread_local_api_settings.api_key
+        # Use explicit key before thread local.
+        # This allow user switching keys without picking up the wrong key from thread local.
         if init_api_key is not None:
             return init_api_key
+        if _thread_local_api_settings.api_key:
+            return _thread_local_api_settings.api_key
         if os.getenv("WANDB_API_KEY"):
             return os.environ["WANDB_API_KEY"]
 
@@ -958,8 +961,8 @@ class Api:
             entity: Name of the entity requested.  If None, will fall back to
                 the default entity passed to `Api`.  If no default entity,
                 will raise a `ValueError`.
-            per_page: Sets the page size for query pagination. If set to `None`,
-                use the default size. Usually there is no reason to change this.
+            per_page: Sets the page size for query pagination.
+                Usually there is no reason to change this.
 
         Returns:
             A `Projects` object which is an iterable collection of `Project`objects.
@@ -1015,9 +1018,8 @@ class Api:
                 entity that created the project as a prefix followed by a
                 forward slash.
             name: Name of the report requested.
-            per_page: Sets the page size for query pagination. If set to
-                `None`, use the default size. Usually there is no reason to
-                change this.
+            per_page: Sets the page size for query pagination.
+                Usually there is no reason to change this.
 
         Returns:
             A `Reports` object which is an iterable collection of
@@ -1380,7 +1382,7 @@ class Api:
         Args:
             project_name: The name of the project to filter on.
             type_name: The name of the artifact type to filter on.
-            per_page: Sets the page size for query pagination.  None will use the default size.
+            per_page: Sets the page size for query pagination.
                 Usually there is no reason to change this.
 
         Returns:
@@ -1483,9 +1485,8 @@ class Api:
         name: The artifact's collection name. Optionally append the
             entity that logged the artifact as a prefix followed by
             a forward slash.
-        per_page: Sets the page size for query pagination. If set to
-            `None`, use the default size. Usually there is no reason
-            to change this.
+        per_page: Sets the page size for query pagination. Usually
+            there is no reason to change this.
         tags: Only return artifacts with all of these tags.
 
         Returns:
@@ -1788,6 +1789,7 @@ class Api:
         self,
         organization: str | None = None,
         filter: dict[str, Any] | None = None,
+        per_page: int = 100,
     ) -> Registries:
         """Returns a lazy iterator of `Registry` objects.
 
@@ -1804,6 +1806,7 @@ class Api:
                     `name`, `tag`, `description`, `created_at`, `updated_at`
                 Fields available to filter for versions are
                     `tag`, `alias`, `created_at`, `updated_at`, `metadata`
+            per_page: Sets the page size for query pagination.
 
         Returns:
             A lazy iterator of `Registry` objects.
@@ -1849,7 +1852,9 @@ class Api:
         organization = organization or fetch_org_from_settings_or_entity(
             self.settings, self.default_entity
         )
-        return Registries(self.client, organization, filter)
+        return Registries(
+            self.client, organization=organization, filter=filter, per_page=per_page
+        )
 
     @tracked
     def registry(self, name: str, organization: str | None = None) -> Registry:
@@ -2325,7 +2330,7 @@ class Api:
         # If needed, rewrite the GraphQL field selection set to omit unsupported fields/fragments/types
         omit_fragments = self._omitted_automation_fragments()
         mutation = gql_compat(CREATE_AUTOMATION_GQL, omit_fragments=omit_fragments)
-        variables = {"params": gql_input.model_dump(exclude_none=True)}
+        variables = {"input": gql_input.model_dump()}
 
         name = gql_input.name
         try:
@@ -2445,7 +2450,7 @@ class Api:
         # If needed, rewrite the GraphQL field selection set to omit unsupported fields/fragments/types
         omit_fragments = self._omitted_automation_fragments()
         mutation = gql_compat(UPDATE_AUTOMATION_GQL, omit_fragments=omit_fragments)
-        variables = {"params": gql_input.model_dump(exclude_none=True)}
+        variables = {"input": gql_input.model_dump()}
 
         name = gql_input.name
         try: