wandb 0.16.3__py3-none-any.whl → 0.16.5__py3-none-any.whl

wandb/apis/public/api.py

@@ -88,10 +88,7 @@ class RetryingClient:
         return self._server_info
 
     def version_supported(self, min_version):
-        try:
-            from packaging.version import Version as parse_version  # noqa: N813
-        except ImportError:
-            from pkg_resources import parse_version
+        from wandb.util import parse_version
 
         return parse_version(min_version) <= parse_version(
             self.server_info["cliVersionInfo"]["max_cli_version"]
@@ -316,15 +313,15 @@ class Api:
             entity: (str) Optional name of the entity to create the queue. If None, will use the configured or default entity.
             prioritization_mode: (str) Optional version of prioritization to use. Either "V0" or None
             config: (dict) Optional default resource configuration to be used for the queue. Use handlebars (eg. "{{var}}") to specify template variables.
-            template_variables (dict): A dictionary of template variable schemas to be used with the config. Expected format of:
+            template_variables: (dict) A dictionary of template variable schemas to be used with the config. Expected format of:
                 {
                     "var-name": {
                         "schema": {
-                            "type": "<string | number | integer>",
-                            "default": <optional value>,
-                            "minimum": <optional minimum>,
-                            "maximum": <optional maximum>,
-                            "enum": [..."<options>"]
+                            "type": ("string", "number", or "integer"),
+                            "default": (optional value),
+                            "minimum": (optional minimum),
+                            "maximum": (optional maximum),
+                            "enum": [..."(options)"]
                         }
                     }
                 }

wandb/apis/public/artifacts.py

@@ -8,6 +8,7 @@ import wandb
 from wandb.apis import public
 from wandb.apis.normalize import normalize_exceptions
 from wandb.apis.paginator import Paginator
+from wandb.errors.term import termlog
 
 if TYPE_CHECKING:
     from wandb.apis.public import RetryingClient, Run
@@ -402,6 +403,43 @@ class ArtifactCollection:
         self._attrs = response["project"]["artifactType"]["artifactCollection"]
         return self._attrs
 
+    def change_type(self, new_type: str) -> None:
+        """Change the type of the artifact collection.
+
+        Arguments:
+            new_type: The new collection type to use, freeform string.
+        """
+        if not self.is_sequence():
+            raise ValueError("Artifact collection needs to be a sequence")
+        termlog(f"Changing artifact collection type of " f"{self.type} to {new_type}")
+        template = """
+            mutation MoveArtifactCollection(
+                $artifactSequenceID: ID!
+                $destinationArtifactTypeName: String!
+            ) {
+                moveArtifactSequence(
+                input: {
+                    artifactSequenceID: $artifactSequenceID
+                    destinationArtifactTypeName: $destinationArtifactTypeName
+                }
+                ) {
+                artifactCollection {
+                    id
+                    name
+                    description
+                    __typename
+                }
+                }
+            }
+            """
+        variable_values = {
+            "artifactSequenceID": self.id,
+            "destinationArtifactTypeName": new_type,
+        }
+        mutation = gql(template)
+        self.client.execute(mutation, variable_values=variable_values)
+        self.type = new_type
+
     @normalize_exceptions
     def is_sequence(self) -> bool:
         """Return True if this is a sequence."""

wandb/apis/public/files.py

@@ -1,6 +1,7 @@
 """Public API: files."""
 import io
 import os
+from typing import Optional
 
 import requests
 from wandb_gql import gql
@@ -11,6 +12,7 @@ from wandb import util
 from wandb.apis.attrs import Attrs
 from wandb.apis.normalize import normalize_exceptions
 from wandb.apis.paginator import Paginator
+from wandb.apis.public.api import Api
 from wandb.apis.public.const import RETRY_TIMEDELTA
 from wandb.sdk.lib import retry
 
@@ -136,7 +138,11 @@ class File(Attrs):
         retryable_exceptions=(RetryError, requests.RequestException),
     )
     def download(
-        self, root: str = ".", replace: bool = False, exist_ok: bool = False
+        self,
+        root: str = ".",
+        replace: bool = False,
+        exist_ok: bool = False,
+        api: Optional[Api] = None,
     ) -> io.TextIOWrapper:
         """Downloads a file previously saved by a run from the wandb server.
 
@@ -150,6 +156,9 @@ class File(Attrs):
         Raises:
             `ValueError` if file already exists, replace=False and exist_ok=False.
         """
+        if api is None:
+            api = wandb.Api()
+
         path = os.path.join(root, self.name)
         if os.path.exists(path) and not replace:
             if exist_ok:
@@ -159,7 +168,7 @@ class File(Attrs):
                     "File already exists, pass replace=True to overwrite or exist_ok=True to leave it as is and don't error."
                 )
 
-        util.download_file_from_url(path, self.url, wandb.Api().api_key)
+        util.download_file_from_url(path, self.url, api.api_key)
         return open(path)
 
     @normalize_exceptions

wandb/apis/reports/v2/__init__.py

@@ -18,22 +18,3 @@ from .interface import (
 )
 from .metrics import *  # noqa
 from .panels import *  # noqa
-
-
-def show_welcome_message():
-    if os.getenv("WANDB_REPORT_API_DISABLE_MESSAGE"):
-        return
-
-    termlog(
-        cleandoc(
-            """
-            Thanks for trying out Report API v2!
-            See a tutorial and the changes here: http://wandb.me/report-api-quickstart
-            For bugs/feature requests, please create an issue on github: https://github.com/wandb/wandb/issues
-            You can disable this message by setting the env var WANDB_REPORT_API_DISABLE_MESSAGE=True
-            """
-        )
-    )
-
-
-show_welcome_message()

wandb/apis/reports/v2/expr_parsing.py

@@ -37,7 +37,6 @@ fe_name_map_reversed = {v: k for k, v in fe_name_map.items()}
 
 
 def expr_to_filters(expr: str) -> Filters:
-    print(f"expr: {expr=}")
     if not expr:
         filters = []
     else:

wandb/apis/reports/v2/interface.py

@@ -4,6 +4,8 @@ from datetime import datetime
 from typing import Dict, Iterable, Optional, Tuple, Union
 from typing import List as LList
 
+from annotated_types import Annotated, Ge, Le
+
 try:
     from typing import Literal
 except ImportError:
@@ -758,14 +760,8 @@ block_mapping = {
 
 @dataclass(config=dataclass_config)
 class GradientPoint(Base):
-    color: str
-    offset: float = Field(0, ge=0, le=100)
-
-    @validator("color")
-    def validate_color(cls, v):  # noqa: N805
-        if not internal.is_valid_color(v):
-            raise ValueError("invalid color, value should be hex, rgb, or rgba")
-        return v
+    color: Annotated[str, internal.ColorStrConstraints]
+    offset: Annotated[float, Ge(0), Le(100)] = 0
 
     def to_model(self):
         return internal.GradientPoint(color=self.color, offset=self.offset)
@@ -1419,8 +1415,7 @@ class Report(Base):
     description: str = ""
     blocks: LList[BlockTypes] = Field(default_factory=list)
 
-    id: str = Field(default_factory=lambda: "", init=False, repr=False)
-
+    id: str = Field(default_factory=lambda: "", init=False, repr=False, kw_only=True)
     _discussion_threads: list = Field(default_factory=list, init=False, repr=False)
     _ref: dict = Field(default_factory=dict, init=False, repr=False)
     _panel_settings: dict = Field(default_factory=dict, init=False, repr=False)
@@ -1470,20 +1465,22 @@ class Report(Base):
         if blocks[-1] == internal.Paragraph():
             blocks = blocks[:-1]
 
-        return cls(
+        obj = cls(
             title=model.display_name,
             description=model.description,
             entity=model.project.entity_name,
             project=model.project.name,
-            id=model.id,
             blocks=[_lookup(b) for b in blocks],
-            _discussion_threads=model.spec.discussion_threads,
-            _panel_settings=model.spec.panel_settings,
-            _ref=model.spec.ref,
-            _authors=model.spec.authors,
-            _created_at=model.created_at,
-            _updated_at=model.updated_at,
         )
+        obj.id = model.id
+        obj._discussion_threads = model.spec.discussion_threads
+        obj._panel_settings = model.spec.panel_settings
+        obj._ref = model.spec.ref
+        obj._authors = model.spec.authors
+        obj._created_at = model.created_at
+        obj._updated_at = model.updated_at
+
+        return obj
 
     @property
     def url(self):

wandb/apis/reports/v2/internal.py

@@ -1,18 +1,19 @@
 """JSONSchema for internal types.  Hopefully this is auto-generated one day!"""
 import json
 import random
-import re
 from copy import deepcopy
 from datetime import datetime
 from typing import Any, Dict, Optional, Tuple, Union
 from typing import List as LList
 
+from annotated_types import Annotated, Ge, Le
+
 try:
     from typing import Literal
 except ImportError:
     from typing_extensions import Literal
 
-from pydantic import BaseModel, ConfigDict, Field, validator
+from pydantic import BaseModel, ConfigDict, Field, StringConstraints, validator
 from pydantic.alias_generators import to_camel
 
 
@@ -48,6 +49,13 @@ def _generate_name(length: int = 12) -> str:
     return rand36.lower()[:length]
 
 
+hex_pattern = r"^#(?:[0-9a-fA-F]{3}){1,2}$"
+rgb_pattern = r"^rgb\(\s*(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\s*,\s*(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\s*,\s*(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\s*\)$"
+rgba_pattern = r"^rgba\(\s*(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\s*,\s*(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\s*,\s*(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\s*,\s*(1|0|0?\.\d+)\s*\)$"
+ColorStrConstraints = StringConstraints(
+    pattern=f"{hex_pattern}|{rgb_pattern}|{rgba_pattern}"
+)
+
 LinePlotStyle = Literal["line", "stacked-area", "pct-area"]
 BarPlotStyle = Literal["bar", "boxplot", "violin"]
 FontSize = Literal["small", "medium", "large", "auto"]
@@ -609,14 +617,8 @@ class LinePlot(Panel):
 
 
 class GradientPoint(ReportAPIBaseModel):
-    color: str
-    offset: float = Field(0, ge=0, le=100)
-
-    @validator("color")
-    def validate_color(cls, v):  # noqa: N805
-        if not is_valid_color(v):
-            raise ValueError("invalid color, value should be hex, rgb, or rgba")
-        return v
+    color: Annotated[str, ColorStrConstraints]
+    offset: Annotated[float, Ge(0), Le(100)] = 0
 
 
 class ScatterPlotConfig(ReportAPIBaseModel):
@@ -866,38 +868,3 @@ block_type_mapping = {
     "table-of-contents": TableOfContents,
     "block-quote": BlockQuote,
 }
-
-
-def is_valid_color(color_str: str) -> bool:
-    # Regular expression for hex color validation
-    hex_color_pattern = r"^#(?:[0-9a-fA-F]{3}){1,2}$"
-
-    # Check if it's a valid hex color
-    if re.match(hex_color_pattern, color_str):
-        return True
-
-    # Try parsing it as an RGB or RGBA tuple
-    try:
-        # Strip 'rgb(' or 'rgba(' and the closing ')'
-        if color_str.startswith("rgb(") and color_str.endswith(")"):
-            parts = color_str[4:-1].split(",")
-        elif color_str.startswith("rgba(") and color_str.endswith(")"):
-            parts = color_str[5:-1].split(",")
-        else:
-            return False
-
-        # Convert parts to integers and validate ranges
-        parts = [int(p.strip()) for p in parts]
-        if len(parts) == 3 and all(0 <= p <= 255 for p in parts):
-            return True  # Valid RGB
-        if (
-            len(parts) == 4
-            and all(0 <= p <= 255 for p in parts[:-1])
-            and 0 <= parts[-1] <= 1
-        ):
-            return True  # Valid RGBA
-
-    except ValueError:
-        pass
-
-    return False

wandb/cli/cli.py

@@ -433,10 +433,14 @@ def beta():
     from wandb.util import get_core_path
 
     if not get_core_path():
-        click.echo(
-            "wandb beta commands require wandb-core, please install with `pip install wandb-core`"
+        click.secho(
+            (
+                "wandb beta commands require wandb-core, please install with"
+                " `pip install wandb-core`"
+            ),
+            fg="red",
+            err=True,
         )
-        sys.exit(1)
 
 
 @beta.command(
@@ -1596,29 +1600,28 @@ def launch(
             sys.exit(0)
     else:
         try:
-            asyncio.run(
-                _launch_add(
-                    api,
-                    uri,
-                    job,
-                    config,
-                    template_variables,
-                    project,
-                    entity,
-                    queue,
-                    resource,
-                    entry_point,
-                    name,
-                    git_version,
-                    docker_image,
-                    project_queue,
-                    resource_args,
-                    build=build,
-                    run_id=run_id,
-                    repository=repository,
-                    priority=priority,
-                )
+            _launch_add(
+                api,
+                uri,
+                job,
+                config,
+                template_variables,
+                project,
+                entity,
+                queue,
+                resource,
+                entry_point,
+                name,
+                git_version,
+                docker_image,
+                project_queue,
+                resource_args,
+                build=build,
+                run_id=run_id,
+                repository=repository,
+                priority=priority,
             )
+
         except Exception as e:
             wandb._sentry.exception(e)
             raise e
@@ -2342,8 +2345,29 @@ def artifact():
     default=None,
     help="Resume the last run from your current directory.",
 )
+@click.option(
+    "--skip_cache",
+    is_flag=True,
+    default=False,
+    help="Skip caching while uploading artifact files.",
+)
+@click.option(
+    "--policy",
+    default="mutable",
+    help="Set the storage policy while uploading artifact files.",
+)
 @display_error
-def put(path, name, description, type, alias, run_id, resume):
+def put(
+    path,
+    name,
+    description,
+    type,
+    alias,
+    run_id,
+    resume,
+    skip_cache,
+    policy,
+):
     if name is None:
         name = os.path.basename(path)
     public_api = PublicApi()
@@ -2358,10 +2382,10 @@ def put(path, name, description, type, alias, run_id, resume):
     artifact_path = f"{entity}/{project}/{artifact_name}:{alias[0]}"
     if os.path.isdir(path):
         wandb.termlog(f'Uploading directory {path} to: "{artifact_path}" ({type})')
-        artifact.add_dir(path)
+        artifact.add_dir(path, skip_cache=skip_cache, policy=policy)
     elif os.path.isfile(path):
         wandb.termlog(f'Uploading file {path} to: "{artifact_path}" ({type})')
-        artifact.add_file(path)
+        artifact.add_file(path, skip_cache=skip_cache, policy=policy)
     elif "://" in path:
         wandb.termlog(
             f'Logging reference artifact from {path} to: "{artifact_path}" ({type})'
@@ -2861,30 +2885,3 @@ def verify(host):
         and url_success
     ):
         sys.exit(1)
-
-
-@cli.group("import", help="Commands for importing data from other systems")
-def importer():
-    pass
-
-
-@importer.command("mlflow", help="Import from MLFlow")
-@click.option("--mlflow-tracking-uri", help="MLFlow Tracking URI")
-@click.option(
-    "--target-entity", required=True, help="Override default entity to import data into"
-)
-@click.option(
-    "--target-project",
-    required=True,
-    help="Override default project to import data into",
-)
-def mlflow(mlflow_tracking_uri, target_entity, target_project):
-    from wandb.apis.importers import MlflowImporter
-
-    importer = MlflowImporter(mlflow_tracking_uri=mlflow_tracking_uri)
-    overrides = {
-        "entity": target_entity,
-        "project": target_project,
-    }
-
-    importer.import_all_parallel(overrides=overrides)

wandb/integration/gym/__init__.py

@@ -47,7 +47,8 @@ def monitor():
             import gym
         else:
             import gymnasium as gym  # type: ignore
-        from pkg_resources import parse_version
+
+        from wandb.util import parse_version
 
         if parse_version(gym.__version__) < parse_version("0.26.0"):
             _gym_version_lt_0_26 = True

wandb/integration/keras/callbacks/model_checkpoint.py

@@ -187,7 +187,7 @@ class WandbModelCheckpoint(callbacks.ModelCheckpoint):
     @property
     def is_old_tf_keras_version(self) -> Optional[bool]:
         if self._is_old_tf_keras_version is None:
-            from pkg_resources import parse_version
+            from wandb.util import parse_version
 
             try:
                 if parse_version(tf.keras.__version__) < parse_version("2.6.0"):

wandb/integration/keras/keras.py

@@ -19,7 +19,8 @@ from wandb.util import add_import_hook
 
 def _check_keras_version():
     from keras import __version__ as keras_version
-    from pkg_resources import parse_version
+
+    from wandb.util import parse_version
 
     if parse_version(keras_version) < parse_version("2.4.0"):
         wandb.termwarn(
@@ -29,7 +30,7 @@ def _check_keras_version():
 
 def _can_compute_flops() -> bool:
     """FLOPS computation is restricted to TF 2.x as it requires tf.compat.v1."""
-    from pkg_resources import parse_version
+    from wandb.util import parse_version
 
     if parse_version(tf.__version__) >= parse_version("2.0.0"):
         return True
@@ -73,9 +74,10 @@ def is_generator_like(data):
 
 
 def patch_tf_keras():  # noqa: C901
-    from pkg_resources import parse_version
     from tensorflow.python.eager import context
 
+    from wandb.util import parse_version
+
     if (
         parse_version("2.6.0")
         <= parse_version(tf.__version__)
@@ -235,7 +237,7 @@ patch_tf_keras()
 
 
 def _get_custom_optimizer_parent_class():
-    from pkg_resources import parse_version
+    from wandb.util import parse_version
 
     if parse_version(tf.__version__) >= parse_version("2.9.0"):
         custom_optimizer_parent_class = tf.keras.optimizers.legacy.Optimizer

wandb/integration/kfp/kfp_patch.py

@@ -3,8 +3,6 @@ import itertools
 import textwrap
 from typing import Callable, List, Mapping, Optional
 
-from pkg_resources import parse_version
-
 import wandb
 
 try:
@@ -13,6 +11,8 @@ try:
     from kfp.components._components import _create_task_factory_from_component_spec
     from kfp.components._python_op import _func_to_component_spec
 
+    from wandb.util import parse_version
+
     MIN_KFP_VERSION = "1.6.1"
 
     if parse_version(kfp_version) < parse_version(MIN_KFP_VERSION):

wandb/integration/openai/fine_tuning.py

@@ -5,13 +5,12 @@ import re
 import time
 from typing import Any, Dict, Optional, Tuple
 
-from pkg_resources import parse_version
-
 import wandb
 from wandb import util
 from wandb.data_types import Table
 from wandb.sdk.lib import telemetry
 from wandb.sdk.wandb_run import Run
+from wandb.util import parse_version
 
 openai = util.get_module(
     name="openai",

wandb/integration/ultralytics/callback.py

@@ -321,7 +321,6 @@ class WandBUltralyticsCallback:
                     )
             if self.enable_model_checkpointing:
                 self._save_model(trainer)
-            self.model.to("cpu")
             trainer.model.to(self.device)
 
     def on_train_end(self, trainer: TRAINER_TYPE):