wandb 0.17.5__py3-none-any.whl → 0.17.7__py3-none-any.whl

wandb/__init__.py

@@ -1,9 +1,6 @@
 """Use wandb to track machine learning work.
 
-The most commonly used functions/objects are:
-  - wandb.init — initialize a new run at the top of your training script
-  - wandb.config — track hyperparameters and metadata
-  - wandb.log — log metrics and media over time within your training loop
+Train and fine-tune models, manage models from experimentation to production.
 
 For guides and examples, see https://docs.wandb.ai.
 
@@ -11,11 +8,7 @@ For scripts and interactive notebooks, see https://github.com/wandb/examples.
 
 For reference documentation, see https://docs.wandb.com/ref/python.
 """
-__version__ = "0.17.5"
-
-
-# Used with pypi checks and other messages related to pip
-_wandb_module = "wandb"
+__version__ = "0.17.7"
 
 from typing import Optional
 
@@ -74,6 +67,7 @@ from wandb.data_types import Video
 from wandb.data_types import Audio
 from wandb.data_types import Table
 from wandb.data_types import Html
+from wandb.data_types import box3d
 from wandb.data_types import Object3D
 from wandb.data_types import Molecule
 from wandb.data_types import Histogram
@@ -117,13 +111,6 @@ def _assert_is_user_process():
     assert not _IS_INTERNAL_PROCESS
 
 
-# toplevel:
-# save()
-# restore()
-# login()
-# sweep()
-# agent()
-
 # globals
 Api = PublicApi
 api = InternalApi()
@@ -245,6 +232,7 @@ __all__ = (
     "Audio",
     "Table",
     "Html",
+    "box3d",
     "Object3D",
     "Molecule",
     "Histogram",
@@ -252,4 +240,5 @@ __all__ = (
     "log_model",
     "use_model",
     "link_model",
+    "define_metric",
 )

wandb/agents/pyagent.py

@@ -14,7 +14,6 @@ import time
 import traceback
 
 import wandb
-from wandb import wandb_sdk
 from wandb.apis import InternalApi
 from wandb.sdk.launch.sweeps import utils as sweep_utils
 
@@ -298,7 +297,7 @@ class Agent:
                 sweep_param_path, job.config
             )
             os.environ[wandb.env.SWEEP_ID] = self._sweep_id
-            wandb_sdk.wandb_setup._setup(_reset=True)
+            wandb.sdk.wandb_setup._setup(_reset=True)
 
             wandb.termlog(f"Agent Starting Run: {run_id} with config:")
             for k, v in job.config.items():

wandb/apis/public/api.py

@@ -821,7 +821,7 @@ class Api:
             order: (str) Order can be `created_at`, `heartbeat_at`, `config.*.value`, or `summary_metrics.*`.
                 If you prepend order with a + order is ascending.
                 If you prepend order with a - order is descending (default).
-                The default order is run.created_at from newest to oldest.
+                The default order is run.created_at from oldest to newest.
             per_page: (int) Sets the page size for query pagination.
             include_sweeps: (bool) Whether to include the sweep runs in the results.
 

wandb/apis/public/jobs.py

@@ -65,6 +65,7 @@ class Job:
         self._entrypoint = source_info.get("entrypoint")
         self._dockerfile = source_info.get("dockerfile")
         self._build_context = source_info.get("build_context")
+        self._base_image = source_info.get("base_image")
         self._args = source_info.get("args")
         self._partial = self._job_info.get("_partial", False)
         self._requirements_file = os.path.join(self._fpath, "requirements.frozen.txt")
@@ -131,6 +132,8 @@ class Job:
             launch_project.set_job_dockerfile(self._dockerfile)
         if self._build_context:
             launch_project.set_job_build_context(self._build_context)
+        if self._base_image:
+            launch_project.set_job_base_image(self._base_image)
 
     def _configure_launch_project_artifact(self, launch_project):
         artifact_string = self._job_info.get("source", {}).get("artifact")
@@ -152,6 +155,8 @@ class Job:
             launch_project.set_job_dockerfile(self._dockerfile)
         if self._build_context:
             launch_project.set_job_build_context(self._build_context)
+        if self._base_image:
+            launch_project.set_job_base_image(self._base_image)
 
     def _configure_launch_project_container(self, launch_project):
         launch_project.docker_image = self._job_info.get("source", {}).get("image")

wandb/cli/cli.py

@@ -1417,6 +1417,13 @@ def launch_sweep(
     help="""Specific docker image you'd like to use. In the form name:tag.
     If passed in, will override the docker image value passed in using a config file.""",
 )
+@click.option(
+    "--base-image",
+    "-B",
+    default=None,
+    metavar="BASE IMAGE",
+    help="""Docker image to run job code in. Incompatible with --docker-image.""",
+)
 @click.option(
     "--config",
     "-c",
@@ -1508,6 +1515,7 @@ def launch(
     entity,
     project,
     docker_image,
+    base_image,
     config,
     cli_template_vars,
     queue,
@@ -1604,6 +1612,7 @@ def launch(
             git_hash=git_version,
             name=job_name,
             project=project,
+            base_image=base_image,
             build_context=build_context,
             dockerfile=dockerfile,
             entity=entity,
@@ -2001,6 +2010,12 @@ def describe(job):
     help="Path to the build context from the root of the job source code. If "
     "provided, this is used as the base path for the Dockerfile and entrypoint.",
 )
+@click.option(
+    "--base-image",
+    "-B",
+    type=str,
+    help="Base image to use for the job. Incompatible with image jobs.",
+)
 @click.option(
     "--dockerfile",
     "-D",
@@ -2025,6 +2040,7 @@ def create(
     git_hash,
     runtime,
     build_context,
+    base_image,
     dockerfile,
 ):
     """Create a job from a source, without a wandb run.
@@ -2056,6 +2072,10 @@ def create(
         )
         entrypoint = "main.py"
 
+    if job_type == "image" and base_image:
+        wandb.termerror("Cannot provide --base-image/-B for an `image` job")
+        return
+
     artifact, action, aliases = _create_job(
         api=api,
         path=path,
@@ -2069,6 +2089,7 @@ def create(
         git_hash=git_hash,
         runtime=runtime,
         build_context=build_context,
+        base_image=base_image,
         dockerfile=dockerfile,
     )
     if not artifact:

wandb/data_types.py

@@ -44,7 +44,7 @@ from .sdk.data_types.histogram import Histogram
 from .sdk.data_types.html import Html
 from .sdk.data_types.image import Image
 from .sdk.data_types.molecule import Molecule
-from .sdk.data_types.object_3d import Object3D
+from .sdk.data_types.object_3d import Object3D, box3d
 from .sdk.data_types.plotly import Plotly
 from .sdk.data_types.saved_model import _SavedModel
 from .sdk.data_types.trace_tree import WBTraceTree
@@ -65,6 +65,7 @@ __all__ = [
     "Html",
     "Image",
     "Molecule",
+    "box3d",
     "Object3D",
     "Plotly",
     "Video",
@@ -103,7 +104,7 @@ class _TableIndex(int, _TableLinkMixin):
 def _json_helper(val, artifact):
     if isinstance(val, WBValue):
         return val.to_json(artifact)
-    elif val.__class__ == dict:
+    elif val.__class__ is dict:
         res = {}
         for key in val:
             res[key] = _json_helper(val[key], artifact)
@@ -269,10 +270,10 @@ class Table(Media):
         if dtype is None:
             dtype = _dtypes.UnknownType()
 
-        if optional.__class__ != list:
+        if optional.__class__ is not list:
             optional = [optional for _ in range(len(self.columns))]
 
-        if dtype.__class__ != list:
+        if dtype.__class__ is not list:
             dtype = [dtype for _ in range(len(self.columns))]
 
         self._column_types = _dtypes.TypedDictType({})

wandb/env.py

@@ -161,6 +161,12 @@ def is_debug(default: Optional[str] = None, env: Optional[Env] = None) -> bool:
     return _env_as_bool(DEBUG, default=default, env=env)
 
 
+def is_offline(env: Optional[Env] = None) -> bool:
+    if env is None:
+        env = os.environ
+    return env.get(MODE) == "offline"
+
+
 def error_reporting_enabled() -> bool:
     return _env_as_bool(ERROR_REPORTING, default="True")
 

wandb/integration/kfp/wandb_logging.py

@@ -30,7 +30,7 @@ def wandb_log(  # noqa: C901
     def isinstance_namedtuple(x):
         t = type(x)
         b = t.__bases__
-        if len(b) != 1 or b[0] != tuple:
+        if len(b) != 1 or b[0] is not tuple:
             return False
         f = getattr(t, "_fields", None)
         if not isinstance(f, tuple):

wandb/integration/lightning/fabric/logger.py

@@ -8,7 +8,7 @@ from typing_extensions import override
 
 import wandb
 from wandb import Artifact
-from wandb.sdk.lib import RunDisabled, telemetry
+from wandb.sdk.lib import telemetry
 from wandb.sdk.wandb_run import Run
 
 try:
@@ -293,7 +293,7 @@ class WandbLogger(Logger):
         anonymous: Optional[bool] = None,
         project: Optional[str] = None,
         log_model: Union[Literal["all"], bool] = False,
-        experiment: Union["Run", "RunDisabled", None] = None,
+        experiment: Optional["Run"] = None,
         prefix: str = "",
         checkpoint_name: Optional[str] = None,
         log_checkpoint_on: Union[Literal["success"], Literal["all"]] = "success",
@@ -312,7 +312,7 @@ class WandbLogger(Logger):
         self._prefix = prefix
         self._experiment = experiment
         self._logged_model_time: Dict[str, float] = {}
-        self._checkpoint_callback: Optional["ModelCheckpoint"] = None
+        self._checkpoint_callback: Optional[ModelCheckpoint] = None
 
         # paths are processed as strings
         if save_dir is not None:
@@ -360,7 +360,7 @@ class WandbLogger(Logger):
 
     @property
     @rank_zero_experiment
-    def experiment(self) -> Union["Run", "RunDisabled"]:
+    def experiment(self) -> "Run":
         r"""Actual wandb object.
 
         To use wandb features in your :class:`~lightning.pytorch.core.LightningModule`, do the
@@ -393,7 +393,7 @@ class WandbLogger(Logger):
                 self._experiment = wandb.init(**self._wandb_init)
 
                 # define default x-axis
-                if isinstance(self._experiment, (Run, RunDisabled)) and getattr(
+                if isinstance(self._experiment, Run) and getattr(
                     self._experiment, "define_metric", None
                 ):
                     self._experiment.define_metric("trainer/global_step")

wandb/integration/openai/fine_tuning.py

@@ -1,3 +1,4 @@
+import base64
 import datetime
 import io
 import json
@@ -16,13 +17,13 @@ from wandb.util import parse_version
 
 openai = util.get_module(
     name="openai",
-    required="`openai` not installed. This integration requires `openai`. To fix, please `pip install openai`",
-    lazy="False",
+    required="This integration requires `openai`. To install, please run `pip install openai`",
+    lazy=False,
 )
 
-if parse_version(openai.__version__) < parse_version("1.0.1"):
+if parse_version(openai.__version__) < parse_version("1.12.0"):
     raise wandb.Error(
-        f"This integration requires openai version 1.0.1 and above. Your current version is {openai.__version__} "
+        f"This integration requires openai version 1.12.0 and above. Your current version is {openai.__version__} "
         "To fix, please `pip install -U openai`"
     )
 
@@ -228,7 +229,14 @@ class WandbLogger:
         # check results are present
         try:
             results_id = fine_tune.result_files[0]
-            results = cls.openai_client.files.content(file_id=results_id).text
+            try:
+                encoded_results = cls.openai_client.files.content(
+                    file_id=results_id
+                ).read()
+                results = base64.b64decode(encoded_results).decode("utf-8")
+            except Exception:
+                # attempt to read as text, works for older jobs
+                results = cls.openai_client.files.content(file_id=results_id).text
         except openai.NotFoundError:
             if show_individual_warnings:
                 wandb.termwarn(

wandb/integration/ultralytics/pose_utils.py

@@ -23,7 +23,6 @@ def annotate_keypoint_results(result: Results, visualize_skeleton: bool):
 
 
 def annotate_keypoint_batch(image_path: str, keypoints: Any, visualize_skeleton: bool):
-    original_image = None
     with Image.open(image_path) as original_image:
         original_image = np.ascontiguousarray(original_image)
         annotator = Annotator(original_image)