wandb 0.17.0rc2__py3-none-macosx_11_0_arm64.whl → 0.17.1__py3-none-macosx_11_0_arm64.whl

wandb/proto/wandb_base_pb2.py

@@ -6,3 +6,5 @@ if protobuf_version == "3":
     from wandb.proto.v3.wandb_base_pb2 import *
 elif protobuf_version == "4":
     from wandb.proto.v4.wandb_base_pb2 import *
+elif protobuf_version == "5":
+    from wandb.proto.v5.wandb_base_pb2 import *

wandb/proto/wandb_deprecated.py

@@ -20,7 +20,11 @@ DEPRECATED_FEATURES = Literal[
     "init__config_include_keys",
     "init__config_exclude_keys",
     "keras_callback__save_model",
-    "langchain_tracer"
+    "langchain_tracer",
+    "artifact__get_path",
+    "artifactmanifestentry__name",
+    "api__artifact_versions",
+    "artifact_collection__change_type",
 ]
 
 
@@ -35,3 +39,7 @@ class Deprecated:
     init__config_exclude_keys: DEPRECATED_FEATURES = "init__config_exclude_keys"
     keras_callback__save_model: DEPRECATED_FEATURES = "keras_callback__save_model"
     langchain_tracer: DEPRECATED_FEATURES = "langchain_tracer"
+    artifact__get_path: DEPRECATED_FEATURES = "artifact__get_path"
+    artifactmanifestentry__name: DEPRECATED_FEATURES = "artifactmanifestentry__name"
+    api__artifact_versions: DEPRECATED_FEATURES = "api__artifact_versions"
+    artifact_collection__change_type: DEPRECATED_FEATURES = "artifact_collection__change_type"

wandb/proto/wandb_generate_deprecated.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+
+
+def generate_deprecated_class_definition() -> None:
+    """Generate a class definition listing the deprecated features.
+    This is to allow static checks to ensure that proper field names are used.
+    """
+    from wandb.proto.wandb_telemetry_pb2 import Deprecated  # type: ignore[import]
+
+    deprecated_features = Deprecated.DESCRIPTOR.fields_by_name.keys()
+
+    code: str = (
+        "# Generated by wandb/proto/wandb_internal_codegen.py.  DO NOT EDIT!\n\n\n"
+        "import sys\n\n\n"
+        "if sys.version_info >= (3, 8):\n"
+        "    from typing import Literal\n"
+        "else:\n"
+        "    from typing_extensions import Literal\n\n\n"
+        "DEPRECATED_FEATURES = Literal[\n"
+        + ",\n".join(f'    "{feature}"' for feature in deprecated_features)
+        + ",\n"
+        + "]\n\n\n"
+        "class Deprecated:\n"
+        + "".join(
+            [
+                f'    {feature}: DEPRECATED_FEATURES = "{feature}"\n'
+                for feature in deprecated_features
+            ]
+        )
+    )
+    with open("wandb_deprecated.py", "w") as f:
+        f.write(code)
+
+generate_deprecated_class_definition()

wandb/proto/{wandb_internal_codegen.py → wandb_generate_proto.py}

@@ -1,46 +1,14 @@
 #!/usr/bin/env python
 
+import importlib.metadata
 import os
 import pathlib
 
 import grpc_tools  # type: ignore
 from grpc_tools import protoc  # type: ignore
-import importlib.metadata
 from packaging import version
 
 
-def generate_deprecated_class_definition() -> None:
-    """
-    Generate a class definition listing the deprecated features.
-    This is to allow static checks to ensure that proper field names are used.
-    """
-    from wandb.proto.wandb_telemetry_pb2 import Deprecated  # type: ignore[import]
-
-    deprecated_features = Deprecated.DESCRIPTOR.fields_by_name.keys()
-
-    code: str = (
-        "# Generated by wandb/proto/wandb_internal_codegen.py.  DO NOT EDIT!\n\n\n"
-        "import sys\n\n\n"
-        "if sys.version_info >= (3, 8):\n"
-        "    from typing import Literal\n"
-        "else:\n"
-        "    from typing_extensions import Literal\n\n\n"
-        "DEPRECATED_FEATURES = Literal[\n"
-        + ",\n".join(f'    "{feature}"' for feature in deprecated_features)
-        + "\n"
-        + "]\n\n\n"
-        "class Deprecated:\n"
-        + "".join(
-            [
-                f'    {feature}: DEPRECATED_FEATURES = "{feature}"\n'
-                for feature in deprecated_features
-            ]
-        )
-    )
-    with open("wandb/proto/wandb_deprecated.py", "w") as f:
-        f.write(code)
-
-
 def get_pip_package_version(package_name: str) -> str:
     try:
         return importlib.metadata.version(package_name)
@@ -79,5 +47,3 @@ for p in (tmp_out / "wandb" / "proto").glob("*pb2*"):
     p.rename(tmp_out / p.name)
 os.rmdir(tmp_out / "wandb" / "proto")
 os.rmdir(tmp_out / "wandb")
-
-generate_deprecated_class_definition()

wandb/proto/wandb_internal_pb2.py

@@ -6,3 +6,5 @@ if protobuf_version == "3":
     from wandb.proto.v3.wandb_internal_pb2 import *
 elif protobuf_version == "4":
     from wandb.proto.v4.wandb_internal_pb2 import *
+elif protobuf_version == "5":
+    from wandb.proto.v5.wandb_internal_pb2 import *

wandb/proto/wandb_server_pb2.py

@@ -6,3 +6,5 @@ if protobuf_version == "3":
     from wandb.proto.v3.wandb_server_pb2 import *
 elif protobuf_version == "4":
     from wandb.proto.v4.wandb_server_pb2 import *
+elif protobuf_version == "5":
+    from wandb.proto.v5.wandb_server_pb2 import *

wandb/proto/wandb_settings_pb2.py

@@ -6,3 +6,5 @@ if protobuf_version == "3":
     from wandb.proto.v3.wandb_settings_pb2 import *
 elif protobuf_version == "4":
     from wandb.proto.v4.wandb_settings_pb2 import *
+elif protobuf_version == "5":
+    from wandb.proto.v5.wandb_settings_pb2 import *

wandb/proto/wandb_telemetry_pb2.py

@@ -6,3 +6,5 @@ if protobuf_version == "3":
     from wandb.proto.v3.wandb_telemetry_pb2 import *
 elif protobuf_version == "4":
     from wandb.proto.v4.wandb_telemetry_pb2 import *
+elif protobuf_version == "5":
+    from wandb.proto.v5.wandb_telemetry_pb2 import *

wandb/sdk/artifacts/artifact.py

@@ -70,6 +70,7 @@ from wandb.sdk.data_types._dtypes import TypeRegistry
 from wandb.sdk.internal.internal_api import Api as InternalApi
 from wandb.sdk.internal.thread_local_settings import _thread_local_api_settings
 from wandb.sdk.lib import filesystem, retry, runid, telemetry
+from wandb.sdk.lib.deprecate import Deprecated, deprecate
 from wandb.sdk.lib.hashutil import B64MD5, b64_to_hex_id, md5_file_b64
 from wandb.sdk.lib.mailbox import Mailbox
 from wandb.sdk.lib.paths import FilePathStr, LogicalPath, StrPath, URIStr
@@ -262,11 +263,12 @@ class Artifact:
                 "name": name,
             },
         )
-        attrs = response.get("project", {}).get("artifact")
-        if attrs is None:
-            raise ValueError(
-                f"Unable to fetch artifact with name {entity}/{project}/{name}"
-            )
+        project_attrs = response.get("project")
+        if not project_attrs:
+            raise ValueError(f"project '{project}' not found under entity '{entity}'")
+        attrs = project_attrs.get("artifact")
+        if not attrs:
+            raise ValueError(f"artifact '{name}' not found in '{entity}/{project}'")
         return cls._from_attrs(entity, project, name, attrs, client)
 
     @classmethod
@@ -425,7 +427,7 @@ class Artifact:
 
         A collection is an ordered group of artifact versions.
         If this artifact was retrieved from a portfolio / linked collection, that
-        collection will be returned rather than the the collection
+        collection will be returned rather than the collection
         that an artifact version originated from. The collection
         that an artifact originates from is known as the source sequence.
         """
@@ -1180,7 +1182,7 @@ class Artifact:
         """
         self._ensure_can_add()
         if not os.path.isfile(local_path):
-            raise ValueError("Path is not a file: %s" % local_path)
+            raise ValueError("Path is not a file: {}".format(local_path))
 
         name = LogicalPath(name or os.path.basename(local_path))
         digest = md5_file_b64(local_path)
@@ -1221,11 +1223,12 @@ class Artifact:
         """
         self._ensure_can_add()
         if not os.path.isdir(local_path):
-            raise ValueError("Path is not a directory: %s" % local_path)
+            raise ValueError("Path is not a directory: {}".format(local_path))
 
         termlog(
-            "Adding directory to artifact (%s)... "
-            % os.path.join(".", os.path.normpath(local_path)),
+            "Adding directory to artifact ({})... ".format(
+                os.path.join(".", os.path.normpath(local_path))
+            ),
             newline=False,
         )
         start_time = time.time()
@@ -1503,8 +1506,9 @@ class Artifact:
 
     def get_path(self, name: StrPath) -> ArtifactManifestEntry:
         """Deprecated. Use `get_entry(name)`."""
-        termwarn(
-            "Artifact.get_path(name) is deprecated, use Artifact.get_entry(name) instead."
+        deprecate(
+            field_name=Deprecated.artifact__get_path,
+            warning_message="Artifact.get_path(name) is deprecated, use Artifact.get_entry(name) instead.",
         )
         return self.get_entry(name)
 
@@ -1526,7 +1530,7 @@ class Artifact:
         name = LogicalPath(name)
         entry = self.manifest.entries.get(name) or self._get_obj_entry(name)[0]
         if entry is None:
-            raise KeyError("Path not contained in artifact: %s" % name)
+            raise KeyError("Path not contained in artifact: {}".format(name))
         entry._parent_artifact = self
         return entry
 
@@ -1937,11 +1941,11 @@ class Artifact:
         for entry in self.manifest.entries.values():
             if entry.ref is None:
                 if md5_file_b64(os.path.join(root, entry.path)) != entry.digest:
-                    raise ValueError("Digest mismatch for file: %s" % entry.path)
+                    raise ValueError("Digest mismatch for file: {}".format(entry.path))
             else:
                 ref_count += 1
         if ref_count > 0:
-            print("Warning: skipped verification of %s refs" % ref_count)
+            print("Warning: skipped verification of {} refs".format(ref_count))
 
     def file(self, root: Optional[str] = None) -> StrPath:
         """Download a single file artifact to the directory you specify with `root`.
@@ -2057,13 +2061,13 @@ class Artifact:
 
         Arguments:
             target_path: The path to the portfolio inside a project.
-            The target path must adhere to one of the following
-            schemas `{portfolio}`, `{project}/{portfolio}` or
-            `{entity}/{project}/{portfolio}`.
-            To link the artifact to the Model Registry, rather than to a generic
-            portfolio inside a project, set `target_path` to the following
-            schema `{"model-registry"}/{Registered Model Name}` or
-            `{entity}/{"model-registry"}/{Registered Model Name}`.
+                The target path must adhere to one of the following
+                schemas `{portfolio}`, `{project}/{portfolio}` or
+                `{entity}/{project}/{portfolio}`.
+                To link the artifact to the Model Registry, rather than to a generic
+                portfolio inside a project, set `target_path` to the following
+                schema `{"model-registry"}/{Registered Model Name}` or
+                `{entity}/{"model-registry"}/{Registered Model Name}`.
             aliases: A list of strings that uniquely identifies the artifact inside the
                 specified portfolio.
 
@@ -2081,6 +2085,48 @@ class Artifact:
         else:
             wandb.run.link_artifact(self, target_path, aliases)
 
+    def unlink(self) -> None:
+        """Unlink this artifact if it is currently a member of a portfolio (a promoted collection of artifacts).
+
+        Raises:
+            ArtifactNotLoggedError: If the artifact is not logged.
+            ValueError: If the artifact is not linked, i.e. it is not a member of a portfolio collection.
+        """
+        self._ensure_logged("unlink")
+
+        # Fail early if this isn't a linked artifact to begin with
+        if self.collection.is_sequence():
+            raise ValueError(
+                f"Artifact {self.qualified_name!r} is not a linked artifact and cannot be unlinked.  "
+                f"To delete it, use {self.delete.__qualname__!r} instead."
+            )
+
+        self._unlink()
+
+    @normalize_exceptions
+    def _unlink(self) -> None:
+        mutation = gql(
+            """
+            mutation UnlinkArtifact($artifactID: ID!, $artifactPortfolioID: ID!) {
+                unlinkArtifact(
+                    input: { artifactID: $artifactID, artifactPortfolioID: $artifactPortfolioID }
+                ) {
+                    artifactID
+                    success
+                    clientMutationId
+                }
+            }
+            """
+        )
+        assert self._client is not None
+        self._client.execute(
+            mutation,
+            variable_values={
+                "artifactID": self.id,
+                "artifactPortfolioID": self.collection.id,
+            },
+        )
+
     def used_by(self) -> List[Run]:
         """Get a list of the runs that have used this artifact.
 

wandb/sdk/artifacts/artifact_manifest.py

@@ -51,7 +51,7 @@ class ArtifactManifest:
             entry.path in self.entries
             and entry.digest != self.entries[entry.path].digest
         ):
-            raise ValueError("Cannot add the same path twice: %s" % entry.path)
+            raise ValueError("Cannot add the same path twice: {}".format(entry.path))
         self.entries[entry.path] = entry
 
     def remove_entry(self, entry: "ArtifactManifestEntry") -> None:

wandb/sdk/artifacts/artifact_manifest_entry.py

@@ -6,8 +6,8 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Dict, Optional, Union
 from urllib.parse import urlparse
 
-from wandb.errors.term import termwarn
 from wandb.sdk.lib import filesystem
+from wandb.sdk.lib.deprecate import Deprecated, deprecate
 from wandb.sdk.lib.hashutil import (
     B64MD5,
     ETag,
@@ -94,8 +94,11 @@ class ArtifactManifestEntry:
 
     @property
     def name(self) -> LogicalPath:
-        # TODO(hugh): add telemetry to see if anyone is still using this.
-        termwarn("ArtifactManifestEntry.name is deprecated, use .path instead")
+        """Deprecated; use `path` instead."""
+        deprecate(
+            field_name=Deprecated.artifactmanifestentry__name,
+            warning_message="ArtifactManifestEntry.name is deprecated, use .path instead.",
+        )
         return self.path
 
     def parent_artifact(self) -> "Artifact":

wandb/sdk/artifacts/artifact_manifests/artifact_manifest_v1.py

@@ -20,7 +20,7 @@ class ArtifactManifestV1(ArtifactManifest):
     ) -> "ArtifactManifestV1":
         if manifest_json["version"] != cls.version():
             raise ValueError(
-                "Expected manifest version 1, got %s" % manifest_json["version"]
+                "Expected manifest version 1, got {}".format(manifest_json["version"])
             )
 
         storage_policy_name = manifest_json["storagePolicy"]

wandb/sdk/artifacts/artifact_saver.py

@@ -173,16 +173,7 @@ class ArtifactSaver:
         self._file_pusher.store_manifest_files(
             self._manifest,
             artifact_id,
-            lambda entry,
-            progress_callback: self._manifest.storage_policy.store_file_sync(
-                artifact_id,
-                artifact_manifest_id,
-                entry,
-                step_prepare,
-                progress_callback=progress_callback,
-            ),
-            lambda entry,
-            progress_callback: self._manifest.storage_policy.store_file_async(
+            lambda entry, progress_callback: self._manifest.storage_policy.store_file(
                 artifact_id,
                 artifact_manifest_id,
                 entry,

wandb/sdk/artifacts/storage_handlers/local_file_handler.py

@@ -43,7 +43,9 @@ class LocalFileHandler(StorageHandler):
         local_path = util.local_file_uri_to_path(str(manifest_entry.ref))
         if not os.path.exists(local_path):
             raise ValueError(
-                "Local file reference: Failed to find file at path %s" % local_path
+                "Local file reference: Failed to find file at path {}".format(
+                    local_path
+                )
             )
 
         path, hit, cache_open = self._cache.check_md5_obj_path(
@@ -131,5 +133,7 @@ class LocalFileHandler(StorageHandler):
             entries.append(entry)
         else:
             # TODO: update error message if we don't allow directories.
-            raise ValueError('Path "%s" must be a valid file or directory path' % path)
+            raise ValueError(
+                'Path "{}" must be a valid file or directory path'.format(path)
+            )
         return entries

wandb/sdk/artifacts/storage_handlers/multi_handler.py

@@ -29,7 +29,7 @@ class MultiHandler(StorageHandler):
                 return handler
         if self._default_handler is not None:
             return self._default_handler
-        raise ValueError('No storage handler registered for url "%s"' % str(url))
+        raise ValueError('No storage handler registered for url "{}"'.format(str(url)))
 
     def load_path(
         self,

wandb/sdk/artifacts/storage_handlers/tracking_handler.py

@@ -57,12 +57,14 @@ class TrackingHandler(StorageHandler):
         url = urlparse(path)
         if name is None:
             raise ValueError(
-                'You must pass name="<entry_name>" when tracking references with unknown schemes. ref: %s'
-                % path
+                'You must pass name="<entry_name>" when tracking references with unknown schemes. ref: {}'.format(
+                    path
+                )
             )
         termwarn(
-            "Artifact references with unsupported schemes cannot be checksummed: %s"
-            % path
+            "Artifact references with unsupported schemes cannot be checksummed: {}".format(
+                path
+            )
         )
         name = name or url.path[1:]  # strip leading slash
         return [ArtifactManifestEntry(path=name, ref=path, digest=path)]

wandb/sdk/artifacts/storage_policies/wandb_storage_policy.py

@@ -263,7 +263,7 @@ class WandbStoragePolicy(StoragePolicy):
             return math.ceil(file_size / S3_MAX_PART_NUMBERS)
         return default_chunk_size
 
-    def store_file_sync(
+    def store_file(
         self,
         artifact_id: str,
         artifact_manifest_id: str,
@@ -301,7 +301,7 @@ class WandbStoragePolicy(StoragePolicy):
                     hex_digests[part_number] = hex_digest
                     part_number += 1
 
-        resp = preparer.prepare_sync(
+        resp = preparer.prepare(
             {
                 "artifactID": artifact_id,
                 "artifactManifestID": artifact_manifest_id,
@@ -347,46 +347,6 @@ class WandbStoragePolicy(StoragePolicy):
 
         return False
 
-    async def store_file_async(
-        self,
-        artifact_id: str,
-        artifact_manifest_id: str,
-        entry: "ArtifactManifestEntry",
-        preparer: "StepPrepare",
-        progress_callback: Optional["progress.ProgressFn"] = None,
-    ) -> bool:
-        """Async equivalent to `store_file_sync`."""
-        resp = await preparer.prepare_async(
-            {
-                "artifactID": artifact_id,
-                "artifactManifestID": artifact_manifest_id,
-                "name": entry.path,
-                "md5": entry.digest,
-            }
-        )
-
-        entry.birth_artifact_id = resp.birth_artifact_id
-        if resp.upload_url is None:
-            return True
-        if entry.local_path is None:
-            return False
-
-        with open(entry.local_path, "rb") as file:
-            # This fails if we don't send the first byte before the signed URL expires.
-            await self._api.upload_file_retry_async(
-                resp.upload_url,
-                file,
-                progress_callback,
-                extra_headers={
-                    header.split(":", 1)[0]: header.split(":", 1)[1]
-                    for header in (resp.upload_headers or {})
-                },
-            )
-
-        self._write_cache(entry)
-
-        return False
-
     def _write_cache(self, entry: "ArtifactManifestEntry") -> None:
         if entry.local_path is None:
             return

wandb/sdk/artifacts/storage_policy.py

@@ -43,7 +43,7 @@ class StoragePolicy:
     ) -> FilePathStr:
         raise NotImplementedError
 
-    def store_file_sync(
+    def store_file(
         self,
         artifact_id: str,
         artifact_manifest_id: str,
@@ -53,17 +53,6 @@ class StoragePolicy:
     ) -> bool:
         raise NotImplementedError
 
-    async def store_file_async(
-        self,
-        artifact_id: str,
-        artifact_manifest_id: str,
-        entry: "ArtifactManifestEntry",
-        preparer: "StepPrepare",
-        progress_callback: Optional["ProgressFn"] = None,
-    ) -> bool:
-        """Async equivalent to `store_file_sync`."""
-        raise NotImplementedError
-
     def store_reference(
         self,
         artifact: "Artifact",

wandb/sdk/data_types/image.py

@@ -480,7 +480,7 @@ class Image(BatchableMedia):
             return "RGBA"
         else:
             raise ValueError(
-                "Un-supported shape for image conversion %s" % list(data.shape)
+                "Un-supported shape for image conversion {}".format(list(data.shape))
             )
 
     @classmethod

wandb/sdk/data_types/video.py

@@ -96,7 +96,9 @@ class Video(BatchableMedia):
         self._channels = None
         self._caption = caption
         if self._format not in Video.EXTS:
-            raise ValueError("wandb.Video accepts %s formats" % ", ".join(Video.EXTS))
+            raise ValueError(
+                "wandb.Video accepts {} formats".format(", ".join(Video.EXTS))
+            )
 
         if isinstance(data_or_path, BytesIO):
             filename = os.path.join(
@@ -110,7 +112,7 @@ class Video(BatchableMedia):
             ext = ext[1:].lower()
             if ext not in Video.EXTS:
                 raise ValueError(
-                    "wandb.Video accepts %s formats" % ", ".join(Video.EXTS)
+                    "wandb.Video accepts {} formats".format(", ".join(Video.EXTS))
                 )
             self._set_file(data_or_path, is_tmp=False)
             # ffprobe -v error -select_streams v:0 -show_entries stream=width,height -of csv=p=0 data_or_path

wandb/sdk/interface/interface.py

@@ -394,11 +394,23 @@ class InterfaceBase:
             source.artifact.artifact = info_source.get("artifact", "")
             source.artifact.entrypoint.extend(info_source.get("entrypoint", []))
             source.artifact.notebook = info_source.get("notebook", False)
+            build_context = info_source.get("build_context")
+            if build_context:
+                source.artifact.build_context = build_context
+            dockerfile = info_source.get("dockerfile")
+            if dockerfile:
+                source.artifact.dockerfile = dockerfile
         elif source_type == "repo":
             source.git.git_info.remote = metadata.get("git", {}).get("remote", "")
             source.git.git_info.commit = metadata.get("git", {}).get("commit", "")
             source.git.entrypoint.extend(metadata.get("entrypoint", []))
             source.git.notebook = metadata.get("notebook", False)
+            build_context = metadata.get("build_context")
+            if build_context:
+                source.git.build_context = build_context
+            dockerfile = metadata.get("dockerfile")
+            if dockerfile:
+                source.git.dockerfile = dockerfile
         elif source_type == "image":
             source.image.image = metadata.get("docker", "")
         else:
@@ -775,6 +787,7 @@ class InterfaceBase:
             source.file.CopyFrom(
                 pb.JobInputSource.ConfigFileSource(path=file_path),
             )
+        request.input_source.CopyFrom(source)
 
         return self._publish_job_input(request)
 

wandb/sdk/interface/interface_shared.py

@@ -321,7 +321,7 @@ class InterfaceShared(InterfaceBase):
         if result is None:
             # TODO: friendlier error message here
             raise wandb.Error(
-                "Couldn't communicate with backend after %s seconds" % timeout
+                "Couldn't communicate with backend after {} seconds".format(timeout)
             )
         login_response = result.response.login_response
         assert login_response

wandb/sdk/internal/file_pusher.py

@@ -14,7 +14,7 @@ from wandb.sdk.lib.paths import LogicalPath
 
 if TYPE_CHECKING:
     from wandb.sdk.artifacts.artifact_manifest import ArtifactManifest
-    from wandb.sdk.artifacts.artifact_saver import SaveFn, SaveFnAsync
+    from wandb.sdk.artifacts.artifact_saver import SaveFn
     from wandb.sdk.internal import file_stream, internal_api
     from wandb.sdk.internal.settings_static import SettingsStatic
 
@@ -148,11 +148,8 @@ class FilePusher:
         manifest: "ArtifactManifest",
         artifact_id: str,
         save_fn: "SaveFn",
-        save_fn_async: "SaveFnAsync",
     ) -> None:
-        event = step_checksum.RequestStoreManifestFiles(
-            manifest, artifact_id, save_fn, save_fn_async
-        )
+        event = step_checksum.RequestStoreManifestFiles(manifest, artifact_id, save_fn)
         self._incoming_queue.put(event)
 
     def commit_artifact(