wandb 0.19.10__py3-none-any.whl → 0.19.11__py3-none-any.whl

wandb/__init__.py

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

wandb/__init__.pyi

@@ -106,7 +106,7 @@ if TYPE_CHECKING:
     import wandb
     from wandb.plot import CustomChart
 
-__version__: str = "0.19.10"
+__version__: str = "0.19.11"
 
 run: Run | None
 config: wandb_config.Config
@@ -1078,7 +1078,7 @@ def link_model(
     registered_model_name: str,
     name: str | None = None,
     aliases: list[str] | None = None,
-) -> None:
+) -> Artifact | None:
     """Log a model artifact version and link it to a registered model in the model registry.
 
     The linked model version will be visible in the UI for the specified registered model.
@@ -1140,7 +1140,7 @@ def link_model(
         ValueError: if name has invalid special characters
 
     Returns:
-        None
+        The linked artifact if linking was successful, otherwise None.
     """
     ...
 

wandb/_pydantic/__init__.py

@@ -1,7 +1,6 @@
 """Internal utilities for working with pydantic."""
 
 from .base import (
-    Base,
     CompatBaseModel,
     GQLBase,
     GQLId,
@@ -9,13 +8,12 @@ from .base import (
     Typename,
     ensure_json,
 )
-from .utils import IS_PYDANTIC_V2, pydantic_isinstance, to_json
+from .utils import IS_PYDANTIC_V2, from_json, pydantic_isinstance, to_json
 from .v1_compat import AliasChoices, computed_field, field_validator, model_validator
 
 __all__ = [
     "IS_PYDANTIC_V2",
     "CompatBaseModel",
-    "Base",
     "GQLBase",
     "Typename",
     "GQLId",
@@ -26,5 +24,6 @@ __all__ = [
     "model_validator",
     "pydantic_isinstance",
     "to_json",
+    "from_json",
     "ensure_json",
 ]

wandb/_pydantic/base.py

@@ -42,17 +42,20 @@ class CompatBaseModel(PydanticCompatMixin, BaseModel):
     __doc__ = None  # Prevent subclasses from inheriting the BaseModel docstring
 
 
-# Base class for all generated classes/types.
+# Base class for all GraphQL-generated types.
 # Omitted from docstring to avoid inclusion in generated docs.
-class Base(CompatBaseModel):
+class GQLBase(CompatBaseModel):
     model_config = ConfigDict(
-        populate_by_name=True,
+        populate_by_name=True,  # Discouraged in pydantic v2.11+, will be deprecated in v3
+        validate_by_name=True,  # Introduced in pydantic v2.11
+        validate_by_alias=True,  # Introduced in pydantic v2.11
+        serialize_by_alias=True,  # Introduced in pydantic v2.11
         validate_assignment=True,
         validate_default=True,
-        extra="forbid",
         use_attribute_docstrings=True,
         from_attributes=True,
         revalidate_instances="always",
+        protected_namespaces=(),  # Some GraphQL fields may begin with "model_"
     )
 
     @override
@@ -76,20 +79,11 @@ class Base(CompatBaseModel):
         return super().model_dump_json(indent=indent, **kwargs)
 
 
-# Base class with extra customization for GQL generated types.
-# Omitted from docstring to avoid inclusion in generated docs.
-class GQLBase(Base):
-    model_config = ConfigDict(
-        extra="ignore",
-        protected_namespaces=(),
-    )
-
-
 # ------------------------------------------------------------------------------
 # Reusable annotations for field types
 T = TypeVar("T")
 
-if IS_PYDANTIC_V2:
+if IS_PYDANTIC_V2 or TYPE_CHECKING:
     GQLId = Annotated[
         StrictStr,
         Field(repr=False, frozen=True),
@@ -121,28 +115,14 @@ def ensure_json(v: Any) -> Any:
 
 
 if IS_PYDANTIC_V2 or TYPE_CHECKING:
-    from pydantic import BeforeValidator
+    from pydantic import BeforeValidator, PlainSerializer
 
     SerializedToJson = Annotated[
         Json[T],
         # Allow lenient instantiation/validation: incoming data may already be deserialized.
         BeforeValidator(ensure_json),
+        PlainSerializer(to_json),
     ]
 else:
+    # FIXME: Restore, modify, or replace this later after ensuring pydantic v1 compatibility.
     SerializedToJson = Json[T]  # type: ignore[misc]
-
-# FIXME: Restore, modify, or replace this later after ensuring pydantic v1 compatibility.
-# def validate_maybe_json(v: Any, handler: ValidatorFunctionWrapHandler) -> Any:
-#     """Wraps default Json[...] field validator to allow instantiation with an already-decoded value."""
-#     try:
-#         return handler(v)
-#     except ValidationError:
-#         # Try revalidating after properly jsonifying the value
-#         return handler(to_json(v, by_alias=True, round_trip=True))
-#
-#
-# SerializedToJson = Annotated[
-#     Json[T],
-#     # Allow lenient instantiation/validation: incoming data may already be deserialized.
-#     WrapValidator(validate_maybe_json),
-# ]

wandb/_pydantic/utils.py

@@ -23,8 +23,12 @@ BaseModelType: TypeAlias = Type[BaseModel]
 if IS_PYDANTIC_V2:
     import pydantic_core  # pydantic_core is only installed by pydantic v2
 
+    def from_json(s: str) -> Any:
+        """Quickly deserialize a JSON string to a Python object."""
+        return pydantic_core.from_json(s)
+
     def to_json(v: Any) -> str:
-        """Serialize a Python object to a JSON string."""
+        """Quickly serialize a (possibly Pydantic) object to a JSON string."""
         return pydantic_core.to_json(v, by_alias=True, round_trip=True).decode("utf-8")
 
     def pydantic_isinstance(
@@ -52,6 +56,9 @@ else:
 
     from pydantic.json import pydantic_encoder  # Only valid in pydantic v1
 
+    def from_json(s: str) -> Any:
+        return json.loads(s)
+
     def to_json(v: Any) -> str:
         return json.dumps(v, default=pydantic_encoder)
 

wandb/_pydantic/v1_compat.py

@@ -101,7 +101,7 @@ class V1MixinMetaclass(PydanticModelMetaclass):
 
     @property
     def model_fields(self) -> dict[str, Any]:
-        return self.__fields__
+        return self.__fields__  # type: ignore[deprecated]
 
 
 # Mixin to ensure compatibility of Pydantic models if Pydantic v1 is detected.
@@ -117,7 +117,7 @@ class V1Mixin(metaclass=V1MixinMetaclass):
         """Reserialize values from `Json`-typed fields after dumping the model to dict."""
         # Get the expected keys (after `.model_dump()`) for `Json`-typed fields.
         # Note: In v1, `Json` fields have `ModelField.parse_json == True`
-        json_fields = (f for f in cls.__fields__.values() if f.parse_json)
+        json_fields = (f for f in cls.__fields__.values() if f.parse_json)  # type: ignore[deprecated]
         get_key = attrgetter("alias" if by_alias else "name")
         json_field_keys = set(map(get_key, json_fields))
 
@@ -213,7 +213,7 @@ else:
         check_fields: bool | None = None,
         **_: Any,
     ) -> Callable:
-        return pydantic.validator(
+        return pydantic.validator(  # type: ignore[deprecated]
             field,
             *fields,
             pre=(mode == "before"),